diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 875df5df80be..6ecb30a5b18a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6123,12 +6123,6 @@ githubId = 49904992; name = "Dawid Sowa"; }; - dawnofmidnight = { - email = "dawnofmidnight@duck.com"; - github = "dawnofmidnight"; - githubId = 78233879; - name = "whispers"; - }; dawoox = { email = "contact@antoinebellanger.fr"; github = "Dawoox"; @@ -28228,6 +28222,13 @@ githubId = 6102222; name = "WheelsForReals"; }; + whispersofthedawn = { + email = "whispersofthedawn@duck.com"; + github = "whispersofthedawn"; + githubId = 78233879; + matrix = "@whispers:catgirl.cloud"; + name = "whispers"; + }; WhiteBlackGoose = { email = "wbg@angouri.org"; github = "WhiteBlackGoose"; diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md index 00d22c04cd1e..41a950d6ce0b 100644 --- a/nixos/doc/manual/release-notes/rl-2605.section.md +++ b/nixos/doc/manual/release-notes/rl-2605.section.md @@ -81,6 +81,12 @@ of pulling the upstream container image from Docker Hub. If you want the old beh No functionality should have been impacted by these changes (including controlling via `wpa_cli`, integration with NetworkManager or connman), but if you find any problems, please open an issue on GitHub. +- `kratos` has been updated from 1.3.1 to [25.4.0](https://github.com/ory/kratos/releases/tag/v25.4.0). Upstream switched to a new versioning scheme (year.major.minor). Notable breaking changes: + + - The `migrate sql` CLI command is now `migrate sql up` + - OIDC registration validation errors are now placed in the `default` node group instead of `oidc` + - Failed OIDC account linking returns HTTP 400 instead of 200 + - `pdns` has been updated to version [v5.0.x](https://doc.powerdns.com/authoritative/changelog/5.0.html), which introduces breaking changes. Check out the [Upgrade Notes](https://doc.powerdns.com/authoritative/upgrading.html#to-5-0-0) for details. - `services.angrr` now uses TOML for configuration. Define policies with `services.angrr.settings` (generate TOML file) or point to a file using `services.angrr.configFile`. The legacy options `services.angrr.period`, `services.angrr.ownedOnly`, and `services.angrr.removeRoot` have been removed. See `man 5 angrr` and the description of `services.angrr.settings` options for examples and details. diff --git a/nixos/modules/programs/wayland/hyprland.nix b/nixos/modules/programs/wayland/hyprland.nix index ae9d224778c2..59ca38e173a4 100644 --- a/nixos/modules/programs/wayland/hyprland.nix +++ b/nixos/modules/programs/wayland/hyprland.nix @@ -89,6 +89,9 @@ in configPackages = lib.mkDefault [ cfg.package ]; }; + # To make the Hyprland session available in DM + services.displayManager.sessionPackages = [ cfg.package ]; + systemd = lib.mkIf cfg.systemd.setPath.enable { user.extraConfig = '' DefaultEnvironment="PATH=/run/wrappers/bin:/etc/profiles/per-user/%u/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:$PATH" @@ -98,18 +101,6 @@ in (lib.mkIf (cfg.withUWSM) { programs.uwsm.enable = true; - # Configure UWSM to launch Hyprland from a display manager like SDDM - programs.uwsm.waylandCompositors = { - hyprland = { - prettyName = "Hyprland"; - comment = "Hyprland compositor managed by UWSM"; - binPath = "/run/current-system/sw/bin/start-hyprland"; - }; - }; - }) - (lib.mkIf (!cfg.withUWSM) { - # To make a vanilla Hyprland session available in DM - services.displayManager.sessionPackages = [ cfg.package ]; }) (import ./wayland-session.nix { diff --git a/nixos/modules/programs/wayland/uwsm.nix b/nixos/modules/programs/wayland/uwsm.nix index ee61c2ebad3e..112251143a30 100644 --- a/nixos/modules/programs/wayland/uwsm.nix +++ b/nixos/modules/programs/wayland/uwsm.nix @@ -107,33 +107,39 @@ in binPath = "/run/current-system/sw/bin/sway"; }; ''; + default = { }; }; }; - config = lib.mkIf cfg.enable { - environment.systemPackages = [ cfg.package ]; - systemd.packages = [ cfg.package ]; - environment.pathsToLink = [ "/share/uwsm" ]; + config = lib.mkIf cfg.enable ( + lib.mkMerge [ + { + environment.systemPackages = [ cfg.package ]; + systemd.packages = [ cfg.package ]; + environment.pathsToLink = [ "/share/uwsm" ]; - # UWSM recommends dbus broker for better compatibility - services.dbus.implementation = "broker"; + # UWSM recommends dbus broker for better compatibility + services.dbus.implementation = "broker"; - services.displayManager = { - enable = true; - sessionPackages = lib.mapAttrsToList ( - name: value: - mk_uwsm_desktop_entry { - inherit name; - inherit (value) - prettyName - comment - binPath - extraArgs - ; - } - ) cfg.waylandCompositors; - }; - }; + services.displayManager.enable = true; + } + + (lib.mkIf (cfg.waylandCompositors != { }) { + services.displayManager.sessionPackages = lib.mapAttrsToList ( + name: value: + mk_uwsm_desktop_entry { + inherit name; + inherit (value) + prettyName + comment + binPath + extraArgs + ; + } + ) cfg.waylandCompositors; + }) + ] + ); meta.maintainers = with lib.maintainers; [ johnrtitor diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index 74c2b2a5a15c..d1c0d2103522 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -609,9 +609,9 @@ in rewrite @allow_media /lib/exe/fetch.php?media=/{http.regexp.path.1} @allow_detail { - path /_detail* + path_regexp path ^/_detail/(.*)$ } - rewrite @allow_detail /lib/exe/detail.php?media={path} + rewrite @allow_detail /lib/exe/detail.php?media=/{http.regexp.path.1} @allow_export { path /_export* diff --git a/nixos/modules/services/web-apps/grocy.nix b/nixos/modules/services/web-apps/grocy.nix index ce5be95ce6f3..b38f35903b68 100644 --- a/nixos/modules/services/web-apps/grocy.nix +++ b/nixos/modules/services/web-apps/grocy.nix @@ -149,9 +149,9 @@ in user = "grocy"; group = "nginx"; - # PHP 8.1 and 8.2 are the only version which are supported/tested by upstream: - # https://github.com/grocy/grocy/blob/v4.0.2/README.md#platform-support - phpPackage = pkgs.php82; + # PHP 8.2 and 8.3 are the only version which are supported/tested by upstream: + # https://github.com/grocy/grocy/blob/v4.5.0/README.md#platform-support + phpPackage = pkgs.php83; inherit (cfg.phpfpm) settings; diff --git a/nixos/modules/system/activation/nixos-init.nix b/nixos/modules/system/activation/nixos-init.nix index 5fc2f1bf0e07..a2928cf1e0a1 100644 --- a/nixos/modules/system/activation/nixos-init.nix +++ b/nixos/modules/system/activation/nixos-init.nix @@ -34,6 +34,14 @@ in assertion = config.services.userborn.enable || config.systemd.sysusers.enable; message = "nixos-init can only be used with services.userborn.enable or systemd.sysusers.enable"; } + { + assertion = config.boot.postBootCommands == ""; + message = "nixos-init cannot be used with boot.postBootCommands"; + } + { + assertion = config.powerManagement.powerUpCommands == ""; + message = "nixos-init cannot be used with powerManagement.powerUpCommands"; + } ]; }; } diff --git a/nixos/modules/system/activation/switchable-system.nix b/nixos/modules/system/activation/switchable-system.nix index 45b5caac7734..0b840c978fb8 100644 --- a/nixos/modules/system/activation/switchable-system.nix +++ b/nixos/modules/system/activation/switchable-system.nix @@ -142,5 +142,16 @@ fi ''; }; + + security = + let + extraConfig = '' + Defaults env_keep+=NIXOS_NO_CHECK + ''; + in + { + sudo = { inherit extraConfig; }; + sudo-rs = { inherit extraConfig; }; + }; }; } diff --git a/nixos/tests/activation/etc-overlay-immutable.nix b/nixos/tests/activation/etc-overlay-immutable.nix index 539010c4ad66..a76c1ad297da 100644 --- a/nixos/tests/activation/etc-overlay-immutable.nix +++ b/nixos/tests/activation/etc-overlay-immutable.nix @@ -26,7 +26,6 @@ systemd.sysusers.enable = true; users.mutableUsers = false; boot.initrd.systemd.enable = true; - boot.kernelPackages = pkgs.linuxPackages_latest; time.timeZone = "Utc"; # The standard resolvconf service tries to write to /etc and crashes, diff --git a/nixos/tests/activation/etc-overlay-mutable.nix b/nixos/tests/activation/etc-overlay-mutable.nix index be0c80da861a..21d7b7fa6f89 100644 --- a/nixos/tests/activation/etc-overlay-mutable.nix +++ b/nixos/tests/activation/etc-overlay-mutable.nix @@ -24,7 +24,6 @@ # Prerequisites boot.initrd.systemd.enable = true; - boot.kernelPackages = pkgs.linuxPackages_latest; specialisation.new-generation.configuration = { environment.etc."newgen".text = "newgen"; diff --git a/nixos/tests/activation/nixos-init.nix b/nixos/tests/activation/nixos-init.nix index 0635efba28b8..2b3ee5c5ec55 100644 --- a/nixos/tests/activation/nixos-init.nix +++ b/nixos/tests/activation/nixos-init.nix @@ -11,6 +11,7 @@ boot.initrd.systemd.enable = true; system.etc.overlay.enable = true; services.userborn.enable = true; + boot.postBootCommands = lib.mkForce ""; system.nixos-init.enable = true; # Forcibly set this to only these specific values. diff --git a/pkgs/applications/backup/timeshift/unwrapped.nix b/pkgs/applications/backup/timeshift/unwrapped.nix index 00824f8840c5..b945e0929765 100644 --- a/pkgs/applications/backup/timeshift/unwrapped.nix +++ b/pkgs/applications/backup/timeshift/unwrapped.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "timeshift"; - version = "25.12.1"; + version = "25.12.3"; outputs = [ "out" "man" @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "linuxmint"; repo = "timeshift"; tag = finalAttrs.version; - hash = "sha256-m+eSF+cALWSaNt/0V0XTrDZiocddsLqK1YDU7yBdXjw="; + hash = "sha256-yrPeaGdt32bmP8lV+eYZb2H3OmVl3G5AH7eeGZ3LM3k="; }; postPatch = '' diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index ea07981c16e4..cd304700ee5f 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -1765,10 +1765,9 @@ let workgroups2 = ignoreCompilationError super.workgroups2; # elisp error ws-butler = super.ws-butler.overrideAttrs (old: { - # work around https://github.com/NixOS/nixpkgs/issues/436534 - src = pkgs.fetchFromSavannah { - repo = "emacs/nongnu"; - inherit (old.src) rev outputHash outputHashAlgo; + # TODO: Remove override when URL was updated in MELPA. + src = old.src.override { + url = "https://https.git.savannah.gnu.org/git/elpa/nongnu.git"; }; }); diff --git a/pkgs/applications/editors/jetbrains/bin/update_bin.py b/pkgs/applications/editors/jetbrains/bin/update_bin.py deleted file mode 100755 index 2c6fdfe29eac..000000000000 --- a/pkgs/applications/editors/jetbrains/bin/update_bin.py +++ /dev/null @@ -1,151 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i python3 -p python3 python3.pkgs.packaging python3.pkgs.requests python3.pkgs.xmltodict -import json -import pathlib -import logging -import requests -import subprocess -import sys -from urllib.error import HTTPError -import urllib.request -import xmltodict -from packaging import version - -updates_url = "https://www.jetbrains.com/updates/updates.xml" -current_path = pathlib.Path(__file__).parent -ides_file_path = current_path.joinpath("..").joinpath("ides.json").resolve() -versions_file_path = current_path.joinpath("versions.json").resolve() -fromVersions = {} -toVersions = {} - -logging.basicConfig(stream=sys.stdout, level=logging.DEBUG) - - -def one_or_more(x): - return x if isinstance(x, list) else [x] - - -def download_channels(): - logging.info("Checking for updates from %s", updates_url) - updates_response = requests.get(updates_url) - updates_response.raise_for_status() - root = xmltodict.parse(updates_response.text) - products = root["products"]["product"] - return { - channel["@name"]: channel - for product in products - if "channel" in product - for channel in one_or_more(product["channel"]) - } - - -def build_version(build): - build_number = build["@fullNumber"] if "@fullNumber" in build else build["@number"] - return version.parse(build_number) - - -def latest_build(channel): - builds = one_or_more(channel["build"]) - latest = max(builds, key=build_version) - return latest - - -def download_sha256(url): - url = f"{url}.sha256" - download_response = requests.get(url) - download_response.raise_for_status() - return download_response.content.decode('UTF-8').split(' ')[0] - - -channels = download_channels() - - -def get_url(template, version_or_build_number, version_number): - release = [str(n) for n in version.parse(version_number).release] - for k in range(len(release), 0, -1): - s = ".".join(release[0:k]) - url = template.format(version=version_or_build_number, versionMajorMinor=s) - try: - if urllib.request.urlopen(url).getcode() == 200: - return url - except HTTPError: - pass - return None - - -def update_product(name, ide, version_info): - update_channel = ide["updateChannel"] - logging.info("Updating %s", name) - channel = channels.get(update_channel) - if channel is None: - logging.error("Failed to find channel %s.", update_channel) - logging.error("Check that the update-channel in %s matches the name in %s", versions_file_path, updates_url) - else: - try: - build = latest_build(channel) - new_version = build["@version"] - new_build_number = "" - if "@fullNumber" not in build: - new_build_number = build["@number"] - else: - new_build_number = build["@fullNumber"] - if "EAP" not in channel["@name"]: - version_or_build_number = new_version - else: - version_or_build_number = new_build_number - version_number = new_version.split(' ')[0] - download_url = get_url(version_info["url-template"], version_or_build_number, version_number) - if not download_url: - raise Exception(f"No valid url for {name} version {version_or_build_number}") - version_info["url"] = download_url - if "sha256" not in version_info or version_info.get("build_number") != new_build_number: - fromVersions[name] = version_info["version"] - toVersions[name] = new_version - logging.info("Found a newer version %s with build number %s.", new_version, new_build_number) - version_info["version"] = new_version - version_info["build_number"] = new_build_number - version_info["sha256"] = download_sha256(download_url) - else: - logging.info("Already at the latest version %s with build number %s.", new_version, new_build_number) - except Exception as e: - logging.exception("Update failed:", exc_info=e) - logging.warning("Skipping %s due to the above error.", name) - logging.warning("It may be out-of-date. Fix the error and rerun.") - - -def update_products(versioned_products, ides): - for name, version_info in versioned_products.items(): - update_product(name, ides[name], version_info) - - -with open(versions_file_path, "r") as versions_file: - versions = json.load(versions_file) - -with open(ides_file_path, "r") as ides_file: - ides = json.load(ides_file) - -for versioned_products in versions.values(): - update_products(versioned_products, ides) - -with open(versions_file_path, "w") as versions_file: - json.dump(versions, versions_file, indent=2) - versions_file.write("\n") - -if len(toVersions) == 0: - # No Updates found - sys.exit(0) - -if len(toVersions) == 1: - commitMessage = "" -else: - lowestVersion = min(fromVersions.values()) - highestVersion = max(toVersions.values()) - commitMessage = f"jetbrains: {lowestVersion} -> {highestVersion}" - commitMessage += "\n\n" - -for name in toVersions.keys(): - commitMessage += f"jetbrains.{name}: {fromVersions[name]} -> {toVersions[name]}\n" - -# Commit the result -logging.info("#### Committing changes... ####") -subprocess.run(['git', 'commit', f'-m{commitMessage}', '--', f'{versions_file_path}'], check=True) diff --git a/pkgs/applications/editors/jetbrains/bin/versions.json b/pkgs/applications/editors/jetbrains/bin/versions.json deleted file mode 100644 index f5998c0c1457..000000000000 --- a/pkgs/applications/editors/jetbrains/bin/versions.json +++ /dev/null @@ -1,490 +0,0 @@ -{ - "x86_64-linux": { - "aqua": { - "url-template": "https://download.jetbrains.com/aqua/aqua-{version}.tar.gz", - "version": "2024.3.2", - "sha256": "de073e8a3734a2c4ef984b3e1bd68f5de72a6180e73400889510439ac3f419aa", - "url": "https://download.jetbrains.com/aqua/aqua-2024.3.2.tar.gz", - "build_number": "243.23654.154" - }, - "clion": { - "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", - "version": "2025.3.1", - "sha256": "44ae3da5358ba010a62d55ab412b72f364c5dcd2c2dcd2004ae34b7463807bbd", - "url": "https://download.jetbrains.com/cpp/CLion-2025.3.1.tar.gz", - "build_number": "253.29346.141" - }, - "datagrip": { - "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", - "version": "2025.3.2", - "sha256": "cb6ed6475d21eb8d30754131bd24003c114096bfa84ffccf334dc11cf8ac60cc", - "url": "https://download.jetbrains.com/datagrip/datagrip-2025.3.2.tar.gz", - "build_number": "253.29346.170" - }, - "dataspell": { - "url-template": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz", - "version": "2025.3.1", - "sha256": "37f13426ce4f5d859d7db246f2328ccbad61adf361d43c784cb6932af6644c28", - "url": "https://download.jetbrains.com/python/dataspell-2025.3.1.tar.gz", - "build_number": "253.29346.157" - }, - "gateway": { - "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz", - "version": "2025.3", - "sha256": "90c8a54f619245a5435c343f94f39595ab59cd3cbada569e2b1e28bcacdbcb4a", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.3.tar.gz", - "build_number": "253.28294.342" - }, - "goland": { - "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", - "version": "2025.3", - "sha256": "6151856286ea546eb8af9aeb025772cee6bd57134f45494a818e8da20a8691c6", - "url": "https://download.jetbrains.com/go/goland-2025.3.tar.gz", - "build_number": "253.28294.337" - }, - "idea-community": { - "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", - "version": "2025.2.5", - "sha256": "995c334cc3e143f13467abafef07a1ccf7d06275512bb6f4c91123948786ab7c", - "url": "https://download.jetbrains.com/idea/ideaIC-2025.2.5.tar.gz", - "build_number": "252.28238.7" - }, - "idea": { - "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz", - "version": "2025.3.1", - "sha256": "21e1b90b5ec684767a03498ba424ef3f9acc5dbf759cceefd5edd474f043ad6c", - "url": "https://download.jetbrains.com/idea/ideaIU-2025.3.1.tar.gz", - "build_number": "253.29346.138" - }, - "mps": { - "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz", - "version": "2025.3", - "sha256": "c4023e52b4e17824d61d2768238619be14e5ae5735db533e3951647f377b6b79", - "url": "https://download.jetbrains.com/mps/2025.3/MPS-2025.3.tar.gz", - "build_number": "253.28294.432" - }, - "phpstorm": { - "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", - "version": "2025.3.1", - "sha256": "fd8937ab6b79605cefc9917ffe6a08e05a6b7cc0256fa2178623d24ec322fa29", - "url": "https://download.jetbrains.com/webide/PhpStorm-2025.3.1.tar.gz", - "build_number": "253.29346.151", - "version-major-minor": "2022.3" - }, - "pycharm-community": { - "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", - "version": "2025.2.5", - "sha256": "7f49a014f53f0f6f7c46f6710b131f390302287f4046b606331d88081cdb551f", - "url": "https://download.jetbrains.com/python/pycharm-community-2025.2.5.tar.gz", - "build_number": "252.28238.29" - }, - "pycharm": { - "url-template": "https://download.jetbrains.com/python/pycharm-{version}.tar.gz", - "version": "2025.3.1", - "sha256": "933fd42d7cc2a76ad4ba23f9112294e4df013fa4c3362435a1e3368051c07391", - "url": "https://download.jetbrains.com/python/pycharm-2025.3.1.tar.gz", - "build_number": "253.29346.142" - }, - "rider": { - "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", - "version": "2025.3.1", - "sha256": "ba840f7c48da7f118cf57aa8c22df30120d16f175fbce3bec6a65590ed87f2e8", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.3.1.tar.gz", - "build_number": "253.29346.144" - }, - "ruby-mine": { - "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", - "version": "2025.3.1", - "sha256": "e9eb2011ca2d5694c58c011690bf544d026e3a7c1c0c8de9bb37a18fa0cf8118", - "url": "https://download.jetbrains.com/ruby/RubyMine-2025.3.1.tar.gz", - "build_number": "253.29346.140" - }, - "rust-rover": { - "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz", - "version": "2025.3.1", - "sha256": "5a1b34e10a1c59eee30694236baa8233c7787580769381be01b4ccb09618ec89", - "url": "https://download.jetbrains.com/rustrover/RustRover-2025.3.1.tar.gz", - "build_number": "253.29346.139" - }, - "webstorm": { - "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", - "version": "2025.3.1", - "sha256": "08a851d216b741c49ebb6846e178fb823d329fe7b9824a2134b68c8fd25ba2ae", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.3.1.tar.gz", - "build_number": "253.29346.143" - }, - "writerside": { - "url-template": "https://download.jetbrains.com/writerside/writerside-{version}.tar.gz", - "version": "2024.3 EAP", - "sha256": "d49e58020d51ec4ccdbdffea5d42b5a2d776a809fc00789cef5abda7b23bd3f6", - "url": "https://download.jetbrains.com/writerside/writerside-243.22562.371.tar.gz", - "build_number": "243.22562.371" - } - }, - "aarch64-linux": { - "aqua": { - "url-template": "https://download.jetbrains.com/aqua/aqua-{version}-aarch64.tar.gz", - "version": "2024.3.2", - "sha256": "d2a3c781756a83ccea63dc6d9aebf85f819de1edb5bcd4e5a1a161eaa0779c84", - "url": "https://download.jetbrains.com/aqua/aqua-2024.3.2-aarch64.tar.gz", - "build_number": "243.23654.154" - }, - "clion": { - "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz", - "version": "2025.3.1", - "sha256": "b96c38c3d2f7ff7b988d75c970fd0e90363e09b8273106defc9ae3defa868ed7", - "url": "https://download.jetbrains.com/cpp/CLion-2025.3.1-aarch64.tar.gz", - "build_number": "253.29346.141" - }, - "datagrip": { - "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.tar.gz", - "version": "2025.3.2", - "sha256": "1a6feb3aa255dace332cc18b868593181b6ea62c3d9f0d36f90032ca0517d068", - "url": "https://download.jetbrains.com/datagrip/datagrip-2025.3.2-aarch64.tar.gz", - "build_number": "253.29346.170" - }, - "dataspell": { - "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.tar.gz", - "version": "2025.3.1", - "sha256": "40afd38cc704cdff2be89b9f0d67bdbcb1699d7b37b25d34d44d2d52ef6a46d3", - "url": "https://download.jetbrains.com/python/dataspell-2025.3.1-aarch64.tar.gz", - "build_number": "253.29346.157" - }, - "gateway": { - "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.tar.gz", - "version": "2025.3", - "sha256": "204ed3f7262877d0a46aaf30c5bafb7216b4e9736bebee71425c993c18486af8", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.3-aarch64.tar.gz", - "build_number": "253.28294.342" - }, - "goland": { - "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz", - "version": "2025.3", - "sha256": "c530dd4bcc7a075a040b64859ecb34142c8fc0399625c5a13ae2d7a8f5974340", - "url": "https://download.jetbrains.com/go/goland-2025.3-aarch64.tar.gz", - "build_number": "253.28294.337" - }, - "idea-community": { - "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.tar.gz", - "version": "2025.2.5", - "sha256": "4c57a783f31ee6f2c82d8c43bb5d0334a9afbc8bfb4542e732048c41f61e63a0", - "url": "https://download.jetbrains.com/idea/ideaIC-2025.2.5-aarch64.tar.gz", - "build_number": "252.28238.7" - }, - "idea": { - "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz", - "version": "2025.3.1", - "sha256": "095711329d1e9c14641ba426e652d4dbd3885b27c9a046e44725ae677491e8c3", - "url": "https://download.jetbrains.com/idea/ideaIU-2025.3.1-aarch64.tar.gz", - "build_number": "253.29346.138" - }, - "mps": { - "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz", - "version": "2025.3", - "sha256": "c4023e52b4e17824d61d2768238619be14e5ae5735db533e3951647f377b6b79", - "url": "https://download.jetbrains.com/mps/2025.3/MPS-2025.3.tar.gz", - "build_number": "253.28294.432" - }, - "phpstorm": { - "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz", - "version": "2025.3.1", - "sha256": "7648667f85b4c45928b04d4c26f22882a8aa65a787a64fa2f7affe51a1bc2a61", - "url": "https://download.jetbrains.com/webide/PhpStorm-2025.3.1-aarch64.tar.gz", - "build_number": "253.29346.151", - "version-major-minor": "2022.3" - }, - "pycharm-community": { - "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.tar.gz", - "version": "2025.2.5", - "sha256": "67b61a3e788b043d93b3cc3e0dd3cea350e6d170402fd94adaf792cfc57e5462", - "url": "https://download.jetbrains.com/python/pycharm-community-2025.2.5-aarch64.tar.gz", - "build_number": "252.28238.29" - }, - "pycharm": { - "url-template": "https://download.jetbrains.com/python/pycharm-{version}-aarch64.tar.gz", - "version": "2025.3.1", - "sha256": "2b6f5a430132773ea7caf3046f7763ea7a031dbfab6e1be72bdc86f3cc7a758b", - "url": "https://download.jetbrains.com/python/pycharm-2025.3.1-aarch64.tar.gz", - "build_number": "253.29346.142" - }, - "rider": { - "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.tar.gz", - "version": "2025.3.1", - "sha256": "19080fcdc48fa0f743ed60927b71975a3c478b805296161cfd8a0aa2c04c8f52", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.3.1-aarch64.tar.gz", - "build_number": "253.29346.144" - }, - "ruby-mine": { - "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz", - "version": "2025.3.1", - "sha256": "bf603c6a1ba1e618afdb70589648447cfce53b4daa7a0cc68073c1b77e727d55", - "url": "https://download.jetbrains.com/ruby/RubyMine-2025.3.1-aarch64.tar.gz", - "build_number": "253.29346.140" - }, - "rust-rover": { - "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz", - "version": "2025.3.1", - "sha256": "fb0f81c9d2a2a604718484954b261a642be9ed6f51de98fcdc6cedb32b0a4c9e", - "url": "https://download.jetbrains.com/rustrover/RustRover-2025.3.1-aarch64.tar.gz", - "build_number": "253.29346.139" - }, - "webstorm": { - "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz", - "version": "2025.3.1", - "sha256": "fd8bb3ee70c549165d9102437bca03e857fc147281c1d7382249d4690c31dd87", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.3.1-aarch64.tar.gz", - "build_number": "253.29346.143" - }, - "writerside": { - "url-template": "https://download.jetbrains.com/writerside/writerside-{version}-aarch64.tar.gz", - "version": "2024.3 EAP", - "sha256": "6067f6f73c4a178e2d0ae42bd18669045d85b5b5ed2c9115c2488ba7aa2a3d88", - "url": "https://download.jetbrains.com/writerside/writerside-243.22562.371-aarch64.tar.gz", - "build_number": "243.22562.371" - } - }, - "x86_64-darwin": { - "aqua": { - "url-template": "https://download.jetbrains.com/aqua/aqua-{version}.dmg", - "version": "2024.3.2", - "sha256": "423d492e9849beb7edbbd1771650a04e8df9f469bf1789b41bc5878c84cee393", - "url": "https://download.jetbrains.com/aqua/aqua-2024.3.2.dmg", - "build_number": "243.23654.154" - }, - "clion": { - "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", - "version": "2025.3.1", - "sha256": "9a8174c9229f9c86f86da1a8e2bdab52ffb369ea0781b57eb245703ebc8307e2", - "url": "https://download.jetbrains.com/cpp/CLion-2025.3.1.dmg", - "build_number": "253.29346.141" - }, - "datagrip": { - "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg", - "version": "2025.3.2", - "sha256": "0383a0a4f2fde583b62ea7d342e5718b0fa306fc8349541c75bec5ae841fb4fc", - "url": "https://download.jetbrains.com/datagrip/datagrip-2025.3.2.dmg", - "build_number": "253.29346.170" - }, - "dataspell": { - "url-template": "https://download.jetbrains.com/python/dataspell-{version}.dmg", - "version": "2025.3.1", - "sha256": "388d956dd6243697a162c062c76b2fee4098f4f3405badb07a69ce6df7de6017", - "url": "https://download.jetbrains.com/python/dataspell-2025.3.1.dmg", - "build_number": "253.29346.157" - }, - "gateway": { - "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg", - "version": "2025.3", - "sha256": "282fd7f302d95adeed022f8d6c679d3292778f96205394af52dd090f6201f338", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.3.dmg", - "build_number": "253.28294.342" - }, - "goland": { - "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", - "version": "2025.3", - "sha256": "e1df4f10b158c7788736559666244e994500a40db5b08661e2691357d269dbf4", - "url": "https://download.jetbrains.com/go/goland-2025.3.dmg", - "build_number": "253.28294.337" - }, - "idea-community": { - "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", - "version": "2025.2.5", - "sha256": "ff48a1e60869342a91db867fa482a49d4cdf38476496911c109f34a7e8d6523d", - "url": "https://download.jetbrains.com/idea/ideaIC-2025.2.5.dmg", - "build_number": "252.28238.7" - }, - "idea": { - "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", - "version": "2025.3.1", - "sha256": "adf5af3839e07ba6387bf0eca94df2f44c829023a1898170eacbc5cbafce0393", - "url": "https://download.jetbrains.com/idea/ideaIU-2025.3.1.dmg", - "build_number": "253.29346.138" - }, - "mps": { - "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos.dmg", - "version": "2025.3", - "sha256": "c216008ca905efd9ab9271df9599ef38ecb66cba2c61482e7a56434ae3eddee6", - "url": "https://download.jetbrains.com/mps/2025.3/MPS-2025.3-macos.dmg", - "build_number": "253.28294.432" - }, - "phpstorm": { - "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", - "version": "2025.3.1", - "sha256": "11988bcee5d94b271ea67aeacd3e836029595a6cfebfec2659565fc18a4ad2d1", - "url": "https://download.jetbrains.com/webide/PhpStorm-2025.3.1.dmg", - "build_number": "253.29346.151", - "version-major-minor": "2022.3" - }, - "pycharm-community": { - "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", - "version": "2025.2.5", - "sha256": "08ba97a278031ff1942ddefb18d8acf7582f0bb4a28ccdf5d65721bfb80ca456", - "url": "https://download.jetbrains.com/python/pycharm-community-2025.2.5.dmg", - "build_number": "252.28238.29" - }, - "pycharm": { - "url-template": "https://download.jetbrains.com/python/pycharm-{version}.dmg", - "version": "2025.3.1", - "sha256": "586c9eed67da609fc1e565a8bfc36eb155b23e5483d5dc6e9dcf8b5540f47fa5", - "url": "https://download.jetbrains.com/python/pycharm-2025.3.1.dmg", - "build_number": "253.29346.142" - }, - "rider": { - "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", - "version": "2025.3.1", - "sha256": "addd816dbdf130e2ef5e7dc184d7a8087f8bfbf6eba4e32ead2452069a49607d", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.3.1.dmg", - "build_number": "253.29346.144" - }, - "ruby-mine": { - "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", - "version": "2025.3.1", - "sha256": "4fce84983a6ace16d8479150b765280250a260b3d24fb37258d114000c6c1115", - "url": "https://download.jetbrains.com/ruby/RubyMine-2025.3.1.dmg", - "build_number": "253.29346.140" - }, - "rust-rover": { - "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg", - "version": "2025.3.1", - "sha256": "3899875452a5182db93b132c00dbc84394ffb637430b97f2390be8abb0412537", - "url": "https://download.jetbrains.com/rustrover/RustRover-2025.3.1.dmg", - "build_number": "253.29346.139" - }, - "webstorm": { - "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", - "version": "2025.3.1", - "sha256": "a6cb906562f95b37e9c1e34c9bd9561dea653a726c95d02bfa957acbe909b88d", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.3.1.dmg", - "build_number": "253.29346.143" - }, - "writerside": { - "url-template": "https://download.jetbrains.com/writerside/writerside-{version}.dmg", - "version": "2024.3 EAP", - "sha256": "0c78b8035497c855aea5666256716778abd46dadf68f51e4f91c0db01f62b280", - "url": "https://download.jetbrains.com/writerside/writerside-243.22562.371.dmg", - "build_number": "243.22562.371" - } - }, - "aarch64-darwin": { - "aqua": { - "url-template": "https://download.jetbrains.com/aqua/aqua-{version}-aarch64.dmg", - "version": "2024.3.2", - "sha256": "43974cdbbb71aaf5bfcfaf2cfd0e69e9920dda3973e64671936c1d52b267494d", - "url": "https://download.jetbrains.com/aqua/aqua-2024.3.2-aarch64.dmg", - "build_number": "243.23654.154" - }, - "clion": { - "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", - "version": "2025.3.1", - "sha256": "11cae8aeb43d1870d96980f1d927ff545fabed989f3bf4e7327911b441e149f1", - "url": "https://download.jetbrains.com/cpp/CLion-2025.3.1-aarch64.dmg", - "build_number": "253.29346.141" - }, - "datagrip": { - "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg", - "version": "2025.3.2", - "sha256": "a7224548dc9da3863727b0c11cef9d613fd951d16baa016ca1407c56a9ec6964", - "url": "https://download.jetbrains.com/datagrip/datagrip-2025.3.2-aarch64.dmg", - "build_number": "253.29346.170" - }, - "dataspell": { - "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg", - "version": "2025.3.1", - "sha256": "fe0d8ef15e6e36af0ea4361bd474f204ee5c307ef90af8ec833976a1dae5a5a3", - "url": "https://download.jetbrains.com/python/dataspell-2025.3.1-aarch64.dmg", - "build_number": "253.29346.157" - }, - "gateway": { - "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg", - "version": "2025.3", - "sha256": "b10cabda93c88d27bcc135a44a1fd98fe60fe8305606d6e75a0d5b736f0df274", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.3-aarch64.dmg", - "build_number": "253.28294.342" - }, - "goland": { - "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", - "version": "2025.3", - "sha256": "d4ee20b5c3df6151d366d6cc9b06b915499ff0c1eb1184aab53a01078908ec89", - "url": "https://download.jetbrains.com/go/goland-2025.3-aarch64.dmg", - "build_number": "253.28294.337" - }, - "idea-community": { - "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", - "version": "2025.2.5", - "sha256": "52065492d433f0ea9df4debd5f0683154ab4dab5846394cabc8a49903d70e5bc", - "url": "https://download.jetbrains.com/idea/ideaIC-2025.2.5-aarch64.dmg", - "build_number": "252.28238.7" - }, - "idea": { - "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", - "version": "2025.3.1", - "sha256": "2137863cc3a5f4acd25ba38a82e004e935d3a94fa566f8e3851d6b8a8ac12777", - "url": "https://download.jetbrains.com/idea/ideaIU-2025.3.1-aarch64.dmg", - "build_number": "253.29346.138" - }, - "mps": { - "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos-aarch64.dmg", - "version": "2025.3", - "url": "https://download.jetbrains.com/mps/2025.3/MPS-2025.3-macos-aarch64.dmg", - "sha256": "dc79c41ce851448f4862306173914eee1e63e230410ed65356498efd2d5f0444", - "build_number": "253.28294.432" - }, - "phpstorm": { - "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", - "version": "2025.3.1", - "sha256": "0453e0a6ee86c3cbf97b8c48f2826751d8085bf8211b541a04752621c5af16bc", - "url": "https://download.jetbrains.com/webide/PhpStorm-2025.3.1-aarch64.dmg", - "build_number": "253.29346.151", - "version-major-minor": "2022.3" - }, - "pycharm-community": { - "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", - "version": "2025.2.5", - "sha256": "040a4ed6bb7563972d844c450f615d0d11385e524fbbfdbfc9fc68d78811e994", - "url": "https://download.jetbrains.com/python/pycharm-community-2025.2.5-aarch64.dmg", - "build_number": "252.28238.29" - }, - "pycharm": { - "url-template": "https://download.jetbrains.com/python/pycharm-{version}-aarch64.dmg", - "version": "2025.3.1", - "sha256": "ec8e97856f00da902020c72b0f079cc10983de6bb4438292ea5faa1e5b0cb935", - "url": "https://download.jetbrains.com/python/pycharm-2025.3.1-aarch64.dmg", - "build_number": "253.29346.142" - }, - "rider": { - "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", - "version": "2025.3.1", - "sha256": "d7080323412900f5d37270233e5a4c773011c6853d6031ce1f5e635c77511426", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.3.1-aarch64.dmg", - "build_number": "253.29346.144" - }, - "ruby-mine": { - "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", - "version": "2025.3.1", - "sha256": "67f1aa674b90ec54ba21f3523ad940218f979befd7429e38ad822bc8146d16a4", - "url": "https://download.jetbrains.com/ruby/RubyMine-2025.3.1-aarch64.dmg", - "build_number": "253.29346.140" - }, - "rust-rover": { - "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg", - "version": "2025.3.1", - "sha256": "103a12ed1c37b6b38cff5d637e7dc7b8dcc78f5c576ba38b8f862c6ba3647d52", - "url": "https://download.jetbrains.com/rustrover/RustRover-2025.3.1-aarch64.dmg", - "build_number": "253.29346.139" - }, - "webstorm": { - "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", - "version": "2025.3.1", - "sha256": "1c21990cee2bbbffdd8f6c90e8071bc03ec7fe5a3662e51931c15222d4b7ccb2", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.3.1-aarch64.dmg", - "build_number": "253.29346.143" - }, - "writerside": { - "url-template": "https://download.jetbrains.com/writerside/writerside-{version}-aarch64.dmg", - "version": "2024.3 EAP", - "sha256": "9d86ef50b4c6d2a07d236219e9b05c0557241fb017d52ac395719bdb425130f5", - "url": "https://download.jetbrains.com/writerside/writerside-243.22562.371-aarch64.dmg", - "build_number": "243.22562.371" - } - } -} diff --git a/pkgs/applications/editors/jetbrains/bin/darwin.nix b/pkgs/applications/editors/jetbrains/builder/darwin.nix similarity index 75% rename from pkgs/applications/editors/jetbrains/bin/darwin.nix rename to pkgs/applications/editors/jetbrains/builder/darwin.nix index a698d9ab205a..d9250c686cbd 100644 --- a/pkgs/applications/editors/jetbrains/bin/darwin.nix +++ b/pkgs/applications/editors/jetbrains/builder/darwin.nix @@ -1,3 +1,8 @@ +# Darwin-specific base builder. +# TODO: +# This actually just ignores a lot of options passed to it... (e.g. buildInputs) +# - not entirely sure how this hasn't caused big problems yet. + { lib, stdenvNoCC, @@ -9,13 +14,14 @@ meta, pname, product, - productShort ? product, + productShort, src, version, + passthru, + plugins ? [ ], - buildNumber, ... -}@args: +}: let loname = lib.toLower productShort; @@ -26,10 +32,8 @@ stdenvNoCC.mkDerivation { src version plugins + passthru ; - passthru.buildNumber = buildNumber; - passthru.product = product; - passthru.tests = args.passthru.tests; meta = meta // { mainProgram = loname; }; diff --git a/pkgs/applications/editors/jetbrains/builder/default.nix b/pkgs/applications/editors/jetbrains/builder/default.nix new file mode 100644 index 000000000000..32787728e803 --- /dev/null +++ b/pkgs/applications/editors/jetbrains/builder/default.nix @@ -0,0 +1,87 @@ +# Builder for JetBrains IDEs (`mkJetBrainsProduct`) + +{ + lib, + stdenv, + callPackage, + + jdk, + fontconfig, + libGL, + libX11, + + vmopts ? null, + forceWayland ? false, +}: +let + baseBuilder = if stdenv.hostPlatform.isDarwin then ./darwin.nix else ./linux.nix; + mkJetBrainsProductCore = callPackage baseBuilder { inherit vmopts; }; +in +# Makes a JetBrains IDE +{ + pname, + src, + version, + buildNumber, + wmClass, + product, + productShort ? product, + meta, + + libdbm, + fsnotifier, + + extraWrapperArgs ? [ ], + extraLdPath ? [ ], + buildInputs ? [ ], + passthru ? { }, +}: +mkJetBrainsProductCore { + inherit + pname + extraLdPath + jdk + src + version + buildNumber + wmClass + product + productShort + libdbm + fsnotifier + ; + + buildInputs = + buildInputs + ++ [ stdenv.cc.cc ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + fontconfig + libGL + libX11 + ]; + + extraWrapperArgs = + extraWrapperArgs + ++ lib.optionals (stdenv.hostPlatform.isLinux && forceWayland) [ + ''--add-flags "\''${WAYLAND_DISPLAY:+-Dawt.toolkit.name=WLToolkit}"'' + ]; + + passthru = lib.recursiveUpdate passthru { + inherit + buildNumber + product + libdbm + fsnotifier + ; + + updateScript = ../updater/main.py; + + tests = { + plugins = callPackage ../plugins/tests.nix { ideName = pname; }; + }; + }; + + meta = meta // { + teams = [ lib.teams.jetbrains ]; + }; +} diff --git a/pkgs/applications/editors/jetbrains/bin/linux.nix b/pkgs/applications/editors/jetbrains/builder/linux.nix similarity index 94% rename from pkgs/applications/editors/jetbrains/bin/linux.nix rename to pkgs/applications/editors/jetbrains/builder/linux.nix index 14532161233b..bb406773d834 100644 --- a/pkgs/applications/editors/jetbrains/bin/linux.nix +++ b/pkgs/applications/editors/jetbrains/builder/linux.nix @@ -1,3 +1,5 @@ +# Linux-specific base builder. + { stdenv, lib, @@ -23,18 +25,20 @@ { pname, product, - productShort ? product, + productShort, version, src, wmClass, - buildNumber, jdk, meta, + passthru, + libdbm, fsnotifier, + extraLdPath ? [ ], extraWrapperArgs ? [ ], - extraBuildInputs ? [ ], + buildInputs ? [ ], ... }@args: @@ -47,13 +51,18 @@ in with stdenv; lib.makeOverridable mkDerivation ( rec { - inherit pname version src; - passthru.buildNumber = buildNumber; - passthru.tests = args.passthru.tests; + inherit + pname + version + src + buildInputs + passthru + ; meta = args.meta // { mainProgram = pname; }; + # FIXME: Do not use meta attributes, see README (`TODO` section) desktopItem = makeDesktopItem { name = pname; exec = pname; @@ -74,7 +83,6 @@ lib.makeOverridable mkDerivation ( unzip autoPatchelfHook ]; - buildInputs = extraBuildInputs; postPatch = '' rm -rf jbr diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 2994e787f57c..f574d87cbd6d 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -1,165 +1,60 @@ -let - # `ides.json` is handwritten and contains information that doesn't change across updates, like maintainers and other metadata - # `versions.json` contains everything generated/needed by the update script version numbers, build numbers and tarball hashes - ideInfo = builtins.fromJSON (builtins.readFile ./ides.json); - versions = builtins.fromJSON (builtins.readFile ./bin/versions.json); -in - { - config, lib, + config, stdenv, callPackage, - fetchurl, + + python3, jdk, - zlib, - python3, - lldb, - dotnetCorePackages, - maven, - openssl, - expat, - libxcrypt, - libxcrypt-legacy, - fontconfig, - libxml2, - runCommand, - musl, - R, - libgcc, - lttng-ust_2_12, - xz, - xorg, - libGL, - - libICE, - libSM, - libX11, - vmopts ? null, forceWayland ? false, }: let - inherit (stdenv.hostPlatform) system; + mkJetBrainsProduct = callPackage ./builder/default.nix { inherit jdk forceWayland vmopts; }; + mkJetBrainsSource = callPackage ./source/build.nix { }; - products = versions.${system} or (throw "Unsupported system: ${system}"); + mkSrcIde = + path: extras: callPackage path ({ inherit mkJetBrainsProduct mkJetBrainsSource; } // extras); - dotnet-sdk = dotnetCorePackages.sdk_10_0-source; + _idea-oss = mkSrcIde ./ides/idea-oss.nix { }; - package = if stdenv.hostPlatform.isDarwin then ./bin/darwin.nix else ./bin/linux.nix; - mkJetBrainsProductCore = callPackage package { inherit vmopts; }; - mkMeta = meta: fromSource: { - inherit (meta) homepage longDescription; - description = - meta.description - + lib.optionalString meta.isOpenSource ( - if fromSource then " (built from source)" else " (patched binaries from jetbrains)" - ); - maintainers = map (x: lib.maintainers."${x}") meta.maintainers; - teams = [ lib.teams.jetbrains ]; - license = if meta.isOpenSource then lib.licenses.asl20 else lib.licenses.unfree; - sourceProvenance = - if fromSource then - [ lib.sourceTypes.fromSource ] - else - ( - if stdenv.hostPlatform.isDarwin then - [ lib.sourceTypes.binaryNativeCode ] - else - [ lib.sourceTypes.binaryBytecode ] - ); - }; + # The binary builds use the same libdbm and fsnotifier as the current idea-oss source build. + mkBinIde = + path: extras: + callPackage path ( + { + inherit mkJetBrainsProduct; + libdbm = _idea-oss.libdbm; + fsnotifier = _idea-oss.fsnotifier; + } + // extras + ); - mkJetBrainsProduct = - { - pname, - fromSource ? false, - extraWrapperArgs ? [ ], - extraLdPath ? [ ], - extraBuildInputs ? [ ], - extraTests ? { }, - }: - mkJetBrainsProductCore { - inherit - pname - extraLdPath - jdk - ; - extraBuildInputs = - extraBuildInputs - ++ [ stdenv.cc.cc ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - fontconfig - libGL - libX11 + # Common build overrides, fixes, etc. + # TODO: These should eventually be moved outside of this file + pyCharmCommonOverrides = ( + finalAttrs: previousAttrs: + lib.optionalAttrs stdenv.hostPlatform.isLinux { + buildInputs = + with python3.pkgs; + (previousAttrs.buildInputs or [ ]) + ++ [ + python3 + setuptools ]; - extraWrapperArgs = - extraWrapperArgs - ++ lib.optionals (stdenv.hostPlatform.isLinux && forceWayland) [ - ''--add-flags "\''${WAYLAND_DISPLAY:+-Dawt.toolkit.name=WLToolkit}"'' - ]; - src = - if fromSource then - communitySources."${pname}" + preInstall = '' + echo "compiling cython debug speedups" + if [[ -d plugins/python-ce ]]; then + ${python3.interpreter} plugins/python-ce/helpers/pydev/setup_cython.py build_ext --inplace else - fetchurl { - url = products."${pname}".url; - sha256 = products."${pname}".sha256; - }; - version = if fromSource then communitySources."${pname}".version else products."${pname}".version; - buildNumber = - if fromSource then communitySources."${pname}".buildNumber else products."${pname}".build_number; - inherit (ideInfo."${pname}") wmClass product; - productShort = ideInfo."${pname}".productShort or ideInfo."${pname}".product; - meta = mkMeta ideInfo."${pname}".meta fromSource; - passthru.tests = extraTests // { - plugins = callPackage ./plugins/tests.nix { ideName = pname; }; - }; - libdbm = communitySources."${pname}".libdbm or communitySources.idea-oss.libdbm; - fsnotifier = communitySources."${pname}".fsnotifier or communitySources.idea-oss.fsnotifier; - }; - - communitySources = callPackage ./source { }; - - buildIdea = - args: - mkJetBrainsProduct ( - args - // { - extraLdPath = [ zlib ]; - extraWrapperArgs = [ - ''--set M2_HOME "${maven}/maven"'' - ''--set M2 "${maven}/maven/bin"'' - ]; - } - ); - - buildPycharm = - args: - (mkJetBrainsProduct args).overrideAttrs ( - finalAttrs: previousAttrs: - lib.optionalAttrs stdenv.hostPlatform.isLinux { - buildInputs = - with python3.pkgs; - (previousAttrs.buildInputs or [ ]) - ++ [ - python3 - setuptools - ]; - preInstall = '' - echo "compiling cython debug speedups" - if [[ -d plugins/python-ce ]]; then - ${python3.interpreter} plugins/python-ce/helpers/pydev/setup_cython.py build_ext --inplace - else - ${python3.interpreter} plugins/python/helpers/pydev/setup_cython.py build_ext --inplace - fi - ''; - # See https://www.jetbrains.com/help/pycharm/2022.1/cython-speedups.html - } - ); - + ${python3.interpreter} plugins/python/helpers/pydev/setup_cython.py build_ext --inplace + fi + ''; + # See https://www.jetbrains.com/help/pycharm/2022.1/cython-speedups.html + } + ); patchSharedLibs = lib.optionalString stdenv.hostPlatform.isLinux '' ls -d \ $out/*/bin/*/linux/*/lib/liblldb.so \ @@ -174,203 +69,27 @@ let --replace-needed libcrypt.so.1 libcrypt.so \ ${lib.optionalString stdenv.hostPlatform.isAarch "--replace-needed libxml2.so.2 libxml2.so"} ''; - - # TODO: These can be moved down again when we don't need the aliases anymore: - _idea = buildIdea { - pname = "idea"; - extraBuildInputs = [ - lldb - musl - ]; - }; - _idea-oss = buildIdea { - pname = "idea-oss"; - fromSource = true; - }; - _pycharm = buildPycharm { - pname = "pycharm"; - extraBuildInputs = [ musl ]; - }; - _pycharm-oss = buildPycharm { - pname = "pycharm-oss"; - fromSource = true; - }; in { # Sorted alphabetically. Deprecated products and aliases are at the very end. - - clion = - (mkJetBrainsProduct { - pname = "clion"; - extraBuildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - python3 - openssl - libxcrypt-legacy - lttng-ust_2_12 - musl - ] - ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch) [ - expat - libxml2 - xz - ]; - }).overrideAttrs - (attrs: { - postInstall = - (attrs.postInstall or "") - + lib.optionalString stdenv.hostPlatform.isLinux '' - for dir in $out/clion/plugins/clion-radler/DotFiles/linux-*; do - rm -rf $dir/dotnet - ln -s ${dotnet-sdk}/share/dotnet $dir/dotnet - done - ''; - - postFixup = '' - ${attrs.postFixup or ""} - ${patchSharedLibs} - ''; - }); - - datagrip = mkJetBrainsProduct { - pname = "datagrip"; - }; - - dataspell = - let - libr = runCommand "libR" { } '' - mkdir -p $out/lib - ln -s ${R}/lib/R/lib/libR.so $out/lib/libR.so - ''; - in - mkJetBrainsProduct { - pname = "dataspell"; - extraBuildInputs = [ - libgcc - libr - ]; - }; - - gateway = mkJetBrainsProduct { - pname = "gateway"; - extraBuildInputs = [ libgcc ]; - }; - - goland = - (mkJetBrainsProduct { - pname = "goland"; - extraWrapperArgs = [ - # fortify source breaks build since delve compiles with -O0 - ''--prefix CGO_CPPFLAGS " " "-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0"'' - ]; - extraBuildInputs = [ - libgcc - ]; - }).overrideAttrs - (attrs: { - postFixup = - (attrs.postFixup or "") - + lib.optionalString stdenv.hostPlatform.isLinux '' - interp="$(cat $NIX_CC/nix-support/dynamic-linker)" - patchelf --set-interpreter $interp $out/goland/plugins/go-plugin/lib/dlv/linux/dlv - chmod +x $out/goland/plugins/go-plugin/lib/dlv/linux/dlv - ''; - }); - - idea = _idea; - + clion = mkBinIde ./ides/clion.nix { inherit patchSharedLibs; }; + datagrip = mkBinIde ./ides/datagrip.nix { }; + dataspell = mkBinIde ./ides/dataspell.nix { }; + gateway = mkBinIde ./ides/gateway.nix { }; + goland = mkBinIde ./ides/goland.nix { }; + idea = mkBinIde ./ides/idea.nix { }; idea-oss = _idea-oss; - - mps = mkJetBrainsProduct { pname = "mps"; }; - - phpstorm = mkJetBrainsProduct { - pname = "phpstorm"; - extraBuildInputs = [ - musl - ]; - }; - - pycharm = _pycharm; - - pycharm-oss = _pycharm-oss; - - rider = - (mkJetBrainsProduct { - pname = "rider"; - extraBuildInputs = [ - openssl - libxcrypt - lttng-ust_2_12 - musl - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - xorg.xcbutilkeysyms - ] - ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch) [ - expat - libxml2 - xz - ]; - extraLdPath = lib.optionals (stdenv.hostPlatform.isLinux) [ - # Avalonia dependencies needed for dotMemory - libICE - libSM - libX11 - ]; - }).overrideAttrs - (attrs: { - postInstall = - (attrs.postInstall or "") - + lib.optionalString stdenv.hostPlatform.isLinux '' - ${patchSharedLibs} - - for dir in $out/rider/lib/ReSharperHost/linux-*; do - rm -rf $dir/dotnet - ln -s ${dotnet-sdk}/share/dotnet $dir/dotnet - done - ''; - }); - - ruby-mine = mkJetBrainsProduct { - pname = "ruby-mine"; - extraBuildInputs = [ - musl - ]; - }; - - rust-rover = - (mkJetBrainsProduct { - pname = "rust-rover"; - extraBuildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - python3 - openssl - libxcrypt-legacy - ] - ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch) [ - expat - libxml2 - xz - ]; - }).overrideAttrs - (attrs: { - postFixup = '' - ${attrs.postFixup or ""} - ${patchSharedLibs} - ''; - }); - - webstorm = mkJetBrainsProduct { - pname = "webstorm"; - extraBuildInputs = [ - musl - ]; - }; + mps = mkBinIde ./ides/mps.nix { }; + phpstorm = mkBinIde ./ides/phpstorm.nix { }; + pycharm = mkBinIde ./ides/pycharm.nix { inherit pyCharmCommonOverrides; }; + pycharm-oss = mkSrcIde ./ides/pycharm-oss.nix { inherit pyCharmCommonOverrides; }; + rider = mkBinIde ./ides/rider.nix { inherit patchSharedLibs; }; + ruby-mine = mkBinIde ./ides/ruby-mine.nix { }; + rust-rover = mkBinIde ./ides/rust-rover.nix { inherit patchSharedLibs; }; + webstorm = mkBinIde ./ides/webstorm.nix { }; # Plugins - plugins = callPackage ./plugins { }; - } // lib.optionalAttrs config.allowAliases rec { @@ -380,12 +99,7 @@ in aqua = lib.warnOnInstantiate "jetbrains.aqua: Aqua has been discontinued by Jetbrains and is not receiving updates. It will be removed in NixOS 26.05." - (mkJetBrainsProduct { - pname = "aqua"; - extraBuildInputs = [ - lldb - ]; - }); + (mkBinIde ./ides/aqua.nix { }); idea-community = lib.warnOnInstantiate @@ -400,37 +114,41 @@ in idea-community-bin = lib.warnOnInstantiate "jetbrains.idea-community-bin: IntelliJ IDEA Community has been discontinued by Jetbrains. This binary build is no longer updated. Switch to 'jetbrains.idea-oss' for open source builds (from source) or 'jetbrains.idea' for commercial builds (binary, unfree). See: https://blog.jetbrains.com/idea/2025/07/intellij-idea-unified-distribution-plan/" - (buildIdea { - pname = "idea-community"; - }); + (mkBinIde ./ides/idea-community.nix { }); - idea-ultimate = lib.warnOnInstantiate "'jetbrains.idea-ultimate' has been renamed to/replaced by 'jetbrains.idea'" _idea; + idea-ultimate = + lib.warnOnInstantiate "'jetbrains.idea-ultimate' has been renamed to/replaced by 'jetbrains.idea'" + (mkBinIde ./ides/idea.nix { }); idea-community-src = lib.warnOnInstantiate "jetbrains.idea-community-src: IntelliJ IDEA Community has been discontinued by Jetbrains. This is now an alias for 'jetbrains.idea-oss', the Open Source build of IntelliJ. See: https://blog.jetbrains.com/idea/2025/07/intellij-idea-unified-distribution-plan/" _idea-oss; pycharm-community = lib.warnOnInstantiate "pycharm-comminity: PyCharm Community has been discontinued by Jetbrains. This deprecated alias uses the, no longer updated, binary build on Darwin. On Linux it uses PyCharm Open Source, built from source. Either switch to 'jetbrains.pycharm-oss' or 'jetbrains.pycharm'. See: https://blog.jetbrains.com/pycharm/2025/04/pycharm-2025" - (if stdenv.hostPlatform.isDarwin then pycharm-community-bin else _pycharm-oss); + ( + if stdenv.hostPlatform.isDarwin then + pycharm-community-bin + else + (mkSrcIde ./ides/pycharm-oss.nix { inherit pyCharmCommonOverrides; }) + ); pycharm-community-bin = lib.warnOnInstantiate "pycharm-comminity-bin: PyCharm Community has been discontinued by Jetbrains. This binary build is no longer updated. Switch to 'jetbrains.pycharm-oss' for open source builds (from source) or 'jetbrains.pycharm' for commercial builds (binary, unfree). See: https://blog.jetbrains.com/pycharm/2025/04/pycharm-2025" - (buildPycharm { - pname = "pycharm-community"; - }); + (mkBinIde ./ides/pycharm-community.nix { inherit pyCharmCommonOverrides; }); - pycharm-community-src = lib.warnOnInstantiate "jetbrains.idea-community-src: PyCharm Community has been discontinued by Jetbrains. This is now an alias for 'jetbrains.pycharm-oss', the Open Source build of PyCharm. See: https://blog.jetbrains.com/pycharm/2025/04/pycharm-2025" _pycharm-oss; + pycharm-community-src = + lib.warnOnInstantiate + "jetbrains.idea-community-src: PyCharm Community has been discontinued by Jetbrains. This is now an alias for 'jetbrains.pycharm-oss', the Open Source build of PyCharm. See: https://blog.jetbrains.com/pycharm/2025/04/pycharm-2025" + (mkSrcIde ./ides/pycharm-oss.nix { inherit pyCharmCommonOverrides; }); - pycharm-professional = lib.warnOnInstantiate "'jetbrains.pycharm-professional' has been renamed to/replaced by 'jetbrains.pycharm'" _pycharm; + pycharm-professional = + lib.warnOnInstantiate + "'jetbrains.pycharm-professional' has been renamed to/replaced by 'jetbrains.pycharm'" + (mkBinIde ./ides/pycharm.nix { inherit pyCharmCommonOverrides; }); writerside = lib.warnOnInstantiate "jetbrains.writerside: Writerside has been discontinued by Jetbrains and is not receiving updates. It will be removed in NixOS 26.05." - (mkJetBrainsProduct { - pname = "writerside"; - extraBuildInputs = [ - musl - ]; - }); + (mkBinIde ./ides/writerside.nix { }); } diff --git a/pkgs/applications/editors/jetbrains/ides.json b/pkgs/applications/editors/jetbrains/ides.json deleted file mode 100644 index ffe3240f5c09..000000000000 --- a/pkgs/applications/editors/jetbrains/ides.json +++ /dev/null @@ -1,237 +0,0 @@ -{ - "aqua": { - "product": "Aqua", - "updateChannel": "Aqua RELEASE", - "wmClass": "jetbrains-aqua", - "meta": { - "isOpenSource": false, - "description": "Test automation IDE from JetBrains", - "maintainers": [ "remcoschrijver" ], - "longDescription": "Aqua is a test automation IDE from jetbrains that can deal with many languages and frameworks to improve your test workflows. Has support for popular testing frameworks like Selenium, Cypress, and Playwright.", - "homepage": "https://www.jetbrains.com/aqua/" - } - }, - "clion": { - "product": "CLion", - "updateChannel": "CLion RELEASE", - "wmClass": "jetbrains-clion", - "meta": { - "isOpenSource": false, - "description": "C/C++ IDE from JetBrains", - "maintainers": [ "mic92", "tymscar" ], - "longDescription": "Enhancing productivity for every C and C++ developer on Linux, macOS and Windows.", - "homepage": "https://www.jetbrains.com/clion/" - } - }, - "datagrip": { - "product": "DataGrip", - "updateChannel": "DataGrip RELEASE", - "wmClass": "jetbrains-datagrip", - "meta": { - "isOpenSource": false, - "description": "Database IDE from JetBrains", - "maintainers": [ ], - "longDescription": "DataGrip is a new IDE from JetBrains built for database admins. It allows you to quickly migrate and refactor relational databases, construct efficient, statically checked SQL queries and much more.", - "homepage": "https://www.jetbrains.com/datagrip/" - } - }, - "dataspell": { - "product": "DataSpell", - "updateChannel": "DataSpell RELEASE", - "wmClass": "jetbrains-dataspell", - "meta": { - "isOpenSource": false, - "description": "Data science IDE from JetBrains", - "maintainers": [ "leona" ], - "longDescription": "DataSpell is a new IDE from JetBrains built for Data Scientists. Mainly it integrates Jupyter notebooks in the IntelliJ platform.", - "homepage": "https://www.jetbrains.com/dataspell/" - } - }, - "gateway": { - "product": "JetBrains Gateway", - "updateChannel": "Gateway RELEASE", - "productShort": "Gateway", - "wmClass": "jetbrains-gateway", - "meta": { - "isOpenSource": false, - "description": "Remote development for JetBrains products", - "maintainers": [ ], - "longDescription": "JetBrains Gateway is a lightweight launcher that connects a remote server with your local machine, downloads necessary components on the backend, and opens your project in JetBrains Client.", - "homepage": "https://www.jetbrains.com/remote-development/gateway/" - } - }, - "goland": { - "product": "Goland", - "updateChannel": "GoLand RELEASE", - "wmClass": "jetbrains-goland", - "meta": { - "isOpenSource": false, - "description": "Go IDE from JetBrains", - "maintainers": [ "tymscar" ], - "longDescription": "Goland is the codename for a new commercial IDE by JetBrains aimed at providing an ergonomic environment for Go development.\n The new IDE extends the IntelliJ platform with the coding assistance and tool integrations specific for the Go language", - "homepage": "https://www.jetbrains.com/go/" - } - }, - "idea": { - "product": "IntelliJ IDEA", - "updateChannel": "IntelliJ IDEA RELEASE", - "productShort": "IDEA", - "wmClass": "jetbrains-idea", - "meta": { - "isOpenSource": false, - "description": "Java, Kotlin, Groovy and Scala IDE from Jetbrains", - "maintainers": [ "gytis-ivaskevicius", "tymscar" ], - "longDescription": "IDE for Java SE, Groovy & Scala development Powerful environment for building Google Android apps Integration with JUnit, TestNG, popular SCMs, Ant & Maven. Also known as IntelliJ.", - "homepage": "https://www.jetbrains.com/idea/" - } - }, - "idea-community": { - "product": "IntelliJ IDEA CE", - "updateChannel": "IntelliJ IDEA RELEASE", - "productShort": "IDEA", - "wmClass": "jetbrains-idea-ce", - "meta": { - "isOpenSource": true, - "description": "Free Java, Kotlin, Groovy and Scala IDE from Jetbrains", - "maintainers": [ "gytis-ivaskevicius", "tymscar" ], - "longDescription": "IDE for Java SE, Groovy & Scala development Powerful environment for building Google Android apps Integration with JUnit, TestNG, popular SCMs, Ant & Maven. Also known as IntelliJ.", - "homepage": "https://www.jetbrains.com/idea/" - } - }, - "idea-oss": { - "product": "IntelliJ IDEA Open Source", - "updateChannel": "IntelliJ IDEA RELEASE", - "productShort": "IDEA", - "wmClass": "jetbrains-idea-ce", - "meta": { - "isOpenSource": true, - "description": "Free Java, Kotlin, Groovy and Scala IDE from Jetbrains", - "maintainers": [ "gytis-ivaskevicius", "tymscar" ], - "longDescription": "IDE for Java SE, Groovy & Scala development Powerful environment for building Google Android apps Integration with JUnit, TestNG, popular SCMs, Ant & Maven. Also known as IntelliJ.", - "homepage": "https://www.jetbrains.com/idea/" - } - }, - "mps": { - "product": "MPS", - "updateChannel": "MPS RELEASE", - "wmClass": "jetbrains-MPS", - "meta": { - "isOpenSource": false, - "description": "IDE for building domain-specific languages from JetBrains", - "maintainers": [ ], - "longDescription": "A metaprogramming system which uses projectional editing which allows users to overcome the limits of language parsers, and build DSL editors, such as ones with tables and diagrams.", - "homepage": "https://www.jetbrains.com/mps/" - } - }, - "phpstorm": { - "product": "PhpStorm", - "updateChannel": "PhpStorm RELEASE", - "wmClass": "jetbrains-phpstorm", - "meta": { - "isOpenSource": false, - "description": "PHP IDE from JetBrains", - "maintainers": [ "dritter", "tymscar" ], - "longDescription": "PhpStorm provides an editor for PHP, HTML and JavaScript with on-the-fly code analysis, error prevention and automated refactorings for PHP and JavaScript code. ", - "homepage": "https://www.jetbrains.com/phpstorm/" - } - }, - "pycharm": { - "product": "PyCharm", - "productShort": "PyCharm", - "updateChannel": "PyCharm RELEASE", - "wmClass": "jetbrains-pycharm", - "meta": { - "isOpenSource": false, - "description": "Python IDE from JetBrains", - "maintainers": [ "genericnerdyusername", "tymscar" ], - "longDescription": "Python IDE with complete set of tools for productive development with Python programming language. In addition, the IDE provides high-class capabilities for professional Web development with Django framework and Google App Engine. It has powerful coding assistance, navigation, a lot of refactoring features, tight integration with various Version Control Systems, Unit testing, powerful all-singing all-dancing Debugger and entire customization. PyCharm is developer driven IDE. It was developed with the aim of providing you almost everything you need for your comfortable and productive development!", - "homepage": "https://www.jetbrains.com/pycharm/" - } - }, - "pycharm-community": { - "product": "PyCharm CE", - "productShort": "PyCharm", - "updateChannel": "PyCharm RELEASE", - "wmClass": "jetbrains-pycharm-ce", - "meta": { - "isOpenSource": true, - "description": "Free Python IDE from JetBrains", - "maintainers": [ "genericnerdyusername", "tymscar" ], - "longDescription": "Python IDE with complete set of tools for productive development with Python programming language. In addition, the IDE provides high-class capabilities for professional Web development with Django framework and Google App Engine. It has powerful coding assistance, navigation, a lot of refactoring features, tight integration with various Version Control Systems, Unit testing, powerful all-singing all-dancing Debugger and entire customization. PyCharm is developer driven IDE. It was developed with the aim of providing you almost everything you need for your comfortable and productive development!", - "homepage": "https://www.jetbrains.com/pycharm/" - } - }, - "pycharm-oss": { - "product": "PyCharm Open Source", - "productShort": "PyCharm", - "updateChannel": "PyCharm RELEASE", - "wmClass": "jetbrains-pycharm-ce", - "meta": { - "isOpenSource": true, - "description": "Free Python IDE from JetBrains", - "maintainers": [ "genericnerdyusername", "tymscar" ], - "longDescription": "Python IDE with complete set of tools for productive development with Python programming language. In addition, the IDE provides high-class capabilities for professional Web development with Django framework and Google App Engine. It has powerful coding assistance, navigation, a lot of refactoring features, tight integration with various Version Control Systems, Unit testing, powerful all-singing all-dancing Debugger and entire customization. PyCharm is developer driven IDE. It was developed with the aim of providing you almost everything you need for your comfortable and productive development!", - "homepage": "https://www.jetbrains.com/pycharm/" - } - }, - "rider": { - "product": "Rider", - "updateChannel": "Rider RELEASE", - "wmClass": "jetbrains-rider", - "meta": { - "isOpenSource": false, - "description": ".NET IDE from JetBrains", - "maintainers": [ "raphaelr" ], - "longDescription": "JetBrains Rider is a new .NET IDE based on the IntelliJ platform and ReSharper. Rider supports .NET Core, .NET Framework and Mono based projects. This lets you develop a wide array of applications including .NET desktop apps, services and libraries, Unity games, ASP.NET and ASP.NET Core web applications.", - "homepage": "https://www.jetbrains.com/rider/" - } - }, - "ruby-mine": { - "product": "RubyMine", - "updateChannel": "RubyMine RELEASE", - "wmClass": "jetbrains-rubymine", - "meta": { - "isOpenSource": false, - "description": "Ruby IDE from JetBrains", - "maintainers": [ "tymscar"], - "longDescription": "Ruby IDE from JetBrains", - "homepage": "https://www.jetbrains.com/ruby/" - } - }, - "rust-rover": { - "product": "RustRover", - "updateChannel": "RustRover RELEASE", - "wmClass": "jetbrains-rustrover", - "meta": { - "isOpenSource": false, - "description": "Rust IDE from JetBrains", - "maintainers": [ "genericnerdyusername"], - "longDescription": "Rust IDE from JetBrains", - "homepage": "https://www.jetbrains.com/rust/" - } - }, - "webstorm": { - "product": "WebStorm", - "updateChannel": "WebStorm RELEASE", - "wmClass": "jetbrains-webstorm", - "meta": { - "isOpenSource": false, - "description": "Web IDE from JetBrains", - "maintainers": [ "abaldeau", "tymscar"], - "longDescription": "WebStorm provides an editor for HTML, JavaScript (incl. Node.js), and CSS with on-the-fly code analysis, error prevention and automated refactorings for JavaScript code.", - "homepage": "https://www.jetbrains.com/webstorm/" - } - }, - "writerside": { - "product": "Writerside", - "updateChannel": "Writerside EAP", - "wmClass": "jetbrains-writerside", - "meta": { - "isOpenSource": false, - "description": "Documentation IDE from JetBrains", - "maintainers": [ "zlepper"], - "longDescription": "The most powerful development environment – now adapted for writing documentation.", - "homepage": "https://www.jetbrains.com/writerside/" - } - } -} diff --git a/pkgs/applications/editors/jetbrains/ides/aqua.nix b/pkgs/applications/editors/jetbrains/ides/aqua.nix new file mode 100644 index 000000000000..ff219361821e --- /dev/null +++ b/pkgs/applications/editors/jetbrains/ides/aqua.nix @@ -0,0 +1,66 @@ +# TODO: This IDE is deprecated and scheduled for removal in 26.05 +{ + stdenv, + lib, + fetchurl, + mkJetBrainsProduct, + libdbm, + fsnotifier, + lldb, +}: +let + system = stdenv.hostPlatform.system; + # update-script-start: urls + urls = { + x86_64-linux = { + url = "https://download.jetbrains.com/aqua/aqua-2024.3.2.tar.gz"; + sha256 = "de073e8a3734a2c4ef984b3e1bd68f5de72a6180e73400889510439ac3f419aa"; + }; + aarch64-linux = { + url = "https://download.jetbrains.com/aqua/aqua-2024.3.2-aarch64.tar.gz"; + sha256 = "d2a3c781756a83ccea63dc6d9aebf85f819de1edb5bcd4e5a1a161eaa0779c84"; + }; + x86_64-darwin = { + url = "https://download.jetbrains.com/aqua/aqua-2024.3.2.dmg"; + sha256 = "423d492e9849beb7edbbd1771650a04e8df9f469bf1789b41bc5878c84cee393"; + }; + aarch64-darwin = { + url = "https://download.jetbrains.com/aqua/aqua-2024.3.2-aarch64.dmg"; + sha256 = "43974cdbbb71aaf5bfcfaf2cfd0e69e9920dda3973e64671936c1d52b267494d"; + }; + }; + # update-script-end: urls +in +mkJetBrainsProduct { + inherit libdbm fsnotifier; + + pname = "aqua"; + + wmClass = "jetbrains-aqua"; + product = "Aqua"; + + # update-script-start: version + version = "2024.3.2"; + buildNumber = "243.23654.154"; + # update-script-end: version + + src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); + + buildInputs = [ + lldb + ]; + + # NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README) + meta = { + homepage = "https://www.jetbrains.com/aqua/"; + description = "Test automation IDE from JetBrains"; + longDescription = "Aqua is a test automation IDE from jetbrains that can deal with many languages and frameworks to improve your test workflows. Has support for popular testing frameworks like Selenium, Cypress, and Playwright."; + maintainers = with lib.maintainers; [ remcoschrijver ]; + license = lib.licenses.unfree; + sourceProvenance = + if stdenv.hostPlatform.isDarwin then + [ lib.sourceTypes.binaryNativeCode ] + else + [ lib.sourceTypes.binaryBytecode ]; + }; +} diff --git a/pkgs/applications/editors/jetbrains/ides/clion.nix b/pkgs/applications/editors/jetbrains/ides/clion.nix new file mode 100644 index 000000000000..0391c23f03ce --- /dev/null +++ b/pkgs/applications/editors/jetbrains/ides/clion.nix @@ -0,0 +1,102 @@ +{ + stdenv, + lib, + fetchurl, + mkJetBrainsProduct, + libdbm, + fsnotifier, + patchSharedLibs, + dotnetCorePackages, + python3, + openssl, + libxcrypt-legacy, + lttng-ust_2_12, + musl, + expat, + libxml2, + xz, +}: +let + system = stdenv.hostPlatform.system; + # update-script-start: urls + urls = { + x86_64-linux = { + url = "https://download.jetbrains.com/cpp/CLion-2025.3.1.tar.gz"; + hash = "sha256-RK49pTWLoBCmLVWrQSty82TF3NLC3NIASuNLdGOAe70="; + }; + aarch64-linux = { + url = "https://download.jetbrains.com/cpp/CLion-2025.3.1-aarch64.tar.gz"; + hash = "sha256-uWw4w9L3/3uYjXXJcP0OkDY+CbgnMQbe/Jrj3vqGjtc="; + }; + x86_64-darwin = { + url = "https://download.jetbrains.com/cpp/CLion-2025.3.1.dmg"; + hash = "sha256-moF0ySKfnIb4baGo4r2rUv+zaeoHgbV+skVwPryDB+I="; + }; + aarch64-darwin = { + url = "https://download.jetbrains.com/cpp/CLion-2025.3.1-aarch64.dmg"; + hash = "sha256-EcrorrQ9GHDZaYDx2Sf/VF+r7ZifO/TnMnkRtEHhSfE="; + }; + }; + # update-script-end: urls +in +(mkJetBrainsProduct { + inherit libdbm fsnotifier; + + pname = "clion"; + + wmClass = "jetbrains-clion"; + product = "CLion"; + + # update-script-start: version + version = "2025.3.1"; + buildNumber = "253.29346.141"; + # update-script-end: version + + src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); + + buildInputs = + lib.optionals stdenv.hostPlatform.isLinux [ + python3 + openssl + libxcrypt-legacy + lttng-ust_2_12 + musl + ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch) [ + expat + libxml2 + xz + ]; + + # NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README) + meta = { + homepage = "https://www.jetbrains.com/clion/"; + description = "C/C++ IDE from JetBrains"; + longDescription = "Enhancing productivity for every C and C++ developer on Linux, macOS and Windows."; + maintainers = with lib.maintainers; [ + mic92 + tymscar + ]; + license = lib.licenses.unfree; + sourceProvenance = + if stdenv.hostPlatform.isDarwin then + [ lib.sourceTypes.binaryNativeCode ] + else + [ lib.sourceTypes.binaryBytecode ]; + }; +}).overrideAttrs + (attrs: { + postInstall = + (attrs.postInstall or "") + + lib.optionalString stdenv.hostPlatform.isLinux '' + for dir in $out/clion/plugins/clion-radler/DotFiles/linux-*; do + rm -rf $dir/dotnet + ln -s ${dotnetCorePackages.sdk_10_0-source}/share/dotnet $dir/dotnet + done + ''; + + postFixup = '' + ${attrs.postFixup or ""} + ${patchSharedLibs} + ''; + }) diff --git a/pkgs/applications/editors/jetbrains/ides/datagrip.nix b/pkgs/applications/editors/jetbrains/ides/datagrip.nix new file mode 100644 index 000000000000..15be98d7cfd3 --- /dev/null +++ b/pkgs/applications/editors/jetbrains/ides/datagrip.nix @@ -0,0 +1,61 @@ +{ + stdenv, + lib, + fetchurl, + mkJetBrainsProduct, + libdbm, + fsnotifier, + +}: +let + system = stdenv.hostPlatform.system; + # update-script-start: urls + urls = { + x86_64-linux = { + url = "https://download.jetbrains.com/datagrip/datagrip-2025.3.2.tar.gz"; + hash = "sha256-y27WR10h640wdUExvSQAPBFAlr+oT/zPM03BHPisYMw="; + }; + aarch64-linux = { + url = "https://download.jetbrains.com/datagrip/datagrip-2025.3.2-aarch64.tar.gz"; + hash = "sha256-Gm/rOqJV2s4zLMGLhoWTGBtupiw9nw02+QAyygUX0Gg="; + }; + x86_64-darwin = { + url = "https://download.jetbrains.com/datagrip/datagrip-2025.3.2.dmg"; + hash = "sha256-A4OgpPL95YO2LqfTQuVxiw+jBvyDSVQcdb7FroQftPw="; + }; + aarch64-darwin = { + url = "https://download.jetbrains.com/datagrip/datagrip-2025.3.2-aarch64.dmg"; + hash = "sha256-pyJFSNydo4Y3J7DBHO+dYT/ZUdFrqgFsoUB8VqnsaWQ="; + }; + }; + # update-script-end: urls +in +mkJetBrainsProduct { + inherit libdbm fsnotifier; + + pname = "datagrip"; + + wmClass = "jetbrains-datagrip"; + product = "DataGrip"; + + # update-script-start: version + version = "2025.3.2"; + buildNumber = "253.29346.170"; + # update-script-end: version + + src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); + + # NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README) + meta = { + homepage = "https://www.jetbrains.com/datagrip/"; + description = "Database IDE from JetBrains"; + longDescription = "DataGrip is a new IDE from JetBrains built for database admins. It allows you to quickly migrate and refactor relational databases, construct efficient, statically checked SQL queries and much more."; + maintainers = [ ]; + license = lib.licenses.unfree; + sourceProvenance = + if stdenv.hostPlatform.isDarwin then + [ lib.sourceTypes.binaryNativeCode ] + else + [ lib.sourceTypes.binaryBytecode ]; + }; +} diff --git a/pkgs/applications/editors/jetbrains/ides/dataspell.nix b/pkgs/applications/editors/jetbrains/ides/dataspell.nix new file mode 100644 index 000000000000..2b9bc50d6508 --- /dev/null +++ b/pkgs/applications/editors/jetbrains/ides/dataspell.nix @@ -0,0 +1,71 @@ +{ + stdenv, + lib, + fetchurl, + mkJetBrainsProduct, + libdbm, + fsnotifier, + libgcc, + runCommand, + R, +}: +let + system = stdenv.hostPlatform.system; + # update-script-start: urls + urls = { + x86_64-linux = { + url = "https://download.jetbrains.com/python/dataspell-2025.3.1.tar.gz"; + hash = "sha256-N/E0Js5PXYWdfbJG8jKMy61hrfNh1Dx4TLaTKvZkTCg="; + }; + aarch64-linux = { + url = "https://download.jetbrains.com/python/dataspell-2025.3.1-aarch64.tar.gz"; + hash = "sha256-QK/TjMcEzf8r6JufDWe9vLFpnXs3sl001E0tUu9qRtM="; + }; + x86_64-darwin = { + url = "https://download.jetbrains.com/python/dataspell-2025.3.1.dmg"; + hash = "sha256-OI2VbdYkNpehYsBix2sv7kCY9PNAW62wemnObffeYBc="; + }; + aarch64-darwin = { + url = "https://download.jetbrains.com/python/dataspell-2025.3.1-aarch64.dmg"; + hash = "sha256-/g2O8V5uNq8OpDYb1HTyBO5cMH75Cvjsgzl2odrlpaM="; + }; + }; + # update-script-end: urls +in +mkJetBrainsProduct { + inherit libdbm fsnotifier; + + pname = "dataspell"; + + wmClass = "jetbrains-dataspell"; + product = "DataSpell"; + + # update-script-start: version + version = "2025.3.1"; + buildNumber = "253.29346.157"; + # update-script-end: version + + src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); + + buildInputs = [ + libgcc + (runCommand "libR" { } '' + mkdir -p $out/lib + ln -s ${R}/lib/R/lib/libR.so $out/lib/libR.so + '') + ]; + + # NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README) + meta = { + homepage = "https://www.jetbrains.com/dataspell/"; + description = "Data science IDE from JetBrains"; + longDescription = "DataSpell is a new IDE from JetBrains built for Data Scientists. Mainly it integrates Jupyter notebooks in the IntelliJ platform."; + maintainers = with lib.maintainers; [ leona ]; + license = lib.licenses.unfree; + sourceProvenance = + if stdenv.hostPlatform.isDarwin then + [ lib.sourceTypes.binaryNativeCode ] + else + [ lib.sourceTypes.binaryBytecode ]; + }; +} diff --git a/pkgs/applications/editors/jetbrains/ides/gateway.nix b/pkgs/applications/editors/jetbrains/ides/gateway.nix new file mode 100644 index 000000000000..4610e98e9a6b --- /dev/null +++ b/pkgs/applications/editors/jetbrains/ides/gateway.nix @@ -0,0 +1,66 @@ +{ + stdenv, + lib, + fetchurl, + mkJetBrainsProduct, + libdbm, + fsnotifier, + libgcc, +}: +let + system = stdenv.hostPlatform.system; + # update-script-start: urls + urls = { + x86_64-linux = { + url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.3.tar.gz"; + hash = "sha256-kMilT2GSRaVDXDQ/lPOVlatZzTy62laeKx4ovKzby0o="; + }; + aarch64-linux = { + url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.3-aarch64.tar.gz"; + hash = "sha256-IE7T9yYod9Ckaq8wxbr7cha06XNr6+5xQlyZPBhIavg="; + }; + x86_64-darwin = { + url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.3.dmg"; + hash = "sha256-KC/X8wLZWt7tAi+NbGedMpJ3j5YgU5SvUt0JD2IB8zg="; + }; + aarch64-darwin = { + url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.3-aarch64.dmg"; + hash = "sha256-sQyr2pPIjSe8wTWkSh/Zj+YP6DBWBtbnWg1bc28N8nQ="; + }; + }; + # update-script-end: urls +in +mkJetBrainsProduct { + inherit libdbm fsnotifier; + + pname = "gateway"; + + wmClass = "jetbrains-gateway"; + product = "JetBrains Gateway"; + productShort = "Gateway"; + + # update-script-start: version + version = "2025.3"; + buildNumber = "253.28294.342"; + # update-script-end: version + + src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); + + buildInputs = [ + libgcc + ]; + + # NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README) + meta = { + homepage = "https://www.jetbrains.com/remote-development/gateway/"; + description = "Remote development for JetBrains products"; + longDescription = "JetBrains Gateway is a lightweight launcher that connects a remote server with your local machine, downloads necessary components on the backend, and opens your project in JetBrains Client."; + maintainers = [ ]; + license = lib.licenses.unfree; + sourceProvenance = + if stdenv.hostPlatform.isDarwin then + [ lib.sourceTypes.binaryNativeCode ] + else + [ lib.sourceTypes.binaryBytecode ]; + }; +} diff --git a/pkgs/applications/editors/jetbrains/ides/goland.nix b/pkgs/applications/editors/jetbrains/ides/goland.nix new file mode 100644 index 000000000000..e2ca7a5502ca --- /dev/null +++ b/pkgs/applications/editors/jetbrains/ides/goland.nix @@ -0,0 +1,79 @@ +{ + stdenv, + lib, + fetchurl, + mkJetBrainsProduct, + libdbm, + fsnotifier, + libgcc, +}: +let + system = stdenv.hostPlatform.system; + # update-script-start: urls + urls = { + x86_64-linux = { + url = "https://download.jetbrains.com/go/goland-2025.3.tar.gz"; + hash = "sha256-YVGFYobqVG64r5rrAldyzua9VxNPRUlKgY6NogqGkcY="; + }; + aarch64-linux = { + url = "https://download.jetbrains.com/go/goland-2025.3-aarch64.tar.gz"; + hash = "sha256-xTDdS8x6B1oEC2SFnss0FCyPwDmWJcWhOuLXqPWXQ0A="; + }; + x86_64-darwin = { + url = "https://download.jetbrains.com/go/goland-2025.3.dmg"; + hash = "sha256-4d9PELFYx3iHNlWWZiROmUUApA21sIZh4mkTV9Jp2/Q="; + }; + aarch64-darwin = { + url = "https://download.jetbrains.com/go/goland-2025.3-aarch64.dmg"; + hash = "sha256-1O4gtcPfYVHTZtbMmwa5FUmf8MHrEYSqtToBB4kI7Ik="; + }; + }; + # update-script-end: urls +in +(mkJetBrainsProduct { + inherit libdbm fsnotifier; + + pname = "goland"; + + wmClass = "jetbrains-goland"; + product = "Goland"; + + # update-script-start: version + version = "2025.3"; + buildNumber = "253.28294.337"; + # update-script-end: version + + src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); + + extraWrapperArgs = [ + # fortify source breaks build since delve compiles with -O0 + ''--prefix CGO_CPPFLAGS " " "-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0"'' + ]; + buildInputs = [ + libgcc + ]; + + # NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README) + meta = { + homepage = "https://www.jetbrains.com/go/"; + description = "Go IDE from JetBrains"; + longDescription = "Goland is the codename for a new commercial IDE by JetBrains aimed at providing an ergonomic environment for Go development. + The new IDE extends the IntelliJ platform with the coding assistance and tool integrations specific for the Go language"; + maintainers = with lib.maintainers; [ tymscar ]; + license = lib.licenses.unfree; + sourceProvenance = + if stdenv.hostPlatform.isDarwin then + [ lib.sourceTypes.binaryNativeCode ] + else + [ lib.sourceTypes.binaryBytecode ]; + }; +}).overrideAttrs + (attrs: { + postFixup = + (attrs.postFixup or "") + + lib.optionalString stdenv.hostPlatform.isLinux '' + interp="$(cat $NIX_CC/nix-support/dynamic-linker)" + patchelf --set-interpreter $interp $out/goland/plugins/go-plugin/lib/dlv/linux/dlv + chmod +x $out/goland/plugins/go-plugin/lib/dlv/linux/dlv + ''; + }) diff --git a/pkgs/applications/editors/jetbrains/ides/idea-community.nix b/pkgs/applications/editors/jetbrains/ides/idea-community.nix new file mode 100644 index 000000000000..19b81e123367 --- /dev/null +++ b/pkgs/applications/editors/jetbrains/ides/idea-community.nix @@ -0,0 +1,69 @@ +# TODO: This IDE is deprecated and scheduled for removal in 26.05 +{ + stdenv, + lib, + fetchurl, + mkJetBrainsProduct, + libdbm, + fsnotifier, + maven, + zlib, +}: +let + system = stdenv.hostPlatform.system; + # update-script-start: urls + urls = { + x86_64-linux = { + url = "https://download.jetbrains.com/idea/ideaIC-2025.2.5.tar.gz"; + sha256 = "995c334cc3e143f13467abafef07a1ccf7d06275512bb6f4c91123948786ab7c"; + }; + aarch64-linux = { + url = "https://download.jetbrains.com/idea/ideaIC-2025.2.5-aarch64.tar.gz"; + sha256 = "4c57a783f31ee6f2c82d8c43bb5d0334a9afbc8bfb4542e732048c41f61e63a0"; + }; + x86_64-darwin = { + url = "https://download.jetbrains.com/idea/ideaIC-2025.2.5.dmg"; + sha256 = "ff48a1e60869342a91db867fa482a49d4cdf38476496911c109f34a7e8d6523d"; + }; + aarch64-darwin = { + url = "https://download.jetbrains.com/idea/ideaIC-2025.2.5-aarch64.dmg"; + sha256 = "52065492d433f0ea9df4debd5f0683154ab4dab5846394cabc8a49903d70e5bc"; + }; + }; + # update-script-end: urls +in +mkJetBrainsProduct { + inherit libdbm fsnotifier; + + pname = "idea-community"; + + wmClass = "jetbrains-idea-ce"; + product = "IntelliJ IDEA CE"; + productShort = "IDEA"; + + # update-script-start: version + version = "2025.2.5"; + buildNumber = "252.28238.7"; + # update-script-end: version + + src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); + + extraLdPath = [ zlib ]; + extraWrapperArgs = [ + ''--set M2_HOME "${maven}/maven"'' + ''--set M2 "${maven}/maven/bin"'' + ]; + + # NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README) + meta = { + homepage = "https://www.jetbrains.com/idea/"; + description = "Free Java, Kotlin, Groovy and Scala IDE from Jetbrains (built from source)"; + longDescription = "IDE for Java SE, Groovy & Scala development Powerful environment for building Google Android apps Integration with JUnit, TestNG, popular SCMs, Ant & Maven. Also known as IntelliJ."; + maintainers = with lib.maintainers; [ + gytis-ivaskevicius + tymscar + ]; + license = lib.licenses.asl20; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + }; +} diff --git a/pkgs/applications/editors/jetbrains/ides/idea-oss.nix b/pkgs/applications/editors/jetbrains/ides/idea-oss.nix new file mode 100644 index 000000000000..e2ac3e14d325 --- /dev/null +++ b/pkgs/applications/editors/jetbrains/ides/idea-oss.nix @@ -0,0 +1,72 @@ +{ + lib, + mkJetBrainsProduct, + mkJetBrainsSource, + maven, + zlib, +}: +let + src = mkJetBrainsSource { + # update-script-start: source-args + version = "2025.3.1"; + buildNumber = "253.29346.138"; + buildType = "idea"; + ideaHash = "sha256-eAq/lgv6ZcN9SR2E1KYnnhDHe/rBQ3GqqbbF6GstDoU="; + androidHash = "sha256-quMCzrjCKIo1pkzw4PWewAs5tz7A2aq7TI5zd+QaaUY="; + jpsHash = "sha256-iHpt926BDLNUwHRXvkqVgwlWiLo1qSZEaGeJcS0Fjmk="; + restarterHash = "sha256-acCmC58URd6p9uKZrm0qWgdZkqu9yqCs23v8qgxV2Ag="; + mvnDeps = ../source/idea_maven_artefacts.json; + repositories = [ + "repo1.maven.org/maven2" + "packages.jetbrains.team/maven/p/ij/intellij-dependencies" + "dl.google.com/dl/android/maven2" + "download.jetbrains.com/teamcity-repository" + "maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-ide-plugin-dependencies" + "packages.jetbrains.team/maven/p/grazi/grazie-platform-public" + "packages.jetbrains.team/maven/p/kpm/public" + "packages.jetbrains.team/maven/p/ki/maven" + "maven.pkg.jetbrains.space/public/p/compose/dev" + "packages.jetbrains.team/maven/p/amper/amper" + "packages.jetbrains.team/maven/p/kt/bootstrap" + ]; + kotlin-jps-plugin = { + version = "2.2.20"; + hash = "sha256-+jGghK2+yq+YFm5zT7ob+WTgTiJnHXAjDtlZjOzSISQ="; + }; + # update-script-end: source-args + }; +in +mkJetBrainsProduct { + inherit src; + inherit (src) + version + buildNumber + libdbm + fsnotifier + ; + + pname = "idea-oss"; + + wmClass = "jetbrains-idea-ce"; + product = "IntelliJ IDEA Open Source"; + productShort = "IDEA"; + + extraLdPath = [ zlib ]; + extraWrapperArgs = [ + ''--set M2_HOME "${maven}/maven"'' + ''--set M2 "${maven}/maven/bin"'' + ]; + + # NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README) + meta = { + homepage = "https://www.jetbrains.com/idea/"; + description = "Free Java, Kotlin, Groovy and Scala IDE from Jetbrains (built from source)"; + longDescription = "IDE for Java SE, Groovy & Scala development Powerful environment for building Google Android apps Integration with JUnit, TestNG, popular SCMs, Ant & Maven. Also known as IntelliJ."; + maintainers = with lib.maintainers; [ + gytis-ivaskevicius + tymscar + ]; + license = lib.licenses.asl20; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + }; +} diff --git a/pkgs/applications/editors/jetbrains/ides/idea.nix b/pkgs/applications/editors/jetbrains/ides/idea.nix new file mode 100644 index 000000000000..beea85af05ef --- /dev/null +++ b/pkgs/applications/editors/jetbrains/ides/idea.nix @@ -0,0 +1,79 @@ +{ + stdenv, + lib, + fetchurl, + mkJetBrainsProduct, + libdbm, + fsnotifier, + maven, + zlib, + lldb, + musl, +}: +let + system = stdenv.hostPlatform.system; + # update-script-start: urls + urls = { + x86_64-linux = { + url = "https://download.jetbrains.com/idea/ideaIU-2025.3.1.tar.gz"; + hash = "sha256-IeG5C17GhHZ6A0mLpCTvP5rMXb91nM7v1e3UdPBDrWw="; + }; + aarch64-linux = { + url = "https://download.jetbrains.com/idea/ideaIU-2025.3.1-aarch64.tar.gz"; + hash = "sha256-CVcRMp0enBRkG6Qm5lLU29OIWyfJoEbkRyWuZ3SR6MM="; + }; + x86_64-darwin = { + url = "https://download.jetbrains.com/idea/ideaIU-2025.3.1.dmg"; + hash = "sha256-rfWvODnge6Y4e/DsqU3y9EyCkCOhiYFw6svFy6/OA5M="; + }; + aarch64-darwin = { + url = "https://download.jetbrains.com/idea/ideaIU-2025.3.1-aarch64.dmg"; + hash = "sha256-ITeGPMOl9KzSW6OKguAE6TXTqU+lZvjjhR1riorBJ3c="; + }; + }; + # update-script-end: urls +in +mkJetBrainsProduct { + inherit libdbm fsnotifier; + + pname = "idea"; + + wmClass = "jetbrains-idea"; + product = "IntelliJ IDEA"; + productShort = "IDEA"; + + # update-script-start: version + version = "2025.3.1"; + buildNumber = "253.29346.138"; + # update-script-end: version + + src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); + + extraLdPath = [ zlib ]; + extraWrapperArgs = [ + ''--set M2_HOME "${maven}/maven"'' + ''--set M2 "${maven}/maven/bin"'' + ]; + + buildInputs = [ + lldb + musl + ]; + + # NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README) + meta = { + homepage = "https://www.jetbrains.com/idea/"; + description = "Java, Kotlin, Groovy and Scala IDE from Jetbrains"; + longDescription = "IDE for Java SE, Groovy & Scala development Powerful environment for building Google Android apps Integration with JUnit, TestNG, popular SCMs, Ant & Maven. Also known as IntelliJ."; + maintainers = with lib.maintainers; [ + gytis-ivaskevicius + tymscar + ]; + license = lib.licenses.unfree; + sourceProvenance = + if stdenv.hostPlatform.isDarwin then + [ lib.sourceTypes.binaryNativeCode ] + else + [ lib.sourceTypes.binaryBytecode ]; + }; +} diff --git a/pkgs/applications/editors/jetbrains/ides/mps.nix b/pkgs/applications/editors/jetbrains/ides/mps.nix new file mode 100644 index 000000000000..d01b9ad29d85 --- /dev/null +++ b/pkgs/applications/editors/jetbrains/ides/mps.nix @@ -0,0 +1,61 @@ +{ + stdenv, + lib, + fetchurl, + mkJetBrainsProduct, + libdbm, + fsnotifier, + +}: +let + system = stdenv.hostPlatform.system; + # update-script-start: urls + urls = { + x86_64-linux = { + url = "https://download.jetbrains.com/mps/2025.3/MPS-2025.3.tar.gz"; + hash = "sha256-xAI+UrTheCTWHSdoI4YZvhTlrlc121M+OVFkfzd7a3k="; + }; + aarch64-linux = { + url = "https://download.jetbrains.com/mps/2025.3/MPS-2025.3.tar.gz"; + hash = "sha256-xAI+UrTheCTWHSdoI4YZvhTlrlc121M+OVFkfzd7a3k="; + }; + x86_64-darwin = { + url = "https://download.jetbrains.com/mps/2025.3/MPS-2025.3-macos.dmg"; + hash = "sha256-whYAjKkF79mrknHflZnvOOy2bLosYUguelZDSuPt3uY="; + }; + aarch64-darwin = { + url = "https://download.jetbrains.com/mps/2025.3/MPS-2025.3-macos-aarch64.dmg"; + hash = "sha256-3HnEHOhRRI9IYjBhc5FO7h5j4jBBDtZTVkmO/S1fBEQ="; + }; + }; + # update-script-end: urls +in +mkJetBrainsProduct { + inherit libdbm fsnotifier; + + pname = "mps"; + + wmClass = "jetbrains-MPS"; + product = "MPS"; + + # update-script-start: version + version = "2025.3"; + buildNumber = "253.28294.432"; + # update-script-end: version + + src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); + + # NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README) + meta = { + homepage = "https://www.jetbrains.com/mps/"; + description = "IDE for building domain-specific languages from JetBrains"; + longDescription = "A metaprogramming system which uses projectional editing which allows users to overcome the limits of language parsers, and build DSL editors, such as ones with tables and diagrams."; + maintainers = [ ]; + license = lib.licenses.unfree; + sourceProvenance = + if stdenv.hostPlatform.isDarwin then + [ lib.sourceTypes.binaryNativeCode ] + else + [ lib.sourceTypes.binaryBytecode ]; + }; +} diff --git a/pkgs/applications/editors/jetbrains/ides/phpstorm.nix b/pkgs/applications/editors/jetbrains/ides/phpstorm.nix new file mode 100644 index 000000000000..3c05396678d4 --- /dev/null +++ b/pkgs/applications/editors/jetbrains/ides/phpstorm.nix @@ -0,0 +1,68 @@ +{ + stdenv, + lib, + fetchurl, + mkJetBrainsProduct, + libdbm, + fsnotifier, + musl, +}: +let + system = stdenv.hostPlatform.system; + # update-script-start: urls + urls = { + x86_64-linux = { + url = "https://download.jetbrains.com/webide/PhpStorm-2025.3.1.tar.gz"; + hash = "sha256-/Yk3q2t5YFzvyZF//moI4FprfMAlb6IXhiPSTsMi+ik="; + }; + aarch64-linux = { + url = "https://download.jetbrains.com/webide/PhpStorm-2025.3.1-aarch64.tar.gz"; + hash = "sha256-dkhmf4W0xFkosE1MJvIogqiqZaeHpk+i96/+UaG8KmE="; + }; + x86_64-darwin = { + url = "https://download.jetbrains.com/webide/PhpStorm-2025.3.1.dmg"; + hash = "sha256-EZiLzuXZSycepnrqzT6DYClZWmz+v+wmWVZfwYpK0tE="; + }; + aarch64-darwin = { + url = "https://download.jetbrains.com/webide/PhpStorm-2025.3.1-aarch64.dmg"; + hash = "sha256-BFPgpu6Gw8v5e4xI8oJnUdgIW/ghG1QaBHUmIcWvFrw="; + }; + }; + # update-script-end: urls +in +mkJetBrainsProduct { + inherit libdbm fsnotifier; + + pname = "phpstorm"; + + wmClass = "jetbrains-phpstorm"; + product = "PhpStorm"; + + # update-script-start: version + version = "2025.3.1"; + buildNumber = "253.29346.151"; + # update-script-end: version + + src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); + + buildInputs = [ + musl + ]; + + # NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README) + meta = { + homepage = "https://www.jetbrains.com/phpstorm/"; + description = "PHP IDE from JetBrains"; + longDescription = "PhpStorm provides an editor for PHP, HTML and JavaScript with on-the-fly code analysis, error prevention and automated refactorings for PHP and JavaScript code. "; + maintainers = with lib.maintainers; [ + dritter + tymscar + ]; + license = lib.licenses.unfree; + sourceProvenance = + if stdenv.hostPlatform.isDarwin then + [ lib.sourceTypes.binaryNativeCode ] + else + [ lib.sourceTypes.binaryBytecode ]; + }; +} diff --git a/pkgs/applications/editors/jetbrains/ides/pycharm-community.nix b/pkgs/applications/editors/jetbrains/ides/pycharm-community.nix new file mode 100644 index 000000000000..2adad4bf5246 --- /dev/null +++ b/pkgs/applications/editors/jetbrains/ides/pycharm-community.nix @@ -0,0 +1,63 @@ +# TODO: This IDE is deprecated and scheduled for removal in 26.05 +{ + stdenv, + lib, + fetchurl, + mkJetBrainsProduct, + libdbm, + fsnotifier, + pyCharmCommonOverrides, +}: +let + system = stdenv.hostPlatform.system; + # update-script-start: urls + urls = { + x86_64-linux = { + url = "https://download.jetbrains.com/python/pycharm-community-2025.2.5.tar.gz"; + sha256 = "7f49a014f53f0f6f7c46f6710b131f390302287f4046b606331d88081cdb551f"; + }; + aarch64-linux = { + url = "https://download.jetbrains.com/python/pycharm-community-2025.2.5-aarch64.tar.gz"; + sha256 = "67b61a3e788b043d93b3cc3e0dd3cea350e6d170402fd94adaf792cfc57e5462"; + }; + x86_64-darwin = { + url = "https://download.jetbrains.com/python/pycharm-community-2025.2.5.dmg"; + sha256 = "08ba97a278031ff1942ddefb18d8acf7582f0bb4a28ccdf5d65721bfb80ca456"; + }; + aarch64-darwin = { + url = "https://download.jetbrains.com/python/pycharm-community-2025.2.5-aarch64.dmg"; + sha256 = "040a4ed6bb7563972d844c450f615d0d11385e524fbbfdbfc9fc68d78811e994"; + }; + }; + # update-script-end: urls +in +(mkJetBrainsProduct { + inherit libdbm fsnotifier; + + pname = "pycharm-community"; + + wmClass = "jetbrains-pycharm-ce"; + product = "PyCharm CE"; + productShort = "PyCharm"; + + # update-script-start: version + version = "2025.2.5"; + buildNumber = "252.28238.29"; + # update-script-end: version + + src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); + + # NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README) + meta = { + homepage = "https://www.jetbrains.com/pycharm/"; + description = "Free Python IDE from JetBrains (built from source)"; + longDescription = "Python IDE with complete set of tools for productive development with Python programming language. In addition, the IDE provides high-class capabilities for professional Web development with Django framework and Google App Engine. It has powerful coding assistance, navigation, a lot of refactoring features, tight integration with various Version Control Systems, Unit testing, powerful all-singing all-dancing Debugger and entire customization. PyCharm is developer driven IDE. It was developed with the aim of providing you almost everything you need for your comfortable and productive development!"; + maintainers = with lib.maintainers; [ + genericnerdyusername + tymscar + ]; + license = lib.licenses.asl20; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + }; +}).overrideAttrs + pyCharmCommonOverrides diff --git a/pkgs/applications/editors/jetbrains/ides/pycharm-oss.nix b/pkgs/applications/editors/jetbrains/ides/pycharm-oss.nix new file mode 100644 index 000000000000..9b79a69e0ed9 --- /dev/null +++ b/pkgs/applications/editors/jetbrains/ides/pycharm-oss.nix @@ -0,0 +1,66 @@ +{ + lib, + mkJetBrainsProduct, + mkJetBrainsSource, + pyCharmCommonOverrides, +}: +let + src = mkJetBrainsSource { + # update-script-start: source-args + version = "2025.3.1"; + buildNumber = "253.29346.142"; + buildType = "pycharm"; + ideaHash = "sha256-eAq/lgv6ZcN9SR2E1KYnnhDHe/rBQ3GqqbbF6GstDoU="; + androidHash = "sha256-quMCzrjCKIo1pkzw4PWewAs5tz7A2aq7TI5zd+QaaUY="; + jpsHash = "sha256-iHpt926BDLNUwHRXvkqVgwlWiLo1qSZEaGeJcS0Fjmk="; + restarterHash = "sha256-acCmC58URd6p9uKZrm0qWgdZkqu9yqCs23v8qgxV2Ag="; + mvnDeps = ../source/pycharm_maven_artefacts.json; + repositories = [ + "repo1.maven.org/maven2" + "packages.jetbrains.team/maven/p/ij/intellij-dependencies" + "dl.google.com/dl/android/maven2" + "download.jetbrains.com/teamcity-repository" + "maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-ide-plugin-dependencies" + "packages.jetbrains.team/maven/p/grazi/grazie-platform-public" + "packages.jetbrains.team/maven/p/kpm/public" + "packages.jetbrains.team/maven/p/ki/maven" + "maven.pkg.jetbrains.space/public/p/compose/dev" + "packages.jetbrains.team/maven/p/amper/amper" + "packages.jetbrains.team/maven/p/kt/bootstrap" + ]; + kotlin-jps-plugin = { + version = "2.2.20"; + hash = "sha256-+jGghK2+yq+YFm5zT7ob+WTgTiJnHXAjDtlZjOzSISQ="; + }; + # update-script-end: source-args + }; +in +(mkJetBrainsProduct { + inherit src; + inherit (src) + version + buildNumber + libdbm + fsnotifier + ; + + pname = "pycharm-oss"; + + wmClass = "jetbrains-pycharm-ce"; + product = "PyCharm Open Source"; + productShort = "PyCharm"; + + # NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README) + meta = { + homepage = "https://www.jetbrains.com/pycharm/"; + description = "Free Python IDE from JetBrains (built from source)"; + longDescription = "Python IDE with complete set of tools for productive development with Python programming language. In addition, the IDE provides high-class capabilities for professional Web development with Django framework and Google App Engine. It has powerful coding assistance, navigation, a lot of refactoring features, tight integration with various Version Control Systems, Unit testing, powerful all-singing all-dancing Debugger and entire customization. PyCharm is developer driven IDE. It was developed with the aim of providing you almost everything you need for your comfortable and productive development!"; + maintainers = with lib.maintainers; [ + genericnerdyusername + tymscar + ]; + license = lib.licenses.asl20; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + }; +}).overrideAttrs + pyCharmCommonOverrides diff --git a/pkgs/applications/editors/jetbrains/ides/pycharm.nix b/pkgs/applications/editors/jetbrains/ides/pycharm.nix new file mode 100644 index 000000000000..222642ace59d --- /dev/null +++ b/pkgs/applications/editors/jetbrains/ides/pycharm.nix @@ -0,0 +1,71 @@ +{ + stdenv, + lib, + fetchurl, + mkJetBrainsProduct, + libdbm, + fsnotifier, + pyCharmCommonOverrides, + musl, +}: +let + system = stdenv.hostPlatform.system; + # update-script-start: urls + urls = { + x86_64-linux = { + url = "https://download.jetbrains.com/python/pycharm-2025.3.1.tar.gz"; + hash = "sha256-kz/ULXzCp2rUuiP5ESKU5N8BP6TDNiQ1oeM2gFHAc5E="; + }; + aarch64-linux = { + url = "https://download.jetbrains.com/python/pycharm-2025.3.1-aarch64.tar.gz"; + hash = "sha256-K29aQwEydz6nyvMEb3dj6noDHb+rbhvnK9yG88x6dYs="; + }; + x86_64-darwin = { + url = "https://download.jetbrains.com/python/pycharm-2025.3.1.dmg"; + hash = "sha256-WGye7WfaYJ/B5WWov8NusVWyPlSD1dxunc+LVUD0f6U="; + }; + aarch64-darwin = { + url = "https://download.jetbrains.com/python/pycharm-2025.3.1-aarch64.dmg"; + hash = "sha256-7I6XhW8A2pAgIMcrDwecwQmD3mu0Q4KS6l+qHlsMuTU="; + }; + }; + # update-script-end: urls +in +(mkJetBrainsProduct { + inherit libdbm fsnotifier; + + pname = "pycharm"; + + wmClass = "jetbrains-pycharm"; + product = "PyCharm"; + productShort = "PyCharm"; + + # update-script-start: version + version = "2025.3.1"; + buildNumber = "253.29346.142"; + # update-script-end: version + + src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); + + buildInputs = [ + musl + ]; + + # NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README) + meta = { + homepage = "https://www.jetbrains.com/pycharm/"; + description = "Python IDE from JetBrains"; + longDescription = "Python IDE with complete set of tools for productive development with Python programming language. In addition, the IDE provides high-class capabilities for professional Web development with Django framework and Google App Engine. It has powerful coding assistance, navigation, a lot of refactoring features, tight integration with various Version Control Systems, Unit testing, powerful all-singing all-dancing Debugger and entire customization. PyCharm is developer driven IDE. It was developed with the aim of providing you almost everything you need for your comfortable and productive development!"; + maintainers = with lib.maintainers; [ + genericnerdyusername + tymscar + ]; + license = lib.licenses.unfree; + sourceProvenance = + if stdenv.hostPlatform.isDarwin then + [ lib.sourceTypes.binaryNativeCode ] + else + [ lib.sourceTypes.binaryBytecode ]; + }; +}).overrideAttrs + pyCharmCommonOverrides diff --git a/pkgs/applications/editors/jetbrains/ides/rider.nix b/pkgs/applications/editors/jetbrains/ides/rider.nix new file mode 100644 index 000000000000..9b454d68c509 --- /dev/null +++ b/pkgs/applications/editors/jetbrains/ides/rider.nix @@ -0,0 +1,106 @@ +{ + stdenv, + lib, + fetchurl, + mkJetBrainsProduct, + libdbm, + fsnotifier, + patchSharedLibs, + openssl, + libxcrypt, + lttng-ust_2_12, + musl, + libICE, + libSM, + libX11, + dotnetCorePackages, + xorg, + expat, + libxml2, + xz, +}: +let + system = stdenv.hostPlatform.system; + # update-script-start: urls + urls = { + x86_64-linux = { + url = "https://download.jetbrains.com/rider/JetBrains.Rider-2025.3.1.tar.gz"; + hash = "sha256-uoQPfEjafxGM9Xqowi3zASDRbxdfvOO+xqZVkO2H8ug="; + }; + aarch64-linux = { + url = "https://download.jetbrains.com/rider/JetBrains.Rider-2025.3.1-aarch64.tar.gz"; + hash = "sha256-GQgPzcSPoPdD7WCSe3GXWjxHi4BSlhYc/YoKosBMj1I="; + }; + x86_64-darwin = { + url = "https://download.jetbrains.com/rider/JetBrains.Rider-2025.3.1.dmg"; + hash = "sha256-rd2Bbb3xMOLvXn3BhNeoCH+L+/brpOMurSRSBppJYH0="; + }; + aarch64-darwin = { + url = "https://download.jetbrains.com/rider/JetBrains.Rider-2025.3.1-aarch64.dmg"; + hash = "sha256-1wgDI0EpAPXTcnAjPlpMdzARxoU9YDHOH15jXHdRFCY="; + }; + }; + # update-script-end: urls +in +(mkJetBrainsProduct { + inherit libdbm fsnotifier; + + pname = "rider"; + + wmClass = "jetbrains-rider"; + product = "Rider"; + + # update-script-start: version + version = "2025.3.1"; + buildNumber = "253.29346.144"; + # update-script-end: version + + src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); + + buildInputs = [ + openssl + libxcrypt + lttng-ust_2_12 + musl + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + xorg.xcbutilkeysyms + ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch) [ + expat + libxml2 + xz + ]; + extraLdPath = lib.optionals (stdenv.hostPlatform.isLinux) [ + # Avalonia dependencies needed for dotMemory + libICE + libSM + libX11 + ]; + + # NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README) + meta = { + homepage = "https://www.jetbrains.com/rider/"; + description = ".NET IDE from JetBrains"; + longDescription = "JetBrains Rider is a new .NET IDE based on the IntelliJ platform and ReSharper. Rider supports .NET Core, .NET Framework and Mono based projects. This lets you develop a wide array of applications including .NET desktop apps, services and libraries, Unity games, ASP.NET and ASP.NET Core web applications."; + maintainers = with lib.maintainers; [ raphaelr ]; + license = lib.licenses.unfree; + sourceProvenance = + if stdenv.hostPlatform.isDarwin then + [ lib.sourceTypes.binaryNativeCode ] + else + [ lib.sourceTypes.binaryBytecode ]; + }; +}).overrideAttrs + (attrs: { + postInstall = + (attrs.postInstall or "") + + lib.optionalString stdenv.hostPlatform.isLinux '' + ${patchSharedLibs} + + for dir in $out/rider/lib/ReSharperHost/linux-*; do + rm -rf $dir/dotnet + ln -s ${dotnetCorePackages.sdk_10_0-source}/share/dotnet $dir/dotnet + done + ''; + }) diff --git a/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix b/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix new file mode 100644 index 000000000000..84dc6cb1d887 --- /dev/null +++ b/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix @@ -0,0 +1,65 @@ +{ + stdenv, + lib, + fetchurl, + mkJetBrainsProduct, + libdbm, + fsnotifier, + musl, +}: +let + system = stdenv.hostPlatform.system; + # update-script-start: urls + urls = { + x86_64-linux = { + url = "https://download.jetbrains.com/ruby/RubyMine-2025.3.1.tar.gz"; + hash = "sha256-6esgEcotVpTFjAEWkL9UTQJuOnwcDI3puzehj6DPgRg="; + }; + aarch64-linux = { + url = "https://download.jetbrains.com/ruby/RubyMine-2025.3.1-aarch64.tar.gz"; + hash = "sha256-v2A8ahuh5hiv23BYlkhEfPzlO02qegzGgHPBt35yfVU="; + }; + x86_64-darwin = { + url = "https://download.jetbrains.com/ruby/RubyMine-2025.3.1.dmg"; + hash = "sha256-T86EmDpqzhbYR5FQt2UoAlCiYLPST7NyWNEUAAxsERU="; + }; + aarch64-darwin = { + url = "https://download.jetbrains.com/ruby/RubyMine-2025.3.1-aarch64.dmg"; + hash = "sha256-Z/GqZ0uQ7FS6IfNSOtlAIY+Xm+/XQp44rYIryBRtFqQ="; + }; + }; + # update-script-end: urls +in +mkJetBrainsProduct { + inherit libdbm fsnotifier; + + pname = "ruby-mine"; + + wmClass = "jetbrains-rubymine"; + product = "RubyMine"; + + # update-script-start: version + version = "2025.3.1"; + buildNumber = "253.29346.140"; + # update-script-end: version + + src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); + + buildInputs = [ + musl + ]; + + # NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README) + meta = { + homepage = "https://www.jetbrains.com/ruby/"; + description = "Ruby IDE from JetBrains"; + longDescription = "Ruby IDE from JetBrains"; + maintainers = with lib.maintainers; [ tymscar ]; + license = lib.licenses.unfree; + sourceProvenance = + if stdenv.hostPlatform.isDarwin then + [ lib.sourceTypes.binaryNativeCode ] + else + [ lib.sourceTypes.binaryBytecode ]; + }; +} diff --git a/pkgs/applications/editors/jetbrains/ides/rust-rover.nix b/pkgs/applications/editors/jetbrains/ides/rust-rover.nix new file mode 100644 index 000000000000..30289c80def1 --- /dev/null +++ b/pkgs/applications/editors/jetbrains/ides/rust-rover.nix @@ -0,0 +1,85 @@ +{ + stdenv, + lib, + fetchurl, + mkJetBrainsProduct, + libdbm, + fsnotifier, + patchSharedLibs, + python3, + openssl, + libxcrypt-legacy, + expat, + libxml2, + xz, +}: +let + system = stdenv.hostPlatform.system; + # update-script-start: urls + urls = { + x86_64-linux = { + url = "https://download.jetbrains.com/rustrover/RustRover-2025.3.1.tar.gz"; + hash = "sha256-Whs04QocWe7jBpQja6qCM8d4dYB2k4G+AbTMsJYY7Ik="; + }; + aarch64-linux = { + url = "https://download.jetbrains.com/rustrover/RustRover-2025.3.1-aarch64.tar.gz"; + hash = "sha256-+w+BydKipgRxhISVSyYaZCvp7W9R3pj83GztsysKTJ4="; + }; + x86_64-darwin = { + url = "https://download.jetbrains.com/rustrover/RustRover-2025.3.1.dmg"; + hash = "sha256-OJmHVFKlGC25OxMsANvIQ5T/tjdDC5fyOQvoq7BBJTc="; + }; + aarch64-darwin = { + url = "https://download.jetbrains.com/rustrover/RustRover-2025.3.1-aarch64.dmg"; + hash = "sha256-EDoS7Rw3trOM/11jfn3HuNzHj1xXa6OLj4Ysa6NkfVI="; + }; + }; + # update-script-end: urls +in +(mkJetBrainsProduct { + inherit libdbm fsnotifier; + + pname = "rust-rover"; + + wmClass = "jetbrains-rustrover"; + product = "RustRover"; + + # update-script-start: version + version = "2025.3.1"; + buildNumber = "253.29346.139"; + # update-script-end: version + + src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); + + buildInputs = + lib.optionals stdenv.hostPlatform.isLinux [ + python3 + openssl + libxcrypt-legacy + ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch) [ + expat + libxml2 + xz + ]; + + # NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README) + meta = { + homepage = "https://www.jetbrains.com/rust/"; + description = "Rust IDE from JetBrains"; + longDescription = "Rust IDE from JetBrains"; + maintainers = with lib.maintainers; [ genericnerdyusername ]; + license = lib.licenses.unfree; + sourceProvenance = + if stdenv.hostPlatform.isDarwin then + [ lib.sourceTypes.binaryNativeCode ] + else + [ lib.sourceTypes.binaryBytecode ]; + }; +}).overrideAttrs + (attrs: { + postFixup = '' + ${attrs.postFixup or ""} + ${patchSharedLibs} + ''; + }) diff --git a/pkgs/applications/editors/jetbrains/ides/webstorm.nix b/pkgs/applications/editors/jetbrains/ides/webstorm.nix new file mode 100644 index 000000000000..bce2d34a87b0 --- /dev/null +++ b/pkgs/applications/editors/jetbrains/ides/webstorm.nix @@ -0,0 +1,68 @@ +{ + stdenv, + lib, + fetchurl, + mkJetBrainsProduct, + libdbm, + fsnotifier, + musl, +}: +let + system = stdenv.hostPlatform.system; + # update-script-start: urls + urls = { + x86_64-linux = { + url = "https://download.jetbrains.com/webstorm/WebStorm-2025.3.1.tar.gz"; + hash = "sha256-CKhR0ha3QcSeu2hG4Xj7gj0yn+e5gkohNLaMj9Jboq4="; + }; + aarch64-linux = { + url = "https://download.jetbrains.com/webstorm/WebStorm-2025.3.1-aarch64.tar.gz"; + hash = "sha256-/Yuz7nDFSRZdkQJDe8oD6Ff8FHKBwdc4IknUaQwx3Yc="; + }; + x86_64-darwin = { + url = "https://download.jetbrains.com/webstorm/WebStorm-2025.3.1.dmg"; + hash = "sha256-psuQZWL5WzfpweNMm9lWHeplOnJsldAr+pV6y+kJuI0="; + }; + aarch64-darwin = { + url = "https://download.jetbrains.com/webstorm/WebStorm-2025.3.1-aarch64.dmg"; + hash = "sha256-HCGZDO4ru//dj2yQ6AcbwD7H/lo2YuUZMcFSItS3zLI="; + }; + }; + # update-script-end: urls +in +mkJetBrainsProduct { + inherit libdbm fsnotifier; + + pname = "webstorm"; + + wmClass = "jetbrains-webstorm"; + product = "WebStorm"; + + # update-script-start: version + version = "2025.3.1"; + buildNumber = "253.29346.143"; + # update-script-end: version + + src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); + + buildInputs = [ + musl + ]; + + # NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README) + meta = { + homepage = "https://www.jetbrains.com/webstorm/"; + description = "Web IDE from JetBrains"; + longDescription = "WebStorm provides an editor for HTML, JavaScript (incl. Node.js), and CSS with on-the-fly code analysis, error prevention and automated refactorings for JavaScript code."; + maintainers = with lib.maintainers; [ + abaldeau + tymscar + ]; + license = lib.licenses.unfree; + sourceProvenance = + if stdenv.hostPlatform.isDarwin then + [ lib.sourceTypes.binaryNativeCode ] + else + [ lib.sourceTypes.binaryBytecode ]; + }; +} diff --git a/pkgs/applications/editors/jetbrains/ides/writerside.nix b/pkgs/applications/editors/jetbrains/ides/writerside.nix new file mode 100644 index 000000000000..a156e8fdbec5 --- /dev/null +++ b/pkgs/applications/editors/jetbrains/ides/writerside.nix @@ -0,0 +1,66 @@ +# TODO: This IDE is deprecated and scheduled for removal in 26.05 +{ + stdenv, + lib, + fetchurl, + mkJetBrainsProduct, + libdbm, + fsnotifier, + musl, +}: +let + system = stdenv.hostPlatform.system; + # update-script-start: urls + urls = { + x86_64-linux = { + url = "https://download.jetbrains.com/writerside/writerside-243.22562.371.tar.gz"; + sha256 = "d49e58020d51ec4ccdbdffea5d42b5a2d776a809fc00789cef5abda7b23bd3f6"; + }; + aarch64-linux = { + url = "https://download.jetbrains.com/writerside/writerside-243.22562.371-aarch64.tar.gz"; + sha256 = "6067f6f73c4a178e2d0ae42bd18669045d85b5b5ed2c9115c2488ba7aa2a3d88"; + }; + x86_64-darwin = { + url = "https://download.jetbrains.com/writerside/writerside-243.22562.371.dmg"; + sha256 = "0c78b8035497c855aea5666256716778abd46dadf68f51e4f91c0db01f62b280"; + }; + aarch64-darwin = { + url = "https://download.jetbrains.com/writerside/writerside-243.22562.371-aarch64.dmg"; + sha256 = "9d86ef50b4c6d2a07d236219e9b05c0557241fb017d52ac395719bdb425130f5"; + }; + }; + # update-script-end: urls +in +mkJetBrainsProduct { + inherit libdbm fsnotifier; + + pname = "writerside"; + + wmClass = "jetbrains-writerside"; + product = "Writerside"; + + # update-script-start: version + version = "2024.3 EAP"; + buildNumber = "243.22562.371"; + # update-script-end: version + + src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); + + buildInputs = [ + musl + ]; + + # NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README) + meta = { + homepage = "https://www.jetbrains.com/writerside/"; + description = "Documentation IDE from JetBrains"; + longDescription = "The most powerful development environment – now adapted for writing documentation."; + maintainers = with lib.maintainers; [ zlepper ]; + license = lib.licenses.unfree; + sourceProvenance = + if stdenv.hostPlatform.isDarwin then + [ lib.sourceTypes.binaryNativeCode ] + else + [ lib.sourceTypes.binaryBytecode ]; + }; +} diff --git a/pkgs/applications/editors/jetbrains/readme.md b/pkgs/applications/editors/jetbrains/readme.md index 43744856818e..220c2b210d9c 100644 --- a/pkgs/applications/editors/jetbrains/readme.md +++ b/pkgs/applications/editors/jetbrains/readme.md @@ -1,4 +1,4 @@ -This directory contains the build expressions needed to build any of the jetbrains IDEs. +This directory contains the build expressions needed to build any of the JetBrains IDEs. The jdk is in `pkgs/development/compilers/jetbrains-jdk`. ## Tests: @@ -35,31 +35,39 @@ fetchurl { } ``` -## How to update stuff: - - Run ./bin/update_bin.py, this will update binary IDEs, and automatically commit them - - Source builds need a bit more effort, as they **aren't automated at the moment**: - - Run ./source/update.py ./source/sources.json. This will update the source version to the latest available version. - - Run these commands respectively: - - `nix build .#jetbrains.idea-oss.src.src && ./source/build_maven.py source/idea_maven_artefacts.json result/` for IDEA - - `nix build .#jetbrains.pycharm-oss.src.src && ./source/build_maven.py source/pycharm_maven_artefacts.json result/` for PyCharm - - Make sure the Kotlin version used is correct. - - Check the recommended Kotlin version in `.idea/kotlinc.xml` in the IDEA source root - - Do a test build - - If it succeeds, make a commit - - make a PR/merge - - If it fails, ping/message GenericNerdyUsername or the nixpkgs Jetbrains maintainer team +## How to update IDEs: + - Run `./updater/main.py`. + This will update binary and source IDEs. + After this you can commit them. + - See `./updater/main.py --help` for additional flags. + - The IDEs have `passthru.updateScript` set up to run `./updater/main.py`. + The script then uses the `UPDATE_NIX_*` environment variables as documented. + +To keep things simple, the update script will search for the following markers and may replace any content between them: +- `update-script-start: urls` / `update-script-end: urls`: URLs for binary IDEs +- `update-script-start: version` / `update-script-end: version`: Version and build number for binary IDEs +- `update-script-start: source-args` / `update-script-end: source-args`: Arguments for `mkJetBrainsSource` for source IDEs. + +Any comments or other manual changes between these markers will be removed when the script runs. ## How to add an IDE: - - Make dummy entries in `bin/versions.json` (make sure to set the version to something older than the real one) - - Run `bin/update_bin.py` - - Add an entry in `ides.json` - - Add an entry in `default.nix` + - Add a new derivation in `ides/` + - Add an entry to the URL templates in `updater/updateInfo.json` + - Add it to `default.nix` ### TODO: + - remove the usage of `meta.` properties for building the Linux desktop files + (JetBrains already provides their own Desktop files, we can just use those probably?) + - drop the community IDEs + - Switch `mkJetbrainsProduct` to use `lib.extendMkDerivation`, see also: + - https://github.com/NixOS/nixpkgs/pull/475183#discussion_r2655305961 + - https://github.com/NixOS/nixpkgs/pull/475183#discussion_r2655348886 + - move PyCharm overrides to a common place outside of `default.nix` + - package `patchSharedLibs` from `default.nix` as a hook + - cleanup this TODO list, especially the following points, which have been here since 2023 - replace `libxcrypt-legacy` with `libxcrypt` when supported - make `jetbrains-remote-dev.patch` cleaner - is extraLdPath needed for IDEA? - - set meta.sourceProvenance for everything - from source builds: - remove timestamps in output `.jar` of `jps-bootstrap` - automated update scripts diff --git a/pkgs/applications/editors/jetbrains/source/build.nix b/pkgs/applications/editors/jetbrains/source/build.nix index 84ee92265ac4..2359ad1dc47b 100644 --- a/pkgs/applications/editors/jetbrains/source/build.nix +++ b/pkgs/applications/editors/jetbrains/source/build.nix @@ -23,7 +23,8 @@ p7zip, pkg-config, xorg, - +}: +{ version, buildNumber, buildType, @@ -35,7 +36,6 @@ repositories, kotlin-jps-plugin, }: - let kotlin' = kotlin.overrideAttrs (oldAttrs: { version = "2.2.20"; @@ -313,6 +313,12 @@ stdenvNoCC.mkDerivation rec { ''; passthru = { - inherit libdbm fsnotifier jps-bootstrap; + inherit + version + buildNumber + libdbm + fsnotifier + jps-bootstrap + ; }; } diff --git a/pkgs/applications/editors/jetbrains/source/build_maven.py b/pkgs/applications/editors/jetbrains/source/build_maven.py deleted file mode 100755 index d549072cf489..000000000000 --- a/pkgs/applications/editors/jetbrains/source/build_maven.py +++ /dev/null @@ -1,109 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i python3 -p python3 python3.pkgs.xmltodict -import os -import urllib -from argparse import ArgumentParser -from xmltodict import parse -from json import dump -from sys import stdout - -def get_args() -> (str, list[str]): - parser = ArgumentParser( - description="Given the path of a intellij source tree, make a list of urls and hashes of maven artefacts required to build" - ) - parser.add_argument("out", help="File to output json to") - parser.add_argument("path", help="Path to the intellij-community source dir") - args = parser.parse_args() - return args.path, args.out - - -def ensure_is_list(x): - if type(x) != list: - return [x] - return x - -def add_entries(sources, targets, hashes): - for artefact in sources: - target = None - base_jar_name = os.path.basename(urllib.parse.urlparse(artefact["@url"]).path) - for candidate in targets: - if candidate["@url"].endswith(base_jar_name + "!/"): - target = candidate - break - if target is None: - raise ValueError(f"Did not find target for source {artefact}") - - url = artefact["@url"].removeprefix("file://$MAVEN_REPOSITORY$/") - if url == artefact["@url"]: - raise ValueError(f"Unexpected artefact URL {url}") - - path = target["@url"].removeprefix("jar://$MAVEN_REPOSITORY$/").removesuffix("!/") - if path == target["@url"]: - raise ValueError(f"Unexpected target path {path}") - - hashes.append({ - "url": url, - "hash": artefact["sha256sum"], - "path": path - }) - - -def add_libraries(root_path: str, hashes: list[dict[str, str]], projects_to_process: list[str]): - library_paths = os.listdir(root_path + "/libraries/") - for path in library_paths: - file_contents = parse(open(root_path + "/libraries/" + path).read()) - if "properties" not in file_contents["component"]["library"]: - continue - sources = ensure_is_list(file_contents["component"]["library"]["properties"]["verification"]["artifact"]) - targets = ensure_is_list(file_contents["component"]["library"]["CLASSES"]["root"]) - add_entries(sources, targets, hashes) - - modules_xml = parse(open(root_path+"/modules.xml").read()) - for module in modules_xml["project"]["component"]["modules"]["module"]: - projects_to_process.append(module["@filepath"]) - - -def add_iml(path: str, hashes: list[dict[str, str]], projects_to_process: list[str]): - try: - contents = parse(open(path).read()) - except FileNotFoundError: - print(f"Warning: path {path} does not exist (did you forget the android directory?)") - return - for manager in ensure_is_list(contents["module"]["component"]): - if manager["@name"] != "NewModuleRootManager": - continue - - for entry in manager["orderEntry"]: - if type(entry) != dict or \ - entry["@type"] != "module-library" or \ - "properties" not in entry["library"]: - continue - - sources = ensure_is_list(entry["library"]["properties"]["verification"]["artifact"]) - targets = ensure_is_list(entry["library"]["CLASSES"]["root"]) - add_entries(sources, targets, hashes) - - -def main(): - root_path, out = get_args() - file_hashes = [] - projects_to_process: list[str] = [root_path+"/.idea"] - - while projects_to_process: - elem = projects_to_process.pop() - elem = elem.replace("$PROJECT_DIR$", root_path) - if elem.endswith(".iml"): - add_iml(elem, file_hashes, projects_to_process) - else: - add_libraries(elem, file_hashes, projects_to_process) - - if out == "stdout": - dump(file_hashes, stdout, indent=4) - else: - file = open(out, "w") - dump(file_hashes, file, indent=4) - file.write("\n") - - -if __name__ == '__main__': - main() diff --git a/pkgs/applications/editors/jetbrains/source/default.nix b/pkgs/applications/editors/jetbrains/source/default.nix deleted file mode 100644 index 84a27ee60135..000000000000 --- a/pkgs/applications/editors/jetbrains/source/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -let - ides = builtins.fromJSON (builtins.readFile ./sources.json); -in -{ - callPackage, -}: -builtins.mapAttrs ( - _: info: callPackage ./build.nix (info // { mvnDeps = ./. + "/${info.mvnDeps}"; }) -) ides diff --git a/pkgs/applications/editors/jetbrains/source/sources.json b/pkgs/applications/editors/jetbrains/source/sources.json deleted file mode 100644 index d3bc51dd97c9..000000000000 --- a/pkgs/applications/editors/jetbrains/source/sources.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "idea-oss": { - "version": "2025.3.1", - "buildNumber": "253.29346.138", - "buildType": "idea", - "ideaHash": "sha256-eAq/lgv6ZcN9SR2E1KYnnhDHe/rBQ3GqqbbF6GstDoU=", - "androidHash": "sha256-quMCzrjCKIo1pkzw4PWewAs5tz7A2aq7TI5zd+QaaUY=", - "jpsHash": "sha256-iHpt926BDLNUwHRXvkqVgwlWiLo1qSZEaGeJcS0Fjmk=", - "restarterHash": "sha256-acCmC58URd6p9uKZrm0qWgdZkqu9yqCs23v8qgxV2Ag=", - "mvnDeps": "idea_maven_artefacts.json", - "repositories": [ - "repo1.maven.org/maven2", - "packages.jetbrains.team/maven/p/ij/intellij-dependencies", - "dl.google.com/dl/android/maven2", - "download.jetbrains.com/teamcity-repository", - "maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-ide-plugin-dependencies", - "packages.jetbrains.team/maven/p/grazi/grazie-platform-public", - "packages.jetbrains.team/maven/p/kpm/public", - "packages.jetbrains.team/maven/p/ki/maven", - "maven.pkg.jetbrains.space/public/p/compose/dev", - "packages.jetbrains.team/maven/p/amper/amper", - "packages.jetbrains.team/maven/p/kt/bootstrap" - ], - "kotlin-jps-plugin": { - "version": "2.2.20", - "hash": "sha256-+jGghK2+yq+YFm5zT7ob+WTgTiJnHXAjDtlZjOzSISQ=" - } - }, - "pycharm-oss": { - "version": "2025.3.1", - "buildNumber": "253.29346.142", - "buildType": "pycharm", - "ideaHash": "sha256-eAq/lgv6ZcN9SR2E1KYnnhDHe/rBQ3GqqbbF6GstDoU=", - "androidHash": "sha256-quMCzrjCKIo1pkzw4PWewAs5tz7A2aq7TI5zd+QaaUY=", - "jpsHash": "sha256-iHpt926BDLNUwHRXvkqVgwlWiLo1qSZEaGeJcS0Fjmk=", - "restarterHash": "sha256-acCmC58URd6p9uKZrm0qWgdZkqu9yqCs23v8qgxV2Ag=", - "mvnDeps": "pycharm_maven_artefacts.json", - "repositories": [ - "repo1.maven.org/maven2", - "packages.jetbrains.team/maven/p/ij/intellij-dependencies", - "dl.google.com/dl/android/maven2", - "download.jetbrains.com/teamcity-repository", - "maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-ide-plugin-dependencies", - "packages.jetbrains.team/maven/p/grazi/grazie-platform-public", - "packages.jetbrains.team/maven/p/kpm/public", - "packages.jetbrains.team/maven/p/ki/maven", - "maven.pkg.jetbrains.space/public/p/compose/dev", - "packages.jetbrains.team/maven/p/amper/amper", - "packages.jetbrains.team/maven/p/kt/bootstrap" - ], - "kotlin-jps-plugin": { - "version": "2.2.20", - "hash": "sha256-+jGghK2+yq+YFm5zT7ob+WTgTiJnHXAjDtlZjOzSISQ=" - } - } -} diff --git a/pkgs/applications/editors/jetbrains/source/update.py b/pkgs/applications/editors/jetbrains/source/update.py deleted file mode 100755 index 967ee9f1dca8..000000000000 --- a/pkgs/applications/editors/jetbrains/source/update.py +++ /dev/null @@ -1,236 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i python3 -p python3 python3.pkgs.packaging python3.pkgs.xmltodict python3.pkgs.requests nurl -import os -import subprocess -import pprint -import pathlib -import requests -import json -import re -from argparse import ArgumentParser -from xmltodict import parse -from json import dump, loads -from sys import stdout -from packaging import version - -UPDATES_URL = "https://www.jetbrains.com/updates/updates.xml" -IDES_FILE_PATH = pathlib.Path(__file__).parent.joinpath("..").joinpath("ides.json").resolve() - - -def convert_hash_to_sri(base32: str) -> str: - result = subprocess.run(["nix-hash", "--to-sri", "--type", "sha256", base32], capture_output=True, check=True, text=True) - return result.stdout.strip() - - -def ensure_is_list(x): - if type(x) != list: - return [x] - return x - - -def one_or_more(x): - return x if isinstance(x, list) else [x] - - -# TODO: Code duplication to update_bin.py - eventually refactor or merge scripts -def download_channels(): - print(f"Checking for updates from {UPDATES_URL}") - updates_response = requests.get(UPDATES_URL) - updates_response.raise_for_status() - root = parse(updates_response.text) - products = root["products"]["product"] - return { - channel["@name"]: channel - for product in products - if "channel" in product - for channel in one_or_more(product["channel"]) - } - - -# TODO: Code duplication to update_bin.py - eventually refactor or merge scripts -def build_version(build): - build_number = build["@fullNumber"] if "@fullNumber" in build else build["@number"] - return version.parse(build_number) - - -# TODO: Code duplication to update_bin.py - eventually refactor or merge scripts -def latest_build(channel): - builds = one_or_more(channel["build"]) - latest = max(builds, key=build_version) - return latest - - -def jar_repositories(root_path: str) -> list[str]: - repositories = [] - file_contents = parse(open(root_path + "/.idea/jarRepositories.xml").read()) - component = file_contents['project']['component'] - if component['@name'] != 'RemoteRepositoriesConfiguration': - return repositories - options = component['remote-repository'] - for option in ensure_is_list(options): - for item in option['option']: - if item['@name'] == 'url': - repositories.append( - # Remove protocol and cache-redirector server, we only want the original URL. We try both the original - # URL and the URL via the cache-redirector for download in build.nix - re.sub(r'^https?://', '', item['@value']).removeprefix("cache-redirector.jetbrains.com/") - ) - - return repositories - - -def kotlin_jps_plugin_info(root_path: str) -> (str, str): - file_contents = parse(open(root_path + "/.idea/kotlinc.xml").read()) - components = file_contents['project']['component'] - for component in components: - if component['@name'] != 'KotlinJpsPluginSettings': - continue - - option = component['option'] - version = option['@value'] - - print(f"* Prefetching Kotlin JPS Plugin version {version}...") - prefetch = subprocess.run(["nix-prefetch-url", "--type", "sha256", f"https://packages.jetbrains.team/maven/p/ij/intellij-dependencies/org/jetbrains/kotlin/kotlin-jps-plugin-classpath/{version}/kotlin-jps-plugin-classpath-{version}.jar"], capture_output=True, check=True, text=True) - - return (version, convert_hash_to_sri(prefetch.stdout.strip())) - - -def requested_kotlinc_version(root_path: str) -> str: - file_contents = parse(open(root_path + "/.idea/kotlinc.xml").read()) - components = file_contents['project']['component'] - for component in components: - if component['@name'] != 'KotlinJpsPluginSettings': - continue - - option = component['option'] - version = option['@value'] - - return version - - -def prefetch_intellij_community(variant: str, buildNumber: str) -> (str, str): - print("* Prefetching IntelliJ community source code...") - prefetch = subprocess.run(["nix-prefetch-url", "--print-path", "--unpack", "--name", "source", "--type", "sha256", f"https://github.com/jetbrains/intellij-community/archive/{variant}/{buildNumber}.tar.gz"], capture_output=True, check=True, text=True) - parts = prefetch.stdout.strip().split() - - hash = convert_hash_to_sri(parts[0]) - outPath = parts[1] - - return (hash, outPath) - - -def prefetch_android(variant: str, buildNumber: str) -> str: - print("* Prefetching Android plugin source code...") - prefetch = subprocess.run(["nix-prefetch-url", "--unpack", "--name", "source", "--type", "sha256", f"https://github.com/jetbrains/android/archive/{variant}/{buildNumber}.tar.gz"], capture_output=True, check=True, text=True) - return convert_hash_to_sri(prefetch.stdout.strip()) - - -def generate_restarter_hash(nixpkgs_path: str, root_path: str) -> str: - print("* Generating restarter Cargo hash...") - root_name = pathlib.Path(root_path).name - output = subprocess.run(["nurl", "--expr", f''' - (import {nixpkgs_path} {{}}).rustPlatform.buildRustPackage {{ - name = "restarter"; - src = {root_path}; - sourceRoot = "{root_name}/native/restarter"; - cargoHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; - }} - '''], capture_output=True, check=True, text=True) - return output.stdout.strip() - - -def generate_jps_hash(nixpkgs_path: str, root_path: str) -> str: - print("* Generating jps repo hash...") - jps_repo_nix = pathlib.Path(__file__).parent.joinpath("jps_repo.nix").resolve() - output = subprocess.run(["nurl", "--expr", f''' - (import {nixpkgs_path} {{}}).callPackage {jps_repo_nix} {{ - jbr = (import {nixpkgs_path} {{}}).jetbrains.jdk-no-jcef; - src = {root_path}; - jpsHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; - }} - '''], capture_output=True, check=True, text=True) - return output.stdout.strip() - - -def get_args() -> str: - parser = ArgumentParser( - description="Updates the IDEA / PyCharm source build infomations" - ) - parser.add_argument("out", help="File to output json to") - args = parser.parse_args() - return args.out - - -# TODO: Code duplication to update_bin.py - eventually refactor or merge scripts -def get_latest_versions(channels: dict, ides: dict, name: str) -> (str, str): - update_channel = ides[name]['updateChannel'] - print(f"Fetching latest {name} (channel: {update_channel}) release...") - channel = channels[update_channel] - - build = latest_build(channel) - new_version = build["@version"] - new_build_number = "" - if "@fullNumber" not in build: - new_build_number = build["@number"] - else: - new_build_number = build["@fullNumber"] - version_number = new_version.split(' ')[0] - - print(f"* Version: {version_number} - Build: {new_build_number}") - return version_number, new_build_number - - -def main(): - out = get_args() - - # source Path: + if current_path.joinpath("flake.nix").exists(): + return current_path + parent = current_path.parent + if parent == current_path: + raise Exception("nixpkgs could not be found, please provide --nixpkgs-root") + return find_nixpkgs(parent) + + +@dataclasses.dataclass(slots=True) +class UpdaterConfig: + nixpkgs_root: Path + jetbrains_root: Path + ide: str | None # If None: Run for all IDEs + old_version: str | None + no_bin: bool + no_src: bool + no_maven_deps: bool + + def __init__(self, argparse_result): + self.nixpkgs_root = ( + Path(argparse_result.nixpkgs_root) + if argparse_result.nixpkgs_root is not None + else find_nixpkgs(Path.cwd()) + ) + self.jetbrains_root = ( + self.nixpkgs_root / "pkgs" / "applications" / "editors" / "jetbrains" + ) + self.ide = ( + argparse_result.ide + if argparse_result.ide is not None + else os.environ.get("UPDATE_NIX_PNAME") + ) + self.old_version = ( + argparse_result.old_version + if argparse_result.old_version is not None + else os.environ.get("UPDATE_NIX_OLD_VERSION") + ) + self.no_bin = argparse_result.no_bin + self.no_src = argparse_result.no_src + self.no_maven_deps = argparse_result.no_maven_deps diff --git a/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/fetcher.py b/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/fetcher.py new file mode 100644 index 000000000000..077bd6306e4a --- /dev/null +++ b/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/fetcher.py @@ -0,0 +1,132 @@ +import dataclasses +from urllib import request +from urllib.error import HTTPError + +import requests +import xmltodict +from packaging import version + +from jetbrains_nix_updater.config import SUPPORTED_SYSTEMS +from jetbrains_nix_updater.ides import Ide +from jetbrains_nix_updater.util import one_or_more + +UPDATES_URL = "https://www.jetbrains.com/updates/updates.xml" + + +@dataclasses.dataclass(slots=True) +class VersionInfo: + version: str + build_number: str + urls: dict[str, str | None] + + def download_sha256(self, system: str) -> str: + if self.urls[system] is None: + raise Exception("No URL available") + print(f"[.] Downloading sha256 for {self.urls[system]}") + url = f"{self.urls[system]}.sha256" + download_response = requests.get(url) + download_response.raise_for_status() + return download_response.content.decode("UTF-8").split(" ")[0] + + +class VersionFetcher: + # Cached updates.xml content + _channels: dict | None = None + + @property + def channels(self) -> dict: + if self._channels is None: + self._channels = self.download_channels() + return self._channels + + def latest_version_info( + self, ide: Ide, ignore_no_url_error=False + ) -> VersionInfo | None: + if ide.update_info is None: + print(f"[!] no update info for {ide.name} in `updateInfo.json` - skipping!") + return None + channel_name = ide.update_info["channel"] + channel = self.channels.get(channel_name) + if channel is None: + print( + f"[!] failed to find IDE channel {channel_name} - skipping! check {ide.name}'s `channel`!" + ) + return None + try: + build = self.latest_build(channel) + new_version = build["@version"] + if "@fullNumber" not in build: + new_build_number = build["@number"] + else: + new_build_number = build["@fullNumber"] + if "EAP" not in channel["@name"]: + version_or_build_number = new_version + else: + version_or_build_number = new_build_number + version_number = new_version.split(" ")[0] + download_urls = {} + for system in SUPPORTED_SYSTEMS: + download_url = self.make_url( + ide.update_info["urls"].get(system, None), + version_or_build_number, + version_number, + ) + if not download_url and not ignore_no_url_error: + print( + f"[!] no valid URL found for '{ide.name}' for '{system}'! make sure `updater/updateInfo.json` contains an entry and is correct." + ) + download_urls[system] = None + else: + download_urls[system] = download_url + return VersionInfo( + version=new_version, + build_number=new_build_number, + urls=download_urls, + ) + except Exception as e: + print(f"[!] exception while trying to fetch version: {e} - skipping!") + return None + + @classmethod + def latest_build(cls, channel: dict) -> dict: + builds = one_or_more(channel["build"]) + latest = max(builds, key=cls.build_version) + return latest + + @staticmethod + def download_channels(): + print(f"[-] Checking for updates from {UPDATES_URL}") + updates_response = requests.get(UPDATES_URL) + updates_response.raise_for_status() + root = xmltodict.parse(updates_response.text) + products = root["products"]["product"] + return { + channel["@name"]: channel + for product in products + if "channel" in product + for channel in one_or_more(product["channel"]) + } + + @staticmethod + def build_version(build): + build_number = ( + build["@fullNumber"] if "@fullNumber" in build else build["@number"] + ) + return version.parse(build_number) + + @staticmethod + def make_url( + template: str | None, version_or_build_number: str, version_number: str + ) -> str | None: + if template is None: + return None + release = [str(n) for n in version.parse(version_number).release] + for k in range(len(release), 0, -1): + s = ".".join(release[0:k]) + url = template.format(version=version_or_build_number, versionMajorMinor=s) + try: + if request.urlopen(url).getcode() == 200: + return url + except HTTPError: + pass + return None diff --git a/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/ides.py b/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/ides.py new file mode 100644 index 000000000000..bbe68b3a7d2f --- /dev/null +++ b/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/ides.py @@ -0,0 +1,64 @@ +import sys + +from subprocess import CalledProcessError +from typing import Iterable, TypedDict + +import dataclasses +from pathlib import Path + +from jetbrains_nix_updater.util import run_command + + +class UpdateInfo(TypedDict): + channel: str + urls: dict[str, str] + + +@dataclasses.dataclass(slots=True) +class Ide: + name: str + drv_path: Path + is_source: bool + update_info: UpdateInfo | None + + +def is_source_ide(drv_path: Path): + assert " " not in str(drv_path) + try: + return ( + run_command( + [ + "nix-instantiate", + "--eval", + "-E", + f'builtins.hasAttr "mkJetBrainsSource" (builtins.functionArgs (import {drv_path}))', + ] + ) + == "true" + ) + except CalledProcessError as ex: + print(f"Failed to eval {drv_path}: {ex.stderr}", file=sys.stderr) + exit(1) + + +def get_single_ide(update_info: dict[str, UpdateInfo], jb_root: Path, name: str) -> Ide: + drv_path = jb_root / "ides" / f"{name}.nix" + if not drv_path.exists(): + raise Exception(f"IDE not found at {drv_path}") + return Ide( + name=name, + drv_path=drv_path, + is_source=is_source_ide(drv_path), + update_info=update_info.get(name), + ) + + +def get_all_ides(update_info: dict[str, UpdateInfo], jb_root: Path) -> Iterable[Ide]: + for file in sorted((jb_root / "ides").iterdir()): + if file.suffix == ".nix": + yield Ide( + name=file.stem, + drv_path=file, + is_source=is_source_ide(file), + update_info=update_info.get(file.stem), + ) diff --git a/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/update_bin.py b/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/update_bin.py new file mode 100644 index 000000000000..49095eedcaed --- /dev/null +++ b/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/update_bin.py @@ -0,0 +1,37 @@ +from jetbrains_nix_updater.config import UpdaterConfig +from jetbrains_nix_updater.fetcher import VersionInfo +from jetbrains_nix_updater.ides import Ide +from jetbrains_nix_updater.util import replace_blocks, convert_hash_to_sri + + +def run_bin_update(ide: Ide, info: VersionInfo, config: UpdaterConfig): + urls_nix = "" + for system, url in info.urls.items(): + urls_nix += f""" + {system} = {{ + url = "{url}"; + hash = "{convert_hash_to_sri(info.download_sha256(system))}"; + }};""" + + try: + replace_blocks( + config, + ide.drv_path, + [ + ( + "version", + f""" + version = "{info.version}"; + buildNumber = "{info.build_number}"; + """, + ), + ( + "urls", + f""" + urls = {{{urls_nix}}}; + """, + ), + ], + ) + except Exception as e: + print(f"[!] Writing update info to file failed: {e}") diff --git a/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/update_src.py b/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/update_src.py new file mode 100644 index 000000000000..54cb9249bee4 --- /dev/null +++ b/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/update_src.py @@ -0,0 +1,205 @@ +import json +import re +from pathlib import Path +from xmltodict import parse + +from jetbrains_nix_updater.config import UpdaterConfig +from jetbrains_nix_updater.fetcher import VersionInfo +from jetbrains_nix_updater.ides import Ide +from jetbrains_nix_updater.update_src_maven import ( + get_maven_deps_for_ide, + ensure_is_list, +) +from jetbrains_nix_updater.util import replace_blocks, run_command, convert_hash_to_sri + + +def jar_repositories(root_path: Path) -> list[str]: + repositories = [] + file_contents = parse(open(root_path / ".idea" / "jarRepositories.xml").read()) + component = file_contents["project"]["component"] + if component["@name"] != "RemoteRepositoriesConfiguration": + return repositories + options = component["remote-repository"] + for option in ensure_is_list(options): + for item in option["option"]: + if item["@name"] == "url": + repositories.append( + # Remove protocol and cache-redirector server, we only want the original URL. We try both the original + # URL and the URL via the cache-redirector for download in build.nix + re.sub(r"^https?://", "", item["@value"]).removeprefix( + "cache-redirector.jetbrains.com/" + ) + ) + + return repositories + + +def kotlin_jps_plugin_info(root_path: Path) -> tuple[str, str]: + file_contents = parse(open(root_path / ".idea" / "kotlinc.xml").read()) + components = file_contents["project"]["component"] + for component in components: + if component["@name"] != "KotlinJpsPluginSettings": + continue + + option = component["option"] + version = option["@value"] + + print(f"[*] Prefetching Kotlin JPS Plugin version {version}...") + prefetch = run_command( + [ + "nix-prefetch-url", + "--type", + "sha256", + f"https://packages.jetbrains.team/maven/p/ij/intellij-dependencies/org/jetbrains/kotlin/kotlin-jps-plugin-classpath/{version}/kotlin-jps-plugin-classpath-{version}.jar", + ] + ) + + return (version, convert_hash_to_sri(prefetch)) + + +def requested_kotlinc_version(root_path: Path) -> str: + file_contents = parse(open(root_path / ".idea" / "kotlinc.xml").read()) + components = file_contents["project"]["component"] + for component in components: + if component["@name"] != "KotlinJpsPluginSettings": + continue + + option = component["option"] + version = option["@value"] + + return version + + +def prefetch_intellij_community(variant: str, build_number: str) -> tuple[str, Path]: + print("[*] Prefetching IntelliJ community source code...") + prefetch = run_command( + [ + "nix-prefetch-url", + "--print-path", + "--unpack", + "--name", + "source", + "--type", + "sha256", + f"https://github.com/jetbrains/intellij-community/archive/{variant}/{build_number}.tar.gz", + ] + ) + parts = prefetch.split() + + hash = convert_hash_to_sri(parts[0]) + out_path = parts[1] + + return (hash, Path(out_path)) + + +def prefetch_android(variant: str, build_number: str) -> str: + print("[*] Prefetching Android plugin source code...") + prefetch = run_command( + [ + "nix-prefetch-url", + "--unpack", + "--name", + "source", + "--type", + "sha256", + f"https://github.com/jetbrains/android/archive/{variant}/{build_number}.tar.gz", + ] + ) + return convert_hash_to_sri(prefetch) + + +def generate_restarter_hash(config: UpdaterConfig, root_path: Path) -> str: + print("[*] Generating restarter Cargo hash...") + root_name = root_path.name + return run_command( + [ + "nurl", + "--expr", + f''' + (import {config.nixpkgs_root} {{}}).rustPlatform.buildRustPackage {{ + name = "restarter"; + src = {root_path}; + sourceRoot = "{root_name}/native/restarter"; + cargoHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; + }} + ''', + ] + ) + + +def generate_jps_hash(config: UpdaterConfig, root_path: Path) -> str: + print("[*] Generating jps repo hash...") + jps_repo_nix = config.jetbrains_root / "source" / "jps_repo.nix" + return run_command( + [ + "nurl", + "--expr", + f""" + (import {config.nixpkgs_root} {{}}).callPackage {jps_repo_nix} {{ + jbr = (import {config.nixpkgs_root} {{}}).jetbrains.jdk-no-jcef; + src = {root_path}; + jpsHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; + }} + """, + ] + ) + + +def maven_out_path(jb_root: Path, name: str) -> Path: + return jb_root / "source" / f"{name}_maven_artefacts.json" + + +def run_src_update(ide: Ide, info: VersionInfo, config: UpdaterConfig): + variant = ide.name.removesuffix("-oss") + intellij_hash, intellij_outpath = prefetch_intellij_community( + variant, info.build_number + ) + android_hash = prefetch_android(variant, info.build_number) + jps_hash = generate_jps_hash(config, intellij_outpath) + restarter_hash = generate_restarter_hash(config, intellij_outpath) + repositories = jar_repositories(intellij_outpath) + kjps_plugin_version, kjps_plugin_hash = kotlin_jps_plugin_info(intellij_outpath) + kotlinc_version = requested_kotlinc_version(intellij_outpath) + print( + f"[i] Prefetched IDEA Open Source requested Kotlin compiler {kotlinc_version}" + ) + + repositories_nix = " ".join(f'"{x}"' for x in repositories) + + try: + replace_blocks( + config, + ide.drv_path, + [ + ( + "source-args", + f""" + version = "{info.version}"; + buildNumber = "{info.build_number}"; + buildType = "{variant}"; + ideaHash = "{intellij_hash}"; + androidHash = "{android_hash}"; + jpsHash = "{jps_hash}"; + restarterHash = "{restarter_hash}"; + mvnDeps = ../source/{variant}_maven_artefacts.json; + repositories = [ + {repositories_nix} + ]; + kotlin-jps-plugin = {{ + version = "{kjps_plugin_version}"; + hash = "{kjps_plugin_hash}"; + }}; + """, + ) + ], + ) + except Exception as e: + print(f"[!] Writing update info to file failed: {e}") + return + + if not config.no_maven_deps: + print("[*] Collecting maven hashes") + maven_hashes = get_maven_deps_for_ide(config, ide) + with open(maven_out_path(config.jetbrains_root, variant), "w") as f: + json.dump(maven_hashes, f, indent=4) + f.write("\n") diff --git a/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/update_src_maven.py b/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/update_src_maven.py new file mode 100644 index 000000000000..7082cb783cc5 --- /dev/null +++ b/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/update_src_maven.py @@ -0,0 +1,111 @@ +import os +from pathlib import Path +from tempfile import TemporaryDirectory +from urllib.parse import urlparse +from xmltodict import parse + +from jetbrains_nix_updater.config import UpdaterConfig +from jetbrains_nix_updater.ides import Ide +from jetbrains_nix_updater.util import ensure_is_list, run_command + + +def add_entries(sources, targets, hashes): + for artefact in sources: + target = None + base_jar_name = os.path.basename(urlparse(artefact["@url"]).path) + for candidate in targets: + if candidate["@url"].endswith(base_jar_name + "!/"): + target = candidate + break + if target is None: + raise ValueError(f"Did not find target for source {artefact}") + + url = artefact["@url"].removeprefix("file://$MAVEN_REPOSITORY$/") + if url == artefact["@url"]: + raise ValueError(f"Unexpected artefact URL {url}") + + path = ( + target["@url"].removeprefix("jar://$MAVEN_REPOSITORY$/").removesuffix("!/") + ) + if path == target["@url"]: + raise ValueError(f"Unexpected target path {path}") + + hashes.append({"url": url, "hash": artefact["sha256sum"], "path": path}) + + +def add_libraries( + root_path: str, hashes: list[dict[str, str]], projects_to_process: list[str] +): + library_paths = os.listdir(root_path + "/libraries/") + for path in library_paths: + file_contents = parse(open(root_path + "/libraries/" + path).read()) + if "properties" not in file_contents["component"]["library"]: + continue + sources = ensure_is_list( + file_contents["component"]["library"]["properties"]["verification"][ + "artifact" + ] + ) + targets = ensure_is_list( + file_contents["component"]["library"]["CLASSES"]["root"] + ) + add_entries(sources, targets, hashes) + + modules_xml = parse(open(root_path + "/modules.xml").read()) + for module in modules_xml["project"]["component"]["modules"]["module"]: + projects_to_process.append(module["@filepath"]) + + +def add_iml(path: str, hashes: list[dict[str, str]], projects_to_process: list[str]): + try: + contents = parse(open(path).read()) + except FileNotFoundError: + print( + f"Warning: path {path} does not exist (did you forget the android directory?)" + ) + return + for manager in ensure_is_list(contents["module"]["component"]): + if manager["@name"] != "NewModuleRootManager": + continue + + for entry in manager["orderEntry"]: + if ( + type(entry) != dict + or entry["@type"] != "module-library" + or "properties" not in entry["library"] + ): + continue + + sources = ensure_is_list( + entry["library"]["properties"]["verification"]["artifact"] + ) + targets = ensure_is_list(entry["library"]["CLASSES"]["root"]) + add_entries(sources, targets, hashes) + + +def get_maven_deps_for_ide(config: UpdaterConfig, ide: Ide) -> list[dict]: + with TemporaryDirectory() as tmp_dir: + root_path = Path(tmp_dir) / "result" + run_command( + [ + "nix-build", + "--out-link", + root_path, + "--attr", + f"jetbrains.{ide.name}.src.src", + ], + cwd=config.nixpkgs_root, + ) + + file_hashes = [] + projects_to_process: list[str] = [str(root_path / ".idea")] + + while projects_to_process: + elem = projects_to_process.pop() + elem = elem.replace("$PROJECT_DIR$", str(root_path)) + if elem.endswith(".iml"): + add_iml(elem, file_hashes, projects_to_process) + else: + add_libraries(elem, file_hashes, projects_to_process) + + return file_hashes diff --git a/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/util.py b/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/util.py new file mode 100644 index 000000000000..69a23a5a7263 --- /dev/null +++ b/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/util.py @@ -0,0 +1,82 @@ +from typing import Iterable + +import subprocess +from pathlib import Path + +from jetbrains_nix_updater.config import UpdaterConfig + + +def run_command(cmd: list[str], **kwargs) -> str: + result = subprocess.run(cmd, capture_output=True, check=True, text=True, **kwargs) + return result.stdout.strip() + + +def convert_hash_to_sri(base32: str) -> str: + return run_command(["nix-hash", "--to-sri", "--type", "sha256", base32]) + + +def ensure_is_list(x): + if type(x) is not list: + return [x] + return x + + +def one_or_more(x): + return x if isinstance(x, list) else [x] + + +def replace_blocks( + config: UpdaterConfig, file: Path, blocks: Iterable[tuple[str, str]] +): + """ + Replace placeholder blocks in a nix file. + + The blocks must be enclosed in the `file` with lines + `# update-script-start: XXX` and `# update-script-end: XXX`, + where these lines must only contain that string and optionally any + number of leading and trailing whitespaces. `XXX` in this example is the + identifier of the block. + + The lines between these markers are replaced with the content of the block. + The content is stripped of trailin and leading lines containing only whitespaces first. + + The file is formatted with `nixfmt` after saving. + """ + with open(file, "r") as f: + lines = f.readlines() + + for name, block in blocks: + old_lines = lines + lines = [] + have_found_start = False + have_found_end = False + for line in old_lines: + if not have_found_start and line.lstrip().startswith( + f"# update-script-start: {name}" + ): + have_found_start = True + lines.append(line) + elif have_found_start and line.lstrip().startswith( + f"# update-script-end: {name}" + ): + for replacement_line in block.splitlines(True): + if replacement_line.rstrip("\n") == "": + # Skip empty lines in replacement + continue + lines.append(replacement_line) + have_found_end = True + lines.append(line) + elif not have_found_start or have_found_end: + lines.append(line) + if not have_found_start or not have_found_end: + raise Exception( + f"Either start or end marker for `{name}` block missing in `{file}`" + ) + + with open(file, "w") as f: + f.writelines(lines) + + run_command( + ["nix-shell", "--run", f"treefmt --no-cache {file.absolute()}"], + cwd=config.nixpkgs_root, + ) diff --git a/pkgs/applications/editors/jetbrains/updater/main.py b/pkgs/applications/editors/jetbrains/updater/main.py new file mode 100755 index 000000000000..08e62cc17695 --- /dev/null +++ b/pkgs/applications/editors/jetbrains/updater/main.py @@ -0,0 +1,82 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i python3 -p python3 python3.pkgs.packaging python3.pkgs.xmltodict python3.pkgs.requests nurl +import argparse +import json + +from jetbrains_nix_updater.config import UpdaterConfig +from jetbrains_nix_updater.fetcher import VersionFetcher +from jetbrains_nix_updater.ides import get_single_ide, get_all_ides +from jetbrains_nix_updater.update_bin import run_bin_update +from jetbrains_nix_updater.update_src import run_src_update + + +def main(): + parser = argparse.ArgumentParser() + parser.add_argument( + "ide", + nargs="?", + help="pname of the IDE to update. If not set, uses UPDATE_NIX_PNAME. " + "If that is also not set, all IDEs are updated", + ) + parser.add_argument( + "--nixpkgs-root", help="root directory of nixpkgs, auto-detected if not given" + ) + parser.add_argument( + "--no-bin", action="store_true", help="do not update binary IDEs" + ) + parser.add_argument( + "--no-src", action="store_true", help="do not update source IDEs" + ) + parser.add_argument( + "--no-maven-deps", + action="store_true", + help="do not update maven dependencies for source IDEs", + ) + parser.add_argument( + "--old-version", + type=str, + help="old version of the IDE, only used if `ide` (or UPDATE_NIX_PNAME) is also used. " + "Defaults to UPDATE_NIX_OLD_VERSION. If the new version matches the old version, " + "exits early without making changes.", + ) + + config = UpdaterConfig(parser.parse_args()) + print(f"[i] running jetbrains updater with: {config}") + + with open(config.jetbrains_root / "updater" / "updateInfo.json", "r") as f: + update_info = json.load(f) + version_fetcher = VersionFetcher() + + ides_to_run_for = ( + [get_single_ide(update_info, config.jetbrains_root, config.ide)] + if config.ide is not None + else list(get_all_ides(update_info, config.jetbrains_root)) + ) + + print(f"[.] found IDEs to update: {', '.join(ide.name for ide in ides_to_run_for)}") + for ide in ides_to_run_for: + if ide.is_source and config.no_src: + print(f"[!] skipping {ide.name}, due to --no-src") + continue + if not ide.is_source and config.no_bin: + print(f"[!] skipping {ide.name}, due to --no-bin") + continue + + print(f"[@] updating IDE {ide.name}") + + info = version_fetcher.latest_version_info( + ide, ignore_no_url_error=ide.is_source + ) + if info is not None: + if config.old_version == info.version: + print("[o] Version is the same, no update required") + return + + if ide.is_source: + run_src_update(ide, info, config) + else: + run_bin_update(ide, info, config) + + +if __name__ == "__main__": + main() diff --git a/pkgs/applications/editors/jetbrains/updater/updateInfo.json b/pkgs/applications/editors/jetbrains/updater/updateInfo.json new file mode 100644 index 000000000000..6c95f480814f --- /dev/null +++ b/pkgs/applications/editors/jetbrains/updater/updateInfo.json @@ -0,0 +1,127 @@ +{ + "clion": { + "channel": "CLion RELEASE", + "urls": { + "x86_64-linux": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", + "aarch64-linux": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz", + "x86_64-darwin": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", + "aarch64-darwin": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg" + } + }, + "datagrip": { + "channel": "DataGrip RELEASE", + "urls": { + "x86_64-linux": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", + "aarch64-linux": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.tar.gz", + "x86_64-darwin": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg", + "aarch64-darwin": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg" + } + }, + "dataspell": { + "channel": "DataSpell RELEASE", + "urls": { + "x86_64-linux": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz", + "aarch64-linux": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.tar.gz", + "x86_64-darwin": "https://download.jetbrains.com/python/dataspell-{version}.dmg", + "aarch64-darwin": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg" + } + }, + "gateway": { + "channel": "Gateway RELEASE", + "urls": { + "x86_64-linux": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz", + "aarch64-linux": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.tar.gz", + "x86_64-darwin": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg", + "aarch64-darwin": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg" + } + }, + "goland": { + "channel": "GoLand RELEASE", + "urls": { + "x86_64-linux": "https://download.jetbrains.com/go/goland-{version}.tar.gz", + "aarch64-linux": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz", + "x86_64-darwin": "https://download.jetbrains.com/go/goland-{version}.dmg", + "aarch64-darwin": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg" + } + }, + "idea": { + "channel": "IntelliJ IDEA RELEASE", + "urls": { + "x86_64-linux": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz", + "aarch64-linux": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz", + "x86_64-darwin": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", + "aarch64-darwin": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg" + } + }, + "idea-oss": { + "channel": "IntelliJ IDEA RELEASE", + "urls": {} + }, + "mps": { + "channel": "MPS RELEASE", + "urls": { + "x86_64-linux": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz", + "aarch64-linux": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz", + "x86_64-darwin": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos.dmg", + "aarch64-darwin": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos-aarch64.dmg" + } + }, + "phpstorm": { + "channel": "PhpStorm RELEASE", + "urls": { + "x86_64-linux": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", + "aarch64-linux": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz", + "x86_64-darwin": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", + "aarch64-darwin": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg" + } + }, + "pycharm": { + "channel": "PyCharm RELEASE", + "urls": { + "x86_64-linux": "https://download.jetbrains.com/python/pycharm-{version}.tar.gz", + "aarch64-linux": "https://download.jetbrains.com/python/pycharm-{version}-aarch64.tar.gz", + "x86_64-darwin": "https://download.jetbrains.com/python/pycharm-{version}.dmg", + "aarch64-darwin": "https://download.jetbrains.com/python/pycharm-{version}-aarch64.dmg" + } + }, + "pycharm-oss": { + "channel": "PyCharm RELEASE", + "urls": {} + }, + "rider": { + "channel": "Rider RELEASE", + "urls": { + "x86_64-linux": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", + "aarch64-linux": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.tar.gz", + "x86_64-darwin": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", + "aarch64-darwin": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg" + } + }, + "ruby-mine": { + "channel": "RubyMine RELEASE", + "urls": { + "x86_64-linux": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", + "aarch64-linux": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz", + "x86_64-darwin": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", + "aarch64-darwin": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg" + } + }, + "rust-rover": { + "channel": "RustRover RELEASE", + "urls": { + "x86_64-linux": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz", + "aarch64-linux": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz", + "x86_64-darwin": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg", + "aarch64-darwin": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg" + } + }, + "webstorm": { + "channel": "WebStorm RELEASE", + "urls": { + "x86_64-linux": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", + "aarch64-linux": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz", + "x86_64-darwin": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", + "aarch64-darwin": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg" + } + } +} diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix index 6a7d1f83573f..cc40709d5b9e 100644 --- a/pkgs/applications/editors/neovim/utils.nix +++ b/pkgs/applications/editors/neovim/utils.nix @@ -68,10 +68,14 @@ let */ makeVimPackageInfo = # a list of neovim plugin derivations, for instance - # plugins = [ - # { plugin=vimPlugins.far-vim; config = "let g:far#source='rg'"; optional = false; } - # vimPlugins.vim-fugitive - # ] + # [ + # { + # plugin = vimPlugins.grug-far-nvim; + # config = "let g:grug_far = { 'startInInsertMode': v:false }"; + # optional = false; + # } + # vimPlugins.vim-fugitive + # ] plugins: let @@ -79,7 +83,7 @@ let vimPackage = normalizedPluginsToVimPackage pluginsNormalized; - userPluginLua = lib.foldl ( + userPluginViml = lib.foldl ( acc: p: if p.config != null then acc ++ [ p.config ] else acc ) [ ] pluginsNormalized; @@ -103,8 +107,8 @@ let # plugins' python dependencies inherit pluginPython3Packages; - # lua config set by the user along with the plugin - inherit userPluginLua; + # viml config set by the user along with the plugin + inherit userPluginViml; # recommanded configuration set in vim plugins ".passthru.initLua" inherit pluginAdvisedLua; diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index ef2372c54f34..c1c7fa4cdeba 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -98,7 +98,7 @@ let # we call vimrcContent without 'packages' to avoid the init.vim generation neovimRcContent' = lib.concatStringsSep "\n" ( - vimPackageInfo.userPluginLua ++ lib.optional (neovimRcContent != null) neovimRcContent + vimPackageInfo.userPluginViml ++ lib.optional (neovimRcContent != null) neovimRcContent ); packpathDirs.myNeovimPackages = vimPackageInfo.vimPackage; diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix index 6eab5329cf37..a957d1f92328 100644 --- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix +++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "claude-code"; publisher = "anthropic"; - version = "2.0.75"; - hash = "sha256-PA7eL4TZTFYVlImXnZCw6aWjrLXl7/KndnkU3D2t1jw="; + version = "2.1.1"; + hash = "sha256-28vuJwUDHcJAVqnHsIVw1t6DXAhzMqmgh0MHC+mcmJQ="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix b/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix index aec6ca22b052..8803648654c7 100644 --- a/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix +++ b/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "basedpyright"; publisher = "detachhead"; - version = "1.36.2"; - hash = "sha256-FOu5ZpjNhtWxV+7Jt9V1RZ4YrK5BZ5t8Ut06raZURFI="; + version = "1.37.0"; + hash = "sha256-tp72kIpG1NcvHLIDKcKo7OmQ/sQdxz/yb7QhGSWsFzc="; }; meta = { changelog = "https://github.com/detachhead/basedpyright/releases"; diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix index 96ee2cd04479..1fe9470e1cb8 100644 --- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix +++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "tinymist"; publisher = "myriad-dreamin"; - version = "0.14.6"; - hash = "sha256-gm12h/+9ROveHwltXLCxArO8DWOOC096EtaR93sWsR0="; + version = "0.14.8"; + hash = "sha256-m0qiur+hhWQ+PaL1JisSo9UHW0d0LsLF87YdnG6fQ18="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/emulators/libretro/cores/play.nix b/pkgs/applications/emulators/libretro/cores/play.nix index c6eb66b7d234..86c8083763e7 100644 --- a/pkgs/applications/emulators/libretro/cores/play.nix +++ b/pkgs/applications/emulators/libretro/cores/play.nix @@ -14,13 +14,13 @@ }: mkLibretroCore { core = "play"; - version = "0-unstable-2025-12-29"; + version = "0-unstable-2026-01-05"; src = fetchFromGitHub { owner = "jpd002"; repo = "Play-"; - rev = "8de4a71f5215ef38e357ac77a07948eb3424448f"; - hash = "sha256-e15p6SEwV71l52OEu08WOKPyMH6uNpnURhmTgcyzBaM="; + rev = "bb6896e8cfd7346b0ddecb43752c854f1c7866f1"; + hash = "sha256-tmIQz7bVuIR1htedyCpOBPn3icr1uiOQ01iFJRhxi9s="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index 4df7834dfefd..a2e5712dc283 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -813,7 +813,7 @@ } }, "ungoogled-chromium": { - "version": "143.0.7499.169", + "version": "143.0.7499.192", "deps": { "depot_tools": { "rev": "e2bb3cd55899346cc68bbfd5139e59c9d85a6984", @@ -825,16 +825,16 @@ "hash": "sha256-kIPhfuJBQSISdRjloe0N2JrqvuVrEkNijb92/9zSE9I=" }, "ungoogled-patches": { - "rev": "143.0.7499.169-1", - "hash": "sha256-6fz1xdX4o0k0Bj4+Y4Tw9h98f/zpcqikYJARtv54Unw=" + "rev": "143.0.7499.192-1", + "hash": "sha256-OUdpe1flyqi2FPDzgFXBYu72CI1ZQkZ0wf3baSN+ayw=" }, "npmHash": "sha256-HF6B4abJJJ9JDVbovtAdaHIvqE1zHJZ2a+g2Cudx8Pw=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "164b20aab62509dad21fd46383951aeec084ad1e", - "hash": "sha256-WqpZXjcklOyPIvEmWi23bC8D/vVXMLkAmFrQQ13Iy6o=", + "rev": "be2c1f4fd451578a9ada68a0ac12d659362b44bf", + "hash": "sha256-YbYtW4UmlFoqXUSvPc7H+Fe0hUM+t9JwpBHKC98pY98=", "recompress": true }, "src/third_party/clang-format/script": { diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index c033cfb6815b..50ce905b8fbe 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -63,14 +63,14 @@ "vendorHash": "sha256-6Tw4rCOzrvN2pK83NejdJJBjljfDfHEniIX+EdfqujA=" }, "argoproj-labs_argocd": { - "hash": "sha256-wCYf/WKEyM816FlxfXuxrUl51N032Xvf2u2Id0HDhYM=", + "hash": "sha256-xIEl9SsiwJp3X7hyVPE/Z9qHGTL9ZotvzIz7Zx5bdEc=", "homepage": "https://registry.terraform.io/providers/argoproj-labs/argocd", "owner": "argoproj-labs", "proxyVendor": true, "repo": "terraform-provider-argocd", - "rev": "v7.12.4", + "rev": "v7.12.5", "spdx": "MPL-2.0", - "vendorHash": "sha256-mzOhvrX7BxU00HfbE17xswPg4oRVbVvDb3etwUbq7EE=" + "vendorHash": "sha256-gVzj5x95MNgCbxwqiqakrUnhF/x+vXnAurv4pUt8kV4=" }, "auth0_auth0": { "hash": "sha256-NB8MRaj3O7Fb2xBYzYEEQ6+ZcibF4JHUQQz51ynUzlc=", @@ -274,13 +274,13 @@ "vendorHash": "sha256-3o6YRDrq4rQhNAFyqiGJrAoxuAykWw85OExRGSE3kGI=" }, "datadog_datadog": { - "hash": "sha256-7SR3DODxlAGz0TTCIpZdEcXi16HvVgV7vLZA5qgzlyo=", + "hash": "sha256-xBfk4Pvu4caOOW5qxNdbaEb4NAOL9/5KMgBCpBfvghU=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v3.83.0", + "rev": "v3.84.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-dyCYlNdi6kaNYZToyiXw66AfDIeTgKAyQEtxh4wZ2Wo=" + "vendorHash": "sha256-FrMa8ah8WM/XlQwwHTvK0tPaSUnCx2ArQDWXw7ULwTk=" }, "datadrivers_nexus": { "hash": "sha256-Lm5CZ+eBDUNIL2KuK/iKc5dTif7P+E9II714vwvYuyU=", @@ -499,13 +499,13 @@ "vendorHash": "sha256-MYVkNvJ+rbwGw0htClIbmxk3YX2OK/ZO/QOTyMRFiug=" }, "hashicorp_aws": { - "hash": "sha256-Q9kenDtLbJeh1otj16JniOKpr8FEwrSmIjCLkaOqICs=", + "hash": "sha256-mrb+bxd6B0qzrU7LmlluraN4WQyT+LM0M2uSphkgLb4=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v6.27.0", + "rev": "v6.28.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-d90pR0WCyYIaXOyZWNw+2++sgt+subhkPCgFOEsX8JQ=" + "vendorHash": "sha256-Ce3ay7PGdv97fQQJjb3PHrvecv4g8vJ/HtSUHeUPqtU=" }, "hashicorp_awscc": { "hash": "sha256-rqZULnv3FaewbLNe1PT+OmDpBRPxloAcn8Yvzj17hIc=", @@ -706,13 +706,13 @@ "vendorHash": null }, "hetznercloud_hcloud": { - "hash": "sha256-qgrwtM6bnJ0TLR8IXgv4H3beUPjLnoZL4pSroVPrVak=", + "hash": "sha256-p0MR+e3iSEhDJwXHSqG1spJ5rt+TV6yQVm7V18spFi0=", "homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud", "owner": "hetznercloud", "repo": "terraform-provider-hcloud", - "rev": "v1.57.0", + "rev": "v1.58.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-BUxnKxr0htpdSSTMzb3ix1nNlX7PTBv38ozDjnZ2eK8=" + "vendorHash": "sha256-8gBaOdoUjmeomi8+H2gMypKnJdkXGzgzu8K0ATqMfxE=" }, "huaweicloud_huaweicloud": { "hash": "sha256-8GsGyWBkeHy+7MOrjn6r8Q67EDBycU0FEFILabJvkWA=", @@ -751,11 +751,11 @@ "vendorHash": null }, "integrations_github": { - "hash": "sha256-WXvb8P5hN9P91ZrpDB9fuGYvXqhgfFbmPtx5irepJ+8=", + "hash": "sha256-I9mQ3oNzU6+n7XPmyhbIgr/d80wcLy5s1s3v96fYbkU=", "homepage": "https://registry.terraform.io/providers/integrations/github", "owner": "integrations", "repo": "terraform-provider-github", - "rev": "v6.9.0", + "rev": "v6.9.1", "spdx": "MIT", "vendorHash": null }, @@ -1247,13 +1247,13 @@ "vendorHash": "sha256-HWAUI0mowVP8FPw44xYaFOTh6jjkfXa7fuPk2zoSZJ8=" }, "spotinst_spotinst": { - "hash": "sha256-AkuuUyMrc4GInuK+NNhTDQgW3vM/EupV4lkCV5Bn+n8=", + "hash": "sha256-1Ws1qEeoU4hWSOs59cymDIT1zQHUlr1QpjBToK3OEdw=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.231.0", + "rev": "v1.232.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-sMwX6NU3nlpw5WMYGAM3LfPJgGQ9hOc89cUIQbMPqPg=" + "vendorHash": "sha256-Cj7RVITkFxIjAZAqHFhnoTa4lTZFXG22ny801g0Y+NE=" }, "statuscakedev_statuscake": { "hash": "sha256-zXBZZA+2uRN2FeGrayq0a4EBk7T+PvlBIwbuxwM7yBc=", @@ -1265,11 +1265,11 @@ "vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs=" }, "sumologic_sumologic": { - "hash": "sha256-fFy9zZIwEkhqFrzIsBWFiuacAKDifhatfn6TseyrKnU=", + "hash": "sha256-UEJNCb1b2BXgBM6FuTHzw5O7FopY3Iv99Hv01KDjY8k=", "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic", "owner": "SumoLogic", "repo": "terraform-provider-sumologic", - "rev": "v3.2.1", + "rev": "v3.2.2", "spdx": "MPL-2.0", "vendorHash": "sha256-IR6KjFW5GbsOIm3EEFyx3ctwhbifZlcNaZeGhbeK/Wo=" }, @@ -1310,11 +1310,11 @@ "vendorHash": "sha256-omxEb+ntQuHDfS2Rmt0rj0BF0Q2T8DLhobLua2uU/0o=" }, "tencentcloudstack_tencentcloud": { - "hash": "sha256-KiHK/tkDDEL+osFp5gRvPTHrP7hEfMhl8aT4VHCCGpw=", + "hash": "sha256-hyQUHz7FWysK+AdCG6FrDch8hEFHWtB8Hp8q2B5tGAs=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.82.50", + "rev": "v1.82.51", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1382,11 +1382,11 @@ "vendorHash": "sha256-6QgkZp3Ay5bRLwy8dxT5904KW2rBcz5yrYqIlvQToJk=" }, "trozz_pocketid": { - "hash": "sha256-+YR1m81CoOj1uS7nQvrsYHfYyOovD+X/XlItaqXdVeE=", + "hash": "sha256-/rEdOnAbVM69mA/eP6SlZhk1FZfzrYpej2aO0NUP6E4=", "homepage": "https://registry.terraform.io/providers/Trozz/pocketid", "owner": "Trozz", "repo": "terraform-provider-pocketid", - "rev": "v0.1.6", + "rev": "v0.1.7", "spdx": "MIT", "vendorHash": "sha256-ozAYLFkilSK0Nygdglhz3VNtRVKoLDGRnrVvg4nWyH4=" }, diff --git a/pkgs/applications/networking/instant-messengers/linphone/bc-ispell/default.nix b/pkgs/applications/networking/instant-messengers/linphone/bc-ispell/default.nix index 69c8fc8fcf8d..d03f01d4957a 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/bc-ispell/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/bc-ispell/default.nix @@ -44,6 +44,8 @@ stdenv.mkDerivation (finalAttrs: { }; }; + env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + meta = { description = "Interactive spelling checker"; homepage = "https://gitlab.linphone.org/BC/public/external/ispell"; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 4815fc2b9849..1a72ebc4eded 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -196,6 +196,7 @@ stdenv.mkDerivation (finalAttrs: { "-DENABLE_WEBRTC=ON" (lib.cmakeBool "ENABLE_QSV11" stdenv.hostPlatform.isx86_64) (lib.cmakeBool "ENABLE_LIBFDK" withFdk) + (lib.cmakeBool "ENABLE_SCRIPTING" scriptingSupport) (lib.cmakeBool "ENABLE_ALSA" alsaSupport) (lib.cmakeBool "ENABLE_PULSEAUDIO" pulseaudioSupport) (lib.cmakeBool "ENABLE_PIPEWIRE" pipewireSupport) diff --git a/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix b/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix index 5e97d14d7aca..0e68a1108319 100644 --- a/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix +++ b/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix @@ -44,14 +44,15 @@ rustPlatform.buildRustPackage rec { # https://github.com/cloud-hypervisor/rust-hypervisor-firmware/issues/249 auditable = false; - RUSTC_BOOTSTRAP = 1; + env = { + RUSTC_BOOTSTRAP = 1; + RUSTFLAGS = "-C linker=lld -C linker-flavor=ld.lld"; + }; nativeBuildInputs = [ lld ]; - RUSTFLAGS = "-C linker=lld -C linker-flavor=ld.lld"; - # Tests don't work for `no_std`. See https://os.phil-opp.com/testing/ doCheck = false; diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 8c7d241d69a9..ccc6709160ba 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -70,11 +70,11 @@ let # A user is required by nix # https://github.com/NixOS/nix/blob/9348f9291e5d9e4ba3c4347ea1b235640f54fd79/src/libutil/util.cc#L478 export USER=nobody - ${buildPackages.nix}/bin/nix-store --load-db < ${ + ${lib.getExe' buildPackages.nix "nix-store"} --load-db < ${ closureInfo { rootPaths = contentsList; } }/registration # Reset registration times to make the image reproducible - ${buildPackages.sqlite}/bin/sqlite3 nix/var/nix/db/db.sqlite "UPDATE ValidPaths SET registrationTime = ''${SOURCE_DATE_EPOCH}" + ${lib.getExe buildPackages.sqlite} nix/var/nix/db/db.sqlite "UPDATE ValidPaths SET registrationTime = ''${SOURCE_DATE_EPOCH}" mkdir -p nix/var/nix/gcroots/docker/ for i in ${lib.concatStringsSep " " contentsList}; do @@ -565,7 +565,7 @@ rec { mkdir -p $out tarhash=$(tar -C layer --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" -cf - . | tee -p $out/layer.tar | - ${tarsum}/bin/tarsum) + ${lib.getExe tarsum}) cat ${baseJson} | jshon -s "$tarhash" -i checksum > $out/json # Indicate to docker that we're using schema version 1.0. @@ -966,14 +966,14 @@ rec { # "#!/usr/bin/env executable" shebang. usrBinEnv = runCommand "usr-bin-env" { } '' mkdir -p $out/usr/bin - ln -s ${coreutils}/bin/env $out/usr/bin + ln -s ${lib.getExe' coreutils "env"} $out/usr/bin ''; # This provides /bin/sh, pointing to bash (interactive). # The use of bash (interactive) here is intentional to support cases like `docker run -it `, so keep these use cases in mind if making any changes to how this works. binSh = runCommand "bin-sh" { } '' mkdir -p $out/bin - ln -s ${bash}/bin/bash $out/bin/sh + ln -s ${lib.getExe bash} $out/bin/sh ''; # This provides the ca bundle in common locations @@ -1268,7 +1268,7 @@ rec { # # https://github.com/NixOS/nix/issues/6379 homeDirectory ? "/build", - shell ? bash + "/bin/bash", + shell ? lib.getExe bash, command ? null, run ? null, }: diff --git a/pkgs/by-name/_3/_3cpio/package.nix b/pkgs/by-name/_3/_3cpio/package.nix index e1aa57abe450..41b1672176c9 100644 --- a/pkgs/by-name/_3/_3cpio/package.nix +++ b/pkgs/by-name/_3/_3cpio/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "3cpio"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "bdrung"; repo = "3cpio"; tag = version; - hash = "sha256-NUOEeyYXAkQkUQuTQc+iIon0tuA5wAEZ6Q57iX++iB4="; + hash = "sha256-4ERSH5Kz/e2MuIIgi3XQVnhW0csBPDIvdmEw05OdREA="; }; - cargoHash = "sha256-wIGvEyB5DyCE62AxchW7ofrB53qOv4LM/VgpzEL+elc="; + cargoHash = "sha256-ER1OQZHHtHBNPoEl4NJ5p5KYjzFgJnFR8nXcmCk2HTA="; # Tests attempt to access arbitrary filepaths doCheck = false; diff --git a/pkgs/by-name/ai/aider-chat/package.nix b/pkgs/by-name/ai/aider-chat/package.nix index a53fda1cb47e..da4a760ab294 100644 --- a/pkgs/by-name/ai/aider-chat/package.nix +++ b/pkgs/by-name/ai/aider-chat/package.nix @@ -35,6 +35,10 @@ let pythonRelaxDeps = true; + pythonRemoveDeps = [ + "importlib-resources" + ]; + build-system = with python3Packages; [ setuptools-scm ]; dependencies = with python3Packages; [ @@ -70,7 +74,6 @@ let httpx huggingface-hub idna - importlib-resources jinja2 jiter json5 @@ -149,6 +152,9 @@ let patches = [ ./fix-tree-sitter.patch + # https://github.com/Aider-AI/aider/pull/4755 + ./replace-importlib_resources.patch + (replaceVars ./fix-flake8-invoke.patch { flake8 = lib.getExe python3Packages.flake8; }) diff --git a/pkgs/by-name/ai/aider-chat/replace-importlib_resources.patch b/pkgs/by-name/ai/aider-chat/replace-importlib_resources.patch new file mode 100644 index 000000000000..ae4b0cf36898 --- /dev/null +++ b/pkgs/by-name/ai/aider-chat/replace-importlib_resources.patch @@ -0,0 +1,97 @@ +diff --git a/aider/help.py b/aider/help.py +index c76188d1..9fded648 100755 +--- a/aider/help.py ++++ b/aider/help.py +@@ -6,7 +6,7 @@ import shutil + import warnings + from pathlib import Path + +-import importlib_resources ++import importlib.resources + + from aider import __version__, utils + from aider.dump import dump # noqa: F401 +@@ -31,7 +31,7 @@ def install_help_extra(io): + + + def get_package_files(): +- for path in importlib_resources.files("aider.website").iterdir(): ++ for path in importlib.resources.files("aider.website").iterdir(): + if path.is_file(): + yield path + elif path.is_dir(): +@@ -112,7 +112,7 @@ def get_index(): + continue + + doc = Document( +- text=importlib_resources.files("aider.website") ++ text=importlib.resources.files("aider.website") + .joinpath(fname) + .read_text(encoding="utf-8"), + metadata=dict( +diff --git a/aider/main.py b/aider/main.py +index afb3f836..7ade37af 100644 +--- a/aider/main.py ++++ b/aider/main.py +@@ -13,7 +13,7 @@ try: + except ImportError: + git = None + +-import importlib_resources ++import importlib.resources + import shtab + from dotenv import load_dotenv + from prompt_toolkit.enums import EditingMode +@@ -391,7 +391,7 @@ def register_litellm_models(git_root, model_metadata_fname, io, verbose=False): + model_metadata_files = [] + + # Add the resource file path +- resource_metadata = importlib_resources.files("aider.resources").joinpath("model-metadata.json") ++ resource_metadata = importlib.resources.files("aider.resources").joinpath("model-metadata.json") + model_metadata_files.append(str(resource_metadata)) + + model_metadata_files += generate_search_path_list( +diff --git a/aider/resources/__init__.py b/aider/resources/__init__.py +index f7ca4efb..cabf3c36 100644 +--- a/aider/resources/__init__.py ++++ b/aider/resources/__init__.py +@@ -1,3 +1,3 @@ +-# This ensures that importlib_resources.files("aider.resources") ++# This ensures that importlib.resources.files("aider.resources") + # doesn't raise ImportError, even if there are no other files in this + # dir. +diff --git a/benchmark/benchmark.py b/benchmark/benchmark.py +index cc694a9f..82124b28 100755 +--- a/benchmark/benchmark.py ++++ b/benchmark/benchmark.py +@@ -16,7 +16,7 @@ from types import SimpleNamespace + from typing import List, Optional + + import git +-import importlib_resources ++import importlib.resources + import lox + import pandas as pd + import prompts +@@ -320,7 +320,7 @@ def main( + + test_dnames = sorted(str(d.relative_to(original_dname)) for d in exercise_dirs) + +- resource_metadata = importlib_resources.files("aider.resources").joinpath("model-metadata.json") ++ resource_metadata = importlib.resources.files("aider.resources").joinpath("model-metadata.json") + model_metadata_files_loaded = models.register_litellm_models([resource_metadata]) + dump(model_metadata_files_loaded) + +diff --git a/tests/basic/test_main.py b/tests/basic/test_main.py +index c8966a53..ec7a04a1 100644 +--- a/tests/basic/test_main.py ++++ b/tests/basic/test_main.py +@@ -1303,7 +1303,7 @@ class TestMain(TestCase): + mock_files = MagicMock() + mock_files.joinpath.return_value = mock_resource_path + +- with patch("aider.main.importlib_resources.files", return_value=mock_files): ++ with patch("aider.main.importlib.resources.files", return_value=mock_files): + # Capture stdout to check the output + with patch("sys.stdout", new_callable=StringIO) as mock_stdout: + main( diff --git a/pkgs/by-name/ai/airshipper/package.nix b/pkgs/by-name/ai/airshipper/package.nix index 4731be7ce016..aba284758545 100644 --- a/pkgs/by-name/ai/airshipper/package.nix +++ b/pkgs/by-name/ai/airshipper/package.nix @@ -87,7 +87,7 @@ rustPlatform.buildRustPackage { makeWrapper ]; - env.RUSTC_BOOTSTRAP = 1; # We need rust unstable features + RUSTC_BOOTSTRAP = 1; # We need rust unstable features postInstall = '' install -Dm444 -t "$out/share/applications" "client/assets/net.veloren.airshipper.desktop" diff --git a/pkgs/by-name/al/alvr/package.nix b/pkgs/by-name/al/alvr/package.nix index d1d757157b26..cad1f3853cbd 100644 --- a/pkgs/by-name/al/alvr/package.nix +++ b/pkgs/by-name/al/alvr/package.nix @@ -78,18 +78,19 @@ rustPlatform.buildRustPackage rec { "-lpng" "-lssl" ]; + RUSTFLAGS = toString ( + map (a: "-C link-arg=${a}") [ + "-Wl,--push-state,--no-as-needed" + "-lEGL" + "-lwayland-client" + "-lxkbcommon" + "-Wl,--pop-state" + ] + ); }; - RUSTFLAGS = map (a: "-C link-arg=${a}") [ - "-Wl,--push-state,--no-as-needed" - "-lEGL" - "-lwayland-client" - "-lxkbcommon" - "-Wl,--pop-state" - ]; - cargoBuildFlags = [ - "--exclude alvr_xtask" + "--exclude=alvr_xtask" "--workspace" ]; diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix index 9c959c10ac93..d61e9093ac69 100644 --- a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix +++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "ananicy-rules-cachyos"; - version = "0-unstable-2025-12-28"; + version = "0-unstable-2026-01-06"; src = fetchFromGitHub { owner = "CachyOS"; repo = "ananicy-rules"; - rev = "3f1f24c3fc1c15444efd00d5562a37e2d4e06995"; - hash = "sha256-RXOV8JICxo97T4TPtCr0tfiudHy1Tam7vjP5BDj86bY="; + rev = "c3e21cb01a909e5da2828f453ebdc375e2f514ad"; + hash = "sha256-g/fexBzHzhckCWtzfXOwXqA6LZqTULQ7Bz3OY5fcLcA="; }; dontConfigure = true; diff --git a/pkgs/by-name/an/ansel/package.nix b/pkgs/by-name/an/ansel/package.nix index 0bea220db8e5..771643576542 100644 --- a/pkgs/by-name/an/ansel/package.nix +++ b/pkgs/by-name/an/ansel/package.nix @@ -82,13 +82,13 @@ let in stdenv.mkDerivation { pname = "ansel"; - version = "0-unstable-2025-12-23"; + version = "0-unstable-2026-01-06"; src = fetchFromGitHub { owner = "aurelienpierreeng"; repo = "ansel"; - rev = "2ff9984637cbce06f943919ae37fd0e08d8d5d9e"; - hash = "sha256-bxEvm6WdBLzf3bi3OqSKvphseKKLPJi8iYJ1A1fHt2Q="; + rev = "b9a2bbdea71aa8114e2de0d6e944d322ead76a97"; + hash = "sha256-364KKrs0g6VgmyTKDhHVYUK+VERc32qFAbxZAjXG4kU="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/as/asusctl/package.nix b/pkgs/by-name/as/asusctl/package.nix index b322fba81723..e0856ee9d559 100644 --- a/pkgs/by-name/as/asusctl/package.nix +++ b/pkgs/by-name/as/asusctl/package.nix @@ -77,14 +77,18 @@ rustPlatform.buildRustPackage rec { wayland ]; - # force linking to all the dlopen()ed dependencies - RUSTFLAGS = map (a: "-C link-arg=${a}") [ - "-Wl,--push-state,--no-as-needed" - "-lEGL" - "-lfontconfig" - "-lwayland-client" - "-Wl,--pop-state" - ]; + env = { + # force linking to all the dlopen()ed dependencies + RUSTFLAGS = toString ( + map (a: "-C link-arg=${a}") [ + "-Wl,--push-state,--no-as-needed" + "-lEGL" + "-lfontconfig" + "-lwayland-client" + "-Wl,--pop-state" + ] + ); + }; # upstream has minimal tests, so don't rebuild twice doCheck = false; diff --git a/pkgs/by-name/bl/blink-qt/package.nix b/pkgs/by-name/bl/blink-qt/package.nix index 4c6dde719b68..e5667fcdebfb 100644 --- a/pkgs/by-name/bl/blink-qt/package.nix +++ b/pkgs/by-name/bl/blink-qt/package.nix @@ -55,7 +55,7 @@ python3Packages.buildPythonApplication rec { python3-application python3-eventlib python3-gnutls - sipsimple + python3-sipsimple sqlobject standard-imghdr xcaplib diff --git a/pkgs/by-name/bo/bootdev-cli/package.nix b/pkgs/by-name/bo/bootdev-cli/package.nix index 3521a7e628ba..0eb5b8b46171 100644 --- a/pkgs/by-name/bo/bootdev-cli/package.nix +++ b/pkgs/by-name/bo/bootdev-cli/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "bootdev-cli"; - version = "1.22.0"; + version = "1.22.1"; src = fetchFromGitHub { owner = "bootdotdev"; repo = "bootdev"; tag = "v${version}"; - hash = "sha256-Fk82JKD8zHRPBoliwnvQKqZNii7TiX13cKENXw5011E="; + hash = "sha256-eOyJx99TwjG7UWTvzYtelLsN1BwhORZD9zkyA13VYSY="; }; vendorHash = "sha256-jhRoPXgfntDauInD+F7koCaJlX4XDj+jQSe/uEEYIMM="; diff --git a/pkgs/by-name/ca/caligula/package.nix b/pkgs/by-name/ca/caligula/package.nix index 7084041552b8..33fede21aca3 100644 --- a/pkgs/by-name/ca/caligula/package.nix +++ b/pkgs/by-name/ca/caligula/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - RUSTFLAGS = "--cfg tracing_unstable"; + env.RUSTFLAGS = "--cfg tracing_unstable"; meta = { description = "User-friendly, lightweight TUI for disk imaging"; diff --git a/pkgs/by-name/ca/canon-cups-ufr2/package.nix b/pkgs/by-name/ca/canon-cups-ufr2/package.nix index 5db657dbe64a..963a2040d134 100644 --- a/pkgs/by-name/ca/canon-cups-ufr2/package.nix +++ b/pkgs/by-name/ca/canon-cups-ufr2/package.nix @@ -20,7 +20,7 @@ cairo, atk, pkg-config, - libxml2, + libxml2_13, libredirect, ghostscript, pkgs, @@ -57,7 +57,7 @@ let libgcrypt glib gtk3 - libxml2 + libxml2_13 gdk-pixbuf pango cairo @@ -123,7 +123,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace $(find cnrdrvcups-lb-${version}/cngplp -name Makefile.am) \ - --replace-quiet /usr/include/libxml2/ ${libxml2.dev}/include/libxml2/ + --replace-quiet /usr/include/libxml2/ ${libxml2_13.dev}/include/libxml2/ substituteInPlace \ cnrdrvcups-common-${version}/{{backend,cngplp/src,rasterfilter}/Makefile.am,rasterfilter/cnrasterproc.h} \ diff --git a/pkgs/by-name/ca/cargo-codspeed/package.nix b/pkgs/by-name/ca/cargo-codspeed/package.nix index d4d3e62f35c1..61d2fdfb6143 100644 --- a/pkgs/by-name/ca/cargo-codspeed/package.nix +++ b/pkgs/by-name/ca/cargo-codspeed/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-codspeed"; - version = "4.2.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "CodSpeedHQ"; repo = "codspeed-rust"; tag = "v${finalAttrs.version}"; - hash = "sha256-ofVgb+9YUNiCPhRZHY3Fm1nXRZK+9Uq8pc5XAm3P6oU="; + hash = "sha256-ljq9d9T3Cx5hDAjP4dbhSnbCYaU1KB42aDhQvRyI7Ws="; }; - cargoHash = "sha256-xcLs2Tdi7wp7F5Jwl1QvEC1wQeK7pBjBZKxGVrzqzu0="; + cargoHash = "sha256-ryKZyl5CuxFsX1dLadJnCyorssVoD2w5kueKDJP80qU="; nativeBuildInputs = [ curl diff --git a/pkgs/by-name/cd/cdk8s-cli/package.nix b/pkgs/by-name/cd/cdk8s-cli/package.nix index 59c758d0fa1c..87b3ddf9b65d 100644 --- a/pkgs/by-name/cd/cdk8s-cli/package.nix +++ b/pkgs/by-name/cd/cdk8s-cli/package.nix @@ -12,18 +12,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "cdk8s-cli"; - version = "2.203.14"; + version = "2.203.15"; src = fetchFromGitHub { owner = "cdk8s-team"; repo = "cdk8s-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-QjW2elwUUABtTDOA/J/S3icG0Fv2sDiFQliWCSWoE80="; + hash = "sha256-vhTvRsKEzh/m5zoGBXi2sR43pkYTf8WyZ8bN1Eo0o38="; }; yarnOfflineCache = fetchYarnDeps { inherit (finalAttrs) src; - hash = "sha256-n6CjFp3kJ/dLYN4JRS+wIOU9FDDUnSy+Q4glOuDWdLw="; + hash = "sha256-32Ssu4NTY7JWnTiJASYW0j3fKF2jgKSQRqZluH220+4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ce/celeste/package.nix b/pkgs/by-name/ce/celeste/package.nix index e3535bf41e09..911d3f54429a 100644 --- a/pkgs/by-name/ce/celeste/package.nix +++ b/pkgs/by-name/ce/celeste/package.nix @@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec { --replace-warn 'edition = "2021"' 'edition = "2024"' ''; - env.RUSTC_BOOTSTRAP = 1; + RUSTC_BOOTSTRAP = 1; nativeBuildInputs = [ just diff --git a/pkgs/by-name/ci/citations/package.nix b/pkgs/by-name/ci/citations/package.nix index 7956828512eb..9aa3d8e6f3d7 100644 --- a/pkgs/by-name/ci/citations/package.nix +++ b/pkgs/by-name/ci/citations/package.nix @@ -23,19 +23,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "citations"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "citations"; rev = finalAttrs.version; - hash = "sha256-aJp9UrfRXAsnHFGgMTHGRgCvlPEa62r9/0hEp5YKRzE="; + hash = "sha256-oWRBJvf7EimxIwdsr11vsN5605nZ4p4LQ1tzx/ZiCrg="; }; cargoDeps = rustPlatform.fetchCargoVendor { src = finalAttrs.src; - hash = "sha256-ZoflXdou6S7CYFF5x1pB71Ur08X1W6wPaJIm1sYsI2w="; + hash = "sha256-FCrrZ9efzTsYleOzaBVjLpC+shgwLnvHfpJmWXF80DI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index 9517f2ea84fd..3d80616af26f 100644 --- a/pkgs/by-name/cl/claude-code/package-lock.json +++ b/pkgs/by-name/cl/claude-code/package-lock.json @@ -1,12 +1,12 @@ { "name": "@anthropic-ai/claude-code", - "version": "2.0.76", + "version": "2.1.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@anthropic-ai/claude-code", - "version": "2.0.76", + "version": "2.1.1", "license": "SEE LICENSE IN README.md", "bin": { "claude": "cli.js" diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index 49421366bad4..ccd52a6117e1 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -11,14 +11,14 @@ }: buildNpmPackage (finalAttrs: { pname = "claude-code"; - version = "2.0.76"; + version = "2.1.1"; src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz"; - hash = "sha256-46IqiGJZrZM4vVcanZj/vY4uxFH3/4LxNA+Qb6iIHDk="; + hash = "sha256-GZIh20GyhsXaAm13veg2WErT4rF9a1x8Dzr9q5Al0io="; }; - npmDepsHash = "sha256-mDErPWWqOe+3fKriTBLNCzXP48pmmlOMoB+kCP4FoT8="; + npmDepsHash = "sha256-F9FaDezEb8kP4Oq4nQNGVspbubk6AZ5caOEXsd8x5Us="; postPatch = '' cp ${./package-lock.json} package-lock.json diff --git a/pkgs/by-name/cl/clifm/package.nix b/pkgs/by-name/cl/clifm/package.nix index 87440b66df19..6bb30dcf36ce 100644 --- a/pkgs/by-name/cl/clifm/package.nix +++ b/pkgs/by-name/cl/clifm/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "clifm"; - version = "1.26.3"; + version = "1.27"; src = fetchFromGitHub { owner = "leo-arch"; repo = "clifm"; tag = "v${finalAttrs.version}"; - hash = "sha256-lYeYElTeQpOnptL/c/06OWpsmI/Jkd7rlKGw0mKc9/c="; + hash = "sha256-LfAXdFFaFldJ36QiBotGrSrdePY1Zc3IIQVOe9FszH0="; }; buildInputs = [ diff --git a/pkgs/by-name/cn/cnsprcy/package.nix b/pkgs/by-name/cn/cnsprcy/package.nix index 4e4f8778bef4..662df4a1f5ca 100644 --- a/pkgs/by-name/cn/cnsprcy/package.nix +++ b/pkgs/by-name/cn/cnsprcy/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: { passthru.updateScript = ./update.sh; - env.RUSTC_BOOTSTRAP = true; + RUSTC_BOOTSTRAP = true; buildInputs = [ sqlite ]; meta = { diff --git a/pkgs/by-name/co/cocoon/package.nix b/pkgs/by-name/co/cocoon/package.nix index d111ee2a8175..c0503010bb92 100644 --- a/pkgs/by-name/co/cocoon/package.nix +++ b/pkgs/by-name/co/cocoon/package.nix @@ -6,13 +6,13 @@ }: buildGoModule (finalAttrs: { pname = "cocoon"; - version = "0.7.1"; + version = "0.8.1"; src = fetchFromGitHub { owner = "haileyok"; repo = "cocoon"; tag = "v${finalAttrs.version}"; - hash = "sha256-kYBYdMoo7ToeljiW7AafL5cHzzeuaiL6MFE4Zw5Taqw="; + hash = "sha256-ztP/Nvv9kRr4bFI8oveJ6pk3LOZ9H4pqhVnBMt1kbew="; }; ldflags = [ @@ -21,7 +21,7 @@ buildGoModule (finalAttrs: { "-X main.Version=${finalAttrs.version}" ]; - vendorHash = "sha256-5WnME+AVrXfvHX2yPbFoL6QgZoCMAJmBj47OM7miOfc="; + vendorHash = "sha256-cNL9H8cXFEiBKwyZcg1AwFUDXzMINi+vjYecyP8KNP0="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ct/ctagdrc/package.nix b/pkgs/by-name/ct/ctagdrc/package.nix index c9cca85c6382..7099451fdaab 100644 --- a/pkgs/by-name/ct/ctagdrc/package.nix +++ b/pkgs/by-name/ct/ctagdrc/package.nix @@ -48,6 +48,17 @@ stdenv.mkDerivation (finalAttrs: { libXtst ]; + env.NIX_CFLAGS_COMPILE = toString [ + # juce, compiled in this build as part of a Git submodule, uses `-flto` as + # a Link Time Optimization flag, and instructs the plugin compiled here to + # use this flag to. This breaks the build for us. Using _fat_ LTO allows + # successful linking while still providing LTO benefits. If our build of + # `juce` was used as a dependency, we could have patched that `-flto` line + # in our juce's source, but that is not possible because it is used as a + # Git Submodule. + "-ffat-lto-objects" + ]; + enableParallelBuilding = true; postPatch = '' @@ -55,8 +66,6 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail 'COPY_PLUGIN_AFTER_BUILD TRUE' 'COPY_PLUGIN_AFTER_BUILD FALSE' substituteInPlace CMakeLists.txt \ --replace-fail 'include(cmake-include/CPM.cmake)' '# No CPM needed' - substituteInPlace CMakeLists.txt \ - --replace-fail 'juce::juce_recommended_lto_flags' '# Not forcing LTO' ''; installPhase = '' diff --git a/pkgs/by-name/de/dexed/package.nix b/pkgs/by-name/de/dexed/package.nix index 3734ee0f27f3..6a699e941963 100644 --- a/pkgs/by-name/de/dexed/package.nix +++ b/pkgs/by-name/de/dexed/package.nix @@ -33,11 +33,6 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace Source/CMakeLists.txt \ --replace-fail 'COPY_PLUGIN_AFTER_BUILD TRUE' 'COPY_PLUGIN_AFTER_BUILD FALSE' - '' - # LTO needs special setup on Linux - + lib.optionalString stdenv.hostPlatform.isLinux '' - substituteInPlace Source/CMakeLists.txt \ - --replace-fail 'juce::juce_recommended_lto_flags' '# Not forcing LTO' ''; strictDeps = true; @@ -68,6 +63,17 @@ stdenv.mkDerivation (finalAttrs: { "-ljack" ]); + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isLinux (toString [ + # juce, compiled in this build as part of a Git submodule, uses `-flto` as + # a Link Time Optimization flag, and instructs the plugin compiled here to + # use this flag to. This breaks the build for us. Using _fat_ LTO allows + # successful linking while still providing LTO benefits. If our build of + # `juce` was used as a dependency, we could have patched that `-flto` line + # in our juce's source, but that is not possible because it is used as a + # Git Submodule. + "-ffat-lto-objects" + ]); + installPhase = let vst3Dir = diff --git a/pkgs/by-name/do/doggo/package.nix b/pkgs/by-name/do/doggo/package.nix index c37472e0f550..2f3a4931acd5 100644 --- a/pkgs/by-name/do/doggo/package.nix +++ b/pkgs/by-name/do/doggo/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "doggo"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "mr-karan"; repo = "doggo"; rev = "v${version}"; - hash = "sha256-wraqaztGZHkldWL3tesclqQzOy4B7T/Vg18A1guFvOc="; + hash = "sha256-yKEjTaDwJVycsGeoJTVMjN9D4AzRLXZAY5fVIp+B14c="; }; - vendorHash = "sha256-+tuMDQnbW3kjpVhck3aSMw1+Rv8aCzdOqD4KD7KX3G8="; + vendorHash = "sha256-ybI17J5EKvigBapt8Ed2FuMEzGUVzEpJ6OTVYWXVOOc="; nativeBuildInputs = [ installShellFiles ]; subPackages = [ "cmd/doggo" ]; diff --git a/pkgs/by-name/do/doublecmd/package.nix b/pkgs/by-name/do/doublecmd/package.nix index cd1c4dd0f763..fecea934cee8 100644 --- a/pkgs/by-name/do/doublecmd/package.nix +++ b/pkgs/by-name/do/doublecmd/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doublecmd"; - version = "1.1.31"; + version = "1.1.32"; src = fetchFromGitHub { owner = "doublecmd"; repo = "doublecmd"; tag = "v${finalAttrs.version}"; - hash = "sha256-aIdjLpfGr98v4i/ssMNPBUJGwugEG612p4LtGUmo3cU="; + hash = "sha256-9HhFUzj9cSH49Y5mG4V6BDcr5tlQiBd5OW9xlUWrVmI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ea/easytag/package.nix b/pkgs/by-name/ea/easytag/package.nix index 1f3fb23e165d..a54f365bf1e1 100644 --- a/pkgs/by-name/ea/easytag/package.nix +++ b/pkgs/by-name/ea/easytag/package.nix @@ -40,7 +40,12 @@ stdenv.mkDerivation rec { }) ]; - NIX_LDFLAGS = "-lid3tag -lz"; + env = { + NIX_LDFLAGS = "-lid3tag -lz"; + # Note: this allows id3lib to be found at configure time, and also prevents + # compilation errors on Linux (GCC 15). Clang / Darwin seems to be unaffected. + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-std=c17 -Wno-implicit-function-declaration"; + }; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix index ae3089d89bb3..e4b777e34ead 100644 --- a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix +++ b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix @@ -1,7 +1,7 @@ { - "version" = "1.12.6"; + "version" = "1.12.7"; "hashes" = { - "desktopSrcHash" = "sha256-3CuEFbota6MPVLPeHkXgtb0OmDW91w08+XVnT3mDHaI="; - "desktopYarnHash" = "sha256-SPXbp+6zmwXD0uN4ByV6kIni+DGQT8evYMioH1NZJVU="; + "desktopSrcHash" = "sha256-VnZyNrylYbKhd9YyuoUSJWbTEphOsTivbbYIUeEZv2U="; + "desktopYarnHash" = "sha256-SAIoJRX06oE4j2Gjb/0MSiUa0UGYkQmuyuV90VRbFtk="; }; } diff --git a/pkgs/by-name/el/element-desktop/keytar/default.nix b/pkgs/by-name/el/element-desktop/keytar/default.nix deleted file mode 100644 index b8fb11b92a55..000000000000 --- a/pkgs/by-name/el/element-desktop/keytar/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - nodejs, - python3, - removeReferencesTo, - pkg-config, - libsecret, - xcbuild, - fetchNpmDeps, - npmHooks, - electron, -}: - -let - pinData = lib.importJSON ./pin.json; -in -stdenv.mkDerivation rec { - pname = "keytar-forked"; - inherit (pinData) version; - - src = fetchFromGitHub { - owner = "shiftkey"; - repo = "node-keytar"; - rev = "v${version}"; - hash = pinData.srcHash; - }; - - nativeBuildInputs = [ - nodejs - python3 - pkg-config - npmHooks.npmConfigHook - ] - ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild; - - buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libsecret ]; - - npmDeps = fetchNpmDeps { - inherit src; - hash = pinData.npmHash; - }; - - doCheck = false; - - postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' - pkg-config() { "''${PKG_CONFIG}" "$@"; } - export -f pkg-config - ''; - - npmFlags = [ - # Make sure the native modules are built against electron's ABI - "--nodedir=${electron.headers}" - # https://nodejs.org/api/os.html#osarch - "--arch=${stdenv.hostPlatform.node.arch}" - ]; - - installPhase = '' - runHook preInstall - shopt -s extglob - rm -rf node_modules - mkdir -p $out - cp -r ./!(build) $out - install -D -t $out/build/Release build/Release/keytar.node - ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc.cc} $out/build/Release/keytar.node - runHook postInstall - ''; - - disallowedReferences = [ stdenv.cc.cc ]; -} diff --git a/pkgs/by-name/el/element-desktop/keytar/pin.json b/pkgs/by-name/el/element-desktop/keytar/pin.json deleted file mode 100644 index 5eba4a97a822..000000000000 --- a/pkgs/by-name/el/element-desktop/keytar/pin.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "version": "7.10.0", - "srcHash": "sha256-G0IYBVB37ANnI/XEyzahs9DbTQLgUKmkDoGryRkra08=", - "npmHash": "sha256-bd4YK3AuD0N5Q9ijx1jqBRBL0WADhw1ZlaxspEctse4=" -} diff --git a/pkgs/by-name/el/element-desktop/keytar/update.sh b/pkgs/by-name/el/element-desktop/keytar/update.sh deleted file mode 100755 index 9b8d014f03c9..000000000000 --- a/pkgs/by-name/el/element-desktop/keytar/update.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../../../../ -i bash -p wget prefetch-npm-deps nix-prefetch-github - -if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then - echo "Regenerates packaging data for the keytar package." - echo "Usage: $0 [git release tag]" - exit 1 -fi - -version="$1" - -set -euo pipefail - -if [ -z "$version" ]; then - version="$(wget -O- "https://api.github.com/repos/atom/node-keytar/releases?per_page=1" | jq -r '.[0].tag_name')" -fi - -# strip leading "v" -version="${version#v}" - -SRC="https://raw.githubusercontent.com/atom/node-keytar/v$version" - -wget "$SRC/package-lock.json" -wget "$SRC/package.json" -npm_hash=$(prefetch-npm-deps package-lock.json) -rm -rf node_modules package.json package-lock.json - -src_hash=$(nix-prefetch-github atom node-keytar --rev v${version} | jq -r .hash) - -cat > pin.json << EOF -{ - "version": "$version", - "srcHash": "$src_hash", - "npmHash": "$npm_hash" -} -EOF diff --git a/pkgs/by-name/el/element-desktop/package.nix b/pkgs/by-name/el/element-desktop/package.nix index 87ab330417bd..28b3c267ba46 100644 --- a/pkgs/by-name/el/element-desktop/package.nix +++ b/pkgs/by-name/el/element-desktop/package.nix @@ -13,7 +13,6 @@ callPackage, desktopToDarwinBundle, typescript, - useKeytar ? true, # command line arguments which are always set commandLineArgs ? "", }: @@ -23,9 +22,6 @@ let inherit (pinData.hashes) desktopSrcHash desktopYarnHash; executableName = "element-desktop"; electron = electron_38; - keytar = callPackage ./keytar { - inherit electron; - }; seshat = callPackage ./seshat { }; in stdenv.mkDerivation ( @@ -90,9 +86,6 @@ stdenv.mkDerivation ( yarn --offline run i18n:sort yarn --offline run build:res - chmod -R a+w node_modules/keytar-forked - rm -rf node_modules/matrix-seshat node_modules/keytar-forked - ${lib.optionalString useKeytar "ln -s ${keytar} node_modules/keytar-forked"} ln -s $seshat node_modules/matrix-seshat runHook postBuild @@ -158,17 +151,6 @@ stdenv.mkDerivation ( passthru = { # run with: nix-shell ./maintainers/scripts/update.nix --argstr package element-desktop updateScript = ./update.sh; - - # TL;DR: keytar is optional while seshat isn't. - # - # This prevents building keytar when `useKeytar` is set to `false`, because - # if libsecret is unavailable (e.g. set to `null` or fails to build), then - # this package wouldn't even considered for building because - # "one of the dependencies failed to build", - # although the dependency wouldn't even be used. - # - # It needs to be `passthru` anyways because other packages do depend on it. - inherit keytar; }; meta = { diff --git a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix index adaebeb66580..e4973d165cbe 100644 --- a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix +++ b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix @@ -1,8 +1,8 @@ { - "version" = "1.12.6"; + "version" = "1.12.7"; "hashes" = { - "webSrcHash" = "sha256-MZohRkaPNoevaLmOb60OcebYJDd0sI3UaPEFMXh7y38="; - "webYarnHash" = "sha256-3iV2XXphubxDG+FzbNC9cHY+gjSTssv6iQK9U7BLMp0="; - "webSharedComponentsYarnHash" = "sha256-fwRasJ3iI+4DjqfNNpZ5CceEydJITUTeB7brhcmqOKk="; + "webSrcHash" = "sha256-D24x3T1m0qRmlpmkZ7zTAxhtMUddlMaip0JKT8H3Ci0="; + "webYarnHash" = "sha256-72M6XyI9zfxcym7e/CvLmQHe21eyzQXO3YfQipFh06s="; + "webSharedComponentsYarnHash" = "sha256-NrDB0itZ0xSFg4lZhAs6EGFap8GE1CZ1/EFa7fa4P2Q="; }; } diff --git a/pkgs/by-name/en/enter-tex/package.nix b/pkgs/by-name/en/enter-tex/package.nix index 8dfc84088f7c..21dddbf74cf0 100644 --- a/pkgs/by-name/en/enter-tex/package.nix +++ b/pkgs/by-name/en/enter-tex/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "enter-tex"; - version = "3.48.0"; + version = "3.49.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "gedit"; repo = "enter-tex"; tag = finalAttrs.version; - hash = "sha256-OnkP4E1kNWuE9k7SQ/ujnxnFgVyAqIhqHAw04ZA0Tno="; + hash = "sha256-CRxWN4eeB9uDdLtRh3aXHoN+gSlXSPDftGHcPtjgAzU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ew/eww/package.nix b/pkgs/by-name/ew/eww/package.nix index 8656401e6a45..9f8739ea741f 100644 --- a/pkgs/by-name/ew/eww/package.nix +++ b/pkgs/by-name/ew/eww/package.nix @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec { cargoTestFlags = cargoBuildFlags; # requires unstable rust features - env.RUSTC_BOOTSTRAP = 1; + RUSTC_BOOTSTRAP = 1; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd eww \ diff --git a/pkgs/by-name/ex/exoscale-cli/package.nix b/pkgs/by-name/ex/exoscale-cli/package.nix index 797277575147..47197da6b2b7 100644 --- a/pkgs/by-name/ex/exoscale-cli/package.nix +++ b/pkgs/by-name/ex/exoscale-cli/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "exoscale-cli"; - version = "1.89.0"; + version = "1.90.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-crSYkC3Y7ooEW3MsCfcwexsLqqAL9vW7UBhow5B993M="; + sha256 = "sha256-dDs0pwOxdwXqYm8al1TUXoZVaBL4vE/PwCcQFhSUarE="; }; vendorHash = null; diff --git a/pkgs/by-name/fi/fire/package.nix b/pkgs/by-name/fi/fire/package.nix index 67ea01bc1c43..1c82e81a96a2 100644 --- a/pkgs/by-name/fi/fire/package.nix +++ b/pkgs/by-name/fi/fire/package.nix @@ -108,11 +108,6 @@ stdenv.mkDerivation (finalAttrs: { # Regression tests require big sound files stored in LFS, skip them rm -v tests/RegressionTests.cpp '' - + lib.optionalString stdenv.hostPlatform.isLinux '' - # Remove hardcoded LTO flags: needs extra setup on Linux - substituteInPlace CMakeLists.txt \ - --replace-fail 'juce::juce_recommended_lto_flags' '# Not forcing LTO' - '' + lib.optionalString (!finalAttrs.finalPackage.doCheck) '' substituteInPlace CMakeLists.txt \ --replace-fail 'include(Tests)' '# Not building tests' \ @@ -144,6 +139,17 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeFeature "Catch2_SOURCE_DIR" "${catch2_3.src}") ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isLinux (toString [ + # juce, compiled in this build as part of a Git submodule, uses `-flto` as + # a Link Time Optimization flag, and instructs the plugin compiled here to + # use this flag to. This breaks the build for us. Using _fat_ LTO allows + # successful linking while still providing LTO benefits. If our build of + # `juce` was used as a dependency, we could have patched that `-flto` line + # in our juce's source, but that is not possible because it is used as a + # Git Submodule. + "-ffat-lto-objects" + ]); + installPhase = '' runHook preInstall diff --git a/pkgs/by-name/fi/firezone-gateway/package.nix b/pkgs/by-name/fi/firezone-gateway/package.nix index a17287029514..e71acd697d53 100644 --- a/pkgs/by-name/fi/firezone-gateway/package.nix +++ b/pkgs/by-name/fi/firezone-gateway/package.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-8YftVt72JpmxWB/WvOPpduE0/QgYvQhSuFRmsFth2iU="; sourceRoot = "${src.name}/rust"; buildAndTestSubdir = "gateway"; - RUSTFLAGS = "--cfg system_certs"; + env.RUSTFLAGS = "--cfg system_certs"; # Required to remove profiling arguments which conflict with this builder postPatch = '' diff --git a/pkgs/by-name/fi/firezone-gui-client/package.nix b/pkgs/by-name/fi/firezone-gui-client/package.nix index 2c9ddac6b374..b45ab51dd27e 100644 --- a/pkgs/by-name/fi/firezone-gui-client/package.nix +++ b/pkgs/by-name/fi/firezone-gui-client/package.nix @@ -82,7 +82,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-TDP1Z4MeQaSER8MGnCEQfIhRsakaSCeJ7boUMBYkkI0="; sourceRoot = "${src.name}/rust"; buildAndTestSubdir = "gui-client"; - RUSTFLAGS = "--cfg system_certs"; + env.RUSTFLAGS = "--cfg system_certs"; nativeBuildInputs = [ cargo-tauri.hook diff --git a/pkgs/by-name/fi/firezone-headless-client/package.nix b/pkgs/by-name/fi/firezone-headless-client/package.nix index b141c4e925c4..dcabff9da084 100644 --- a/pkgs/by-name/fi/firezone-headless-client/package.nix +++ b/pkgs/by-name/fi/firezone-headless-client/package.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-J2IqqFBuoTkbO0nMJbY680G2HTAtC1To/nMra2PCopY="; sourceRoot = "${src.name}/rust"; buildAndTestSubdir = "headless-client"; - RUSTFLAGS = "--cfg system_certs"; + env.RUSTFLAGS = "--cfg system_certs"; # Required to remove profiling arguments which conflict with this builder postPatch = '' diff --git a/pkgs/by-name/fi/firezone-relay/package.nix b/pkgs/by-name/fi/firezone-relay/package.nix index 720d3eecd438..83282a0b8458 100644 --- a/pkgs/by-name/fi/firezone-relay/package.nix +++ b/pkgs/by-name/fi/firezone-relay/package.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-uqy4GgYaSX2kM4a37093lHmhvOtNUhkEs6/ZS1bjuYo="; sourceRoot = "${src.name}/rust"; buildAndTestSubdir = "relay"; - RUSTFLAGS = "--cfg system_certs"; + env.RUSTFLAGS = "--cfg system_certs"; # Required to remove profiling arguments which conflict with this builder postPatch = '' diff --git a/pkgs/by-name/fl/fleeting-plugin-aws/package.nix b/pkgs/by-name/fl/fleeting-plugin-aws/package.nix index 6af661274734..ea2d23efe249 100644 --- a/pkgs/by-name/fl/fleeting-plugin-aws/package.nix +++ b/pkgs/by-name/fl/fleeting-plugin-aws/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "fleeting-plugin-aws"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitLab { owner = "gitlab-org/fleeting/plugins"; repo = "aws"; tag = "v${finalAttrs.version}"; - hash = "sha256-AN+dHI1ZLNAGAe1tVuUt6KuXUU1gDyFqEdyiOm3OCoo="; + hash = "sha256-Emm8ETCFVWGb9b+TQayqazGgEtEGR2fMgaI33fLtmb8="; }; - vendorHash = "sha256-aOs3zSIvK2EUuMsh+BhD+jxHXASsetPXtm83mv7dAaA="; + vendorHash = "sha256-cRcIc/+odubxVNHOqruWFcA5aOc/GeIJIoYOdWq2ldc="; # Needed for "fleeting-plugin-aws -version" to not show "dev". # diff --git a/pkgs/by-name/fr/freshfetch/package.nix b/pkgs/by-name/fr/freshfetch/package.nix index d61bbb398d22..dd6b7510d7b9 100644 --- a/pkgs/by-name/fr/freshfetch/package.nix +++ b/pkgs/by-name/fr/freshfetch/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-LKltHVig33zUSWoRgCb1BgeKiJsDnlYEuPfQfrnhafI="; # freshfetch depends on rust nightly features - env.RUSTC_BOOTSTRAP = 1; + RUSTC_BOOTSTRAP = 1; meta = { description = "Fresh take on neofetch"; diff --git a/pkgs/by-name/fu/fuc/package.nix b/pkgs/by-name/fu/fuc/package.nix index bb6632c0f710..6175f66772b3 100644 --- a/pkgs/by-name/fu/fuc/package.nix +++ b/pkgs/by-name/fu/fuc/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-OoTWGeF96BpPDx1Y9AEVOIBK7kCz6pjw24pLiNcKmOc="; - env.RUSTC_BOOTSTRAP = 1; + RUSTC_BOOTSTRAP = 1; cargoBuildFlags = [ "--workspace" diff --git a/pkgs/by-name/ga/gatling/package.nix b/pkgs/by-name/ga/gatling/package.nix index 6bcb3eb735a5..ad5e17bf7a0b 100644 --- a/pkgs/by-name/ga/gatling/package.nix +++ b/pkgs/by-name/ga/gatling/package.nix @@ -44,6 +44,8 @@ stdenv.mkDerivation rec { make gatling ''; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=incompatible-pointer-types" ]; + meta = { description = "High performance web server"; homepage = "http://www.fefe.de/gatling/"; diff --git a/pkgs/by-name/ge/gedit/package.nix b/pkgs/by-name/ge/gedit/package.nix index e2839fb6aaa6..c6d374972030 100644 --- a/pkgs/by-name/ge/gedit/package.nix +++ b/pkgs/by-name/ge/gedit/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { pname = "gedit"; - version = "48.2"; + version = "49.0"; outputs = [ "out" @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { repo = "gedit"; tag = version; fetchSubmodules = true; - hash = "sha256-M8ZyjY4wSogEjhEx9sOKfuGkbiypDmZoU0H4ja+TgaY="; + hash = "sha256-IW3zBQOq/eeIjJbgJooHlOd+6/ZHOG6DUspHUlopG8A="; }; patches = [ diff --git a/pkgs/by-name/ge/gelly/package.nix b/pkgs/by-name/ge/gelly/package.nix index f745cb78d999..69a1b061e415 100644 --- a/pkgs/by-name/ge/gelly/package.nix +++ b/pkgs/by-name/ge/gelly/package.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "gelly"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "Fingel"; repo = "gelly"; tag = "v${finalAttrs.version}"; - hash = "sha256-7EmRC8qFN0q9O8FsQiSqYqEfvCg7yKKOxLca098867A="; + hash = "sha256-tjJIIKv4+ElmhLIaZAC/MIqhsZI6RzZBAkXZoN4nLeM="; }; - cargoHash = "sha256-INxtgEg1a8PK0BofySwB2OsLFlVZaiz9nbXGNKB+icE="; + cargoHash = "sha256-sQJrhkyRYTfk2qQ7FXG6IQ4js9Jq4BSWAh9z0V0jdm8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gi/git-spice/package.nix b/pkgs/by-name/gi/git-spice/package.nix index 522598eae58f..a69b764a7c60 100644 --- a/pkgs/by-name/gi/git-spice/package.nix +++ b/pkgs/by-name/gi/git-spice/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "git-spice"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "abhinav"; repo = "git-spice"; tag = "v${finalAttrs.version}"; - hash = "sha256-w7MBbR5eEtpP1ydSAEYlsmg+SOQTwHVRp8rrFMhgqfc="; + hash = "sha256-+k+uwOobHDMIqsFRLIMx64YV+64qh8qDAqGOpig1VXY="; }; - vendorHash = "sha256-4We8i/A1YDcmR/9MIf6D+z3oKZ3ZGQvdPuKRuhmJPyY="; + vendorHash = "sha256-fd4G6xBeso0jbHSZmyPR7zblSpbqvcPlMMy4RBIzTwU="; subPackages = [ "." ]; diff --git a/pkgs/by-name/go/golangci-lint/package.nix b/pkgs/by-name/go/golangci-lint/package.nix index 2941c2185df6..637ac955e0f6 100644 --- a/pkgs/by-name/go/golangci-lint/package.nix +++ b/pkgs/by-name/go/golangci-lint/package.nix @@ -14,16 +14,16 @@ buildGo125Module (finalAttrs: { pname = "golangci-lint"; - version = "2.7.2"; + version = "2.8.0"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; tag = "v${finalAttrs.version}"; - hash = "sha256-8dVIWa+yFvuBz2yXcPG1cBkxltqdjlb+tmQ+AtYuicc="; + hash = "sha256-w6MAOirj8rPHYbKrW4gJeemXCS64fNtteV6IioqIQTQ="; }; - vendorHash = "sha256-MHz9VQvObHkvf62HNcPGfsskv5RJpe6g23CoXHOGUZc"; + vendorHash = "sha256-/Vqo/yrmGh6XipELQ9NDtlMEO2a654XykmvnMs0BdrI="; subPackages = [ "cmd/golangci-lint" ]; diff --git a/pkgs/by-name/go/gops/package.nix b/pkgs/by-name/go/gops/package.nix index 6c6187b7640c..f31ffcb11fec 100644 --- a/pkgs/by-name/go/gops/package.nix +++ b/pkgs/by-name/go/gops/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "gops"; - version = "0.3.28"; + version = "0.3.29"; src = fetchFromGitHub { owner = "google"; repo = "gops"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-HNM487WSfNWNF31ccDIdotsEG8Mj2C7V85UI47a9drU="; + sha256 = "sha256-2xY/e+lqE1XtMMOJ+WmbMWibQMCIoEouOXNIJKEikvs="; }; - vendorHash = "sha256-ptC2G7cXcAjthJcAXvuBqI2ZpPuSMBqzO+gJiyaAUP0="; + vendorHash = "sha256-mumni9LEUhnJz6RYp1MjjFQd9iXe7V0RjXR+S266WaE="; nativeCheckInputs = [ writableTmpDirAsHomeHook ]; diff --git a/pkgs/by-name/go/gossip/package.nix b/pkgs/by-name/go/gossip/package.nix index 4821daaab8e8..6665a892c2d1 100644 --- a/pkgs/by-name/go/gossip/package.nix +++ b/pkgs/by-name/go/gossip/package.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-rE7SErOhl2fcmvLairq+mvdnbDIk1aPo3eYqwRx5kkA="; # See https://github.com/mikedilger/gossip/blob/0.9/README.md. - RUSTFLAGS = "--cfg tokio_unstable"; + env.RUSTFLAGS = "--cfg tokio_unstable"; # Some users might want to add "rustls-tls(-native)" for Rust TLS instead of OpenSSL. buildFeatures = [ diff --git a/pkgs/by-name/gr/grype/package.nix b/pkgs/by-name/gr/grype/package.nix index e4b86c9b46c8..349b3281ff64 100644 --- a/pkgs/by-name/gr/grype/package.nix +++ b/pkgs/by-name/gr/grype/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "grype"; - version = "0.104.3"; + version = "0.104.4"; src = fetchFromGitHub { owner = "anchore"; repo = "grype"; tag = "v${finalAttrs.version}"; - hash = "sha256-/XirnwA20DHOFs43/ZRMgxGIcEBfoX+217sFLOclzjY="; + hash = "sha256-XuB3eUBtyi23Wd3l8iuaN4rVw9/0/XNDBee8/m6swZo="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -32,7 +32,7 @@ buildGoModule (finalAttrs: { proxyVendor = true; - vendorHash = "sha256-77gN/XAgHD9BFA9de2efPuFALpAghGF0JRoGqoqOzbE="; + vendorHash = "sha256-toxkblzuAO/IYgKuvpmp5yc70KtFx6wiW2mkkO5owMY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/he/helmsman/package.nix b/pkgs/by-name/he/helmsman/package.nix index 20a0795d7d9c..4e432c1f6a9a 100644 --- a/pkgs/by-name/he/helmsman/package.nix +++ b/pkgs/by-name/he/helmsman/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "helmsman"; - version = "4.0.4"; + version = "4.0.5"; src = fetchFromGitHub { owner = "mkubaczyk"; repo = "helmsman"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-I2QBATunHjNwf4weHjYczpLNMX/8QsPe/ok0LTgZpmA="; + sha256 = "sha256-TeP7M0Mtd3rx9hcRCvgJAs7fBx2SZwUZSAhI/yhaO6k="; }; subPackages = [ "cmd/helmsman" ]; diff --git a/pkgs/by-name/he/hextazy/package.nix b/pkgs/by-name/he/hextazy/package.nix index d93a7a2990c0..6225a757e8ec 100644 --- a/pkgs/by-name/he/hextazy/package.nix +++ b/pkgs/by-name/he/hextazy/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "hextazy"; - version = "0.8.1"; + version = "0.8.3"; src = fetchFromGitHub { owner = "0xfalafel"; repo = "hextazy"; tag = version; - hash = "sha256-z7grcv7kfMvPqt9GI/NovGCWD1CZ38oiZ1bYDzZCbFg="; + hash = "sha256-sglKEdmfS8+PHsgZ/Z7HJs9+lrkD0pFvfUDrKtEdRNQ="; }; - cargoHash = "sha256-9JDqeLuQOs2AbrhQfn8pmnURXFyLf9/G9rEuvhedwr4="; + cargoHash = "sha256-E0ia/I7e40lDG24qYUCOwWNKSZ9/VmI5/4BsIKmE61I="; meta = { description = "TUI hexeditor in Rust with colored bytes"; diff --git a/pkgs/by-name/hi/highlight-assertions/package.nix b/pkgs/by-name/hi/highlight-assertions/package.nix index 4f03a55c63a6..50d48e31db33 100644 --- a/pkgs/by-name/hi/highlight-assertions/package.nix +++ b/pkgs/by-name/hi/highlight-assertions/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-egrxcnDVKKgk1sL5WNMIR2FPwQbjjMy20VWizcTBEtM="; # requires nightly features - env.RUSTC_BOOTSTRAP = 1; + RUSTC_BOOTSTRAP = 1; meta = { description = "Tool for unit testing tree sitter highlights for nvim-treesitter"; diff --git a/pkgs/by-name/hm/hmcl/package.nix b/pkgs/by-name/hm/hmcl/package.nix index 2c705e4b9a0c..9df6e3918a47 100644 --- a/pkgs/by-name/hm/hmcl/package.nix +++ b/pkgs/by-name/hm/hmcl/package.nix @@ -39,13 +39,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hmcl"; - version = "3.8.2"; + version = "3.9.1"; src = fetchurl { # HMCL has built-in keys, such as the Microsoft OAuth secret and the CurseForge API key. # See https://github.com/HMCL-dev/HMCL/blob/refs/tags/release-3.6.12/.github/workflows/gradle.yml#L26-L28 url = "https://github.com/HMCL-dev/HMCL/releases/download/v${finalAttrs.version}/HMCL-${finalAttrs.version}.jar"; - hash = "sha256-0vAgyN8PC2AQbor9aVqr/K1oBLt4QGpEQ2vSL2ajQOg="; + hash = "sha256-UcycobEFbiSys19a3C01CqLKTM1SdAwHDNExRNVv6ug="; }; # - HMCL prompts users to download prebuilt Terracotta binary for @@ -200,6 +200,7 @@ stdenv.mkDerivation (finalAttrs: { ''; maintainers = with lib.maintainers; [ daru-san + Misaka13514 moraxyc ]; inherit (hmclJdk.meta) platforms; diff --git a/pkgs/by-name/ho/holo-cli/package.nix b/pkgs/by-name/ho/holo-cli/package.nix index e3efcf600528..44dc53470480 100644 --- a/pkgs/by-name/ho/holo-cli/package.nix +++ b/pkgs/by-name/ho/holo-cli/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: { passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; # Use rust nightly features - env.RUSTC_BOOTSTRAP = 1; + RUSTC_BOOTSTRAP = 1; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/ho/holo-daemon/package.nix b/pkgs/by-name/ho/holo-daemon/package.nix index 10b86b93b7a1..c71f737c54f8 100644 --- a/pkgs/by-name/ho/holo-daemon/package.nix +++ b/pkgs/by-name/ho/holo-daemon/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-YZ2c6W6CCqgyN+6i7Vh5fWLKw8L4pUqvq/tDO/Q/kf0="; # Use rust nightly features - env.RUSTC_BOOTSTRAP = 1; + RUSTC_BOOTSTRAP = 1; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix index 4a43f8dcaf03..6a2356b951d2 100644 --- a/pkgs/by-name/hy/hyprland/package.nix +++ b/pkgs/by-name/hy/hyprland/package.nix @@ -194,7 +194,7 @@ customStdenv.mkDerivation (finalAttrs: { "NO_XWAYLAND" = !enableXWayland; "NO_SYSTEMD" = !withSystemd; "CMAKE_DISABLE_PRECOMPILE_HEADERS" = true; - "NO_UWSM" = true; + "NO_UWSM" = !withSystemd; "NO_HYPRPM" = true; "TRACY_ENABLE" = false; }; diff --git a/pkgs/by-name/hy/hyprshell/package.nix b/pkgs/by-name/hy/hyprshell/package.nix index 2fcc086414cc..278a70d789d9 100644 --- a/pkgs/by-name/hy/hyprshell/package.nix +++ b/pkgs/by-name/hy/hyprshell/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "hyprshell"; - version = "4.8.3"; + version = "4.9.2"; src = fetchFromGitHub { owner = "H3rmt"; repo = "hyprshell"; tag = "v${finalAttrs.version}"; - hash = "sha256-MO3v5YTVRGp0k0WNZSmal2e9Un9EBCsKwl3NL5PyJUI="; + hash = "sha256-1nt+/cAtIsS/3O790W2aMUuPiMV6JEjC334Sw0SD804="; }; - cargoHash = "sha256-4XlyVuePqB9hBNNOjnipA2FVJJwP/7dJR594o8u1rNQ="; + cargoHash = "sha256-WnmK7eUjXqNUWXeaXqloYeRSp/uvg8QoYbcotm5uEt4="; nativeBuildInputs = [ wrapGAppsHook4 diff --git a/pkgs/by-name/in/insync/package.nix b/pkgs/by-name/in/insync/package.nix index 1cdc8816d1ea..b9257b1a572b 100644 --- a/pkgs/by-name/in/insync/package.nix +++ b/pkgs/by-name/in/insync/package.nix @@ -74,6 +74,9 @@ buildFHSEnv { pkgs: with pkgs; [ libudev0-shim insync-pkg + # Qt requires usr/share/icons/hicolor/index.theme file (provided by hicolor-icon-theme) to be + # present to successfully find the system tray icons. + hicolor-icon-theme ]; extraInstallCommands = '' @@ -117,10 +120,6 @@ buildFHSEnv { and built in sharing. There is a 15-day free trial, and it is a paid application after that. - - Known bug(s): - - 1) Currently the system try icon does not render correctly. ''; mainProgram = "insync"; }; diff --git a/pkgs/by-name/io/iosevka-bin/package.nix b/pkgs/by-name/io/iosevka-bin/package.nix index 820236c45d48..b209f8275ce4 100644 --- a/pkgs/by-name/io/iosevka-bin/package.nix +++ b/pkgs/by-name/io/iosevka-bin/package.nix @@ -17,7 +17,7 @@ let in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "33.3.6"; + version = "34.0.0"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip"; diff --git a/pkgs/by-name/io/iosevka-bin/variants.nix b/pkgs/by-name/io/iosevka-bin/variants.nix index a0a8bc02d8e4..87ce658cd745 100644 --- a/pkgs/by-name/io/iosevka-bin/variants.nix +++ b/pkgs/by-name/io/iosevka-bin/variants.nix @@ -1,93 +1,93 @@ # This file was autogenerated. DO NOT EDIT! { - Iosevka = "1q4247pmw0j2nnanr38g5fzpz090n35cc3lbnh43s2pygdyhj6hf"; - IosevkaAile = "19hmq5s15jmym1zv72aixky35gjn2md8zk9f5phbfvijypl3npbn"; - IosevkaCurly = "09g5mg7mckw6wqinyvd9q946cgljqynvfkgxrn0qbisgp9byw8dc"; - IosevkaCurlySlab = "0ysafys9fsp1v0rvvy4hg6q30211linsl5nkizifjiw76k0r661d"; - IosevkaEtoile = "0ympybrr103jpgqmmlsr9wnz7f1fl6avm2jn0jrqycaiwcxci3nf"; - IosevkaSlab = "16gsb5lyrzjkq3bnm9dv7kzrlnxa4sf7n3qyv4wvk9djvdw007d2"; - IosevkaSS01 = "05mnmkizl1fs2s9hb4lvk278rjjbdyhmnn27a0r9ygbc4c56bw8l"; - IosevkaSS02 = "108hnpv1sg46f2rmyjd0pdm284wryq2phkbbcyq8mj1gpah64aqx"; - IosevkaSS03 = "17iqyvd2gihnwzclimvc4r5jqbwkzhcbv9qj3s23f050rbk5h678"; - IosevkaSS04 = "05j7vgsy2bwxv305njgy2w101gjv6y21rn7vbdfywzla7a57wrqm"; - IosevkaSS05 = "1nvkwmvrxdjnj1ix44f69k2slxd9j6dgl0m25jhwlr1qcyl4dlrh"; - IosevkaSS06 = "0szbiiiyp20avrxkmm7qxsqjwsfvl4nl5wb4dvk3fcx1hgp138a3"; - IosevkaSS07 = "0ssnnsd272wac96k298gz64lx42jqzbswq3qlg8qn8b3fglc7rqm"; - IosevkaSS08 = "1fgab0vzhnxninsgw6ih7fwqsy5nkwigix33lxi9ynvmss4vndg5"; - IosevkaSS09 = "1znkr9vg1q8afmsi6yq8szzlb7sp98iq5myp9b7rbgii9798p6wk"; - IosevkaSS10 = "0k3v14a26ia2nzzm5dladqx1aqrc5j97ay75c6v4z6jmjhhmc0p2"; - IosevkaSS11 = "0jvp9hkfgyqkv1fvfl43rxmphy251b3s5av6yldcz9vvca0hxz13"; - IosevkaSS12 = "1vvhk5mwamdrpaxqj4d65s8kvc87lzwygzq6kaayzr9alj6wwkcw"; - IosevkaSS13 = "1f55lg9c89zpac9zksbvpl9zsqcim50jm2wd9x6zvryfr4kf5xyx"; - IosevkaSS14 = "04qxl0lyzrf7slaiby8asqn7nwbp9h22kycpv6pxjniy8149vzs2"; - IosevkaSS15 = "09r5z7xhlcw5cm5q0xrxwy8z6r443ny7bld6kav3y5rq4qf280s5"; - IosevkaSS16 = "10i6ydf9jc1lqkic2vmv4m89ixqh96l8gp487spq36ish4yj8zc9"; - IosevkaSS17 = "0yx7jb5ycr5cg2rka30j00cadr75am6ir8n6k7sphh2ncyf7wr8i"; - IosevkaSS18 = "1d744fkdfp6hjid1ykj3bz8w0r4yycfz5qsqvb4fmw8qlnw45rri"; - SGr-Iosevka = "13kbcgcfd13vsbrm1zkvbrv3r1cg565kc1iijvqgvsgxswzc1004"; - SGr-IosevkaCurly = "05aidqs63m120h4sganzic8668d98jjmwy4cbbgd1zl8nwr2p1sf"; - SGr-IosevkaCurlySlab = "05mhzm9rbigqfvvf8gv61a0zig3nq0llmj01qj335wjhnrgk52ny"; - SGr-IosevkaFixed = "106fvdpyxvgaiflg5awp2d7llc79zf2amvxlam5hhcwfw20dji1w"; - SGr-IosevkaFixedCurly = "1dbpd569rr84r1dn1qvwsixha5qkh3i2ccpnv8q5vg79157nx976"; - SGr-IosevkaFixedCurlySlab = "1fcw0mgscs5xnwbzl7r9rfi4z9jazrlz8s5p1xa58zb0p8srqkz3"; - SGr-IosevkaFixedSlab = "1xj1h6gq53zld04zx26lf84fnkmyw0gm98jw0msq2md6q682ad4j"; - SGr-IosevkaFixedSS01 = "014yxma4s7xjz1vagb4bzkcvhpv4j7djpd7m108hmi7kviv51mnh"; - SGr-IosevkaFixedSS02 = "0j0lr0a60yq00fj5n6ylfqccbdnsrrpqaxhhvsknhbrg7fnmbxas"; - SGr-IosevkaFixedSS03 = "1z2aw34vy8dxh2n6p63wsk4k63a9hismrbqafqfzxqxrbkn6q6lb"; - SGr-IosevkaFixedSS04 = "0gklzxliydmvd1vx6ncvwr2zl83flhivy1qa795zhqjas11zdr1z"; - SGr-IosevkaFixedSS05 = "05n5ww1f82q7ri9irxn5dfh9njr8drvai2xqb743fgmp2wgl42pk"; - SGr-IosevkaFixedSS06 = "0gzbxm1qfs3mch61xc3rk7rls266l1321x8wnfm9zlwr49km3416"; - SGr-IosevkaFixedSS07 = "02wdr1k7vknjwih886fyhzcvs985n140lgscdql9vflpfriln74g"; - SGr-IosevkaFixedSS08 = "1h8s62k03l3y0fbzs4il6xissvggr685r6y88nira2698akhwiqm"; - SGr-IosevkaFixedSS09 = "12cg9zv6z6cisz9j7brwqjypmair3ri3jdwvhis357nfzaf2r8qz"; - SGr-IosevkaFixedSS10 = "1i4k663ab6v61mh4sap5l8bnkjmq1scnybdhfzy0g9wcgx31cnmm"; - SGr-IosevkaFixedSS11 = "06h0fm5dh05j1zwv8gicnls1f31f1l7kd57k7z2v415aszygslb2"; - SGr-IosevkaFixedSS12 = "0hds5l8a83v8z2nn7q4br7xp256n5vi7k88s9czy7drfw803nzaq"; - SGr-IosevkaFixedSS13 = "0fad7498bd28dy74rrckxa9s4impkfs30p7r2am9rxvxqqbq1836"; - SGr-IosevkaFixedSS14 = "0n0q0zgdx2kcv225yicfr7p324g0gnb954b7kjr4rr85kkag9vg8"; - SGr-IosevkaFixedSS15 = "0n8qasgn45jyr29nya9c3v0xssnwg5xqmin6z8kc0d70x1r3fd4f"; - SGr-IosevkaFixedSS16 = "0gymxyb8ycfzxzr8r0lgl3bh4f7yj1xbsah60q17zn6n2r594wrw"; - SGr-IosevkaFixedSS17 = "0j5sr6b0g5ja1pcqwfjk4lw631l3hg3dvb4fgxbbzw6ijf7lmmz5"; - SGr-IosevkaFixedSS18 = "078ar89mi5y3x7rfa7p1fiwp1xjl3iq41h83m4vb06yw7nvm8rim"; - SGr-IosevkaSlab = "1lfrqs2dwncfhjapk0c15pxzy2pk07qndff66qkrkcsnayawz89z"; - SGr-IosevkaSS01 = "0f0vknrkbnfp3s3v31pjfa3h8cnpqf0ps53lsiyifl43v4x56mnl"; - SGr-IosevkaSS02 = "0iywxly03ayjvg7baxnac4fpbagdvhj3svir09hzycvp25r6ilxa"; - SGr-IosevkaSS03 = "1wqa3gqknjj5kdpkh4zx5cm9kvvf98jidb917lm1wl2mk2h04s21"; - SGr-IosevkaSS04 = "1z2372d1wdi70pi71wlbf4phh08s7vc8fxqnq175m0b09lb942fi"; - SGr-IosevkaSS05 = "0za4z2gsknynh2gmaf58wpf3aqacswn2r1d5w9hynrzb76188vyx"; - SGr-IosevkaSS06 = "1fqq0b6rpgn1r1cqqd9zjifqx4kk7j89z78hxdlv2hlakq43499j"; - SGr-IosevkaSS07 = "1dh0rjhxwpy2yg2s7fbnvyczncgv3ij60c3gaa6mfcansbzk92gi"; - SGr-IosevkaSS08 = "0bwc6pqmmgacx534vdj16547r94s24bwkflg1b2pp0c620fw3bbl"; - SGr-IosevkaSS09 = "1wn0zlwypdrzy2impb31n1z4f8crz8zr2hhd2r6cilxz8hwfsbwv"; - SGr-IosevkaSS10 = "1x91rl36caipz7adw1rwnp0q62h0hh3di52kyj98lhp2km8p9zkf"; - SGr-IosevkaSS11 = "1b8y1hj3zmyyas58d51whxb622abjx3r48zhnnhi7m39w8n57qyv"; - SGr-IosevkaSS12 = "0gr0vxxg5draiamkhr776jg678b0b5h3pphnf8aqan38md01d1fg"; - SGr-IosevkaSS13 = "16w97f386kbb5s28w8wyr2zlljs0ixsrw4l579vhxbh67krw35g7"; - SGr-IosevkaSS14 = "1l4fpj7hrk0j5sqys7dwy6lz7yj6y7fzvi53sf6ix861lg8g00jw"; - SGr-IosevkaSS15 = "006zzfm5kfg6gxs7zhasyxfgg67d447d727cb5wb76ylpvry6ij7"; - SGr-IosevkaSS16 = "1qgzwpqyknqq7b5y00g09jfb0n3dca1wrypv3r91cxcj7vn0gf2f"; - SGr-IosevkaSS17 = "0y3p7rq42cna3sifj3f3rl89scaca6m73wig4lqzbzkaxmpr89dx"; - SGr-IosevkaSS18 = "142lzhswh4wz6wij958d7i4dh87xkw71245nyviy51pmjiw4scg9"; - SGr-IosevkaTerm = "1wpqhd93gsp0byi2sfgcsmlplcj372bx93xk8ip4vswhjw8cfkg4"; - SGr-IosevkaTermCurly = "1haads1szkmffpar41hkhcss75i6v4wn2z17iddbk51yf7wrs5kb"; - SGr-IosevkaTermCurlySlab = "0x75lj8qpikv0h7hmz7vi10s5by06fivhlafiynz6kw9pn4vijqx"; - SGr-IosevkaTermSlab = "1i2165jyhbgm8j7wlvfm9khl8ffrb12480n3bha30yw0iairn37a"; - SGr-IosevkaTermSS01 = "0zvng9icc44mwnhvqrawl55i096w50qr63yv6z0h4vzkrdc4n5dq"; - SGr-IosevkaTermSS02 = "1axgnmbn5vx2lgdk8zkg4aqbbb35ygjhkj0pwbdzif9ws8m1hmd6"; - SGr-IosevkaTermSS03 = "1g4gnysdb1mzbb61232qqphlx771nsyhkhxvwwaqar6387jzj1gi"; - SGr-IosevkaTermSS04 = "1bgs9428f70q63sg0dx50hdvn84mgkiixb2fp81rvgfngcl6lxla"; - SGr-IosevkaTermSS05 = "1kxmlv5g9wc3yx7hnbjdp0s9jk2ph750iwsc3954nla9ggxga36d"; - SGr-IosevkaTermSS06 = "12lph9h8jajsg8w072wwx79hx4wgljxq32py98clkn2dfb5z0vbr"; - SGr-IosevkaTermSS07 = "1gjlch3rv7r16myzy0cbmpr89n8k3n61g8kkipj9gq2y0ycb1p4c"; - SGr-IosevkaTermSS08 = "10f9wrpiygnbdzgw4l3pfcbnnmqmadbq0lw5hlb4shkcdn87nks0"; - SGr-IosevkaTermSS09 = "0x30s607w4caacsbl766bja6wqffy5mlyaf6rc6hzfy73wm4y6r5"; - SGr-IosevkaTermSS10 = "0q3l2k6xfmqq8fq1vylk7g9r4r3873d3qmf04c146q0j6vksl9v4"; - SGr-IosevkaTermSS11 = "0sswj6by9hxa8plnqs9lbg169xdplljphxzwnzk3pq59ac6jw1gh"; - SGr-IosevkaTermSS12 = "11fdb0ajb3jg8cvp7myasicrfixcrvfjkbrpfh21lpdr8ybnx9hi"; - SGr-IosevkaTermSS13 = "0db4mc4kammjqahqwvq6h0gcrcksbc7g4n8gghgl1kyr4x6a8c22"; - SGr-IosevkaTermSS14 = "095wpa96mw12s0jhw33j8iii7gghagynqg95rwijgywjb7wx7shn"; - SGr-IosevkaTermSS15 = "1g2ifnf2ac3r759appyw6vigf933kzk1znprq2s1r17hz10ccz5q"; - SGr-IosevkaTermSS16 = "1fan9xfd3jl726vzq18l51vjb0rq6gxappqi2wd4505vrl4pw5f4"; - SGr-IosevkaTermSS17 = "1vn9clpsrxx0a3cl41lcndb3c8lp31hbgryklf72yl4cgcq40irn"; - SGr-IosevkaTermSS18 = "07avylpy1hx62gxy1gmgx9lknhfmv0b6084zhqkw1axv0d9mrfy3"; + Iosevka = "049xg34s93adwnrj2ilwzprx19v1x76cwn1nj4fl6rhq188lxy5l"; + IosevkaAile = "0nx0i65fvsh4nhal2wkc7q97vr9bndnmdzn3kh2fyfyly9g35gwp"; + IosevkaCurly = "0b51fp7brgy0jy8md5zaryd2fj6lb1bnz1yrs5pbp65sqga1myvx"; + IosevkaCurlySlab = "12xn0639bxpc2zf64ygxli9j98q4nwsnfz75mpma5qd8viq8vr3k"; + IosevkaEtoile = "04clc64sqsqsm5bj5g3rabz1i3hhhi2lqm3ch43z2l9zb8jbn1bz"; + IosevkaSlab = "103b9zl481p3dy3d59sy0wn788hk72vlmvym3dfcdphclj6m2q2a"; + IosevkaSS01 = "00zvzi9s34xdy6q7lgh3g5qnrsprjqc71p773x82qzigzmr2x9ac"; + IosevkaSS02 = "1wnqpkl0jyd9hyy0ghizjhnw4rn84xzlj6dng438k9hbvjv4m81l"; + IosevkaSS03 = "1z250kgfslddc2k1nx03kan8i9ddngwskff0bsyaqwyxsbgvpkpv"; + IosevkaSS04 = "07b7g4bz4nvqhmklpn55rarzk0zyg6bwla88amkg9v6y86rs36d5"; + IosevkaSS05 = "0x4himbsrjw3c9c00ayqrb5dsyv56dh652ddagmx8ayx1dly78zs"; + IosevkaSS06 = "0nh9nf40ac1jw1wc2bpmw1dv7v9klbrjikhjrgjh4pa8ix63y93n"; + IosevkaSS07 = "17g7synzlkhq9kv8j0j5zg29v735ysfkik2nwcxs6jr3mq8b6c91"; + IosevkaSS08 = "1han2rn8x196v716zs78nz3nm9mlpdanx4ji6fnavlli7mrqqrr4"; + IosevkaSS09 = "16nlyw2z20jxs6cmi57vaswmjxd2fipbdva21dl9aq42q3f01v4y"; + IosevkaSS10 = "134fyhyi8hqjp72p4v734g0cbpb4wc49x8qvnw2lyv1c3zs806xh"; + IosevkaSS11 = "02yc1mmsrigp41l9d8pcksc2fmxrv3byyvafidialrwy134sp10n"; + IosevkaSS12 = "08f9754fai7xvyfyjxa010m7p3qg4cmbj6nbz1ij2r27clz3drpw"; + IosevkaSS13 = "16dmz5mj6l98ni8py3cj6ic5hvh7nhnlkyi7y9990zclr6jm75yc"; + IosevkaSS14 = "138i59bspwmf1lbpvzvbi5l1qaiqyh0gl7xrlv03vrn25bc2rlki"; + IosevkaSS15 = "1kwk5lr3r1rc45l05drgw0zkv3nsyn7yjphyrb61w3hiw8jvdrf3"; + IosevkaSS16 = "1acmn8danv4gmspj6ghfxrqdlnwdibf8b62zbgslb3zg2q4cxs46"; + IosevkaSS17 = "16pm15m0hklb75wf6kf3wr7dw9wsalsxlwrcwba0bpbcn3qd80ay"; + IosevkaSS18 = "1jlfxh6av584ng1szzqk47g7k4ii745s06i69scp4adag7n50gls"; + SGr-Iosevka = "0ak5vq49cc1lvj6kwz70yg0g82pvp5xzhn1g945hr04q3bg6k7kz"; + SGr-IosevkaCurly = "1ryh7v1aqvqj658q537hlkaglhb5xfqkskyp4sa2mmvv3hm9b0ch"; + SGr-IosevkaCurlySlab = "047vksiiw3vz37yn5y7a0c07ii5q9v8apbsqcx82cqjlgdy3yrfp"; + SGr-IosevkaFixed = "0f9zvwcxn652fsjynhvm8wpdiz8iz5h2iclzvgrgw74mb95rcpw6"; + SGr-IosevkaFixedCurly = "0llbli2mcadyjsgma4fg7m9sp8m4rknm4pfx4j8jls216c4hvkmq"; + SGr-IosevkaFixedCurlySlab = "1q3mwp7d1s8nc26p5lb6swv5qrjv4arcm5pisxxkgx8pgw35xmkb"; + SGr-IosevkaFixedSlab = "1xxphzvhhxnj612nxhin0kchxjqf4i3mm4nnaw0rrnwnmfk9kxd0"; + SGr-IosevkaFixedSS01 = "17ncsp460qsbwnvmcmbij1xw9cid978kmnks55fqjm7awqpylqak"; + SGr-IosevkaFixedSS02 = "076ai8i8a8m5akrra0czn9d7b8lc6wb3mlyxnzpfjblzdmzv2ca6"; + SGr-IosevkaFixedSS03 = "00jznjxv9gvzcgim21h67iszlcm9hhk5aig5nbbn38jnwcdpdmiw"; + SGr-IosevkaFixedSS04 = "1lahi2nip6qnrxpd8r5jjimlczcabk5hxzcb84h2aw3466ka84c1"; + SGr-IosevkaFixedSS05 = "0lhml3fzzhfzhs9nyk05aa4q075r69bvrqw3n3p0889j9zhp032h"; + SGr-IosevkaFixedSS06 = "12b50b4r3ipgx2wli3qn4gcpy23bhvmgibbcbyi80l3khrd1n72a"; + SGr-IosevkaFixedSS07 = "166vcyj3svawm3lmsdbs9mn50f1shn347jvwapr0q29pjkqf6wmw"; + SGr-IosevkaFixedSS08 = "0iml98i1bjxkhx7jw5wsc3r47qv3lzxy45p6ysvrldqp9rn6cyl9"; + SGr-IosevkaFixedSS09 = "0wr1s4qrnmi8ywch05m5x2bx22c4z2qywjcx2hy9sganhcpywdi8"; + SGr-IosevkaFixedSS10 = "0if1rlrb1lgxxyvl56f4lw8bfxp3178a0qiw9vsqlxrr23l697nr"; + SGr-IosevkaFixedSS11 = "1w1lsb0kmdn777xc38h2d6riwjiyhq5fml2zj4zv2vakjd7fsvzk"; + SGr-IosevkaFixedSS12 = "01krwyq4cfxwhji304k4ihm5q8ankiwi6fajmyc1x3xxxnqx7x57"; + SGr-IosevkaFixedSS13 = "1g4va6k35z732xm6q8pmjmif9fbddlcj6i3znypnqy1c9aklbdkc"; + SGr-IosevkaFixedSS14 = "1p10v2gwxiwim49xws9pnr9l286pl7l7syxc5hpy4xwsalb74mjl"; + SGr-IosevkaFixedSS15 = "1mci65bn9b70y7rzbabdgr0rchrjq1qrk6cvj740w6rym66v96pc"; + SGr-IosevkaFixedSS16 = "1cpclj67qbggai3cqp575b2q2dn0m0zp9w8mjgnm317q5kfhxlyp"; + SGr-IosevkaFixedSS17 = "130a2y4jkcnrgm71nn03060dx5017vjpsw9jwz97wff0akffdbbx"; + SGr-IosevkaFixedSS18 = "1s8p1cm8shjzklkfkzj2v9xhl7y33ckwq231kcawmam9njy8dazs"; + SGr-IosevkaSlab = "1i9b0rqxnivfd5vw425r7jpmfck7rk96kzj8shzms8jlxp7s83hj"; + SGr-IosevkaSS01 = "1qvshwpcrbiap0fmbmc4fgl08jfwrx6japkb56ps0bp8hcl4fbq4"; + SGr-IosevkaSS02 = "09z8qmq8g6dp6z82l6ax12xyz0fmblz2kwmkck82m9fd5x1y15hk"; + SGr-IosevkaSS03 = "1x141y7dgd6h0mpl6vlqkgzbva0pw31fjzdhakk9gnlkg7mqrrq4"; + SGr-IosevkaSS04 = "1jgxziyjsvvjr058plqwqmk0v9p25s3djqmh3b304q8pzwh8n5nv"; + SGr-IosevkaSS05 = "0gkiq20zbiqhv0dn34giv3ynnvmdry1spgfanjjqpc464lp9vnf7"; + SGr-IosevkaSS06 = "1lafg32clw1hl3nb46ypd0w43nz0gfcyg359pyplahfqil4k0y07"; + SGr-IosevkaSS07 = "1cwkvmmb4w9if4iha2yrnl636c8nmsb43a0r1qmmi7hrljnwqv66"; + SGr-IosevkaSS08 = "10zai3iw7bm9c848amkxf1p5bcd9bwb5pyvhlrld8x97hx86ah38"; + SGr-IosevkaSS09 = "01nr0lgg0hbr9j7xk4f73xwjjh8rwq5cpgrrbm7ix3n9zvwcppzl"; + SGr-IosevkaSS10 = "1akp2nndwkx0jfayq79yz3lpyf6d5qi5f5j2njpz0blmf9bxk513"; + SGr-IosevkaSS11 = "0f1z8qix2nd8xqknlm0962v1aylwd8aavsm9g8qhixjcp0zycb56"; + SGr-IosevkaSS12 = "02jcyagl2w0ky94fnm5g55r09fjzi6ny9a9ndh31dw4y1df0rq56"; + SGr-IosevkaSS13 = "152xkjjpp687523v93z62whj767jdmrq1103k49jdz0jsx719qs8"; + SGr-IosevkaSS14 = "0bjmyrwizasvj12wxmh4s2xz8fvjyrfxqlrrmjfcx2m7xl5fnpw8"; + SGr-IosevkaSS15 = "0v1yn16gwmkpabj4282db3vq9ww85p1n68gvr1fhvq9np5p51dbs"; + SGr-IosevkaSS16 = "0j7czrj6na618hdvgzk0pgf3wd19rr0d5pxp0a2mm08n4ba54zdx"; + SGr-IosevkaSS17 = "0fwjlsl5fmadqgim0pk3qz97wwf4mdds5vvw8p0j6gx131m0ghbx"; + SGr-IosevkaSS18 = "1588l6d7gdhbg8b3halbllfbr2ysz0nrxs7cbdj2fakvf4vbkwcn"; + SGr-IosevkaTerm = "07m9zsjpr1q8lbswakllwy9fxwfwy8j346ymqfcj9s2qdm0wliz2"; + SGr-IosevkaTermCurly = "1wcdjbdrlkjhapqz5r5v24dj5319nxib4gmgwqyp13wvl4s7w12r"; + SGr-IosevkaTermCurlySlab = "1y5j4a0mhdr02d5rnpfpjc11nmblgwl1sfm0kgqy9ching5a6wmg"; + SGr-IosevkaTermSlab = "0ydpajym193aisgqd31ibqal7f5d6klxbz36ifyvp1bi5xs1k4m3"; + SGr-IosevkaTermSS01 = "0f38yascmkla7dfn9sswczab707whamnj4nh83svwhdcn12zv24s"; + SGr-IosevkaTermSS02 = "1jj02783rfd7pyxypya8kqcs37q5vh6w7cxhx7dzsgf97rk73gxl"; + SGr-IosevkaTermSS03 = "0g8ki2gn56jx93y2m5np6g3gmvbgd2a2znf1pbf7zxpapqsr6d1f"; + SGr-IosevkaTermSS04 = "1v8zc59sbkqjf32cpw078ym2i429bqjrsylj8rnw7g1lfjgjzwk9"; + SGr-IosevkaTermSS05 = "04rdk0vajpyrpqlgb7y5ayvkiy7h65m53dk1m3mxnr6m6kix3ql4"; + SGr-IosevkaTermSS06 = "1rsk13m3w51nqpzvqzl8q056407kc8bg8minb2i4rrr41jaxkjp8"; + SGr-IosevkaTermSS07 = "0zbf4vgigz5hjv357zh460zarnrbmjy7z751vdn2l2nx5lrf3rln"; + SGr-IosevkaTermSS08 = "1x216ky05xmk28ydncbbgspbdzbdv0mglsz4v257lgqm36rkqm1s"; + SGr-IosevkaTermSS09 = "084chb52qrlv9jg1pxhvy5h31jpifqnls2ljg5hqpjj0b7c281rg"; + SGr-IosevkaTermSS10 = "1gvzd4wca9jv60m9rwnca3s7fka0zc917wsncn24ykp4rfiq5gw5"; + SGr-IosevkaTermSS11 = "11hr5dg08bp7ffcvn3cxz4c0flphbipbx1hagfqrmxl7q7bws7z6"; + SGr-IosevkaTermSS12 = "1687hy6bvgc0i3s4xfvg2cxvxywx2pszg811cn6r5prirf7w084f"; + SGr-IosevkaTermSS13 = "1gf28sgaswl2p7m4nvasp2i41k43bz6p7x09p5pja37jwfydvcpw"; + SGr-IosevkaTermSS14 = "0krgh1wq0n5z1gag90f4jfkah6a0qlwfbyggfbl4m4j9ha3ij3ya"; + SGr-IosevkaTermSS15 = "0sxsb4svrkbj9y18jby1z5ykh91dpkqkkifmm9sslzkw6if6dl1x"; + SGr-IosevkaTermSS16 = "06gv6xyh1ji54sqx6km43gfhprqzz11cmpnayszqflhcfc6ggkgy"; + SGr-IosevkaTermSS17 = "1daqp42rdw2qkc0vdncg99l62iamn03iyawwdmjpnqx8mhy0yvda"; + SGr-IosevkaTermSS18 = "02nnd8fjc5h0a3qs3gi3g5ffrgkvrhwv5ww5xnmnjp1ps8am680f"; } diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix index 9f2c4d36febb..efc1a874b18e 100644 --- a/pkgs/by-name/ju/jujutsu/package.nix +++ b/pkgs/by-name/ju/jujutsu/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "jujutsu"; - version = "0.36.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "jj-vcs"; repo = "jj"; tag = "v${finalAttrs.version}"; - hash = "sha256-HGMzNXm6vWKf/RHPwB/soDqxAvCOW1J6BPs0tsrEuTI="; + hash = "sha256-KN8hukahS+/RowmQoaUrfxCKFT9YUhaIXzh84cBV1Ck="; }; - cargoHash = "sha256-jai0FNuCUcgN+ZmmYgbFrMK1Z1vcv21wALkEb74h7H0="; + cargoHash = "sha256-rk3Qft9g67rG0m6rPd4d++wDM5RiRrJAIHdUOQhn9bg="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ki/kime/package.nix b/pkgs/by-name/ki/kime/package.nix index 2fe8019f549f..e426b3f45bec 100644 --- a/pkgs/by-name/ki/kime/package.nix +++ b/pkgs/by-name/ki/kime/package.nix @@ -128,9 +128,11 @@ stdenv.mkDerivation (finalAttrs: { cargo ]; - RUST_BACKTRACE = 1; - # https://github.com/Riey/kime/issues/688 - RUSTFLAGS = "-Clink-args=-L./target/release"; + env = { + RUST_BACKTRACE = 1; + # https://github.com/Riey/kime/issues/688 + RUSTFLAGS = "-Clink-args=-L./target/release"; + }; meta = { homepage = "https://github.com/Riey/kime"; diff --git a/pkgs/by-name/ki/kind2/package.nix b/pkgs/by-name/ki/kind2/package.nix index c571fd6d0058..34ae627b4597 100644 --- a/pkgs/by-name/ki/kind2/package.nix +++ b/pkgs/by-name/ki/kind2/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { ''; # requires nightly features - env.RUSTC_BOOTSTRAP = true; + RUSTC_BOOTSTRAP = true; meta = { description = "Functional programming language and proof assistant"; diff --git a/pkgs/by-name/ko/kord/package.nix b/pkgs/by-name/ko/kord/package.nix index 682215044f71..ad3862b6f54f 100644 --- a/pkgs/by-name/ko/kord/package.nix +++ b/pkgs/by-name/ko/kord/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { version = "0.6.1"; # kord depends on nightly features - env.RUSTC_BOOTSTRAP = 1; + RUSTC_BOOTSTRAP = 1; src = fetchFromGitHub { owner = "twitchax"; diff --git a/pkgs/by-name/kr/kratos/package.nix b/pkgs/by-name/kr/kratos/package.nix index 9da5b1e6e129..c4c5f3f19456 100644 --- a/pkgs/by-name/kr/kratos/package.nix +++ b/pkgs/by-name/kr/kratos/package.nix @@ -6,7 +6,7 @@ }: let pname = "kratos"; - version = "1.3.1"; + version = "25.4.0"; in buildGoModule { inherit pname version; @@ -15,10 +15,10 @@ buildGoModule { owner = "ory"; repo = "kratos"; rev = "v${version}"; - hash = "sha256-FJrBwjWBYwoiy8rWXn+jaVc1b35So1Rb9SjkUlNwAqE="; + hash = "sha256-f/K86B5h7xM7Zsbr5w2rZgsyNlCSemrBkqtMRQq/Xws="; }; - vendorHash = "sha256-zZwunp/433oIYI5ZA3Pznq9jfvIZE5ZUJKxboVef8g0="; + vendorHash = "sha256-ayL3V8TQ+9Tk2Wkhvn+Tft9AqxiFegznKXD0eBkFbhs="; subPackages = [ "." ]; diff --git a/pkgs/by-name/ku/kubetui/package.nix b/pkgs/by-name/ku/kubetui/package.nix index b38b10f58d1d..f871c763ca8a 100644 --- a/pkgs/by-name/ku/kubetui/package.nix +++ b/pkgs/by-name/ku/kubetui/package.nix @@ -6,20 +6,20 @@ rustPlatform.buildRustPackage rec { pname = "kubetui"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "sarub0b0"; repo = "kubetui"; tag = "v${version}"; - hash = "sha256-e2YjtshgBRx9rf0Z7VUXa767UMyWc8OnIV1yjYC0erw="; + hash = "sha256-KhO9MY1TIf27Wh10OhUsaxgFghSTwO8yJ/n9/a0cqzE="; }; checkFlags = [ "--skip=workers::kube::store::tests::kubeconfigからstateを生成" ]; - cargoHash = "sha256-0D7AfhmImaNUnpN6sEY4T0io4EMXP0HPwgh30VDRQm0="; + cargoHash = "sha256-BwKAyDtvxzpAce2m4DGBVMhJCcSTnxfBoN0IJH0rRnM="; meta = { homepage = "https://github.com/sarub0b0/kubetui"; diff --git a/pkgs/by-name/la/lact/package.nix b/pkgs/by-name/la/lact/package.nix index ef9cf6a8192e..a15cec0beec7 100644 --- a/pkgs/by-name/la/lact/package.nix +++ b/pkgs/by-name/la/lact/package.nix @@ -53,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; # we do this here so that the binary is usable during integration tests - RUSTFLAGS = lib.optionalString stdenv.targetPlatform.isElf ( + env.RUSTFLAGS = lib.optionalString stdenv.targetPlatform.isElf ( lib.concatStringsSep " " [ "-C link-arg=-Wl,-rpath,${ lib.makeLibraryPath [ diff --git a/pkgs/by-name/la/lazyworktree/package.nix b/pkgs/by-name/la/lazyworktree/package.nix new file mode 100644 index 000000000000..4c5440c44371 --- /dev/null +++ b/pkgs/by-name/la/lazyworktree/package.nix @@ -0,0 +1,55 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, + versionCheckHook, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "lazyworktree"; + version = "1.20.0"; + + src = fetchFromGitHub { + owner = "chmouel"; + repo = "lazyworktree"; + tag = "v${finalAttrs.version}"; + hash = "sha256-V+FViC68RCoVhIQdFX46er3t27colvyY3iyiKIiMEm8="; + }; + + vendorHash = "sha256-0O8i84mzAYq/VUWn0vbHf218hwXRMAvlfKnBUYXo8Ck="; + + nativeBuildInputs = [ installShellFiles ]; + + # Tests require git and are integration tests + doCheck = false; + + ldflags = [ + "-s" + "-w" + "-X main.version=${finalAttrs.version}" + ]; + + postInstall = '' + install -Dm444 shell/functions.shell -t $out/share/lazyworktree + installManPage lazyworktree.1 + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "BubbleTea-based Terminal User Interface for efficient Git worktree management"; + homepage = "https://github.com/chmouel/lazyworktree"; + changelog = "https://github.com/chmouel/lazyworktree/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + chmouel + vdemeester + ]; + mainProgram = "lazyworktree"; + }; +}) diff --git a/pkgs/by-name/li/libation/package.nix b/pkgs/by-name/li/libation/package.nix index 42efcdb236aa..05fc502a2be5 100644 --- a/pkgs/by-name/li/libation/package.nix +++ b/pkgs/by-name/li/libation/package.nix @@ -13,13 +13,13 @@ buildDotnetModule rec { pname = "libation"; - version = "13.0.0"; + version = "13.1.1"; src = fetchFromGitHub { owner = "rmcrackan"; repo = "Libation"; tag = "v${version}"; - hash = "sha256-13hPTIbEloFiJMTT6J1CRf8s0xLnqkVe5lOGNEYenzs="; + hash = "sha256-c/K8jAWwul0FQGYxEbuhQnqXe5+R57TzOXwWUv68M1Q="; }; sourceRoot = "${src.name}/Source"; diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix index 527d13cb3f23..94a89b8dbf1b 100644 --- a/pkgs/by-name/li/libdeltachat/package.nix +++ b/pkgs/by-name/li/libdeltachat/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "2.35.0"; + version = "2.36.0"; src = fetchFromGitHub { owner = "chatmail"; repo = "core"; tag = "v${version}"; - hash = "sha256-tcH9F+FKXfFozk6PcbEE37HFIojhDR672bfcPXfKnCs="; + hash = "sha256-w9OxYrKqJJRfxCi4EjmRhqRv+7WPgQwag5CE1qNYeYU="; }; patches = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoVendor { pname = "chatmail-core"; inherit version src; - hash = "sha256-p1E7K1EiEftpNSyE41LpMYmkZwjeasZzrXbYxKK/IgI="; + hash = "sha256-o1CtEgjuy+wVbtfCEd3401pt5oBdDoR4xlroi1Q9WQ0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libgedit-gtksourceview/package.nix b/pkgs/by-name/li/libgedit-gtksourceview/package.nix index 209b388b471b..c1b7dfed6832 100644 --- a/pkgs/by-name/li/libgedit-gtksourceview/package.nix +++ b/pkgs/by-name/li/libgedit-gtksourceview/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libgedit-gtksourceview"; - version = "299.5.0"; + version = "299.6.0"; outputs = [ "out" @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "gedit"; repo = "libgedit-gtksourceview"; rev = finalAttrs.version; - hash = "sha256-3HnlYLa1Zy1GRpX5fjEoXUzfB9X6nydpVjZTzJyhvIs="; + hash = "sha256-PBayAXttEFB1nHXOFTHvc4/vSL8+VZjuuwyeMKHKd9I="; }; patches = [ diff --git a/pkgs/by-name/li/libgedit-tepl/package.nix b/pkgs/by-name/li/libgedit-tepl/package.nix index fa70f86bd385..aaf520fb4722 100644 --- a/pkgs/by-name/li/libgedit-tepl/package.nix +++ b/pkgs/by-name/li/libgedit-tepl/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "libgedit-tepl"; - version = "6.13.0"; + version = "6.14.0"; outputs = [ "out" @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "gedit"; repo = "libgedit-tepl"; tag = version; - hash = "sha256-YWONsw5+gq5Uew6xB76pKsGTJmI83zAssO5WX6aP7ZM="; + hash = "sha256-KtmExJCEfa4c6alrtWOLNSKZUs65tZ7p9zcT9f8ZC+k="; }; strictDeps = true; diff --git a/pkgs/by-name/li/libmspub/package.nix b/pkgs/by-name/li/libmspub/package.nix index 803be7ab7e32..5b7f35bb7755 100644 --- a/pkgs/by-name/li/libmspub/package.nix +++ b/pkgs/by-name/li/libmspub/package.nix @@ -33,9 +33,13 @@ stdenv.mkDerivation (finalAttrs: { patches = [ (fetchpatch { - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libmspub/-/raw/main/buildfix.diff?ref_type=heads"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libmspub/-/raw/8721a52e09e14f905311abd3d5f2ad9bb3fe78a2/buildfix.diff"; hash = "sha256-evxEoQ0a6YHoymR+SEJwqfr7rkWp3JnsWOD1tfYfZOw="; }) + (fetchpatch { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libmspub/-/raw/9d565015753364fa458da19e5dd4ce8224cf9246/includes.patch"; + hash = "sha256-oHXEWSOSod9VnOrFtdMQcHYm7EdKkG+S7Q9rfM0DaTg="; + }) ]; meta = { diff --git a/pkgs/by-name/li/libowfat/package.nix b/pkgs/by-name/li/libowfat/package.nix index 29095b5d71fa..25bc4faf71be 100644 --- a/pkgs/by-name/li/libowfat/package.nix +++ b/pkgs/by-name/li/libowfat/package.nix @@ -32,6 +32,8 @@ stdenv.mkDerivation rec { ]; enableParallelBuilding = true; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=incompatible-pointer-types" ]; + meta = { description = "GPL reimplementation of libdjb"; homepage = "https://www.fefe.de/libowfat/"; diff --git a/pkgs/by-name/li/libuninameslist/package.nix b/pkgs/by-name/li/libuninameslist/package.nix index 838080311ec6..f29e99aa2b79 100644 --- a/pkgs/by-name/li/libuninameslist/package.nix +++ b/pkgs/by-name/li/libuninameslist/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "libuninameslist"; - version = "20250909"; + version = "20260107"; src = fetchFromGitHub { owner = "fontforge"; repo = "libuninameslist"; rev = version; - hash = "sha256-jLl9UY24wIBkMxr/zq/yXRcKgwlHFG8zmoyo3YKqq9A="; + hash = "sha256-o+moQBFXIhnqvAc9F08kLRiXVS5pJEuUJwWl4Y/8AS4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ma/mainsail/package.nix b/pkgs/by-name/ma/mainsail/package.nix index 36a2ace37bb2..020d336e30de 100644 --- a/pkgs/by-name/ma/mainsail/package.nix +++ b/pkgs/by-name/ma/mainsail/package.nix @@ -2,6 +2,7 @@ lib, buildNpmPackage, fetchFromGitHub, + nodejs_20, }: buildNpmPackage rec { @@ -17,6 +18,8 @@ buildNpmPackage rec { npmDepsHash = "sha256-8rUhDo1l0oLENWwy56UzwlSGIBJtTPsH6w5OX8tnp6U="; + nodejs = nodejs_20; + # Prevent Cypress binary download. CYPRESS_INSTALL_BINARY = 0; diff --git a/pkgs/by-name/ma/mapnik/package.nix b/pkgs/by-name/ma/mapnik/package.nix index 7a7e025388b2..55a8ffaa4275 100644 --- a/pkgs/by-name/ma/mapnik/package.nix +++ b/pkgs/by-name/ma/mapnik/package.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mapnik"; - version = "4.1.4"; + version = "4.2.0"; src = fetchFromGitHub { owner = "mapnik"; repo = "mapnik"; tag = "v${finalAttrs.version}"; - hash = "sha256-WwxQNMTDaImlDqBYo4p1aNvIzAc3egza6LkXH7gEqOA="; + hash = "sha256-hlPH0gvEURidPeEnDgpDfp89haMSBoZahoW/xNNZ5XA="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/md/mdbook-d2/package.nix b/pkgs/by-name/md/mdbook-d2/package.nix index 84fb25a73510..dfc187079ec1 100644 --- a/pkgs/by-name/md/mdbook-d2/package.nix +++ b/pkgs/by-name/md/mdbook-d2/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-d2"; - version = "0.3.6"; + version = "0.3.8"; src = fetchFromGitHub { owner = "danieleades"; repo = "mdbook-d2"; rev = "v${version}"; - hash = "sha256-2mpGufQvnIForU0X96Mi65r2xQ+bIj9MdJugMXVPcnM="; + hash = "sha256-+pwPJjjXNre5PduNT8oowP1K4CIT8egA5RxBpp2FmVs="; }; - cargoHash = "sha256-K4vovc78MiLkWMVS4YDuSK9L7EmwpGdZXdRqeELcPT8="; + cargoHash = "sha256-uEHg404q3mYqQVYBds9oExXe+xxzrfM9duvQ8BzCXUc="; doCheck = false; meta = { diff --git a/pkgs/by-name/mi/miniflux/package.nix b/pkgs/by-name/mi/miniflux/package.nix index 7b81e7baeebc..c4170aab833c 100644 --- a/pkgs/by-name/mi/miniflux/package.nix +++ b/pkgs/by-name/mi/miniflux/package.nix @@ -23,10 +23,7 @@ buildGoModule (finalAttrs: { nativeBuildInputs = [ installShellFiles ]; # skip tests that require network access - checkFlags = [ - "-skip=TestClient" - "-skip=TestResolvesToPrivateIP" - ]; + checkFlags = [ "-skip=TestResolvesToPrivateIP" ]; ldflags = [ "-s" diff --git a/pkgs/by-name/mi/mint-themes/package.nix b/pkgs/by-name/mi/mint-themes/package.nix index e709803f2b56..2b9edb598cee 100644 --- a/pkgs/by-name/mi/mint-themes/package.nix +++ b/pkgs/by-name/mi/mint-themes/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-themes"; - version = "2.3.6"; + version = "2.3.7"; src = fetchFromGitHub { owner = "linuxmint"; repo = "mint-themes"; rev = version; - hash = "sha256-LM5ZAstFr1fU7RhDEnuJKS1+5gOnL6bUJ+u9EFy6+NI="; + hash = "sha256-7/4mDcQ3B7keX9CusQUOOOYSrzxEKRcakA37VOU0+gE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mi/miro/package.nix b/pkgs/by-name/mi/miro/package.nix index 69877851fcd2..d8242fb5b98a 100644 --- a/pkgs/by-name/mi/miro/package.nix +++ b/pkgs/by-name/mi/miro/package.nix @@ -36,13 +36,15 @@ rustPlatform.buildRustPackage (finalAttrs: { libglvnd ]; - RUSTFLAGS = map (a: "-C link-arg=${a}") [ - "-Wl,--push-state,--no-as-needed" - "-lEGL" - "-lwayland-client" - "-lxkbcommon" - "-Wl,--pop-state" - ]; + env.RUSTFLAGS = toString ( + map (a: "-C link-arg=${a}") [ + "-Wl,--push-state,--no-as-needed" + "-lEGL" + "-lwayland-client" + "-lxkbcommon" + "-Wl,--pop-state" + ] + ); doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/mi/mise/package.nix b/pkgs/by-name/mi/mise/package.nix index cd55c93b63fa..e206610d2580 100644 --- a/pkgs/by-name/mi/mise/package.nix +++ b/pkgs/by-name/mi/mise/package.nix @@ -22,16 +22,16 @@ rustPlatform.buildRustPackage rec { pname = "mise"; - version = "2025.12.12"; + version = "2026.1.0"; src = fetchFromGitHub { owner = "jdx"; repo = "mise"; rev = "v${version}"; - hash = "sha256-Grba4mV+eB3+P8v6SgLSwfoRP6TZhiPodZ85uH8yDvQ="; + hash = "sha256-AxNVHWqvLePR4SeVuzUZxLoR0ZGo97I3SJzGOCchjeU="; }; - cargoHash = "sha256-ogSgNuxFN4GjN7JUaXwDu2/gtnqyyxJbVax205g0gZA="; + cargoHash = "sha256-Z8qZEmtFUeT4c78gIWxanVRJEjArLD65j3eaO7fjfz0="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/mi/mitra/package.nix b/pkgs/by-name/mi/mitra/package.nix index f9a516901f83..3653115f75af 100644 --- a/pkgs/by-name/mi/mitra/package.nix +++ b/pkgs/by-name/mi/mitra/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { # require running database doCheck = false; - RUSTFLAGS = [ + env.RUSTFLAGS = toString [ # MEMO: mitra use ammonia crate with unstable rustc flag "--cfg=ammonia_unstable" ]; diff --git a/pkgs/by-name/ms/msedit/package.nix b/pkgs/by-name/ms/msedit/package.nix index 3319b3e30d9a..8b9a2ed13745 100644 --- a/pkgs/by-name/ms/msedit/package.nix +++ b/pkgs/by-name/ms/msedit/package.nix @@ -19,18 +19,14 @@ rustPlatform.buildRustPackage (finalAttrs: { }; cargoHash = "sha256-U8U70nzTmpY6r8J661EJ4CGjx6vWrGovu5m25dvz5sY="; - # Requires nightly features - env = { - RUSTC_BOOTSTRAP = 1; - # Without -headerpad, the following error occurs on x86_64-darwin - # error: install_name_tool: changing install names or rpaths can't be redone for: ... because larger updated load commands do not fit (the program must be relinked, and you may need to use -headerpad or -headerpad_max_install_names) - NIX_LDFLAGS = toString ( - lib.optionals (with stdenv.hostPlatform; isDarwin && isx86_64) [ - "-headerpad_max_install_names" - ] - ); - }; + env.RUSTC_BOOTSTRAP = 1; + + # Without -headerpad, the following error occurs on x86_64-darwin + # error: install_name_tool: changing install names or rpaths can't be redone for: ... because larger updated load commands do not fit (the program must be relinked, and you may need to use -headerpad or -headerpad_max_install_names) + NIX_LDFLAGS = lib.optionals (with stdenv.hostPlatform; isDarwin && isx86_64) [ + "-headerpad_max_install_names" + ]; buildInputs = [ icu diff --git a/pkgs/by-name/ms/mstflint/package.nix b/pkgs/by-name/ms/mstflint/package.nix index 1683fb968e3a..90af450d776c 100644 --- a/pkgs/by-name/ms/mstflint/package.nix +++ b/pkgs/by-name/ms/mstflint/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, rdma-core, openssl, zlib, @@ -24,15 +24,15 @@ enableDPA ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mstflint"; + version = "4.34.1-2"; - # if you update the version of this package, also update the input hash in mstflint_access! - version = "4.34.0-1"; - - src = fetchurl { - url = "https://github.com/Mellanox/mstflint/releases/download/v${version}/mstflint-${version}.tar.gz"; - hash = "sha256-MOFfbrjwnWXVskFCF2pgjf1Z8nkZV0l+CLfGWzxmmIg="; + src = fetchFromGitHub { + owner = "Mellanox"; + repo = finalAttrs.pname; + tag = "v${finalAttrs.version}"; + hash = "sha256-jYZoP0tJG3HmLojJAWSgMFqlyP9hX8v1R0HL1lwR4Eg="; }; nativeBuildInputs = [ @@ -130,4 +130,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ thillux ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/n9/n98-magerun2/package.nix b/pkgs/by-name/n9/n98-magerun2/package.nix index fbd8d183047c..429947719dc6 100644 --- a/pkgs/by-name/n9/n98-magerun2/package.nix +++ b/pkgs/by-name/n9/n98-magerun2/package.nix @@ -7,16 +7,16 @@ php83.buildComposerProject2 (finalAttrs: { pname = "n98-magerun2"; - version = "9.1.0"; + version = "9.2.1"; src = fetchFromGitHub { owner = "netz98"; repo = "n98-magerun2"; tag = finalAttrs.version; - hash = "sha256-kjT72pLKuN166Edm8+8vUIfhFdMnZkeTagl0ECL20b8="; + hash = "sha256-00VbleO94noopyqy9XOyHTi5M2ECEhWaT/byXgNEed0="; }; - vendorHash = "sha256-wqaePPMC1OiXwtdhMJzg4AvcYDmJg2Uo2LV7TbZ00ec="; + vendorHash = "sha256-g9O83bq3OoXM3kP2qmvuYaXywfkDc/GQxjkLBU9XmOc="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/na/nas/package.nix b/pkgs/by-name/na/nas/package.nix index ff2ce23c8bc0..779bd289595b 100644 --- a/pkgs/by-name/na/nas/package.nix +++ b/pkgs/by-name/na/nas/package.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation (finalAttrs: { ]; env.NIX_CFLAGS_COMPILE = toString [ + "-std=c17" "-Wno-error=implicit-function-declaration" "-Wno-error=implicit-int" "-Wno-error=incompatible-pointer-types" diff --git a/pkgs/by-name/nb/nbytes/package.nix b/pkgs/by-name/nb/nbytes/package.nix new file mode 100644 index 000000000000..5cb94ca957e8 --- /dev/null +++ b/pkgs/by-name/nb/nbytes/package.nix @@ -0,0 +1,64 @@ +{ + lib, + cmake, + fetchFromGitHub, + fetchpatch2, + gtest, + nix-update-script, + stdenv, + testers, + validatePkgConfig, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "nbytes"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "nodejs"; + repo = "nbytes"; + tag = "v${finalAttrs.version}"; + hash = "sha256-lsd1Qrv1HEz/5ry10s7Pq7unoh3y9ZmwCaT+6nTlxkc="; + }; + + patches = [ + # Use `gtest` from Nixpkgs to allow an offline build + ./use-nix-googletest.patch + # Add support for pkgconfig for use as a shared lib + # TODO: remove when included in the next release + (fetchpatch2 { + url = "https://github.com/nodejs/nbytes/commit/00f48a0620cef800054d4aab061f09d89990a1b9.patch?full_index=1"; + hash = "sha256-uOPEI70Dq446K56BSFHVyxDHNaYY5OASu3QeWGCLQmI="; + }) + ]; + + outputs = [ + "out" + ]; + + nativeBuildInputs = [ + cmake + validatePkgConfig + ]; + buildInputs = [ + gtest + ]; + + passthru = { + updateScript = nix-update-script { }; + + tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + }; + + meta = { + description = "Library of byte handling functions extracted from Node.js core"; + homepage = "https://github.com/nodejs/nbytes"; + changelog = "https://github.com/nodejs/nbytes/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ aduh95 ]; + platforms = lib.platforms.all; + pkgConfigModules = [ "nbytes" ]; + }; +}) diff --git a/pkgs/by-name/nb/nbytes/use-nix-googletest.patch b/pkgs/by-name/nb/nbytes/use-nix-googletest.patch new file mode 100644 index 000000000000..859aa81603bd --- /dev/null +++ b/pkgs/by-name/nb/nbytes/use-nix-googletest.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f2efa3c..3f363dd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -11,15 +11,9 @@ endif() + option(NBYTES_DEVELOPMENT_CHECKS "Enable development checks" OFF) + + include(GNUInstallDirs) +-include(FetchContent) + +-FetchContent_Declare( +- googletest +- URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip +-) +-# For Windows: Prevent overriding the parent project's compiler/linker settings +-set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) +-FetchContent_MakeAvailable(googletest) ++# Use find_package to use the gtest package provided by Nix ++find_package(GTest REQUIRED) + + add_subdirectory(src) + enable_testing() diff --git a/pkgs/by-name/nc/ncps/package.nix b/pkgs/by-name/nc/ncps/package.nix index 3822e983512d..c9d4d47349c3 100644 --- a/pkgs/by-name/nc/ncps/package.nix +++ b/pkgs/by-name/nc/ncps/package.nix @@ -3,117 +3,52 @@ curl, dbmate, fetchFromGitHub, + jq, lib, + makeWrapper, + mariadb, minio, minio-client, + postgresql, python3, + redis, + writeShellScriptBin, }: let - - # Start MinIO before running tests to enable S3 integration tests - minioPreCheck = '' - echo "🚀 Starting MinIO for S3 integration tests..." - - # Create temporary directories for MinIO data and config - export MINIO_DATA_DIR=$(mktemp -d) - export HOME=$(mktemp -d) - - # Configure MinIO credentials (must be set before starting MinIO) - export MINIO_ROOT_USER=admin - export MINIO_ROOT_PASSWORD=password - export MINIO_REGION=us-east-1 - - # Generate random free ports using python - # We bind to port 0, get the assigned port, and close the socket immediately. - # In a Nix sandbox, the race condition risk (port being stolen between check and use) is negligible. - export MINIO_PORT=$(python3 -c 'import socket; s=socket.socket(); s.bind(("", 0)); print(s.getsockname()[1]); s.close()') - export CONSOLE_PORT=$(python3 -c 'import socket; s=socket.socket(); s.bind(("", 0)); print(s.getsockname()[1]); s.close()') - - # Export S3 test environment variables - export NCPS_TEST_S3_BUCKET="test-bucket" - export NCPS_TEST_S3_ENDPOINT="http://127.0.0.1:$MINIO_PORT" - export NCPS_TEST_S3_REGION="us-east-1" - export NCPS_TEST_S3_ACCESS_KEY_ID="test-access-key" - export NCPS_TEST_S3_SECRET_ACCESS_KEY="test-secret-key" - - # Start MinIO server in background - minio server "$MINIO_DATA_DIR" \ - --address "127.0.0.1:$MINIO_PORT" \ - --console-address "127.0.0.1:$CONSOLE_PORT" & - export MINIO_PID=$! - - # Wait for MinIO to be ready - echo "⏳ Waiting for MinIO to be ready..." - for i in {1..30}; do - if curl -sf "$NCPS_TEST_S3_ENDPOINT/minio/health/live"; then - echo "✅ MinIO is ready" - break - fi - if [ $i -eq 30 ]; then - echo "❌ MinIO failed to start" - kill $MINIO_PID 2>/dev/null || true - exit 1 - fi - sleep 1 - done - - # Setup admin alias - mc alias set local "$NCPS_TEST_S3_ENDPOINT" "$MINIO_ROOT_USER" "$MINIO_ROOT_PASSWORD" - - # Create test bucket - mc mb "local/$NCPS_TEST_S3_BUCKET" || true - - # Create service account for tests - mc admin user svcacct add \ - --access-key "$NCPS_TEST_S3_ACCESS_KEY_ID" \ - --secret-key "$NCPS_TEST_S3_SECRET_ACCESS_KEY" \ - local admin || true - - echo "✅ MinIO configured for S3 integration tests" + dbmate-real = writeShellScriptBin "dbmate.real" '' + exec ${dbmate}/bin/dbmate "$@" ''; - # Stop MinIO after tests complete - minioPostCheck = '' - echo "🛑 Stopping MinIO..." - if [ -n "$MINIO_PID" ]; then - kill $MINIO_PID 2>/dev/null || true - # Wait for MinIO to fully shut down - for i in {1..30}; do - if ! kill -0 $MINIO_PID 2>/dev/null; then - break - fi - sleep 0.5 - done + dbmate-wrapper = buildGoModule { + pname = "ncps-dbmate-wrapper"; + inherit (finalAttrs) version; - # If it's still alive, force kill it - if kill -0 $MINIO_PID 2>/dev/null; then - echo "MinIO did not shut down gracefully, force killing..." - kill -9 $MINIO_PID 2>/dev/null || true - sleep 1 # Give a moment for the OS to clean up after SIGKILL - fi - fi - sleep 1 - rm -rf "$MINIO_DATA_DIR" 2>/dev/null || true - echo "✅ MinIO stopped and cleaned up" - ''; + src = "${finalAttrs.src}/nix/dbmate-wrapper/src"; + + vendorHash = null; + + subPackages = [ "." ]; + }; finalAttrs = { pname = "ncps"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "kalbasit"; repo = "ncps"; tag = "v${finalAttrs.version}"; - hash = "sha256-uGghoADkD2eJYZwt8QSiVzw68dRDLI+OxMa1VAQhBKQ="; + hash = "sha256-/Fa8cpBACbbB74W1HSQmsS06BLofnH094be6I2peX0U="; }; ldflags = [ "-X github.com/kalbasit/ncps/cmd.Version=v${finalAttrs.version}" ]; - vendorHash = "sha256-3YPKlz7+x7nYCqKmOroaiUyZGKIQMGFxcNyPnrA9Tio="; + vendorHash = "sha256-GuUhJ0Zf2Zjfgstxcy6/DAs0Eq7PU4aiiJMSNcNqsqI="; + + subPackages = [ "." ]; doCheck = true; checkFlags = [ "-race" ]; @@ -121,25 +56,41 @@ let nativeBuildInputs = [ curl # used for checking MinIO health check dbmate # used for testing + jq # used for testing by the init-minio + mariadb # MySQL/MariaDB for integration tests minio # S3-compatible storage for integration tests minio-client # mc CLI for MinIO setup + postgresql # PostgreSQL for integration tests python3 # used for generating the ports + redis # Redis for distributed locking integration tests + makeWrapper # For wrapping dbmate. ]; # pre and post checks preCheck = '' # Set up cleanup trap to ensure background processes are killed even if tests fail cleanup() { - ${minioPostCheck} + source $src/nix/packages/ncps/post-check-minio.sh + source $src/nix/packages/ncps/post-check-mysql.sh + source $src/nix/packages/ncps/post-check-postgres.sh + source $src/nix/packages/ncps/post-check-redis.sh } trap cleanup EXIT - ${minioPreCheck} + source $src/nix/packages/ncps/pre-check-minio.sh + source $src/nix/packages/ncps/pre-check-mysql.sh + source $src/nix/packages/ncps/pre-check-postgres.sh + source $src/nix/packages/ncps/pre-check-redis.sh ''; postInstall = '' mkdir -p $out/share/ncps cp -r db $out/share/ncps/db + + makeWrapper ${dbmate-wrapper}/bin/dbmate-wrapper \ + $out/bin/dbmate-ncps \ + --prefix PATH : ${dbmate-real}/bin \ + --set NCPS_DB_MIGRATIONS_DIR $out/share/ncps/db/migrations ''; meta = { diff --git a/pkgs/by-name/ne/netsniff-ng/package.nix b/pkgs/by-name/ne/netsniff-ng/package.nix index 118b70c858e2..94109f2d976d 100644 --- a/pkgs/by-name/ne/netsniff-ng/package.nix +++ b/pkgs/by-name/ne/netsniff-ng/package.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + fetchpatch, makeWrapper, bison, flex, @@ -30,6 +31,14 @@ stdenv.mkDerivation rec { hash = "sha256-P1xZqhZ/HJV3fAvh4xhhApZ0+FLDFqvYrZlbvb+FV7I="; }; + patches = [ + # GCC 15 compatibility + (fetchpatch { + url = "https://github.com/netsniff-ng/netsniff-ng/commit/1af7ae33e3e8178ab5c649c3a52838d4375c4228.patch"; + sha256 = "sha256-aNV1Srnr396HsyAKVQoCeGBo/oduxLrUidlZLuI5Rlk="; + }) + ]; + nativeBuildInputs = [ bison flex diff --git a/pkgs/by-name/ni/nix-ld/package.nix b/pkgs/by-name/ni/nix-ld/package.nix index 8290aaa03212..3c69baf06241 100644 --- a/pkgs/by-name/ni/nix-ld/package.nix +++ b/pkgs/by-name/ni/nix-ld/package.nix @@ -21,10 +21,8 @@ rustPlatform.buildRustPackage rec { hardeningDisable = [ "stackprotector" ]; - env = { - NIX_SYSTEM = stdenv.system; - RUSTC_BOOTSTRAP = "1"; - }; + NIX_SYSTEM = stdenv.system; + RUSTC_BOOTSTRAP = "1"; preCheck = '' export NIX_LD=${stdenv.cc.bintools.dynamicLinker} diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py index cf3f1eefc891..f30ccf90d1ea 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py @@ -37,6 +37,8 @@ SWITCH_TO_CONFIGURATION_CMD_PREFIX: Final = [ "LOCALE_ARCHIVE", "-E", "NIXOS_INSTALL_BOOTLOADER", + "-E", + "NIXOS_NO_CHECK", "--collect", "--no-ask-password", "--pipe", diff --git a/pkgs/by-name/no/noriskclient-launcher-unwrapped/disable-bundling.patch b/pkgs/by-name/no/noriskclient-launcher-unwrapped/disable-bundling.patch index 8666b86ddfef..0058be312b92 100644 --- a/pkgs/by-name/no/noriskclient-launcher-unwrapped/disable-bundling.patch +++ b/pkgs/by-name/no/noriskclient-launcher-unwrapped/disable-bundling.patch @@ -1,17 +1,17 @@ diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json -index bb58d13..c1046f8 100644 +index 5f41e46..12d859e 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json -@@ -100,7 +100,7 @@ +@@ -109,7 +109,7 @@ } } }, - "active": true, + "active": false, - "targets": ["app", "dmg", "deb", "appimage", "nsis"], - "icon": [ - "icons/32x32.png", -@@ -109,7 +109,7 @@ + "targets": [ + "app", + "dmg", +@@ -124,7 +124,7 @@ "icons/icon.icns", "icons/icon.ico" ], @@ -19,4 +19,4 @@ index bb58d13..c1046f8 100644 + "createUpdaterArtifacts": false, "fileAssociations": [ { - "ext": ["noriskpack"], + "ext": [ diff --git a/pkgs/by-name/no/noriskclient-launcher-unwrapped/package.nix b/pkgs/by-name/no/noriskclient-launcher-unwrapped/package.nix index b4b8adfbea7c..28e138fb7fa0 100644 --- a/pkgs/by-name/no/noriskclient-launcher-unwrapped/package.nix +++ b/pkgs/by-name/no/noriskclient-launcher-unwrapped/package.nix @@ -18,18 +18,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "noriskclient-launcher-unwrapped"; - version = "0.6.14"; + version = "0.6.16"; src = fetchFromGitHub { owner = "NoRiskClient"; repo = "noriskclient-launcher"; tag = "v${finalAttrs.version}"; - hash = "sha256-9UUNIS8r/695maQ2j2+Wj2L5qy55Wfs/MNhKJnwC6GI="; + hash = "sha256-xYbQC7KLYKB2nU+bTl8jMMkfSuq7p8RNr8nJyLEQb1c="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-IWgP4VEyEBNsxALKGMpk8WZCIc76qcEu5K+kYqsdYkQ="; + hash = "sha256-tRvtYeOUn3xm7dhLWnzlpS8SK8NVVQAtNgvyiM48X28="; }; patches = [ @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" ''; - cargoHash = "sha256-heSUEW7r9Lt26Fu68Jo/7BHW6Qmp8GrRSavukCS+ySk="; + cargoHash = "sha256-mldZg4Y12o6Laf2RJSeLzKCcqBpFesUbHhmxRjT9MDI="; cargoRoot = "src-tauri"; buildAndTestSubdir = finalAttrs.cargoRoot; diff --git a/pkgs/by-name/ns/nss_pam_ldapd/fix-bool-c23-keyword.patch b/pkgs/by-name/ns/nss_pam_ldapd/fix-bool-c23-keyword.patch new file mode 100644 index 000000000000..9a461f098fbe --- /dev/null +++ b/pkgs/by-name/ns/nss_pam_ldapd/fix-bool-c23-keyword.patch @@ -0,0 +1,31 @@ +From 8ddb983a546f632986a84a784c4625110f7782a2 Mon Sep 17 00:00:00 2001 +From: Arthur de Jong +Date: Sun, 23 Feb 2025 15:22:38 +0100 +Subject: Fix variable name (bool) which is a keyword in C23 + +Closes https://bugs.debian.org/1097481 +--- + nslcd/cfg.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/nslcd/cfg.c b/nslcd/cfg.c +index ded797a..b984b0e 100644 +--- a/nslcd/cfg.c ++++ b/nslcd/cfg.c +@@ -207,10 +207,10 @@ static int get_boolean(const char *filename, int lnr, + return parse_boolean(filename, lnr, token); + } + +-static const char *print_boolean(int bool) ++static const char *print_boolean(int value) + { +- if (bool) return "yes"; +- else return "no"; ++ if (value) return "yes"; ++ else return "no"; + } + + #define TIME_MINUTES 60 +-- +cgit v1.2.3 + diff --git a/pkgs/by-name/ns/nss_pam_ldapd/package.nix b/pkgs/by-name/ns/nss_pam_ldapd/package.nix index d00e085ebfb4..1ec8d96f46e3 100644 --- a/pkgs/by-name/ns/nss_pam_ldapd/package.nix +++ b/pkgs/by-name/ns/nss_pam_ldapd/package.nix @@ -19,6 +19,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-4BeE4Xy1M7tmvQYB4gXnhSY0RcPC33pvkCMqtBMccW0="; }; + patches = [ + # Fix C23 compatibility: rename 'bool' variable which is now a keyword + ./fix-bool-c23-keyword.patch + ]; + nativeBuildInputs = [ pkg-config makeWrapper diff --git a/pkgs/by-name/nu/nut/package.nix b/pkgs/by-name/nu/nut/package.nix index fc42f5adcafd..f9f7441c6331 100644 --- a/pkgs/by-name/nu/nut/package.nix +++ b/pkgs/by-name/nu/nut/package.nix @@ -49,11 +49,11 @@ in stdenv.mkDerivation rec { pname = "nut"; - version = "2.8.3"; + version = "2.8.4"; src = fetchurl { url = "https://networkupstools.org/source/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-1soX8LOQA7rHZJ6xerSnE+TV/KqP0a7cooNX1Z3wle0="; + sha256 = "sha256-ATC6gup58Euk80xSSahZQ5d+/ZhO199q7BpRjVo1lPg="; }; patches = [ @@ -98,9 +98,11 @@ stdenv.mkDerivation rec { doInstallCheck = true; configureFlags = [ + "--enable-docs-changelog=no" # TODO: add required build deps "--with-all" "--with-ssl" "--without-powerman" # Until we have it ... + "--with-pynut=app" # avoid attempts to install python modules to python store path "--with-systemdsystempresetdir=$(out)/lib/systemd/system-preset" "--with-systemdsystemunitdir=$(out)/lib/systemd/system" "--with-systemdshutdowndir=$(out)/lib/systemd/system-shutdown" diff --git a/pkgs/by-name/nw/nwg-hello/package.nix b/pkgs/by-name/nw/nwg-hello/package.nix index 604bae286b6b..8169e526c741 100644 --- a/pkgs/by-name/nw/nwg-hello/package.nix +++ b/pkgs/by-name/nw/nwg-hello/package.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "nwg-hello"; - version = "0.4.1"; + version = "0.4.2"; pyproject = true; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-hello"; tag = "v${version}"; - hash = "sha256-h/2e2pQw4ID17kT36AMzFe/FX6pYxxOxqkmHVHS5R1E="; + hash = "sha256-SLz9qnk8JESTj1EeTJiQboDylEHC6r5KbvDhZ4zgiAo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ob/oboete/package.nix b/pkgs/by-name/ob/oboete/package.nix index e5af2e599cb2..27198218a00a 100644 --- a/pkgs/by-name/ob/oboete/package.nix +++ b/pkgs/by-name/ob/oboete/package.nix @@ -3,7 +3,6 @@ stdenv, rustPlatform, fetchFromGitHub, - fetchpatch2, just, libcosmicAppHook, sqlite, @@ -12,25 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "oboete"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "mariinkys"; repo = "oboete"; tag = finalAttrs.version; - hash = "sha256-yCIZl51Etv/vXJsIMTvUDPhCnkIuenvHjcP0KZXdAiE="; + hash = "sha256-MBWqAQekGdJHQhyObjnR8AUV+yjM++R11ALpE5BuUHc="; }; - cargoHash = "sha256-BWGUzGGm1u64bQLy1rg9+WYNlgeuxcHlKsdIb18yVZA="; - - # TODO: Remove in the next update - patches = [ - (fetchpatch2 { - name = "fix-oboete-justfile.patch"; - url = "https://patch-diff.githubusercontent.com/raw/mariinkys/oboete/pull/25.diff?full_index=1"; - hash = "sha256-GPrtL73EKQi5fIIWPYcuS3HRwJ4ZHFsHzRYN6pYuUVg="; - }) - ]; + cargoHash = "sha256-deQeX1hVwJvzwCmtACiugEpRbzVP4Z2OBi2y2PPLVCM="; nativeBuildInputs = [ libcosmicAppHook diff --git a/pkgs/by-name/ok/okteto/package.nix b/pkgs/by-name/ok/okteto/package.nix index d587cd4e95e4..218b86d0d04e 100644 --- a/pkgs/by-name/ok/okteto/package.nix +++ b/pkgs/by-name/ok/okteto/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "okteto"; - version = "3.14.0"; + version = "3.15.0"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; tag = finalAttrs.version; - hash = "sha256-uxM4ejuzFNkD6a7PNKCsO9Gwft7nd99t9IhVPCTApoE="; + hash = "sha256-EXkHA8/YIhEmxMezLzXC1dpaBSMKywaN7XnCOqhNPLs="; }; - vendorHash = "sha256-JBMpNxfobrdLZYsVs7mhjyrPfuDUfTsAiU4chfw2gog="; + vendorHash = "sha256-OMrQf8TRH/zd+OmA6TQBs/dHrUujoifSz1ex/oqAVsA="; postPatch = '' # Disable some tests that need file system & network access. diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index 7d91031028ed..0a856eb9c0d8 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -14,12 +14,12 @@ }: let pname = "opencode"; - version = "1.1.3"; + version = "1.1.6"; src = fetchFromGitHub { owner = "anomalyco"; repo = "opencode"; tag = "v${version}"; - hash = "sha256-uNeje6WZ/FJVOtxdTdWXbWhPl7BwMws+7/Iz2Hz/stw="; + hash = "sha256-CXABHBk+stVF57+5oGkuMRFJpwA6qb7AMpkFVWfs38c="; }; node_modules = stdenvNoCC.mkDerivation { @@ -71,7 +71,7 @@ let # NOTE: Required else we get errors that our fixed-output derivation references store paths dontFixup = true; - outputHash = "sha256-LJ7xgKQP0ows76P8QVflS6SGGowVBYVvarkmCVkfe60="; + outputHash = "sha256-tea/pSuUOELsSSMdwi0mmG5GsFZpqR5MlyQvVUno7dM="; outputHashAlgo = "sha256"; outputHashMode = "recursive"; }; diff --git a/pkgs/by-name/op/openobserve/package.nix b/pkgs/by-name/op/openobserve/package.nix index 0da357e2fbef..fdc0ce6ac3ce 100644 --- a/pkgs/by-name/op/openobserve/package.nix +++ b/pkgs/by-name/op/openobserve/package.nix @@ -1,7 +1,9 @@ { lib, + stdenv, rustPlatform, fetchFromGitHub, + fetchurl, pkg-config, protobuf, bzip2, @@ -14,109 +16,134 @@ gitUpdater, }: -let - version = "0.15.3"; - src = fetchFromGitHub { - owner = "openobserve"; - repo = "openobserve"; - tag = "v${version}"; - hash = "sha256-GHyfIVUSX7evP3LaHZClD1RjZ6somYcMNBFdkaZL7lg="; - }; - web = buildNpmPackage { - inherit src version; - pname = "openobserve-ui"; +rustPlatform.buildRustPackage ( + finalAttrs: + let + web = buildNpmPackage { + inherit (finalAttrs) src version; + pname = "openobserve-ui"; - sourceRoot = "${src.name}/web"; + sourceRoot = "${finalAttrs.src.name}/web"; - npmDepsHash = "sha256-5bXEC48m3FbtmLwVYYvEdMV3qWA7KNEKVxkMZ94qEpA="; + npmDepsHash = "sha256-ED3plf8Miw5+cbCOo+R1rbRxBju/MZvR0U9JA+NLr2k="; - preBuild = '' - # Patch vite config to not open the browser to visualize plugin composition - substituteInPlace vite.config.ts \ - --replace "open: true" "open: false"; - ''; + preBuild = '' + # Patch vite config to not open the browser to visualize plugin composition + substituteInPlace vite.config.ts \ + --replace "open: true" "open: false"; + ''; - env = { - NODE_OPTIONS = "--max-old-space-size=8192"; - # cypress tries to download binaries otherwise - CYPRESS_INSTALL_BINARY = 0; + env = { + NODE_OPTIONS = "--max-old-space-size=8192"; + # cypress tries to download binaries otherwise + CYPRESS_INSTALL_BINARY = 0; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share + mv dist $out/share/openobserve-ui + runHook postInstall + ''; + }; + in + { + pname = "openobserve"; + version = "0.40.0"; + + src = fetchFromGitHub { + owner = "openobserve"; + repo = "openobserve"; + tag = "v${finalAttrs.version}"; + hash = "sha256-eiF9t3l6RcbO6d79iSuA7ikH2atizyNjWABQ9KAkkfE="; }; - installPhase = '' - runHook preInstall - mkdir -p $out/share - mv dist $out/share/openobserve-ui - runHook postInstall + patches = [ + # prevent using git to determine version info during build time + ./build.rs.patch + ]; + + preBuild = '' + cp -r ${web}/share/openobserve-ui web/dist ''; - }; -in -rustPlatform.buildRustPackage { - pname = "openobserve"; - inherit version src; - patches = [ - # prevent using git to determine version info during build time - ./build.rs.patch - ]; + cargoHash = "sha256-RNrI5DB5FTSLxeT7a62KkEnqyDYV4dQ3G65PPofa9Zs="; - preBuild = '' - cp -r ${web}/share/openobserve-ui web/dist - ''; + nativeBuildInputs = [ + pkg-config + protobuf + ]; - cargoHash = "sha256-j/bx4qoWcSh2/yJ9evnzSfyUd0tLAk4M310A89k4wy8="; + buildInputs = [ + bzip2 + oniguruma + sqlite + xz + zlib + zstd + ]; - nativeBuildInputs = [ - pkg-config - protobuf - ]; + env = { + RUSTONIG_SYSTEM_LIBONIG = true; + ZSTD_SYS_USE_PKG_CONFIG = true; - buildInputs = [ - bzip2 - oniguruma - sqlite - xz - zlib - zstd - ]; + RUSTC_BOOTSTRAP = 1; # uses experimental features - env = { - RUSTONIG_SYSTEM_LIBONIG = true; - ZSTD_SYS_USE_PKG_CONFIG = true; + # the patched build.rs file sets these variables + GIT_VERSION = finalAttrs.src.tag; + GIT_COMMIT_HASH = "builtByNix"; + GIT_BUILD_DATE = "1970-01-01T00:00:00Z"; - RUSTC_BOOTSTRAP = 1; # uses experimental features + RUSTFLAGS = "-C target-feature=+aes,+sse2"; - # the patched build.rs file sets these variables - GIT_VERSION = src.tag; - GIT_COMMIT_HASH = "builtByNix"; - GIT_BUILD_DATE = "1970-01-01T00:00:00Z"; + SWAGGER_UI_DOWNLOAD_URL = + # When updating: + # - Look for the version of `utoipa-swagger-ui` at: + # https://github.com/StractOrg/stract/blob//Cargo.toml#L183 + # - Look at the corresponding version of `swagger-ui` at: + # https://github.com/juhaku/utoipa/blob/utoipa-swagger-ui-/utoipa-swagger-ui/build.rs#L21-L22 + let + swaggerUiVersion = "5.17.14"; + swaggerUi = fetchurl { + url = "https://github.com/swagger-api/swagger-ui/archive/refs/tags/v${swaggerUiVersion}.zip"; + hash = "sha256-SBJE0IEgl7Efuu73n3HZQrFxYX+cn5UU5jrL4T5xzNw="; + }; + in + "file://${swaggerUi}"; + }; - RUSTFLAGS = "-C target-feature=+aes,+sse2"; - }; + # swagger-ui will once more be copied in the target directory during the check phase + # Not deleting the existing unpacked archive leads to a `PermissionDenied` error + preCheck = '' + rm -rf target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/build/ + ''; - # requires network access or filesystem mutations - checkFlags = [ - "--skip=handler::http::router::tests::test_get_proxy_routes" - "--skip=tests::e2e_test" - "--skip=tests::test_setup_logs" - "--skip=handler::http::router::middlewares::compress::Compress" - # Tests are not threadsafe. Most likely can only run one test at a time, - # due to altering shared database state. - # This option already in upstream code: https://github.com/openobserve/openobserve/pull/7084 - # Also see: https://github.com/NixOS/nixpkgs/pull/457421 - "--test-threads=1" - ]; + # requires network access or filesystem mutations + checkFlags = [ + "--skip=handler::http::router::tests::test_get_proxy_routes" + "--skip=tests::e2e_test" + "--skip=tests::test_setup_logs" + "--skip=handler::http::router::middlewares::compress::Compress" + "--skip=service::github" + # Tests are not threadsafe. Most likely can only run one test at a time, + # due to altering shared database state. + # This option already in upstream code: https://github.com/openobserve/openobserve/pull/7084 + # Also see: https://github.com/NixOS/nixpkgs/pull/457421 + "--test-threads=1" + ]; - passthru.updateScript = gitUpdater { - rev-prefix = "v"; - ignoredVersions = "rc"; - }; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + ignoredVersions = "rc"; + }; - meta = { - description = "Cloud-native observability platform built specifically for logs, metrics, traces, analytics & realtime user-monitoring"; - homepage = "https://github.com/openobserve/openobserve"; - changelog = "https://github.com/openobserve/openobserve/releases/tag/v${version}"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ happysalada ]; - mainProgram = "openobserve"; - }; -} + meta = { + description = "Cloud-native observability platform built specifically for logs, metrics, traces, analytics & realtime user-monitoring"; + homepage = "https://github.com/openobserve/openobserve"; + changelog = "https://github.com/openobserve/openobserve/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ happysalada ]; + mainProgram = "openobserve"; + }; + } +) diff --git a/pkgs/by-name/ow/owmods-gui/package.nix b/pkgs/by-name/ow/owmods-gui/package.nix index 29fe462bd470..b56788379cc5 100644 --- a/pkgs/by-name/ow/owmods-gui/package.nix +++ b/pkgs/by-name/ow/owmods-gui/package.nix @@ -18,19 +18,20 @@ }: rustPlatform.buildRustPackage rec { pname = "owmods-gui"; - version = "0.15.3"; + version = "0.15.4"; src = fetchFromGitHub { owner = "ow-mods"; repo = "ow-mod-man"; tag = "gui_v${version}"; - hash = "sha256-mR4CKcdwlkJPyYK0KPSGbWMaSmHlGo5kOGHoZybduco="; + hash = "sha256-1m648o9hm7j/etNNhGy2Yq9paz6ZHWDxVBLGdzGMbZQ="; }; - cargoHash = "sha256-KcJAbhIeScFHLjEboQmt0NiqoIen2TihtDJaJwsVuEQ="; + cargoHash = "sha256-/id7DC3W22musOI4r4b0RPqSnIQVn1yHYLZcTilShVk="; + buildNoDefaultFeatures = true; buildFeatures = [ - "tauri/custom-protocol" + "custom-protocol" ]; nativeBuildInputs = [ @@ -63,7 +64,7 @@ rustPlatform.buildRustPackage rec { src = "${src}/owmods_gui/frontend"; packageJSON = "${src}/owmods_gui/frontend/package.json"; - npmDepsHash = "sha256-puDgzzzYy9HsuMo5V/E8Z8k6blCkl01JdfbpdhtnvS0="; + npmDepsHash = "sha256-PDpL8Cdl6U17wPBGmyg5kYP5zh1NXRPVnaW4WrFD3oM="; postBuild = '' cp -r ../dist/ $out diff --git a/pkgs/by-name/ox/oxfmt/package.nix b/pkgs/by-name/ox/oxfmt/package.nix index 881f4036eb26..bf65cec96980 100644 --- a/pkgs/by-name/ox/oxfmt/package.nix +++ b/pkgs/by-name/ox/oxfmt/package.nix @@ -14,6 +14,7 @@ rustc, versionCheckHook, nix-update-script, + tsgolint, }: # Build with pnpm instead of buildRustPackage because Prettier integration @@ -89,6 +90,7 @@ stdenv.mkDerivation (finalAttrs: { cp npm/oxfmt/configuration_schema.json $outPath/ makeWrapper ${lib.getExe nodejs-slim} $out/bin/oxfmt \ + --prefix PATH : "${lib.makeBinPath [ tsgolint ]}" \ --add-flags $outPath/dist/cli.js runHook postInstall diff --git a/pkgs/by-name/pp/ppl/package.nix b/pkgs/by-name/pp/ppl/package.nix index d02dd8dd787a..344eebad0d88 100644 --- a/pkgs/by-name/pp/ppl/package.nix +++ b/pkgs/by-name/pp/ppl/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { inherit version; src = fetchurl { - url = "http://bugseng.com/products/ppl/download/ftp/releases/${version}/ppl-${version}.tar.bz2"; + url = "https://mirror.metanet.ch/sage/spkg/upstream/ppl/ppl-${version}.tar.bz2"; sha256 = "1wgxcbgmijgk11df43aiqfzv31r3bkxmgb4yl68g21194q60nird"; }; diff --git a/pkgs/by-name/pr/proteus/package.nix b/pkgs/by-name/pr/proteus/package.nix index 16f76ab2687f..191ddd8d7773 100644 --- a/pkgs/by-name/pr/proteus/package.nix +++ b/pkgs/by-name/pr/proteus/package.nix @@ -58,7 +58,13 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = toString [ # Support JACK output in the standalone application: "-DJUCE_JACK" - # Accommodate -flto: + # juce, compiled in this build as part of a Git submodule, uses `-flto` as + # a Link Time Optimization flag, and instructs the plugin compiled here to + # use this flag to. This breaks the build for us. Using _fat_ LTO allows + # successful linking while still providing LTO benefits. If our build of + # `juce` was used as a dependency, we could have patched that `-flto` line + # in our juce's source, but that is not possible because it is used as a + # Git Submodule. "-ffat-lto-objects" ]; diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix index e1d872ae1556..226559f00913 100644 --- a/pkgs/by-name/pr/proton-pass/package.nix +++ b/pkgs/by-name/pr/proton-pass/package.nix @@ -9,11 +9,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-pass"; - version = "1.33.3"; + version = "1.33.4"; src = fetchurl { url = "https://proton.me/download/pass/linux/x64/proton-pass_${finalAttrs.version}_amd64.deb"; - hash = "sha256-1e/on++1IdJ1jZ7cxu5CxTmFzf0HtEpvoxl5ZweIiNk="; + hash = "sha256-sGO4BiVS1Zbs0y6UkBK42Tfq+VrLDcYXZA4U3xHaXmM="; }; dontConfigure = true; diff --git a/pkgs/by-name/pr/protonplus/package.nix b/pkgs/by-name/pr/protonplus/package.nix index a3abf2595b30..2da4a29ce212 100644 --- a/pkgs/by-name/pr/protonplus/package.nix +++ b/pkgs/by-name/pr/protonplus/package.nix @@ -20,13 +20,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "protonplus"; - version = "0.5.14"; + version = "0.5.15"; src = fetchFromGitHub { owner = "Vysp3r"; repo = "protonplus"; tag = "v${finalAttrs.version}"; - hash = "sha256-/J+qZKFYWECHGkhpHqzH+ZRpgJYoWRNs0GSc9wyLk54="; + hash = "sha256-VFoPFKbKyupsZNNb1V9Bb1BdgigKfRsgn5HmRHybqyY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pr/proxmox-backup-client/package.nix b/pkgs/by-name/pr/proxmox-backup-client/package.nix index 46461df67457..1ba669faae8b 100644 --- a/pkgs/by-name/pr/proxmox-backup-client/package.nix +++ b/pkgs/by-name/pr/proxmox-backup-client/package.nix @@ -124,13 +124,14 @@ rustPlatform.buildRustPackage { "--bin=pxar" ]; - RUSTFLAGS = [ "-L.dep-stubs" ]; + env = { + RUSTFLAGS = toString [ "-L.dep-stubs" ]; + # pbs-buildcfg requires this set, would be the git commit id + REPOID = ""; + }; doCheck = false; - # pbs-buildcfg requires this set, would be the git commit id - REPOID = ""; - nativeBuildInputs = [ pkgconf rustPlatform.bindgenHook diff --git a/pkgs/by-name/pr/prs/package.nix b/pkgs/by-name/pr/prs/package.nix index 3ad7be627cd4..28824bd381e2 100644 --- a/pkgs/by-name/pr/prs/package.nix +++ b/pkgs/by-name/pr/prs/package.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "prs"; - version = "0.5.4"; + version = "0.5.6"; src = fetchFromGitLab { owner = "timvisee"; repo = "prs"; tag = "v${finalAttrs.version}"; - hash = "sha256-RWquV2apUazgGiwzTc0cMzKNItJOBZDSRMp13k+mhS0="; + hash = "sha256-oV5i93+4+ZI1ngZX6A68vXQ3NtjChK8AzgjZC3URmBw="; }; - cargoHash = "sha256-v5jZJQHXxMENJ5EbZjoI4sZ0EpCfVZOkOX442S1TReU="; + cargoHash = "sha256-430/6Ww+PUBwyDs5vWLsMyHDEfF9wxgYZd455G5sj/w="; nativeBuildInputs = [ gpgme diff --git a/pkgs/by-name/py/pyrefly/package.nix b/pkgs/by-name/py/pyrefly/package.nix index 5fc49b71e2eb..1c09e7ea4d41 100644 --- a/pkgs/by-name/py/pyrefly/package.nix +++ b/pkgs/by-name/py/pyrefly/package.nix @@ -10,17 +10,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "pyrefly"; - version = "0.46.3"; + version = "0.47.0"; src = fetchFromGitHub { owner = "facebook"; repo = "pyrefly"; tag = finalAttrs.version; - hash = "sha256-GtYOfmtjKw0xEBxUUZlHz/XXqVCFp1WiwlznVY/9Vbg="; + hash = "sha256-ur1QTNnQnGiAq2pdbe1IfnKUCD0hfzrujLgLA89nR9E="; }; buildAndTestSubdir = "pyrefly"; - cargoHash = "sha256-A9ay3ooyGB1oCOz7CrRlWgOjEEFW6k0Hm4rVUARvH/k="; + cargoHash = "sha256-4FsNFx70/hIkfKmuzP26YLhwEEY7J3xacluDgDcFh6s="; buildInputs = [ rust-jemalloc-sys ]; diff --git a/pkgs/by-name/qd/qdelay/package.nix b/pkgs/by-name/qd/qdelay/package.nix index 50ff33fa3933..5aadb56b08f1 100644 --- a/pkgs/by-name/qd/qdelay/package.nix +++ b/pkgs/by-name/qd/qdelay/package.nix @@ -61,10 +61,16 @@ stdenv.mkDerivation (finalAttrs: { "-DCMAKE_OSX_ARCHITECTURES=${stdenv.hostPlatform.darwinArch}" ]; - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail 'juce::juce_recommended_lto_flags' '# Not forcing LTO' - ''; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isLinux (toString [ + # juce, compiled in this build as part of a Git submodule, uses `-flto` as + # a Link Time Optimization flag, and instructs the plugin compiled here to + # use this flag to. This breaks the build for us. Using _fat_ LTO allows + # successful linking while still providing LTO benefits. If our build of + # `juce` was used as a dependency, we could have patched that `-flto` line + # in our juce's source, but that is not possible because it is used as a + # Git Submodule. + "-ffat-lto-objects" + ]); installPhase = '' runHook preInstall diff --git a/pkgs/by-name/ra/radiance/package.nix b/pkgs/by-name/ra/radiance/package.nix deleted file mode 100644 index 3d67eac17466..000000000000 --- a/pkgs/by-name/ra/radiance/package.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - cmake, - fetchFromGitHub, - runCommand, - lib, - libGLU, - stdenv, - libX11, - tcsh, - tk, -}: -let - csh = runCommand "csh" { } '' - mkdir -p $out/bin - ln -s ${lib.getExe tcsh} $out/bin/csh - ''; -in -stdenv.mkDerivation (finalAttrs: { - pname = "radiance"; - version = "5.4"; - - src = fetchFromGitHub { - owner = "LBNL-ETA"; - repo = "radiance"; - tag = "rad${lib.versions.major finalAttrs.version}R${lib.versions.minor finalAttrs.version}"; - hash = "sha256-21lVWqO8uJefnm/dyfrjQJYbGck0fIRr2j0A+7WlZbM="; - }; - - nativeBuildInputs = [ - cmake - csh # for some custom scripting in the repo - tk # for wish - ]; - - buildInputs = [ - libGLU - libX11 - ]; - - meta = { - description = "Validated Lighting Simulation Tool"; - homepage = "https://github.com/LBNL-ETA/Radiance"; - license = lib.licenses.bsd3Lbnl; - maintainers = with lib.maintainers; [ robwalt ]; - mainProgram = "rad"; - }; -}) diff --git a/pkgs/by-name/ra/rattler-build/package.nix b/pkgs/by-name/ra/rattler-build/package.nix index 89341f7c201f..0d11a7ca58e0 100644 --- a/pkgs/by-name/ra/rattler-build/package.nix +++ b/pkgs/by-name/ra/rattler-build/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rattler-build"; - version = "0.55.0"; + version = "0.55.1"; src = fetchFromGitHub { owner = "prefix-dev"; repo = "rattler-build"; tag = "v${finalAttrs.version}"; - hash = "sha256-SofCRYAhSOwoNwnFF8eapXRxjwz/x2DNrcOXdiwvkng="; + hash = "sha256-H0cEyr0iLkbviYnY/xHrFwiQjzX7w5qQ4O0MhQFghuM="; }; - cargoHash = "sha256-pe8r2bYVlP/3l4Ye1FLieiH0Cf5otNN2KCag5fntHUg="; + cargoHash = "sha256-P6KTDVhBlOdvs4CIQDZJWwh8uCQeZo3atmpo6zVEA/Q="; doCheck = false; # test requires network access diff --git a/pkgs/by-name/ra/rauc/package.nix b/pkgs/by-name/ra/rauc/package.nix index b16bbcf2b63f..7116fc3791f5 100644 --- a/pkgs/by-name/ra/rauc/package.nix +++ b/pkgs/by-name/ra/rauc/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "rauc"; - version = "1.15"; + version = "1.15.1"; src = fetchFromGitHub { owner = "rauc"; repo = "rauc"; rev = "v${version}"; - sha256 = "sha256-TnOpWLJREbx707W3W2w1WkMQoV6R2A5+jA4hGIT8V9E="; + sha256 = "sha256-aGJj1Vm1gznZBnoGkfbJlhGAUrP5JAMgEL8L+8UL9LY="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/rc/rcp/package.nix b/pkgs/by-name/rc/rcp/package.nix index d7708a0c0cc0..fcaefb4265cc 100644 --- a/pkgs/by-name/rc/rcp/package.nix +++ b/pkgs/by-name/rc/rcp/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-AcH5V5hapVQgGrwWAEN6Xpj00RRNqZiCSn+/onpmd50="; - RUSTFLAGS = "--cfg tokio_unstable"; + env.RUSTFLAGS = "--cfg tokio_unstable"; checkFlags = [ # these tests set setuid permissions on a test file (3oXXX) which doesn't work in a sandbox diff --git a/pkgs/by-name/re/recon/package.nix b/pkgs/by-name/re/recon/package.nix new file mode 100644 index 000000000000..009719783c05 --- /dev/null +++ b/pkgs/by-name/re/recon/package.nix @@ -0,0 +1,31 @@ +{ + lib, + flutter338, + fetchFromGitHub, + nix-update-script, +}: + +flutter338.buildFlutterApplication rec { + pname = "recon"; + version = "0.12.1-beta"; + + src = fetchFromGitHub { + owner = "Nutcake"; + repo = "Recon"; + tag = "v${version}"; + hash = "sha256-21fnYTjv4IWeR2kWzSIks1jZLpYJe3JAJbcMuKzCUSc="; + }; + + pubspecLock = lib.importJSON ./pubspec.lock.json; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Contacts app for Resonite, built with flutter"; + homepage = "https://github.com/Nutcake/Recon"; + mainProgram = "recon"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ bddvlpr ]; + }; +} diff --git a/pkgs/by-name/re/recon/pubspec.lock.json b/pkgs/by-name/re/recon/pubspec.lock.json new file mode 100644 index 000000000000..473cdaae4910 --- /dev/null +++ b/pkgs/by-name/re/recon/pubspec.lock.json @@ -0,0 +1,1472 @@ +{ + "packages": { + "args": { + "dependency": "transitive", + "description": { + "name": "args", + "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.7.0" + }, + "async": { + "dependency": "transitive", + "description": { + "name": "async", + "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.13.0" + }, + "audio_session": { + "dependency": "transitive", + "description": { + "name": "audio_session", + "sha256": "8f96a7fecbb718cb093070f868b4cdcb8a9b1053dce342ff8ab2fde10eb9afb7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.2" + }, + "background_downloader": { + "dependency": "direct main", + "description": { + "name": "background_downloader", + "sha256": "a913b37cc47a656a225e9562b69576000d516f705482f392e2663500e6ff6032", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.3.0" + }, + "boolean_selector": { + "dependency": "transitive", + "description": { + "name": "boolean_selector", + "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "cached_network_image": { + "dependency": "direct main", + "description": { + "name": "cached_network_image", + "sha256": "7c1183e361e5c8b0a0f21a28401eecdbde252441106a9816400dd4c2b2424916", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.4.1" + }, + "cached_network_image_platform_interface": { + "dependency": "transitive", + "description": { + "name": "cached_network_image_platform_interface", + "sha256": "35814b016e37fbdc91f7ae18c8caf49ba5c88501813f73ce8a07027a395e2829", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.1" + }, + "cached_network_image_web": { + "dependency": "transitive", + "description": { + "name": "cached_network_image_web", + "sha256": "980842f4e8e2535b8dbd3d5ca0b1f0ba66bf61d14cc3a17a9b4788a3685ba062", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.1" + }, + "camera": { + "dependency": "direct main", + "description": { + "name": "camera", + "sha256": "eefad89f262a873f38d21e5eec853461737ea074d7c9ede39f3ceb135d201cab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.11.3" + }, + "camera_android_camerax": { + "dependency": "transitive", + "description": { + "name": "camera_android_camerax", + "sha256": "d96bf774152dd2a0aee64c59ba6b914b5efb04ec5a25b56e17b7e898869cc07c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.24+2" + }, + "camera_avfoundation": { + "dependency": "transitive", + "description": { + "name": "camera_avfoundation", + "sha256": "035b90c1e33c2efad7548f402572078f6e514d4f82be0a315cd6c6af7e855aa8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.22+6" + }, + "camera_platform_interface": { + "dependency": "transitive", + "description": { + "name": "camera_platform_interface", + "sha256": "98cfc9357e04bad617671b4c1f78a597f25f08003089dd94050709ae54effc63", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.12.0" + }, + "camera_web": { + "dependency": "transitive", + "description": { + "name": "camera_web", + "sha256": "77e53acb64d9de8917424eeb32b5c7c73572d1e00954bbf54a1e609d79a751a2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.5+1" + }, + "characters": { + "dependency": "transitive", + "description": { + "name": "characters", + "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "clock": { + "dependency": "transitive", + "description": { + "name": "clock", + "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "collection": { + "dependency": "direct main", + "description": { + "name": "collection", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.19.1" + }, + "color": { + "dependency": "direct main", + "description": { + "name": "color", + "sha256": "ddcdf1b3badd7008233f5acffaf20ca9f5dc2cd0172b75f68f24526a5f5725cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "cross_file": { + "dependency": "transitive", + "description": { + "name": "cross_file", + "sha256": "701dcfc06da0882883a2657c445103380e53e647060ad8d9dfb710c100996608", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.5+1" + }, + "crypto": { + "dependency": "direct main", + "description": { + "name": "crypto", + "sha256": "c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.7" + }, + "csslib": { + "dependency": "transitive", + "description": { + "name": "csslib", + "sha256": "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, + "dbus": { + "dependency": "transitive", + "description": { + "name": "dbus", + "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.11" + }, + "dynamic_color": { + "dependency": "direct main", + "description": { + "name": "dynamic_color", + "sha256": "43a5a6679649a7731ab860334a5812f2067c2d9ce6452cf069c5e0c25336c17c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.8.1" + }, + "fake_async": { + "dependency": "transitive", + "description": { + "name": "fake_async", + "sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.3" + }, + "ffi": { + "dependency": "transitive", + "description": { + "name": "ffi", + "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "file": { + "dependency": "transitive", + "description": { + "name": "file", + "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.1" + }, + "file_picker": { + "dependency": "direct main", + "description": { + "name": "file_picker", + "sha256": "f8f4ea435f791ab1f817b4e338ed958cb3d04ba43d6736ffc39958d950754967", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.3.6" + }, + "file_selector_linux": { + "dependency": "transitive", + "description": { + "name": "file_selector_linux", + "sha256": "80a877f5ec570c4fb3b40720a70b6f31e8bb1315a464b4d3e92fe82754d4b21a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.3+3" + }, + "file_selector_macos": { + "dependency": "transitive", + "description": { + "name": "file_selector_macos", + "sha256": "44f24d102e368370951b98ffe86c7325b38349e634578312976607d28cc6d747", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.4+6" + }, + "file_selector_platform_interface": { + "dependency": "transitive", + "description": { + "name": "file_selector_platform_interface", + "sha256": "35e0bd61ebcdb91a3505813b055b09b79dfdc7d0aee9c09a7ba59ae4bb13dc85", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.7.0" + }, + "file_selector_windows": { + "dependency": "transitive", + "description": { + "name": "file_selector_windows", + "sha256": "62197474ae75893a62df75939c777763d39c2bc5f73ce5b88497208bc269abfd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.3+5" + }, + "fixnum": { + "dependency": "transitive", + "description": { + "name": "fixnum", + "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "flutter": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_cache_manager": { + "dependency": "transitive", + "description": { + "name": "flutter_cache_manager", + "sha256": "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.4.1" + }, + "flutter_cube": { + "dependency": "direct main", + "description": { + "name": "flutter_cube", + "sha256": "71cf679a251166eb97f86751c56582b09abdbf859485fbf60524948813914c3b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.1" + }, + "flutter_lints": { + "dependency": "direct dev", + "description": { + "name": "flutter_lints", + "sha256": "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.0" + }, + "flutter_local_notifications": { + "dependency": "direct main", + "description": { + "name": "flutter_local_notifications", + "sha256": "19ffb0a8bb7407875555e5e98d7343a633bb73707bae6c6a5f37c90014077875", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "19.5.0" + }, + "flutter_local_notifications_linux": { + "dependency": "transitive", + "description": { + "name": "flutter_local_notifications_linux", + "sha256": "e3c277b2daab8e36ac5a6820536668d07e83851aeeb79c446e525a70710770a5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.0" + }, + "flutter_local_notifications_platform_interface": { + "dependency": "transitive", + "description": { + "name": "flutter_local_notifications_platform_interface", + "sha256": "277d25d960c15674ce78ca97f57d0bae2ee401c844b6ac80fcd972a9c99d09fe", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.1.0" + }, + "flutter_local_notifications_windows": { + "dependency": "transitive", + "description": { + "name": "flutter_local_notifications_windows", + "sha256": "8d658f0d367c48bd420e7cf2d26655e2d1130147bca1eea917e576ca76668aaf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.3" + }, + "flutter_phoenix": { + "dependency": "direct main", + "description": { + "name": "flutter_phoenix", + "sha256": "39589dac934ea476d0e43fb60c1ddfba58f14960743640c8250dea11c4333378", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "flutter_plugin_android_lifecycle": { + "dependency": "transitive", + "description": { + "name": "flutter_plugin_android_lifecycle", + "sha256": "306f0596590e077338312f38837f595c04f28d6cdeeac392d3d74df2f0003687", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.32" + }, + "flutter_secure_storage": { + "dependency": "direct main", + "description": { + "name": "flutter_secure_storage", + "sha256": "9cad52d75ebc511adfae3d447d5d13da15a55a92c9410e50f67335b6d21d16ea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.2.4" + }, + "flutter_secure_storage_linux": { + "dependency": "transitive", + "description": { + "name": "flutter_secure_storage_linux", + "sha256": "be76c1d24a97d0b98f8b54bce6b481a380a6590df992d0098f868ad54dc8f688", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.3" + }, + "flutter_secure_storage_macos": { + "dependency": "transitive", + "description": { + "name": "flutter_secure_storage_macos", + "sha256": "6c0a2795a2d1de26ae202a0d78527d163f4acbb11cde4c75c670f3a0fc064247", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.3" + }, + "flutter_secure_storage_platform_interface": { + "dependency": "transitive", + "description": { + "name": "flutter_secure_storage_platform_interface", + "sha256": "cf91ad32ce5adef6fba4d736a542baca9daf3beac4db2d04be350b87f69ac4a8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "flutter_secure_storage_web": { + "dependency": "transitive", + "description": { + "name": "flutter_secure_storage_web", + "sha256": "f4ebff989b4f07b2656fb16b47852c0aab9fed9b4ec1c70103368337bc1886a9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "flutter_secure_storage_windows": { + "dependency": "transitive", + "description": { + "name": "flutter_secure_storage_windows", + "sha256": "b20b07cb5ed4ed74fc567b78a72936203f587eba460af1df11281c9326cd3709", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "flutter_test": { + "dependency": "direct dev", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_web_plugins": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "hive": { + "dependency": "direct main", + "description": { + "name": "hive", + "sha256": "8dcf6db979d7933da8217edcec84e9df1bdb4e4edc7fc77dbd5aa74356d6d941", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.3" + }, + "hive_flutter": { + "dependency": "direct main", + "description": { + "name": "hive_flutter", + "sha256": "dca1da446b1d808a51689fb5d0c6c9510c0a2ba01e22805d492c73b68e33eecc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "html": { + "dependency": "direct main", + "description": { + "name": "html", + "sha256": "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.15.6" + }, + "http": { + "dependency": "direct main", + "description": { + "name": "http", + "sha256": "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.6.0" + }, + "http_parser": { + "dependency": "direct main", + "description": { + "name": "http_parser", + "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.2" + }, + "image_picker": { + "dependency": "direct main", + "description": { + "name": "image_picker", + "sha256": "784210112be18ea55f69d7076e2c656a4e24949fa9e76429fe53af0c0f4fa320", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "image_picker_android": { + "dependency": "transitive", + "description": { + "name": "image_picker_android", + "sha256": "788167bcb578b13613b17c3b4a4efae911715f353e36bddc48a0b02a54a8de40", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.8.13+9" + }, + "image_picker_for_web": { + "dependency": "transitive", + "description": { + "name": "image_picker_for_web", + "sha256": "66257a3191ab360d23a55c8241c91a6e329d31e94efa7be9cf7a212e65850214", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.1" + }, + "image_picker_ios": { + "dependency": "transitive", + "description": { + "name": "image_picker_ios", + "sha256": "997d100ce1dda5b1ba4085194c5e36c9f8a1fb7987f6a36ab677a344cd2dc986", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.8.13+2" + }, + "image_picker_linux": { + "dependency": "transitive", + "description": { + "name": "image_picker_linux", + "sha256": "1f81c5f2046b9ab724f85523e4af65be1d47b038160a8c8deed909762c308ed4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.2" + }, + "image_picker_macos": { + "dependency": "transitive", + "description": { + "name": "image_picker_macos", + "sha256": "86f0f15a309de7e1a552c12df9ce5b59fe927e71385329355aec4776c6a8ec91", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.2+1" + }, + "image_picker_platform_interface": { + "dependency": "transitive", + "description": { + "name": "image_picker_platform_interface", + "sha256": "567e056716333a1647c64bb6bd873cff7622233a5c3f694be28a583d4715690c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.11.1" + }, + "image_picker_windows": { + "dependency": "transitive", + "description": { + "name": "image_picker_windows", + "sha256": "d248c86554a72b5495a31c56f060cf73a41c7ff541689327b1a7dbccc33adfae", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.2" + }, + "intl": { + "dependency": "direct main", + "description": { + "name": "intl", + "sha256": "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.20.2" + }, + "js": { + "dependency": "transitive", + "description": { + "name": "js", + "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.7" + }, + "just_audio": { + "dependency": "direct main", + "description": { + "name": "just_audio", + "sha256": "9694e4734f515f2a052493d1d7e0d6de219ee0427c7c29492e246ff32a219908", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.5" + }, + "just_audio_platform_interface": { + "dependency": "transitive", + "description": { + "name": "just_audio_platform_interface", + "sha256": "2532c8d6702528824445921c5ff10548b518b13f808c2e34c2fd54793b999a6a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.6.0" + }, + "just_audio_web": { + "dependency": "transitive", + "description": { + "name": "just_audio_web", + "sha256": "6ba8a2a7e87d57d32f0f7b42856ade3d6a9fbe0f1a11fabae0a4f00bb73f0663", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.16" + }, + "leak_tracker": { + "dependency": "transitive", + "description": { + "name": "leak_tracker", + "sha256": "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "11.0.2" + }, + "leak_tracker_flutter_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_flutter_testing", + "sha256": "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.10" + }, + "leak_tracker_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_testing", + "sha256": "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "lints": { + "dependency": "transitive", + "description": { + "name": "lints", + "sha256": "a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.0" + }, + "logging": { + "dependency": "direct main", + "description": { + "name": "logging", + "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "matcher": { + "dependency": "transitive", + "description": { + "name": "matcher", + "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.17" + }, + "material_color_utilities": { + "dependency": "transitive", + "description": { + "name": "material_color_utilities", + "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.11.1" + }, + "meta": { + "dependency": "transitive", + "description": { + "name": "meta", + "sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.17.0" + }, + "mime": { + "dependency": "transitive", + "description": { + "name": "mime", + "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "nested": { + "dependency": "transitive", + "description": { + "name": "nested", + "sha256": "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "objective_c": { + "dependency": "transitive", + "description": { + "name": "objective_c", + "sha256": "1f81ed9e41909d44162d7ec8663b2c647c202317cc0b56d3d56f6a13146a0b64", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.1.0" + }, + "octo_image": { + "dependency": "transitive", + "description": { + "name": "octo_image", + "sha256": "34faa6639a78c7e3cbe79be6f9f96535867e879748ade7d17c9b1ae7536293bd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "package_info_plus": { + "dependency": "direct main", + "description": { + "name": "package_info_plus", + "sha256": "f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.0.0" + }, + "package_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "package_info_plus_platform_interface", + "sha256": "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "path": { + "dependency": "direct main", + "description": { + "name": "path", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.1" + }, + "path_provider": { + "dependency": "direct main", + "description": { + "name": "path_provider", + "sha256": "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.5" + }, + "path_provider_android": { + "dependency": "transitive", + "description": { + "name": "path_provider_android", + "sha256": "95c68a74d3cab950fd0ed8073d9fab15c1c06eb1f3eec68676e87aabc9ecee5a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.21" + }, + "path_provider_foundation": { + "dependency": "transitive", + "description": { + "name": "path_provider_foundation", + "sha256": "6192e477f34018ef1ea790c56fffc7302e3bc3efede9e798b934c252c8c105ba", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.0" + }, + "path_provider_linux": { + "dependency": "transitive", + "description": { + "name": "path_provider_linux", + "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + }, + "path_provider_platform_interface": { + "dependency": "transitive", + "description": { + "name": "path_provider_platform_interface", + "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "path_provider_windows": { + "dependency": "transitive", + "description": { + "name": "path_provider_windows", + "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "permission_handler": { + "dependency": "direct main", + "description": { + "name": "permission_handler", + "sha256": "bc917da36261b00137bbc8896bf1482169cd76f866282368948f032c8c1caae1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "12.0.1" + }, + "permission_handler_android": { + "dependency": "transitive", + "description": { + "name": "permission_handler_android", + "sha256": "1e3bc410ca1bf84662104b100eb126e066cb55791b7451307f9708d4007350e6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "13.0.1" + }, + "permission_handler_apple": { + "dependency": "transitive", + "description": { + "name": "permission_handler_apple", + "sha256": "f000131e755c54cf4d84a5d8bd6e4149e262cc31c5a8b1d698de1ac85fa41023", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.4.7" + }, + "permission_handler_html": { + "dependency": "transitive", + "description": { + "name": "permission_handler_html", + "sha256": "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3+5" + }, + "permission_handler_platform_interface": { + "dependency": "transitive", + "description": { + "name": "permission_handler_platform_interface", + "sha256": "eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.3.0" + }, + "permission_handler_windows": { + "dependency": "transitive", + "description": { + "name": "permission_handler_windows", + "sha256": "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.1" + }, + "petitparser": { + "dependency": "transitive", + "description": { + "name": "petitparser", + "sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.1" + }, + "photo_view": { + "dependency": "direct main", + "description": { + "name": "photo_view", + "sha256": "1fc3d970a91295fbd1364296575f854c9863f225505c28c46e0a03e48960c75e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.15.0" + }, + "platform": { + "dependency": "transitive", + "description": { + "name": "platform", + "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.6" + }, + "plugin_platform_interface": { + "dependency": "transitive", + "description": { + "name": "plugin_platform_interface", + "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.8" + }, + "provider": { + "dependency": "direct main", + "description": { + "name": "provider", + "sha256": "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.5+1" + }, + "pub_semver": { + "dependency": "transitive", + "description": { + "name": "pub_semver", + "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "record": { + "dependency": "direct main", + "description": { + "name": "record", + "sha256": "6bad72fb3ea6708d724cf8b6c97c4e236cf9f43a52259b654efeb6fd9b737f1f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.2" + }, + "record_android": { + "dependency": "transitive", + "description": { + "name": "record_android", + "sha256": "9aaf3f151e61399b09bd7c31eb5f78253d2962b3f57af019ac5a2d1a3afdcf71", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.5" + }, + "record_ios": { + "dependency": "transitive", + "description": { + "name": "record_ios", + "sha256": "69fcd37c6185834e90254573599a9165db18a2cbfa266b6d1e46ffffeb06a28c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.5" + }, + "record_linux": { + "dependency": "transitive", + "description": { + "name": "record_linux", + "sha256": "235b1f1fb84e810f8149cc0c2c731d7d697f8d1c333b32cb820c449bf7bb72d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "record_macos": { + "dependency": "transitive", + "description": { + "name": "record_macos", + "sha256": "842ea4b7e95f4dd237aacffc686d1b0ff4277e3e5357865f8d28cd28bc18ed95", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "record_platform_interface": { + "dependency": "transitive", + "description": { + "name": "record_platform_interface", + "sha256": "b0065fdf1ec28f5a634d676724d388a77e43ce7646fb049949f58c69f3fcb4ed", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "record_web": { + "dependency": "transitive", + "description": { + "name": "record_web", + "sha256": "3feeffbc0913af3021da9810bb8702a068db6bc9da52dde1d19b6ee7cb9edb51", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2" + }, + "record_windows": { + "dependency": "transitive", + "description": { + "name": "record_windows", + "sha256": "223258060a1d25c62bae18282c16783f28581ec19401d17e56b5205b9f039d78", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.7" + }, + "rxdart": { + "dependency": "transitive", + "description": { + "name": "rxdart", + "sha256": "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.28.0" + }, + "share_plus": { + "dependency": "direct main", + "description": { + "name": "share_plus", + "sha256": "14c8860d4de93d3a7e53af51bff479598c4e999605290756bbbe45cf65b37840", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "12.0.1" + }, + "share_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "share_plus_platform_interface", + "sha256": "88023e53a13429bd65d8e85e11a9b484f49d4c190abbd96c7932b74d6927cc9a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.0" + }, + "sky_engine": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "source_span": { + "dependency": "transitive", + "description": { + "name": "source_span", + "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.1" + }, + "sqflite": { + "dependency": "transitive", + "description": { + "name": "sqflite", + "sha256": "e2297b1da52f127bc7a3da11439985d9b536f75070f3325e62ada69a5c585d03", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "sqflite_android": { + "dependency": "transitive", + "description": { + "name": "sqflite_android", + "sha256": "ecd684501ebc2ae9a83536e8b15731642b9570dc8623e0073d227d0ee2bfea88", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2+2" + }, + "sqflite_common": { + "dependency": "transitive", + "description": { + "name": "sqflite_common", + "sha256": "6ef422a4525ecc601db6c0a2233ff448c731307906e92cabc9ba292afaae16a6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.6" + }, + "sqflite_darwin": { + "dependency": "transitive", + "description": { + "name": "sqflite_darwin", + "sha256": "279832e5cde3fe99e8571879498c9211f3ca6391b0d818df4e17d9fff5c6ccb3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "sqflite_platform_interface": { + "dependency": "transitive", + "description": { + "name": "sqflite_platform_interface", + "sha256": "8dd4515c7bdcae0a785b0062859336de775e8c65db81ae33dd5445f35be61920", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "stack_trace": { + "dependency": "transitive", + "description": { + "name": "stack_trace", + "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.12.1" + }, + "stream_channel": { + "dependency": "transitive", + "description": { + "name": "stream_channel", + "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "stream_transform": { + "dependency": "transitive", + "description": { + "name": "stream_transform", + "sha256": "ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "string_scanner": { + "dependency": "transitive", + "description": { + "name": "string_scanner", + "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.1" + }, + "synchronized": { + "dependency": "transitive", + "description": { + "name": "synchronized", + "sha256": "c254ade258ec8282947a0acbbc90b9575b4f19673533ee46f2f6e9b3aeefd7c0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.4.0" + }, + "term_glyph": { + "dependency": "transitive", + "description": { + "name": "term_glyph", + "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2" + }, + "test_api": { + "dependency": "transitive", + "description": { + "name": "test_api", + "sha256": "ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.7" + }, + "timezone": { + "dependency": "transitive", + "description": { + "name": "timezone", + "sha256": "dd14a3b83cfd7cb19e7888f1cbc20f258b8d71b54c06f79ac585f14093a287d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.1" + }, + "typed_data": { + "dependency": "transitive", + "description": { + "name": "typed_data", + "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "url_launcher": { + "dependency": "direct main", + "description": { + "name": "url_launcher", + "sha256": "f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.2" + }, + "url_launcher_android": { + "dependency": "transitive", + "description": { + "name": "url_launcher_android", + "sha256": "5387615091fb9bcacfe03e140437be22c3a3cd7ac53052ec9a16d2a6a370a994", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.27" + }, + "url_launcher_ios": { + "dependency": "transitive", + "description": { + "name": "url_launcher_ios", + "sha256": "cfde38aa257dae62ffe79c87fab20165dfdf6988c1d31b58ebf59b9106062aad", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.6" + }, + "url_launcher_linux": { + "dependency": "transitive", + "description": { + "name": "url_launcher_linux", + "sha256": "d5e14138b3bc193a0f63c10a53c94b91d399df0512b1f29b94a043db7482384a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "url_launcher_macos": { + "dependency": "transitive", + "description": { + "name": "url_launcher_macos", + "sha256": "368adf46f71ad3c21b8f06614adb38346f193f3a59ba8fe9a2fd74133070ba18", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.5" + }, + "url_launcher_platform_interface": { + "dependency": "transitive", + "description": { + "name": "url_launcher_platform_interface", + "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "url_launcher_web": { + "dependency": "transitive", + "description": { + "name": "url_launcher_web", + "sha256": "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "url_launcher_windows": { + "dependency": "transitive", + "description": { + "name": "url_launcher_windows", + "sha256": "712c70ab1b99744ff066053cbe3e80c73332b38d46e5e945c98689b2e66fc15f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.5" + }, + "uuid": { + "dependency": "direct main", + "description": { + "name": "uuid", + "sha256": "a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.5.2" + }, + "vector_math": { + "dependency": "transitive", + "description": { + "name": "vector_math", + "sha256": "d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "vm_service": { + "dependency": "transitive", + "description": { + "name": "vm_service", + "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "15.0.2" + }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "web_socket": { + "dependency": "transitive", + "description": { + "name": "web_socket", + "sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "web_socket_channel": { + "dependency": "direct main", + "description": { + "name": "web_socket_channel", + "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.3" + }, + "win32": { + "dependency": "transitive", + "description": { + "name": "win32", + "sha256": "d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.15.0" + }, + "workmanager": { + "dependency": "direct main", + "description": { + "name": "workmanager", + "sha256": "065673b2a465865183093806925419d311a9a5e0995aa74ccf8920fd695e2d10", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.0+3" + }, + "workmanager_android": { + "dependency": "transitive", + "description": { + "name": "workmanager_android", + "sha256": "9ae744db4ef891f5fcd2fb8671fccc712f4f96489a487a1411e0c8675e5e8cb7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.0+2" + }, + "workmanager_apple": { + "dependency": "transitive", + "description": { + "name": "workmanager_apple", + "sha256": "1cc12ae3cbf5535e72f7ba4fde0c12dd11b757caf493a28e22d684052701f2ca", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.1+2" + }, + "workmanager_platform_interface": { + "dependency": "transitive", + "description": { + "name": "workmanager_platform_interface", + "sha256": "f40422f10b970c67abb84230b44da22b075147637532ac501729256fcea10a47", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.1+1" + }, + "xdg_directories": { + "dependency": "transitive", + "description": { + "name": "xdg_directories", + "sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "xml": { + "dependency": "transitive", + "description": { + "name": "xml", + "sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.6.1" + } + }, + "sdks": { + "dart": ">=3.9.0 <4.0.0", + "flutter": ">=3.35.0" + } +} diff --git a/pkgs/by-name/re/rectangle/package.nix b/pkgs/by-name/re/rectangle/package.nix index 3a67dd7ee333..7fa6596a571f 100644 --- a/pkgs/by-name/re/rectangle/package.nix +++ b/pkgs/by-name/re/rectangle/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "rectangle"; - version = "0.92"; + version = "0.93"; src = fetchurl { url = "https://github.com/rxhanson/Rectangle/releases/download/v${finalAttrs.version}/Rectangle${finalAttrs.version}.dmg"; - hash = "sha256-0Yv2DroNvk2U17U5vzrhfEcr9xAVpV0ivFVIDviI11s="; + hash = "sha256-hIgXUm8/e9Qfc8zilVglI/97tHRu1kcjV1ZZV08pinY="; }; sourceRoot = "."; diff --git a/pkgs/by-name/re/restate/package.nix b/pkgs/by-name/re/restate/package.nix index 91c7e175df8e..38cfca80005a 100644 --- a/pkgs/by-name/re/restate/package.nix +++ b/pkgs/by-name/re/restate/package.nix @@ -100,13 +100,14 @@ rustPlatform.buildRustPackage (finalAttrs: { checkFlags = [ # Error: deadline has elapsed - "--skip replicated_loglet" - + "--skip" + "replicated_loglet" # TIMEOUT [ 180.006s] - "--skip fast_forward_over_trim_gap" - - # TIMEOUT (could be related to https://github.com/restatedev/restate/issues/3043) - "--skip restatectl_smoke_test" + "--skip" + "fast_forward_over_trim_gap" + # TIMEOUT (could be related to https://github.com/resytatedev/restate/issues/3043) + "--skip" + "restatectl_smoke_test" ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/re/resterm/package.nix b/pkgs/by-name/re/resterm/package.nix index 2b3b3ef90a4b..99a538f5a81b 100644 --- a/pkgs/by-name/re/resterm/package.nix +++ b/pkgs/by-name/re/resterm/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "resterm"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "unkn0wn-root"; repo = "resterm"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-ip/0QKMK+/wbc9O3yTP2AEUgV2DJN92LmCq47YFYrhk="; + sha256 = "sha256-N1/q1i/J8T52DRrwJsBQZKoUXAgS+dETjtGWuP1N8+A="; }; vendorHash = "sha256-E/Y4kW5xy7YamUP5bxFmDCAK6RqiqGN7DpEPG1MaCHc="; diff --git a/pkgs/by-name/rg/rgrc/package.nix b/pkgs/by-name/rg/rgrc/package.nix new file mode 100644 index 000000000000..66fe5fd6dbbe --- /dev/null +++ b/pkgs/by-name/rg/rgrc/package.nix @@ -0,0 +1,52 @@ +{ + fetchFromGitHub, + installShellFiles, + lib, + nix-update-script, + rustPlatform, + stdenv, + versionCheckHook, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "rgrc"; + version = "0.6.5"; + + src = fetchFromGitHub { + owner = "lazywalker"; + repo = "rgrc"; + tag = "v${finalAttrs.version}"; + hash = "sha256-OuNVX1whhJOMj2rX2yANyHie8dn9i5JAI29btOgNH38="; + }; + + cargoHash = "sha256-wQht/DJgTvnOIQ3u2Nz5jyUNhotDgA2/iXhb9ZElGI4="; + + nativeBuildInputs = [ installShellFiles ]; + + checkFlags = [ "--skip=test_command_exists" ]; + + postInstall = '' + installManPage doc/rgrc.1 + install -Dm644 share/conf.* -t $out/share/rgrc/ + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd rgrc \ + --bash <($out/bin/rgrc --completions bash) \ + --fish <($out/bin/rgrc --completions fish) \ + --zsh <($out/bin/rgrc --completions zsh) + ''; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/lazywalker/rgrc/releases/tag/v${finalAttrs.version}"; + description = "Rusty Generic Colouriser - just like grc but fast"; + homepage = "https://lazywalker.github.io/rgrc/"; + license = lib.licenses.mit; + mainProgram = "rgrc"; + maintainers = with lib.maintainers; [ sedlund ]; + }; +}) diff --git a/pkgs/by-name/ri/ripgrep-all/package.nix b/pkgs/by-name/ri/ripgrep-all/package.nix index cbcdffaecdff..d85e4b488ebf 100644 --- a/pkgs/by-name/ri/ripgrep-all/package.nix +++ b/pkgs/by-name/ri/ripgrep-all/package.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-v+lLCI2ti/xL8hcGkm/xDDN9qk0G9MgtijE8xYnhC68="; # override debug=true set in Cargo.toml upstream - RUSTFLAGS = "-C debuginfo=none"; + env.RUSTFLAGS = "-C debuginfo=none"; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/ri/ripplerx/package.nix b/pkgs/by-name/ri/ripplerx/package.nix index 8b7e94b36d49..670b2cff797d 100644 --- a/pkgs/by-name/ri/ripplerx/package.nix +++ b/pkgs/by-name/ri/ripplerx/package.nix @@ -61,15 +61,20 @@ stdenv.mkDerivation (finalAttrs: { "-lXrandr" ]; + env.NIX_CFLAGS_COMPILE = toString [ + # juce, compiled in this build as part of a Git submodule, uses `-flto` as + # a Link Time Optimization flag, and instructs the plugin compiled here to + # use this flag to. This breaks the build for us. Using _fat_ LTO allows + # successful linking while still providing LTO benefits. If our build of + # `juce` was used as a dependency, we could have patched that `-flto` line + # in our juce's source, but that is not possible because it is used as a + # Git Submodule. + "-ffat-lto-objects" + ]; + # Fontconfig error: Cannot load default config file: No such file: (null) env.FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; - # LTO needs special setup on Linux - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail 'juce::juce_recommended_lto_flags' '# Not forcing LTO' - ''; - installPhase = '' runHook preInstall diff --git a/pkgs/by-name/rs/rstudio/fix-darwin.patch b/pkgs/by-name/rs/rstudio/fix-darwin.patch index be15630fa12d..0d940d4044f7 100644 --- a/pkgs/by-name/rs/rstudio/fix-darwin.patch +++ b/pkgs/by-name/rs/rstudio/fix-darwin.patch @@ -1,8 +1,8 @@ diff --git a/cmake/globals.cmake b/cmake/globals.cmake -index e53248b..c705d67 100644 +index 3601ee4..5090f32 100644 --- a/cmake/globals.cmake +++ b/cmake/globals.cmake -@@ -334,6 +334,7 @@ if (APPLE) +@@ -340,6 +340,7 @@ if (APPLE) set(RSTUDIO_INSTALL_SUPPORTING RStudio.app/Contents/Resources/app) # handles Quarto share when not stored alongside bin set(RSTUDIO_INSTALL_RESOURCES RStudio.app/Contents/Resources) @@ -10,11 +10,56 @@ index e53248b..c705d67 100644 else() set(RSTUDIO_INSTALL_BIN RStudio.app/Contents/MacOS) set(RSTUDIO_INSTALL_SUPPORTING RStudio.app/Contents/Resources) +@@ -470,44 +471,6 @@ macro(add_stripped_executable _target) + define_source_file_names("${_target}") + endmacro(add_stripped_executable) + +-if(APPLE) +- +- # set Homebrew prefix directory +- if(NOT DEFINED HOMEBREW_PREFIX) +- +- if(UNAME_M STREQUAL arm64) +- set(HOMEBREW_PREFIX_FALLBACK /opt/homebrew) +- else() +- set(HOMEBREW_PREFIX_FALLBACK /usr/local) +- endif() +- +- find_path(HOMEBREW_PREFIX +- NAMES bin/brew +- HINTS +- "${HOMEBREW_PREFIX_FALLBACK}") +- +- message(STATUS "Using Homebrew: ${HOMEBREW_PREFIX}") +- +- endif() +- +- # help Boost find icu4c +- if(RSTUDIO_USE_SYSTEM_BOOST) +- link_directories(${HOMEBREW_PREFIX}/opt/icu4c/lib) +- endif() +- +- # set OPENSSL_ROOT_DIR if unset +- if(NOT DEFINED OPENSSL_ROOT_DIR) +- +- file(GLOB OPENSSL_ROOT_CANDIDATE "${HOMEBREW_PREFIX}/Cellar/openssl/*") +- if(EXISTS "${OPENSSL_ROOT_CANDIDATE}") +- set(OPENSSL_ROOT_DIR "${OPENSSL_ROOT_CANDIDATE}" CACHE INTERNAL "") +- elseif(EXISTS "${HOMEBREW_PREFIX}/opt/openssl") +- set(OPENSSL_ROOT_DIR "${HOMEBREW_PREFIX}/opt/openssl" CACHE INTERNAL "") +- endif() +- +- endif() +- +-endif() + + # If enabled, use caching for the build + if(SCCACHE_ENABLED) diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt -index 76f3acb..2910cee 100644 +index 62688dd..f909f8d 100644 --- a/src/cpp/CMakeLists.txt +++ b/src/cpp/CMakeLists.txt -@@ -243,7 +243,7 @@ endif() +@@ -167,7 +167,7 @@ endif() # determine whether we should statically link boost. we always do this # unless we are building a non-packaged build on linux (in which case # boost dynamic libraries are presumed to be installed on the system ldpath) @@ -23,7 +68,7 @@ index 76f3acb..2910cee 100644 set(Boost_USE_STATIC_LIBS ON) endif() -@@ -483,7 +483,7 @@ endif() +@@ -304,7 +304,7 @@ endif() # find SOCI libraries if(UNIX) @@ -32,8 +77,20 @@ index 76f3acb..2910cee 100644 find_library(SOCI_CORE_LIB NAMES "libsoci_core.a" "soci_core" REQUIRED) find_library(SOCI_SQLITE_LIB NAMES "libsoci_sqlite3.a" "soci_sqlite3" REQUIRED) if(RSTUDIO_PRO_BUILD) +diff --git a/src/cpp/session/postback/CMakeLists.txt b/src/cpp/session/postback/CMakeLists.txt +index 7bba997..4ef0abf 100644 +--- a/src/cpp/session/postback/CMakeLists.txt ++++ b/src/cpp/session/postback/CMakeLists.txt +@@ -36,6 +36,7 @@ add_stripped_executable(rpostback ${POSTBACK_SOURCE_FILES} ${POSTBACK_HEADER_FIL + # set link dependencies + target_link_libraries(rpostback + rstudio-core ++ ${FOUNDATION_LIBRARY} + ) + + if (RSTUDIO_SERVER) diff --git a/src/node/CMakeNodeTools.txt b/src/node/CMakeNodeTools.txt -index 40ae0f3..756fd5f 100644 +index fb3f394..3595f87 100644 --- a/src/node/CMakeNodeTools.txt +++ b/src/node/CMakeNodeTools.txt @@ -27,17 +27,7 @@ endif() @@ -85,10 +142,10 @@ index bccf5b3..0cc798a 100644 OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE diff --git a/src/node/desktop/src/main/session-launcher.ts b/src/node/desktop/src/main/session-launcher.ts -index 94f56ac..fe7d5d9 100644 +index d84de20..efef843 100644 --- a/src/node/desktop/src/main/session-launcher.ts +++ b/src/node/desktop/src/main/session-launcher.ts -@@ -91,29 +91,9 @@ function launchProcess(absPath: FilePath, argList: string[]): ChildProcess { +@@ -85,29 +85,9 @@ function launchProcess(absPath: FilePath, argList: string[]): ChildProcess { // DYLD_INSERT_LIBRARIES to inject the library we wish to use const rHome = new FilePath(getenv('R_HOME')); const rLib = rHome.completePath('lib/libR.dylib'); @@ -121,7 +178,7 @@ index 94f56ac..fe7d5d9 100644 } const rsessionOptions = new LogOptions('rsession'); -@@ -566,22 +546,6 @@ export class SessionLauncher { +@@ -563,22 +543,6 @@ export class SessionLauncher { } } diff --git a/pkgs/by-name/rs/rstudio/package.nix b/pkgs/by-name/rs/rstudio/package.nix index c4d1d3340d09..791f6eb2840e 100644 --- a/pkgs/by-name/rs/rstudio/package.nix +++ b/pkgs/by-name/rs/rstudio/package.nix @@ -17,7 +17,7 @@ git, jdk, makeWrapper, - nodejs_22, + nodejs, npmHooks, xcbuild, yarn, @@ -25,7 +25,7 @@ zip, boost187, - electron_37, + electron_38, fontconfig, gnumake, hunspellDicts, @@ -44,11 +44,7 @@ }: let - # nodejs_24 has npm v11, which broke the lockfile - # let's just use nodejs_22 for now - nodejs = nodejs_22; - - electron = electron_37; + electron = electron_38; mathJaxSrc = fetchzip { url = "https://s3.amazonaws.com/rstudio-buildtools/mathjax-27.zip"; @@ -66,10 +62,8 @@ let owner = "quarto-dev"; repo = "quarto"; # Note: rev should ideally be the last commit of the release/rstudio-[codename] branch - # Note: This is the last working revision, because https://github.com/quarto-dev/quarto/pull/757 - # started using `file:` in the lockfile, which our fetcher can't handle - rev = "faef822a085df65809adf55fb77c273e9cdb87b9"; - hash = "sha256-DLpVYl0OkaBQtkFinJAS2suZ8gqx9BVS5HBaYrrT1HA="; + rev = "591b3520eafbb4da7b26b9f31aac6948801f19d8"; + hash = "sha256-scdm66Ekfjp5wdNDXcVZA5ZhNgFvuf/kIBF56HrE8uM="; }; hunspellDictionaries = lib.filter lib.isDerivation (lib.unique (lib.attrValues hunspellDicts)); @@ -91,13 +85,13 @@ let in stdenv.mkDerivation rec { pname = "RStudio"; - version = "2025.09.2+418"; + version = "2026.01.0+392"; src = fetchFromGitHub { owner = "rstudio"; repo = "rstudio"; tag = "v${version}"; - hash = "sha256-UFhvNLamKZQ9IBjEtDvSPOUILqGphDDOVb7ZZ8dnfVU="; + hash = "sha256-Q79uoNKh4plRFTe3uOTr27Hh/fMMkCbRPveZyq7cHQk="; }; # sources fetched into _deps via cmake's FetchContent @@ -129,7 +123,7 @@ stdenv.mkDerivation rec { dontBuild = true; dontFixup = true; - outputHash = "sha256-pXpp42hjjKrV75f2XLDYK7A9lrvWhuQBDJ0oymXE8Fg="; + outputHash = "sha256-t2kWnviFMw7TdxaJpiGDXe0M5HSIGD7o5hqWiPKUdOc="; outputHashAlgo = "sha256"; outputHashMode = "recursive"; }; @@ -183,7 +177,6 @@ stdenv.mkDerivation rec { (lib.cmakeBool "RSTUDIO_DISABLE_CHECK_FOR_UPDATES" true) (lib.cmakeBool "QUARTO_ENABLED" true) (lib.cmakeBool "RSTUDIO_ENABLE_COPILOT" false) # copilot-language-server is unfree - (lib.cmakeBool "RSTUDIO_CRASHPAD_ENABLED" false) # This is a NOOP except on x86_64-darwin (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" ( (placeholder "out") + (if stdenv.hostPlatform.isDarwin then "/Applications" else "/lib/rstudio") @@ -240,7 +233,7 @@ stdenv.mkDerivation rec { yarnOfflineCache = fetchYarnDeps { src = quartoSrc; - hash = "sha256-9ObJ3fzxPyGVfIgBj4BhCWqkrG1A2JqZsCreJA+1fWQ="; + hash = "sha256-XRxClyAaz3ja+Tr97aoqVxKhWOxezZ6OmEPGILdeOww="; }; dontYarnInstallDeps = true; # will call manually in preConfigure @@ -256,7 +249,7 @@ stdenv.mkDerivation rec { name = "rstudio-${version}-npm-deps"; inherit src; postPatch = "cd ${npmRoot}"; - hash = "sha256-/5GgRusDRyBMr5581ypTMzhqkvjpzYBaniFos524bEw="; + hash = "sha256-7gXLCFhan/TCTlc2okMWuWzfRYXmuwcqhmGKAqJOEM0="; }; preConfigure = '' @@ -290,10 +283,14 @@ stdenv.mkDerivation rec { # version in dependencies/common/install-mathjax ln -s ${mathJaxSrc} dependencies/mathjax-27 + # node used by cmake and node used for distribution + # version in cmake/globals.cmake + RSTUDIO_NODE_VERSION="22.13.1" + RSTUDIO_INSTALLED_NODE_VERSION="22.21.1" + mkdir -p dependencies/common/node - # node used by cmake - # version in cmake/globals.cmake (RSTUDIO_NODE_VERSION) - ln -s ${nodejs} dependencies/common/node/22.13.1 + ln -s ${nodejs} dependencies/common/node/$RSTUDIO_NODE_VERSION + ln -s ${nodejs} dependencies/common/node/$RSTUDIO_INSTALLED_NODE_VERSION-installed '' + lib.optionalString (!server) '' @@ -320,11 +317,6 @@ stdenv.mkDerivation rec { substituteInPlace node_modules/@electron/packager/dist/packager.js \ --replace-fail "await this.getElectronZipPath(downloadOpts)" "'$(pwd)/electron.zip'" - # Work around known nan issue for electron_33 and above - # https://github.com/nodejs/nan/issues/978 - substituteInPlace node_modules/nan/nan.h \ - --replace-fail '#include "nan_scriptorigin.h"' "" - # now that we patched everything, we still have to run the scripts we ignored with --ignore-scripts npm rebuild @@ -335,7 +327,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin '' + lib.optionalString (server && stdenv.hostPlatform.isLinux) '' - ln -s $out/lib/rstudio/bin/{crash-handler-proxy,postback,r-ldpath,rpostback,rserver,rserver-pam,rsession,rstudio-server} $out/bin + ln -s $out/lib/rstudio/bin/{postback,r-ldpath,rpostback,rserver,rserver-pam,rsession,rstudio-server} $out/bin '' + lib.optionalString (!server && stdenv.hostPlatform.isLinux) '' # remove unneeded electron files, since we'll wrap the app with our own electron @@ -350,7 +342,7 @@ stdenv.mkDerivation rec { ln -s $out/lib/rstudio/resources/app/bin/{diagnostics,rpostback} $out/bin '' + lib.optionalString (server && stdenv.hostPlatform.isDarwin) '' - ln -s $out/Applications/RStudio.app/Contents/MacOS/{crash-handler-proxy,postback,r-ldpath,rpostback,rserver,rserver-pam,rsession,rstudio-server} $out/bin + ln -s $out/Applications/RStudio.app/Contents/MacOS/{postback,r-ldpath,rpostback,rserver,rserver-pam,rsession,rstudio-server} $out/bin '' + lib.optionalString (!server && stdenv.hostPlatform.isDarwin) '' # electron can't find its files if we use a symlink here diff --git a/pkgs/by-name/ru/rustdesk/package.nix b/pkgs/by-name/ru/rustdesk/package.nix index c82c5dd04914..984957363d56 100644 --- a/pkgs/by-name/ru/rustdesk/package.nix +++ b/pkgs/by-name/ru/rustdesk/package.nix @@ -111,6 +111,11 @@ rustPlatform.buildRustPackage (finalAttrs: { xdotool ]; + postPatch = '' + sed -e '1i #include ' -i $cargoDepsCopy/webm-1.1.0/src/sys/libwebm/mkvparser/mkvparser.cc + sed -e '1i #include ' -i $cargoDepsCopy/webm-sys-1.0.4/libwebm/mkvparser/mkvparser.cc + ''; + # Add static ui resources and libsciter to same folder as binary so that it # can find them. postInstall = '' diff --git a/pkgs/by-name/sg/sg-323/package.nix b/pkgs/by-name/sg/sg-323/package.nix index 23c9dbc9dee2..8299ca0f9aea 100644 --- a/pkgs/by-name/sg/sg-323/package.nix +++ b/pkgs/by-name/sg/sg-323/package.nix @@ -52,10 +52,16 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail 'juce::juce_recommended_lto_flags' '# Not forcing LTO' - ''; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isLinux (toString [ + # juce, compiled in this build as part of a Git submodule, uses `-flto` as + # a Link Time Optimization flag, and instructs the plugin compiled here to + # use this flag to. This breaks the build for us. Using _fat_ LTO allows + # successful linking while still providing LTO benefits. If our build of + # `juce` was used as a dependency, we could have patched that `-flto` line + # in our juce's source, but that is not possible because it is used as a + # Git Submodule. + "-ffat-lto-objects" + ]); installPhase = let diff --git a/pkgs/by-name/sh/shadow-tls/package.nix b/pkgs/by-name/sh/shadow-tls/package.nix index f985456e6329..960372fdf6b5 100644 --- a/pkgs/by-name/sh/shadow-tls/package.nix +++ b/pkgs/by-name/sh/shadow-tls/package.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-1oJCdqBa1pWpQ7QvZ0vZaOd73R+SzR9OPf+yoI+RwCY="; - env.RUSTC_BOOTSTRAP = 1; + RUSTC_BOOTSTRAP = 1; # network required doCheck = false; diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix index bc85b6048099..9fd84b6a07e2 100644 --- a/pkgs/by-name/si/signal-desktop/package.nix +++ b/pkgs/by-name/si/signal-desktop/package.nix @@ -60,7 +60,10 @@ let owner = "signalapp"; repo = "Signal-Desktop"; tag = "v${version}"; - hash = "sha256-hzeioXrO9kdFFTGhhY4klrCxRgS1eoGY7+7fTGsN4cY="; + hash = "sha256-r1RB6vtG2mdRJifaKNrmQvxJxXOqkpHoWivvPPpesow="; + postCheckout = '' + git -C "$out" show -s --format=%ct > "$out"/GIT_COMMIT_TIME + ''; }; sticker-creator = stdenv.mkDerivation (finalAttrs: { @@ -127,6 +130,10 @@ stdenv.mkDerivation (finalAttrs: { # it at runtime. substituteInPlace app/updateDefaultSession.main.ts \ --replace-fail "\''${process.versions.electron}" "`jq -r '.devDependencies.electron' < package.json`" + + # https://github.com/signalapp/Signal-Desktop/issues/7667 + substituteInPlace ts/util/version.std.ts \ + --replace-fail 'isAdhoc(version)' 'true' ''; pnpmDeps = fetchPnpmDeps { @@ -148,9 +155,12 @@ stdenv.mkDerivation (finalAttrs: { env = { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; SIGNAL_ENV = "production"; - SOURCE_DATE_EPOCH = 1766066770; }; + preConfigure = '' + export SOURCE_DATE_EPOCH=`cat GIT_COMMIT_TIME` + ''; + preBuild = '' if [ "`jq -r '.engines.node' < package.json | cut -d. -f1`" != "${lib.versions.major nodejs.version}" ] then diff --git a/pkgs/by-name/si/signal-desktop/update.sh b/pkgs/by-name/si/signal-desktop/update.sh index d4dca6e74ef8..a39078678c1d 100755 --- a/pkgs/by-name/si/signal-desktop/update.sh +++ b/pkgs/by-name/si/signal-desktop/update.sh @@ -13,8 +13,6 @@ releaseInfo="`curl_github \ "https://api.github.com/repos/signalapp/Signal-Desktop/releases/latest"`" releaseTag="`jq -r ".tag_name" <<< $releaseInfo`" -releaseDate="`jq -r ".created_at" <<< $releaseInfo`" -releaseEpoch=`date -d $releaseDate +%s` packageJson="`curl_github "https://raw.githubusercontent.com/signalapp/Signal-Desktop/refs/tags/$releaseTag/package.json"`" @@ -29,7 +27,6 @@ webrtcVersion="`grep --only-matching "^webrtc.version=.*$" <<< $ringrtcVersionPr sed -E -i "s/(nodejs_)../\1$nodeVersion/" $SCRIPT_DIR/package.nix sed -E -i "s/(electron_)../\1$electronVersion/" $SCRIPT_DIR/package.nix -sed -E -i "s/(SOURCE_DATE_EPOCH = )[0-9]+/\1$releaseEpoch/" $SCRIPT_DIR/package.nix sed -E -i "s/(withAppleEmojis \? )false/\1true/" $SCRIPT_DIR/package.nix nix-update signal-desktop --subpackage sticker-creator --version="$latestVersion" diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix index dbd7fc048b65..acacdd301a98 100644 --- a/pkgs/by-name/si/signalbackup-tools/package.nix +++ b/pkgs/by-name/si/signalbackup-tools/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20260105-2"; + version = "20260108-2"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; tag = version; - hash = "sha256-xGHrzG1ssb16x4xwWyY3kevmrWCxsGygF7Kn1VgRHWs="; + hash = "sha256-5WDwlhy8oRVqmFWY28Fz9ZNhliwP9GjFkBaEZOAGb7M="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sk/skaffold/package.nix b/pkgs/by-name/sk/skaffold/package.nix index 833c5de2570e..0dc1bc6907ea 100644 --- a/pkgs/by-name/sk/skaffold/package.nix +++ b/pkgs/by-name/sk/skaffold/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "skaffold"; - version = "2.17.0"; + version = "2.17.1"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - hash = "sha256-2IXUQo6o9HiU5/98mMp96Mzjmku2YhiZu3EROSTtG3o="; + hash = "sha256-Cbpfz0IXFopCeKNDwx8mB/1quhcOO3IWStsFmKeNPYg="; }; vendorHash = null; diff --git a/pkgs/by-name/sn/snell/package.nix b/pkgs/by-name/sn/snell/package.nix new file mode 100644 index 000000000000..c55ab58baa1e --- /dev/null +++ b/pkgs/by-name/sn/snell/package.nix @@ -0,0 +1,54 @@ +{ + lib, + stdenv, + fetchzip, + autoPatchelfHook, + upx, +}: +let + platformMap = { + "x86_64-linux" = "linux-amd64"; + "aarch64-linux" = "linux-aarch64"; + }; + system = stdenv.hostPlatform.system; + platform = platformMap.${system} or (throw "Unsupported platform: ${system}"); + hashs = { + "x86_64-linux" = "sha256-J2kRVJRC0GhxLMarg7Ucdk8uvzTsKbFHePEflPjwsHU="; + "aarch64-linux" = "sha256-UT+Rd6TEMYL/+xfqGxGN/tiSBvN8ntDrkCBj4PuMRwg="; + }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "snell-server"; + version = "5.0.1"; + + src = fetchzip { + url = "https://dl.nssurge.com/snell/snell-server-v${finalAttrs.version}-${platform}.zip"; + hash = hashs.${system}; + }; + + nativeBuildInputs = [ + upx + autoPatchelfHook + ]; + buildInputs = [ + (lib.getLib stdenv.cc.cc) + ]; + installPhase = '' + runHook preInstall + upx -d snell-server + install -Dm755 snell-server $out/bin/snell-server + runHook postInstall + ''; + + meta = { + description = "Lean encrypted proxy protocol"; + homepage = "https://kb.nssurge.com/surge-knowledge-base/release-notes/snell"; + license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + platforms = lib.attrNames platformMap; + maintainers = with lib.maintainers; [ + mlyxshi + ]; + mainProgram = "snell-server"; + }; +}) diff --git a/pkgs/by-name/so/socalabs-papu/package.nix b/pkgs/by-name/so/socalabs-papu/package.nix new file mode 100644 index 000000000000..8b4b06b2f221 --- /dev/null +++ b/pkgs/by-name/so/socalabs-papu/package.nix @@ -0,0 +1,144 @@ +{ + stdenv, + fetchFromGitHub, + lib, + cmake, + pkg-config, + alsa-lib, + copyDesktopItems, + makeDesktopItem, + libX11, + libXcomposite, + libXcursor, + libXinerama, + libXrandr, + libXtst, + libXdmcp, + libXext, + xvfb, + freetype, + fontconfig, + expat, + libGL, + libjack2, + curl, + ninja, + writableTmpDirAsHomeHook, + nix-update-script, + # Disable VST building by default, since its unfree + enableVST2 ? false, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "socalabs-papu"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "FigBug"; + repo = "PAPU"; + tag = "v${finalAttrs.version}"; + hash = "sha256-psSwQJwfCvsSgF72/K0WZQRqt0CoasVITLH69V4XcUg="; + fetchSubmodules = true; + }; + + desktopItems = [ + (makeDesktopItem { + type = "Application"; + name = "socalabs-papu"; + desktopName = "Socalabs PAPU"; + comment = "Socalabs Nintendo Gameboy PAPU Emulation Plugin (Standalone)"; + icon = "PAPU"; + exec = "PAPU"; + categories = [ + "Audio" + "AudioVideo" + ]; + }) + ]; + + nativeBuildInputs = [ + writableTmpDirAsHomeHook + cmake + pkg-config + copyDesktopItems + ninja + ]; + + buildInputs = [ + alsa-lib + libX11 + libXcomposite + libXcursor + libXinerama + libXrandr + libXtst + libXdmcp + libXext + xvfb + libGL + libjack2 + freetype + fontconfig + expat + curl + ]; + + cmakeFlags = [ + (lib.cmakeBool "JUCE_COPY_PLUGIN_AFTER_BUILD" false) + "--preset ninja-gcc" + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'FORMATS Standalone VST VST3 AU LV2' 'FORMATS Standalone ${lib.optionalString enableVST2 "VST"} VST3 LV2' + ''; + + strictDeps = true; + + preBuild = '' + cd ../Builds/ninja-gcc + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/vst3 $out/lib/lv2 $out/bin + + ${lib.optionalString enableVST2 '' + mkdir -p $out/lib/vst + cp -r PAPU_artefacts/Release/VST/libPAPU.so $out/lib/vst + ''} + + cp -r PAPU_artefacts/Release/LV2/PAPU.lv2 $out/lib/lv2 + cp -r PAPU_artefacts/Release/VST3/PAPU.vst3 $out/lib/vst3 + + install -Dm555 PAPU_artefacts/Release/Standalone/PAPU $out/bin + + install -Dm444 $src/plugin/Resources/icon.png $out/share/pixmaps/PAPU.png + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + NIX_LDFLAGS = ( + toString [ + "-lX11" + "-lXext" + "-lXcomposite" + "-lXcursor" + "-lXinerama" + "-lXrandr" + "-lXtst" + "-lXdmcp" + ] + ); + + meta = { + description = "Socalabs Nintendo Gameboy PAPU Emulation Plugin"; + homepage = "https://socalabs.com/synths/papu/"; + mainProgram = "PAPU"; + platforms = lib.platforms.linux; + license = [ lib.licenses.gpl2 ] ++ lib.optional enableVST2 lib.licenses.unfree; + maintainers = [ lib.maintainers.l1npengtul ]; + }; +}) diff --git a/pkgs/by-name/so/soft-serve/package.nix b/pkgs/by-name/so/soft-serve/package.nix index f2fc8c95b723..672ab0487b7c 100644 --- a/pkgs/by-name/so/soft-serve/package.nix +++ b/pkgs/by-name/so/soft-serve/package.nix @@ -9,7 +9,7 @@ }: let - version = "0.11.1"; + version = "0.11.2"; in buildGoModule { pname = "soft-serve"; @@ -19,10 +19,10 @@ buildGoModule { owner = "charmbracelet"; repo = "soft-serve"; rev = "v${version}"; - hash = "sha256-rWLjir4BqeLgwTGpumIoZ+No3bJyqeyrrNJ8da1Ivhg="; + hash = "sha256-FItQus4dAf1/wG+7B3oC5Z/7rv3HG/b7lcbrsW4IUyM="; }; - vendorHash = "sha256-DBgVcbt2kejtEJSajJh6vS4feT3Lwm+KqUOks55iWIc="; + vendorHash = "sha256-bGtIqdbjkQZD0lOfAOS022gPBGWWzXsjfLbbLwup1/Q="; doCheck = false; diff --git a/pkgs/by-name/so/sonobus/package.nix b/pkgs/by-name/so/sonobus/package.nix index ccff9bc0cb01..416359bc5717 100644 --- a/pkgs/by-name/so/sonobus/package.nix +++ b/pkgs/by-name/so/sonobus/package.nix @@ -76,10 +76,18 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux "-rpath ${lib.makeLibraryPath (finalAttrs.runtimeDependencies)}"; dontPatchELF = true; # needed or nix will try to optimize the binary by removing "useless" rpath + env.NIX_CFLAGS_COMPILE = toString [ + # juce, compiled in this build as part of a Git submodule, uses `-flto` as + # a Link Time Optimization flag, and instructs the plugin compiled here to + # use this flag to. This breaks the build for us. Using _fat_ LTO allows + # successful linking while still providing LTO benefits. If our build of + # `juce` was used as a dependency, we could have patched that `-flto` line + # in our juce's source, but that is not possible because it is used as a + # Git Submodule. + "-ffat-lto-objects" + ]; + postPatch = lib.optionalString (stdenv.hostPlatform.isLinux) '' - # needs special setup on Linux, dunno if it can work on Darwin - # Also, I get issues with linking without that, not sure why - sed -i -e '/juce::juce_recommended_lto_flags/d' CMakeLists.txt patchShebangs linux/install.sh ''; diff --git a/pkgs/by-name/sq/sqld/package.nix b/pkgs/by-name/sq/sqld/package.nix index 8254f81468b0..c814d4d303d3 100644 --- a/pkgs/by-name/sq/sqld/package.nix +++ b/pkgs/by-name/sq/sqld/package.nix @@ -55,10 +55,12 @@ rustPlatform.buildRustPackage rec { zstd ]; - env.ZSTD_SYS_USE_PKG_CONFIG = true; + env = { + ZSTD_SYS_USE_PKG_CONFIG = true; - # error[E0425]: cannot find function `consume_budget` in module `tokio::task` - env.RUSTFLAGS = "--cfg tokio_unstable"; + # error[E0425]: cannot find function `consume_budget` in module `tokio::task` + RUSTFLAGS = "--cfg tokio_unstable"; + }; # requires a complex setup with podman for the end-to-end tests doCheck = false; diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix index 903475c18317..72529efccc87 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.44"; + version = "3.16.47"; src = fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; tag = finalAttrs.version; - hash = "sha256-NetBsY30rvt82ueoUSgl7VWhdOPmEy7BjSgZS794MJg="; + hash = "sha256-wmXPgDazzB7WtbbxuEe7liYTmzBtV6Q4DKcsk90ona4="; }; outputs = [ diff --git a/pkgs/by-name/su/subfont/package.nix b/pkgs/by-name/su/subfont/package.nix index 58eafd3ed739..1032f8db3599 100644 --- a/pkgs/by-name/su/subfont/package.nix +++ b/pkgs/by-name/su/subfont/package.nix @@ -1,6 +1,7 @@ { lib, buildNpmPackage, + nodejs_22, fetchurl, testers, }: @@ -16,6 +17,8 @@ in buildNpmPackage (finalAttrs: { inherit pname version src; + nodejs = nodejs_22; + npmDepsHash = "sha256-vqsm8/1I1HFo9IZdOqGQ/qFEyLTYY5uwtsnp1PJfPIk="; postPatch = '' diff --git a/pkgs/by-name/su/subxt/package.nix b/pkgs/by-name/su/subxt/package.nix index f0c69289e153..ba93d9591136 100644 --- a/pkgs/by-name/su/subxt/package.nix +++ b/pkgs/by-name/su/subxt/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "subxt"; - version = "0.44.0"; + version = "0.44.1"; src = fetchFromGitHub { owner = "paritytech"; repo = "subxt"; rev = "v${version}"; - hash = "sha256-gn8PdVvXGDEAfeDMXtMILsGBTy6y1jFdYXVeFrbHNyo="; + hash = "sha256-W4bQVgEvnmYZomLD4ToProCvAKnh94Mw9Rr18b9GVEg="; }; - cargoHash = "sha256-JLQr2GDdAFXlsr2F9a5VQ8HwAFpEhYWfsLEdLfABGDM="; + cargoHash = "sha256-AdFO0U3vj7yxhGmpXkn6iIQ8+zS6dd+eGVkWnonoy24="; # Only build the command line client cargoBuildFlags = [ diff --git a/pkgs/by-name/su/surrealdb/package.nix b/pkgs/by-name/su/surrealdb/package.nix index 724799abd25e..058a18c22b6f 100644 --- a/pkgs/by-name/su/surrealdb/package.nix +++ b/pkgs/by-name/su/surrealdb/package.nix @@ -26,13 +26,15 @@ rustPlatform.buildRustPackage (finalAttrs: { rm .cargo/config.toml ''; - PROTOC = "${protobuf}/bin/protoc"; - PROTOC_INCLUDE = "${protobuf}/include"; + env = { + PROTOC = "${protobuf}/bin/protoc"; + PROTOC_INCLUDE = "${protobuf}/include"; - ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; - ROCKSDB_LIB_DIR = "${rocksdb}/lib"; + ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; + ROCKSDB_LIB_DIR = "${rocksdb}/lib"; - RUSTFLAGS = "--cfg surrealdb_unstable"; + RUSTFLAGS = "--cfg surrealdb_unstable"; + }; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs b/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs index 6d13b3c7605f..22d5f4954faf 100644 --- a/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs +++ b/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs @@ -87,6 +87,12 @@ const DRY_RELOAD_BY_ACTIVATION_LIST_FILE: &str = "/run/nixos/dry-activation-relo // Reuse the same default timeout that systemd uses. See https://github.com/systemd/systemd/blob/8b4278d12ec55cc3f96764bc8197e1055fbb6d3f/src/libsystemd/sd-bus/bus-internal.h#L312 const BUS_TIMEOUT: Duration = Duration::from_secs(25); +// Reuse the same daemon reload/reexecute timeout that systemd uses. See https://github.com/systemd/systemd/blob/5366dbdbd44ba4dc0c914dd4daa1a5297e0b2bde/src/basic/constants.h#L18 +const DAEMON_RELOAD_TIMEOUT: Duration = Duration::from_secs(180); + +// Used during times of waiting for D-Bus to process messages. +const DBUS_PROCESS_TIME: Duration = Duration::from_millis(500); + #[derive(Debug, Clone, PartialEq)] enum Action { Switch, @@ -932,7 +938,7 @@ fn block_on_jobs( "waiting for submitted jobs to finish, still have {} job(s)", submitted_jobs.borrow().len() ); - _ = conn.process(Duration::from_millis(500)); + _ = conn.process(DBUS_PROCESS_TIME); } } @@ -987,7 +993,7 @@ fn do_user_switch(parent_exe: String) -> anyhow::Result<()> { log::debug!("waiting for nixos activation to finish"); while !*nixos_activation_done.borrow() { _ = dbus_conn - .process(Duration::from_secs(500)) + .process(DBUS_PROCESS_TIME) .context("Failed to process dbus messages")?; } @@ -1158,19 +1164,19 @@ won't take effect until you reboot the system. let submitted_jobs = Rc::new(RefCell::new(HashMap::new())); let finished_jobs = Rc::new(RefCell::new(HashMap::new())); - let systemd_reload_status = Rc::new(RefCell::new(false)); + let systemd_is_reloading = Rc::new(RefCell::new(false)); systemd .subscribe() .context("Failed to subscribe to systemd dbus messages")?; - let _systemd_reload_status = systemd_reload_status.clone(); + let _systemd_is_reloading = systemd_is_reloading.clone(); let reloading_token = systemd .match_signal( move |signal: OrgFreedesktopSystemd1ManagerReloading, _: &LocalConnection, _msg: &Message| { - *_systemd_reload_status.borrow_mut() = signal.active; + *_systemd_is_reloading.borrow_mut() = signal.active; true }, @@ -1690,13 +1696,23 @@ won't take effect until you reboot the system. // just in case the new one has trouble communicating with the running pid 1. if restart_systemd { eprintln!("restarting systemd..."); + *systemd_is_reloading.borrow_mut() = true; _ = systemd.reexecute(); // we don't get a dbus reply here log::debug!("waiting for systemd restart to finish"); - while !*systemd_reload_status.borrow() { + + let mut reexec_time_waited = Duration::from_secs(0); + while *systemd_is_reloading.borrow() { _ = dbus_conn - .process(Duration::from_millis(500)) + .process(DBUS_PROCESS_TIME) .context("Failed to process dbus messages")?; + reexec_time_waited += DBUS_PROCESS_TIME; + if reexec_time_waited >= DAEMON_RELOAD_TIMEOUT { + anyhow::bail!( + "systemd daemon reexecute failed, timeout after {:?}", + DAEMON_RELOAD_TIMEOUT + ); + } } } @@ -1706,12 +1722,22 @@ won't take effect until you reboot the system. .context("Failed to reset failed units")?; // Make systemd reload its units. + *systemd_is_reloading.borrow_mut() = true; _ = systemd.reload(); // we don't get a dbus reply here log::debug!("waiting for systemd reload to finish"); - while !*systemd_reload_status.borrow() { + + let mut reload_time_waited = Duration::from_secs(0); + while *systemd_is_reloading.borrow() { _ = dbus_conn - .process(Duration::from_millis(500)) + .process(DBUS_PROCESS_TIME) .context("Failed to process dbus messages")?; + reload_time_waited += DBUS_PROCESS_TIME; + if reload_time_waited >= DAEMON_RELOAD_TIMEOUT { + anyhow::bail!( + "systemd daemon reload failed, timeout after {:?}", + DAEMON_RELOAD_TIMEOUT + ); + } } dbus_conn diff --git a/pkgs/by-name/sy/sylkserver/package.nix b/pkgs/by-name/sy/sylkserver/package.nix index 8f8fce608f9f..d2fcb511e53c 100644 --- a/pkgs/by-name/sy/sylkserver/package.nix +++ b/pkgs/by-name/sy/sylkserver/package.nix @@ -37,7 +37,7 @@ python3Packages.buildPythonApplication rec { msrplib python3-eventlib python3-gnutls - sipsimple + python3-sipsimple wokkel xcaplib ]; diff --git a/pkgs/by-name/sy/syndicate-server/package.nix b/pkgs/by-name/sy/syndicate-server/package.nix index 4f6219b3596a..025b446e0e81 100644 --- a/pkgs/by-name/sy/syndicate-server/package.nix +++ b/pkgs/by-name/sy/syndicate-server/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl ]; - env.RUSTC_BOOTSTRAP = 1; + RUSTC_BOOTSTRAP = 1; doCheck = false; doInstallCheck = true; diff --git a/pkgs/by-name/sy/systemd-lsp/package.nix b/pkgs/by-name/sy/systemd-lsp/package.nix index 2d4ed253a1a6..1a2c38d50e37 100644 --- a/pkgs/by-name/sy/systemd-lsp/package.nix +++ b/pkgs/by-name/sy/systemd-lsp/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "systemd-lsp"; - version = "2025.12.30"; + version = "2026.01.06"; src = fetchFromGitHub { owner = "JFryy"; repo = "systemd-lsp"; tag = "v${finalAttrs.version}"; - hash = "sha256-iDVyWV+j1zdcF5Fpl1X7y/itHNLg3cxcvi4UrDrgicg="; + hash = "sha256-wTqbktVaGUk3/cJ3oH1GXvddqVKJQe09sRiyaU+cqCg="; }; - cargoHash = "sha256-D8XkMzh6dxXGGrDpkREUl0RkN/vhbw9uQYtqdiTcfBE="; + cargoHash = "sha256-2+0+VeHEsUyTivDU7FQbm44RZe0t0hsVHNN2fplDlRI="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix index 34bb3a4ee5ff..704ff4a1c306 100644 --- a/pkgs/by-name/ta/tailscale/package.nix +++ b/pkgs/by-name/ta/tailscale/package.nix @@ -24,7 +24,7 @@ buildGoModule (finalAttrs: { pname = "tailscale"; - version = "1.92.4"; + version = "1.92.5"; outputs = [ "out" @@ -35,7 +35,7 @@ buildGoModule (finalAttrs: { owner = "tailscale"; repo = "tailscale"; tag = "v${finalAttrs.version}"; - hash = "sha256-IMRFye4P3D3TKlZfBPnwh7NmrfU5EDBVmyaD9aIuQLg="; + hash = "sha256-S0aD+x8dUPHaNb5MdB41oeID/8eERB3FKKuuqlCqJkU="; }; vendorHash = "sha256-jJSSXMyUqcJoZuqfSlBsKDQezyqS+jDkRglMMjG1K8g="; @@ -84,6 +84,9 @@ buildGoModule (finalAttrs: { # panic: httptest: failed to listen on a port: listen tcp6 [::1]:0: bind: operation not permitted __darwinAllowLocalNetworking = true; + # Tests are in the `tests` passthru derivation because they are flaky, frequently causing build failures. + doCheck = false; + preCheck = '' # feed in all tests for testing # subPackages above limits what is built to just what we @@ -215,6 +218,7 @@ buildGoModule (finalAttrs: { passthru.tests = { inherit (nixosTests) headscale; inherit tailscale-nginx-auth; + tests = finalAttrs.finalPackage.overrideAttrs { doCheck = true; }; }; meta = { diff --git a/pkgs/by-name/ti/tic-80/package.nix b/pkgs/by-name/ti/tic-80/package.nix index 82e08012f082..1c9cf9c3184c 100644 --- a/pkgs/by-name/ti/tic-80/package.nix +++ b/pkgs/by-name/ti/tic-80/package.nix @@ -21,7 +21,7 @@ }: let # git rev-list HEAD --count - revision = "3042"; + revision = "3049"; year = "2025"; in @@ -29,18 +29,18 @@ stdenv.mkDerivation { pname = "tic-80"; # use an untagged version until upstream tags a new version. We want # 'PREFER_SYSTEM_LIBRARIES', and without it tic-80 won't build - version = "1.1-unstable-2025-10-21"; + version = "1.1-unstable-2025-12-30"; src = fetchFromGitHub { owner = "nesbox"; repo = "TIC-80"; - rev = "a2c875f7275541e7724199ce8e504fb578b819a6"; + rev = "881828910e77c799c1a6894cadc2d05a5c2f3f70"; # TIC-80 vendors its dependencies as submodules. For the following dependencies, # there are no (or no compatible) packages in nixpkgs yet, so we use the vendored # ones as a fill-in: wasm, squirrel, pocketpy, argparse, naett, # sdlgpu, mruby. fetchSubmodules = true; - hash = "sha256-S/v1WHrvVndW4qHFWRJc3dcQkjw5vCU1/mN0PW9Wfkc="; + hash = "sha256-bqLVoLJpT62k9d+WZUgIu4ClcJNUvURB7j+NE/fzWNk="; }; # TIC-80 tries to determine the revision part of the version using its Git history. diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix index 21db267878f9..e745798080d4 100644 --- a/pkgs/by-name/ti/tinymist/package.nix +++ b/pkgs/by-name/ti/tinymist/package.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tinymist"; # Please update the corresponding vscode extension when updating # this derivation. - version = "0.14.6"; + version = "0.14.8"; src = fetchFromGitHub { owner = "Myriad-Dreamin"; repo = "tinymist"; tag = "v${finalAttrs.version}"; - hash = "sha256-bAfehxoI5oDAMgkj1BbQ2I8j2rvITXLHbIWN+gW7TPA="; + hash = "sha256-0bO5Sn/602m9uE/dHls0RmRbTE1x+p2wEaah4xU2t0g="; }; - cargoHash = "sha256-c3kJ/d/EPtccdzIw9KDZPJkMsXNSaVhF36/jbRkiAaU="; + cargoHash = "sha256-iz5NTPqWEVKpQLD7UayiRTeFDerUUAwMQJ4R1NOfC0o="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/tl/tldx/package.nix b/pkgs/by-name/tl/tldx/package.nix index 861066eef2c0..070a6e047f2e 100644 --- a/pkgs/by-name/tl/tldx/package.nix +++ b/pkgs/by-name/tl/tldx/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "tldx"; - version = "1.3.0"; + version = "1.3.4"; src = fetchFromGitHub { owner = "brandonyoungdev"; repo = "tldx"; tag = "v${finalAttrs.version}"; - hash = "sha256-JdVngzH6Md7LPV5m8p+C8CW/JRdXlEX19C9+oMTEtDY="; + hash = "sha256-yKC/omwFG4equAlBHz25Wx+X/06N0x4vdNchiWSfZZQ="; }; - vendorHash = "sha256-Dzeo4ZvbKUow8IF5Lal1GK7sT71IEBPDitYCvNaK4aI="; + vendorHash = "sha256-FVcTTfOf1eAiR6Iys1uesZWpVrnMTGX7zS1MdeXDoQM="; ldflags = [ "-s" diff --git a/pkgs/by-name/to/tokio-console/package.nix b/pkgs/by-name/to/tokio-console/package.nix index daafce25d061..f57ef2d3f986 100644 --- a/pkgs/by-name/to/tokio-console/package.nix +++ b/pkgs/by-name/to/tokio-console/package.nix @@ -28,13 +28,13 @@ rustPlatform.buildRustPackage rec { ]; # uses currently unstable tokio features - RUSTFLAGS = "--cfg tokio_unstable"; + env.RUSTFLAGS = "--cfg tokio_unstable"; checkFlags = [ # tests depend upon git repository at test execution time - "--skip bootstrap" - "--skip config::tests::args_example_changed" - "--skip config::tests::toml_example_changed" + "--skip=bootstrap" + "--skip=config::tests::args_example_changed" + "--skip=config::tests::toml_example_changed" ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' diff --git a/pkgs/by-name/to/topicctl/package.nix b/pkgs/by-name/to/topicctl/package.nix index 1ec61ba1762b..a11fa855328e 100644 --- a/pkgs/by-name/to/topicctl/package.nix +++ b/pkgs/by-name/to/topicctl/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "topicctl"; - version = "1.23.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "segmentio"; repo = "topicctl"; rev = "v${version}"; - sha256 = "sha256-49byQWrv0yDPCAMcgltlDnmYZ5TWyTUIZy0K46CiTUs="; + sha256 = "sha256-48s15CF6prLoaZjJ77bXNM0Y8ZkFlDTEJUb+DtnbwZY="; }; vendorHash = "sha256-ltvWWB0Y5arPV8o3bSYHcDf1ZSRRCrPriXklShj/fjo="; diff --git a/pkgs/by-name/tr/trojan-rs/package.nix b/pkgs/by-name/tr/trojan-rs/package.nix index 422db3cbc707..371a88292d7a 100644 --- a/pkgs/by-name/tr/trojan-rs/package.nix +++ b/pkgs/by-name/tr/trojan-rs/package.nix @@ -21,8 +21,10 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ rustPlatform.bindgenHook ]; buildInputs = [ ipset ]; - env.RUSTC_BOOTSTRAP = true; - env.RUSTFLAGS = "--cfg tokio_unstable"; + env = { + RUSTC_BOOTSTRAP = true; + RUSTFLAGS = "--cfg tokio_unstable"; + }; meta = { homepage = "https://github.com/lazytiger/trojan-rs"; diff --git a/pkgs/by-name/tt/tt-system-tools/package.nix b/pkgs/by-name/tt/tt-system-tools/package.nix index f242fba017ff..a2190a639010 100644 --- a/pkgs/by-name/tt/tt-system-tools/package.nix +++ b/pkgs/by-name/tt/tt-system-tools/package.nix @@ -9,13 +9,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "tt-system-tools"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "tenstorrent"; repo = "tt-system-tools"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZtEs1XRho/EJShAV6+8Db2wxCK2QQBuNp+TRqb+ZiM4="; + hash = "sha256-bJtDfOXwtIKQMu8B+5/UYLmwBv/KTtGEsxAUhF2w6OY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix index 2a6ed9950e2b..bd19dbd99a6d 100644 --- a/pkgs/by-name/ty/ty/package.nix +++ b/pkgs/by-name/ty/ty/package.nix @@ -14,14 +14,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ty"; - version = "0.0.9"; + version = "0.0.10"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ty"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-6f1qm0n8kPPFGCVi+McsqlnMsV1qG1Um2BA/i+YT8Wg="; + hash = "sha256-nloCLGxW1T4INzBSx5BJR8sCUWK3c7lGE9D5SgCW7PQ="; }; # For Darwin platforms, remove the integration test for file notifications, @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoBuildFlags = [ "--package=ty" ]; - cargoHash = "sha256-AWYxIPp+/pzTBjv1VjHumKuNfjU/ByspfONezEFE+FY="; + cargoHash = "sha256-Tg4MYpbRjW9qvIzRCceX0lEMLThe4bo1/+xyNOzb+T0="; nativeBuildInputs = [ installShellFiles ]; @@ -60,9 +60,9 @@ rustPlatform.buildRustPackage (finalAttrs: { # Flaky: # called `Result::unwrap()` on an `Err` value: Os { code: 26, kind: ExecutableFileBusy, message: "Text file busy" } "--skip=python_environment::ty_environment_and_active_environment" + "--skip=python_environment::ty_environment_and_discovered_venv" "--skip=python_environment::ty_environment_is_only_environment" "--skip=python_environment::ty_environment_is_system_not_virtual" - "--skip=python_environment::ty_environment_and_discovered_venv" ]; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/ty/typescript-go/package.nix b/pkgs/by-name/ty/typescript-go/package.nix index 42cbbb1cc178..0e14c5041266 100644 --- a/pkgs/by-name/ty/typescript-go/package.nix +++ b/pkgs/by-name/ty/typescript-go/package.nix @@ -10,13 +10,13 @@ let in buildGoModule { pname = "typescript-go"; - version = "0-unstable-2025-12-28"; + version = "0-unstable-2026-01-08"; src = fetchFromGitHub { owner = "microsoft"; repo = "typescript-go"; - rev = "1611cc951fa772cfca09c38fe2d981f6da5d20b8"; - hash = "sha256-lFyHFg6u0G6E5fEOYt/N55LrLOHDCiZ6OA+NAZABkGE="; + rev = "ceefddd3b46e03cb98c0bf088676d7b6be6021a1"; + hash = "sha256-IWaqL55dK3HEv6DTSjuQObKNgSEfvBdiD9RmfDSaQ0M="; fetchSubmodules = false; }; diff --git a/pkgs/by-name/un/unison-ucm/package.nix b/pkgs/by-name/un/unison-ucm/package.nix index eca7813c0c56..1b2d38df93f2 100644 --- a/pkgs/by-name/un/unison-ucm/package.nix +++ b/pkgs/by-name/un/unison-ucm/package.nix @@ -14,25 +14,25 @@ stdenv.mkDerivation (finalAttrs: { pname = "unison-code-manager"; - version = "1.0.1"; + version = "1.0.2"; src = { aarch64-darwin = fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos-arm64.tar.gz"; - hash = "sha256-yEV6wQge9LJ9tp2So85Q7DN/8LmmSJ9vgU1lYezdp5o="; + hash = "sha256-ZoacT9ssAHb0pjLyHBfc+4VI5Xh13QVzHWGOJpz9asU="; }; x86_64-darwin = fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos-x64.tar.gz"; - hash = "sha256-T1bZ/TQKeyW3m+IIxJkrEEDKJHGEJBHzJDLsH1Cfoag="; + hash = "sha256-rHT4ssN0dqPF28PgoEcxa0pgXcFNcJufUC1sxzWKV+4="; }; aarch64-linux = fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux-arm64.tar.gz"; - hash = "sha256-NXpKthOeYYqd9ZVbpXQpNf2O4aC/X9R/kSzoNzDTC7c="; + hash = "sha256-W4ComCy//3XWqVZvx6xvVFarv7okfNngSseHeDyNrDk="; }; x86_64-linux = fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux-x64.tar.gz"; - hash = "sha256-ovx+ZBR3ZDDb/HJ464lmhro6kd4OK8jbCSbYJgwubhU="; + hash = "sha256-7W16iJ+yklYiw2qYKhsW87FFAdhGZJZBOWldt4qHMBA="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/un/unpfs/package.nix b/pkgs/by-name/un/unpfs/package.nix index 99d7d9662bdf..4cf96dbdd0de 100644 --- a/pkgs/by-name/un/unpfs/package.nix +++ b/pkgs/by-name/un/unpfs/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-jRe1lgzfhzBUsS6wwwlqxxomap2TIDOyF3YBv20GJ14="; - env.RUSTC_BOOTSTRAP = 1; + RUSTC_BOOTSTRAP = 1; postInstall = '' install -D -m 0444 ../../README* -t "$out/share/doc/${pname}" diff --git a/pkgs/by-name/us/usql/package.nix b/pkgs/by-name/us/usql/package.nix index 35774454f805..81a0f478480f 100644 --- a/pkgs/by-name/us/usql/package.nix +++ b/pkgs/by-name/us/usql/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "usql"; - version = "0.20.0"; + version = "0.20.5"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; tag = "v${version}"; - hash = "sha256-/wF2cZ+gGr4ydSREMTvfNayLEOcOpsEeAlXpSYiVcI0="; + hash = "sha256-rMjUT4YBSI16L7bxLIs8hs0A+yQwEX3ZWm1Yym5w2jE="; }; buildInputs = [ @@ -25,7 +25,7 @@ buildGoModule rec { icu ]; - vendorHash = "sha256-hOTmU33gOWUfMJRmixQXY+qkQ2aanOTtEhYrycxyqFM="; + vendorHash = "sha256-bu9vU7rpq8sg5zHcmbOhdOkO18ci4dUErsLwip0j3Jo="; proxyVendor = true; # Exclude drivers from the bad group diff --git a/pkgs/by-name/uu/uutils-acl/package.nix b/pkgs/by-name/uu/uutils-acl/package.nix new file mode 100644 index 000000000000..9b69bc6b185d --- /dev/null +++ b/pkgs/by-name/uu/uutils-acl/package.nix @@ -0,0 +1,39 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "uutils-acl"; + version = "0.0.1-unstable-2026-01-08"; + + src = fetchFromGitHub { + owner = "uutils"; + repo = "acl"; + rev = "f5d374af73ec0206a6ea3106052550f873d5bcd8"; + hash = "sha256-38Mp2ue89e7fLYaGwJsbkq+4l25gQDfVeJMY2ZAjJ8c="; + }; + + cargoHash = "sha256-5rHHhs+Hz0Yzvi5V1D2NPR6l5juP4BvjJve+8bbWbXc="; + + checkFlags = [ + # Operation not supported + "--skip=common::util::tests::test_compare_xattrs" + # assertion failed + "--skip=test_setfacl::test_invalid_arg" + ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + + meta = { + description = "Rust reimplementation of the acl project"; + homepage = "https://github.com/uutils/acl"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kyehn ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/uu/uutils-procps/package.nix b/pkgs/by-name/uu/uutils-procps/package.nix new file mode 100644 index 000000000000..12c3a05b1a33 --- /dev/null +++ b/pkgs/by-name/uu/uutils-procps/package.nix @@ -0,0 +1,61 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + writableTmpDirAsHomeHook, + systemdLibs, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "uutils-procps"; + version = "0.0.1-unstable-2025-12-31"; + + src = fetchFromGitHub { + owner = "uutils"; + repo = "procps"; + rev = "644666759ec3e8f038a0d376b594e67a8780dc29"; + hash = "sha256-U/5thGk/1h4CkI63DllLUc3scrHbV4+djcxLiTC+3lM="; + }; + + cargoHash = "sha256-kWT5PYE68TUcYnz82zxhiMIZFAn8Rf00Oj7oLsmzsG8="; + + nativeBuildInputs = [ + pkg-config + writableTmpDirAsHomeHook + ]; + + buildInputs = [ systemdLibs ]; + + checkFlags = [ + # can't run on sandbox + "--skip=test_pgrep::test_count_with_matching_pattern" + "--skip=test_pgrep::test_list_full_process_with_empty_cmdline" + "--skip=test_pgrep::test_terminal_multiple_terminals" + "--skip=test_pgrep::test_unknown_terminal" + "--skip=test_pidof" + "--skip=test_pmap::test_device_permission_denied" + "--skip=test_pmap::test_extended_permission_denied" + "--skip=test_pmap::test_permission_denied" + "--skip=test_ps::test_deselect" + "--skip=test_ps::test_effective_group_selection" + "--skip=test_ps::test_effective_user_selection" + "--skip=test_ps::test_real_group_selection" + "--skip=test_ps::test_real_user_selection" + "--skip=test_pkill::test_inverse" + "--skip=test_pgrep::test_pidfile" + ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + + meta = { + description = "Rust reimplementation of the procps project"; + homepage = "https://github.com/uutils/procps"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kyehn ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/uu/uutils-sed/package.nix b/pkgs/by-name/uu/uutils-sed/package.nix new file mode 100644 index 000000000000..c89ac96235db --- /dev/null +++ b/pkgs/by-name/uu/uutils-sed/package.nix @@ -0,0 +1,29 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "uutils-sed"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "uutils"; + repo = "sed"; + tag = finalAttrs.version; + hash = "sha256-y1X9nj/quBtisp+6MHFjVKFHrdFnujWTxLWNLvdrADA="; + }; + + cargoHash = "sha256-N5wwNPjOL3U4bPSONGpjmOBU31Nt/sCVth+JH3xmz/g="; + + meta = { + changelog = "https://github.com/uutils/sed/releases/tag/${finalAttrs.version}"; + description = "Rewrite of sed in Rust"; + homepage = "https://github.com/uutils/sed"; + license = lib.licenses.mit; + mainProgram = "sed"; + maintainers = with lib.maintainers; [ kyehn ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/uu/uutils-util-linux/package.nix b/pkgs/by-name/uu/uutils-util-linux/package.nix new file mode 100644 index 000000000000..6a1c40e60413 --- /dev/null +++ b/pkgs/by-name/uu/uutils-util-linux/package.nix @@ -0,0 +1,74 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + coreutils, + pkg-config, + util-linux, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "uutils-util-linux"; + version = "0.0.1-unstable-2026-01-08"; + + src = fetchFromGitHub { + owner = "uutils"; + repo = "util-linux"; + rev = "8f87ce4641e8040eba624ffa99b73f73f73ab373"; + hash = "sha256-9U1vJyBEvOeesZrttSZg7vMqXSUj4eq/xtB2gRovXiA="; + }; + + postPatch = '' + substituteInPlace tests/by-util/test_setsid.rs \ + --replace-fail "/usr/bin/cat" "${lib.getExe' coreutils "cat"}" \ + --replace-fail "/usr/bin/true" "${lib.getExe' coreutils "true"}" \ + --replace-fail "/usr/bin/false" "${lib.getExe' coreutils "false"}" + substituteInPlace tests/by-util/test_setpgid.rs \ + --replace-fail "echo" "${lib.getExe' coreutils "echo"}" \ + --replace-fail '"cut"' '"${lib.getExe' coreutils "cut"}"' + ''; + + cargoHash = "sha256-k1wIiL1DUkk9+UJX+6mgNEW+0zGNHuUTPUk8zuQFo1s="; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + ]; + + buildInputs = [ util-linux ]; + + preBuild = '' + export NIX_LDFLAGS="$NIX_LDFLAGS -lsmartcols -lmount" + ''; + + checkFlags = [ + # Operation not supported + "--skip=common::util::tests::test_compare_xattrs" + # can't run on sandbox + "--skip=test_last::test_display_hostname_last_column" + "--skip=test_last::test_last" + "--skip=test_last::test_limit_arg" + "--skip=test_last::test_since_only_shows_entries_after_time" + "--skip=test_last::test_timestamp_format_full" + "--skip=test_last::test_timestamp_format_iso" + "--skip=test_last::test_timestamp_format_no_time" + "--skip=test_last::test_timestamp_format_short" + "--skip=test_last::test_until_only_shows_entries_before_time" + "--skip=test_lscpu::test_json" + "--skip=test_lscpu::test_output" + "--skip=test_lslocks::test_column_headers" + ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + + meta = { + description = "Rust reimplementation of the util-linux project"; + homepage = "https://github.com/uutils/util-linux"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kyehn ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/va/vacuum-go/package.nix b/pkgs/by-name/va/vacuum-go/package.nix index 5a33971c385d..8c34af0f8057 100644 --- a/pkgs/by-name/va/vacuum-go/package.nix +++ b/pkgs/by-name/va/vacuum-go/package.nix @@ -7,17 +7,17 @@ buildGoModule (finalAttrs: { pname = "vacuum-go"; - version = "0.23.0"; + version = "0.23.2"; src = fetchFromGitHub { owner = "daveshanley"; repo = "vacuum"; # using refs/tags because simple version gives: 'the given path has multiple possibilities' error tag = "v${finalAttrs.version}"; - hash = "sha256-WVseXIGUwvoBCVWqM5+OQTkReS8/K1Bq2pDs+n9r7Nk="; + hash = "sha256-zQ9NzNPWJC431AF1wlrRAZRhUTMdKJO6qWa4x9jpFoE="; }; - vendorHash = "sha256-9Gu1FarlMZthq9PYCU3DsCCR+Uxii05ePfcPZIQJhtQ="; + vendorHash = "sha256-kpW1i6LJUFMJArSHYMI4taTfAcfDH+E39GOBOKZFu+c="; env.CGO_ENABLED = 0; ldflags = [ diff --git a/pkgs/by-name/va/vaporizer2/package.nix b/pkgs/by-name/va/vaporizer2/package.nix index b6c4fc02fc3d..6e4a34bfc4c5 100644 --- a/pkgs/by-name/va/vaporizer2/package.nix +++ b/pkgs/by-name/va/vaporizer2/package.nix @@ -31,10 +31,6 @@ stdenv.mkDerivation (finalAttrs: { }; postPatch = '' - # LTO needs special setup on Linux - substituteInPlace CMakeLists.txt \ - --replace-fail 'juce::juce_recommended_lto_flags' '# Not forcing LTO' - rm -rf clap-juce-extensions ln -s ${finalAttrs.passthru.clapJuceExtensions} clap-juce-extensions ''; @@ -65,6 +61,17 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeFeature "USE_SYSTEM_JUCE" "ON") ]; + env.NIX_CFLAGS_COMPILE = toString [ + # juce, compiled in this build as part of a Git submodule, uses `-flto` as + # a Link Time Optimization flag, and instructs the plugin compiled here to + # use this flag to. This breaks the build for us. Using _fat_ LTO allows + # successful linking while still providing LTO benefits. If our build of + # `juce` was used as a dependency, we could have patched that `-flto` line + # in our juce's source, but that is not possible because it is used as a + # Git Submodule. + "-ffat-lto-objects" + ]; + passthru.clapJuceExtensions = fetchFromGitHub { owner = "free-audio"; repo = "clap-juce-extensions"; diff --git a/pkgs/by-name/ve/veilid/package.nix b/pkgs/by-name/ve/veilid/package.nix index d4b32d6ef24a..eedeccc69ebe 100644 --- a/pkgs/by-name/ve/veilid/package.nix +++ b/pkgs/by-name/ve/veilid/package.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { "--workspace" ]; - RUSTFLAGS = "--cfg tokio_unstable"; + env.RUSTFLAGS = "--cfg tokio_unstable"; doCheck = false; diff --git a/pkgs/by-name/ve/versatiles/package.nix b/pkgs/by-name/ve/versatiles/package.nix index bd545c3c61c9..f29bf47c7b2e 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.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "versatiles-org"; repo = "versatiles-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-U9Os5HiehujU+/O2ZeUEtBJCVOBOi4dfH89Y9d0+RlI="; + hash = "sha256-DnCaq8qGuw5FzfWjGKNpD4IFnL927vOnYmHD9zHB1fA="; }; - cargoHash = "sha256-p2ezrYhAxGvxzI3Q8BA0nGWwzim3L3AdIdf+8oMquSA="; + cargoHash = "sha256-nbbDVS6Oea29EzANwSkZ24swanibgsjqCKx5UolhgE0="; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/vi/vicinae/package.nix b/pkgs/by-name/vi/vicinae/package.nix index df8ccc62d2b3..8a4d1e0a8c32 100644 --- a/pkgs/by-name/vi/vicinae/package.nix +++ b/pkgs/by-name/vi/vicinae/package.nix @@ -22,13 +22,13 @@ }: gcc15Stdenv.mkDerivation (finalAttrs: { pname = "vicinae"; - version = "0.18.0"; + version = "0.18.2"; src = fetchFromGitHub { owner = "vicinaehq"; repo = "vicinae"; tag = "v${finalAttrs.version}"; - hash = "sha256-ApMcDKe+6uYb2M+UL8SWW8M1S5bmT8EI5uOChLxzWqs="; + hash = "sha256-OPBgcM2ZzbVEUS6lwRpJo2JBfiRK8TmYVSmZImEW2gA="; }; apiDeps = fetchNpmDeps { @@ -108,7 +108,7 @@ gcc15Stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/vicinaehq/vicinae"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ - dawnofmidnight + whispersofthedawn zstg ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/vm/vmpk/package.nix b/pkgs/by-name/vm/vmpk/package.nix index 77d8427c0bf7..4cfc4f4536be 100644 --- a/pkgs/by-name/vm/vmpk/package.nix +++ b/pkgs/by-name/vm/vmpk/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "vmpk"; - version = "0.9.1"; + version = "0.9.2"; src = fetchurl { url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-O/uIg1Wq6Hwt7J5AkoXQshBhrKrQdfVTbb8qr7ttSNw="; + hash = "sha256-FUVI6Ioe4zmQa84pqGlw/my2Rw8fpMcZi9bZu/gzIGA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vo/voicevox-core/package.nix b/pkgs/by-name/vo/voicevox-core/package.nix index 10e99f0c29d8..3b43aeba66d8 100644 --- a/pkgs/by-name/vo/voicevox-core/package.nix +++ b/pkgs/by-name/vo/voicevox-core/package.nix @@ -21,8 +21,11 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "voicevox-core"; + + # Update only together with voicevox and voicevox-engine + # nixpkgs-update: no auto update version = "0.16.2"; - modelVersion = "0.16.1"; + passthru.modelVersion = "0.16.3"; src = fetchFromGitHub { owner = "VOICEVOX"; @@ -61,13 +64,13 @@ rustPlatform.buildRustPackage (finalAttrs: { passthru.models = stdenv.mkDerivation { pname = "voicevox-models"; - version = finalAttrs.modelVersion; + version = finalAttrs.passthru.modelVersion; src = fetchFromGitHub { owner = "VOICEVOX"; repo = "voicevox_vvm"; - tag = finalAttrs.modelVersion; - hash = "sha256-OY+xuvNjgmH/bxhL61XJZ3JVOxyec6kifkoGD4eN7HA="; + tag = finalAttrs.passthru.modelVersion; + hash = "sha256-VqSNEHJV/g9R+4XknRGi/s4C7/uXEGCK5/NC2XwiPcI="; }; nativeBuildInputs = [ python3 ]; @@ -77,6 +80,10 @@ rustPlatform.buildRustPackage (finalAttrs: { # convert multipart zip archive into single file python scripts/merge_vvm.py + + # Exclude VOICEVOX Nemo models similar to upstream's CI, as voicevox-engine doesn't use them + rm vvms/n* + mkdir -p "$out" cp vvms/* "$out" diff --git a/pkgs/by-name/vo/voicevox-engine/package.nix b/pkgs/by-name/vo/voicevox-engine/package.nix index 2995e9a6f85d..f15ff0a8bc8e 100644 --- a/pkgs/by-name/vo/voicevox-engine/package.nix +++ b/pkgs/by-name/vo/voicevox-engine/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "voicevox-engine"; - version = "0.25.0"; + version = "0.25.1"; pyproject = true; src = fetchFromGitHub { owner = "VOICEVOX"; repo = "voicevox_engine"; tag = version; - hash = "sha256-ZthTXHXzexbffWoi8AKJrgX9/gd7fmKbYpCwuZZiQWQ="; + hash = "sha256-4pZs5f6Fe4kHIKcyww1eq9uRTf7rk5KAr/00H8aH9qA="; }; patches = [ @@ -103,7 +103,7 @@ python3Packages.buildPythonApplication rec { owner = "VOICEVOX"; repo = "voicevox_resource"; tag = version; - hash = "sha256-yj3bwEB1qeoXAf3Dr02FF/HB6g7toAd2VUmR2937yzc="; + hash = "sha256-YaUVlZnpxu/IhLrp1XdcxDyus7DRhyzu4VKfabTsPUY="; }; pyopenjtalk = python3Packages.callPackage ./pyopenjtalk.nix { }; diff --git a/pkgs/by-name/vo/voicevox/package.nix b/pkgs/by-name/vo/voicevox/package.nix index 0a0b60076f19..be05fd058311 100644 --- a/pkgs/by-name/vo/voicevox/package.nix +++ b/pkgs/by-name/vo/voicevox/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "voicevox"; - version = "0.25.0"; + version = "0.25.1"; src = fetchFromGitHub { owner = "VOICEVOX"; repo = "voicevox"; tag = finalAttrs.version; - hash = "sha256-s8+uHwqxK9my/850C52VT5kshlGrHOOHtopUlsowNeI="; + hash = "sha256-l9aFuhOylcQrHa+0R0P4Jy5iL2gA6xJsUJt8KvWIMuM="; }; patches = [ diff --git a/pkgs/by-name/wa/warpgate/package.nix b/pkgs/by-name/wa/warpgate/package.nix index 523b9683c006..34ac736aca9b 100644 --- a/pkgs/by-name/wa/warpgate/package.nix +++ b/pkgs/by-name/wa/warpgate/package.nix @@ -52,7 +52,7 @@ rustPlatform.buildRustPackage ( (replaceVars ./hardcode-version.patch { inherit (finalAttrs) version; }) ]; - RUSTFLAGS = "--cfg tokio_unstable"; + env.RUSTFLAGS = "--cfg tokio_unstable"; buildFeatures = [ "postgres" diff --git a/pkgs/by-name/wa/way-edges/package.nix b/pkgs/by-name/wa/way-edges/package.nix index 9b587e5c5cd4..0495e54e8991 100644 --- a/pkgs/by-name/wa/way-edges/package.nix +++ b/pkgs/by-name/wa/way-edges/package.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: { libpulseaudio ]; - RUSTFLAGS = [ + env.RUSTFLAGS = toString [ "--cfg tokio_unstable" "--cfg tokio_uring" ]; diff --git a/pkgs/by-name/wi/win2xcur/package.nix b/pkgs/by-name/wi/win2xcur/package.nix index d365c2aa8a03..17cc259a6cc9 100644 --- a/pkgs/by-name/wi/win2xcur/package.nix +++ b/pkgs/by-name/wi/win2xcur/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonPackage rec { pname = "win2xcur"; - version = "0.1.2"; + version = "0.2.0"; pyproject = true; src = fetchFromGitHub { owner = "quantum5"; repo = "win2xcur"; rev = "v${version}"; - hash = "sha256-OjLj+QYg8YOJzDq3Y6/uyEXlNWbPm8VA/b1yP9jT6Jo="; + hash = "sha256-uG9yrH1BvdGyFosGBXLNB7lr0w7r89MWhW4gCVS+s1w="; }; build-system = with python3Packages; [ setuptools ]; diff --git a/pkgs/by-name/wo/woof-doom/package.nix b/pkgs/by-name/wo/woof-doom/package.nix index 1865edf505af..499f131ad9fe 100644 --- a/pkgs/by-name/wo/woof-doom/package.nix +++ b/pkgs/by-name/wo/woof-doom/package.nix @@ -55,13 +55,18 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "WITH_DISCORD_RPC" withDiscordRpc) ]; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "woof_(.*)" + ]; + }; meta = { description = "Doom source port based on Boom/MBF"; homepage = "https://github.com/fabiangreffrath/woof"; changelog = "https://github.com/fabiangreffrath/woof/blob/${finalAttrs.src.rev}/CHANGELOG.md"; - license = lib.licenses.gpl2Only; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ keenanweaver ]; mainProgram = "woof"; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/wp/wprs/package.nix b/pkgs/by-name/wp/wprs/package.nix index 9643140ca8d5..dd349cca0c22 100644 --- a/pkgs/by-name/wp/wprs/package.nix +++ b/pkgs/by-name/wp/wprs/package.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-krrVgdoCcW3voSiQAoWsG+rPf1HYKbuGhplhn21as2c="; - RUSTFLAGS = "-C target-feature=+avx2"; # only works on x86 systems supporting AVX2 + env.RUSTFLAGS = "-C target-feature=+avx2"; # only works on x86 systems supporting AVX2 preFixup = '' cp wprs "$out/bin/wprs" diff --git a/pkgs/by-name/xd/xdg-terminal-exec/package.nix b/pkgs/by-name/xd/xdg-terminal-exec/package.nix index ceb1bebc1c03..1ced272872c1 100644 --- a/pkgs/by-name/xd/xdg-terminal-exec/package.nix +++ b/pkgs/by-name/xd/xdg-terminal-exec/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, dash, scdoc, + makeBinaryWrapper, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "xdg-terminal-exec"; @@ -16,25 +17,26 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-RgyXdrJEiPXOHpnUUuu7UVNC+RE36WgyXuuDgA8H1EQ="; }; - nativeBuildInputs = [ scdoc ]; + strictDeps = true; - buildPhase = '' - runHook preBuild - scdoc < xdg-terminal-exec.1.scd > xdg-terminal-exec.1 - runHook postBuild - ''; + nativeBuildInputs = [ + scdoc + makeBinaryWrapper + ]; - installPhase = '' - runHook preInstall - install -Dm555 xdg-terminal-exec -t $out/bin - install -Dm444 xdg-terminal-exec.1 -t $out/share/man/man1 - runHook postInstall - ''; + buildInputs = [ dash ]; + + makeFlags = [ "prefix=${placeholder "out"}" ]; dontPatchShebangs = true; postFixup = '' + # use dash posix sh implementation as recommended by upstream substituteInPlace $out/bin/xdg-terminal-exec \ --replace-fail '#!/bin/sh' '#!${lib.getExe dash}' + + # add default config to XDG_DATA_DIRS + wrapProgram $out/bin/xdg-terminal-exec \ + --suffix XDG_DATA_DIRS : '${placeholder "out"}/share' ''; meta = { diff --git a/pkgs/by-name/xd/xdp-tools/package.nix b/pkgs/by-name/xd/xdp-tools/package.nix index 90daa5033e33..8863498ac4b1 100644 --- a/pkgs/by-name/xd/xdp-tools/package.nix +++ b/pkgs/by-name/xd/xdp-tools/package.nix @@ -17,13 +17,13 @@ }: stdenv.mkDerivation rec { pname = "xdp-tools"; - version = "1.5.8"; + version = "1.6.0"; src = fetchFromGitHub { owner = "xdp-project"; repo = "xdp-tools"; rev = "v${version}"; - hash = "sha256-fW0If34PTGE36KoZYPeKOMuNjaFz1JmSCaWIaSjB0gk="; + hash = "sha256-Smu93zwZN2jn9bLkVRpyubqTUh8VnVFMGqzc9myryLU="; }; outputs = [ diff --git a/pkgs/by-name/xe/xed-editor/package.nix b/pkgs/by-name/xe/xed-editor/package.nix index 50009b60595c..9592ae997bca 100644 --- a/pkgs/by-name/xe/xed-editor/package.nix +++ b/pkgs/by-name/xe/xed-editor/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "xed-editor"; - version = "3.8.7"; + version = "3.8.8"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xed"; rev = version; - hash = "sha256-Vl2yf4PlREvyAY/lRP+nB47GEuuyYeLnBARKhDEfG4M="; + hash = "sha256-BbakdZwigC/im9Il5sCeRF0SJuLCPtqe7/mcYmPcCRI="; }; patches = [ diff --git a/pkgs/by-name/xf/xfe/package.nix b/pkgs/by-name/xf/xfe/package.nix index 6867041b4fd7..e45aedbbc6f0 100644 --- a/pkgs/by-name/xf/xfe/package.nix +++ b/pkgs/by-name/xf/xfe/package.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "xfe"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { url = "mirror://sourceforge/xfe/xfe-${version}.tar.xz"; - sha256 = "sha256-41c2NUbaeQd/XlpUZGS+HtiinVH6PN8Ekt4RjZppOLs="; + sha256 = "sha256-jgDgd/DOB92v19SAGqBnTHIYQE+EohgDvvFCwTNDJlE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/xr/xreader/package.nix b/pkgs/by-name/xr/xreader/package.nix index 6cbe4aa32ac7..a272bee3cb38 100644 --- a/pkgs/by-name/xr/xreader/package.nix +++ b/pkgs/by-name/xr/xreader/package.nix @@ -37,13 +37,13 @@ stdenv.mkDerivation rec { pname = "xreader"; - version = "4.6.1"; + version = "4.6.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xreader"; rev = version; - hash = "sha256-+T89KxGTGycN1pnXBxJY15ViRvwJbM2adZVUTTSG3VQ="; + hash = "sha256-LUpP4gBxe5kxH3OdCFWPx3APMqVMfJy/r3FGHrGxPqI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/xw/xwin/package.nix b/pkgs/by-name/xw/xwin/package.nix index 26ab31a10aed..210f71b342f3 100644 --- a/pkgs/by-name/xw/xwin/package.nix +++ b/pkgs/by-name/xw/xwin/package.nix @@ -8,16 +8,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "xwin"; - version = "0.6.7"; + version = "0.7.0"; src = fetchFromGitHub { owner = "Jake-Shadle"; repo = "xwin"; tag = finalAttrs.version; - hash = "sha256-od8QnUC0hU9GYE/gRB74BlQezlt9IZq2A4F331wHm7Q="; + hash = "sha256-p7rrZ2yxSpGKNuddcSO2wlvsIFj8LYG91tCK1mWO+NY="; }; - cargoHash = "sha256-77ArdZ9mOYEon4nzNUNSL0x0UlE1iVujFLwreAd9iMM="; + cargoHash = "sha256-e2uYAE2veYDNZpHr40bpIbplg7orW8oIxgZORhPpbFY="; strictDeps = true; nativeBuildInputs = [ diff --git a/pkgs/by-name/za/zapret/package.nix b/pkgs/by-name/za/zapret/package.nix index e97a4bb8b532..9e97fc0bbe91 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.5"; + version = "72.6"; src = fetchFromGitHub { owner = "bol-van"; @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { ''; tag = "v${finalAttrs.version}"; - hash = "sha256-idIL7jO7bXuuE2b6fC4LvoEobCFiLoQp5R/Mxz67wVE="; + hash = "sha256-raBM/vf5Vb0Tmsk2yyNL9cLJ0yyT2bwwFVn98qJI3a4="; }; buildInputs = [ diff --git a/pkgs/by-name/za/zapzap/package.nix b/pkgs/by-name/za/zapzap/package.nix index fbf443a32afc..4bc308db96e0 100644 --- a/pkgs/by-name/za/zapzap/package.nix +++ b/pkgs/by-name/za/zapzap/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "zapzap"; - version = "6.2.4"; + version = "6.2.5"; pyproject = true; src = fetchFromGitHub { owner = "rafatosta"; repo = "zapzap"; tag = version; - hash = "sha256-8SUwb7W2K6jnj94LOt0vX8aI9EuOnMKR8nclWFhaTBw="; + hash = "sha256-PP0SQbTXUaAfCX8EZ7+5/uGYDhOmgxxGwVhjc70c7mA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 4a1d607c1144..5f883aee44de 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -106,7 +106,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "0.217.4"; + version = "0.218.6"; outputs = [ "out" @@ -119,7 +119,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-yeDJNnKiFQ05OuUkPd/SVpjJh4MeTdv3R8EZDDcSFpQ="; + hash = "sha256-fNwJWC48DqUECadQ12p+iCHR7pIueFFdu6QRdomJ6/o="; }; postPatch = '' @@ -139,7 +139,7 @@ rustPlatform.buildRustPackage (finalAttrs: { rm -r $out/git/*/candle-book/ ''; - cargoHash = "sha256-UfnKnN91uA3MmYCpgCbjz5U9chxsYwE4t4Fu/wD0o/c="; + cargoHash = "sha256-+8L4BaR7J+j7ytQ7JM8XbuAYDKzq8Hv3oKQFnN0TdK0="; nativeBuildInputs = [ cmake @@ -208,10 +208,9 @@ rustPlatform.buildRustPackage (finalAttrs: { # Used by `zed --version` RELEASE_VERSION = finalAttrs.version; LK_CUSTOM_WEBRTC = livekit-libwebrtc; + RUSTFLAGS = lib.optionalString withGLES "--cfg gles"; }; - RUSTFLAGS = lib.optionalString withGLES "--cfg gles"; - preBuild = '' bash script/generate-licenses ''; diff --git a/pkgs/by-name/zl/zlcompressor/package.nix b/pkgs/by-name/zl/zlcompressor/package.nix index 9f6aac97c9d7..27d13226efc9 100644 --- a/pkgs/by-name/zl/zlcompressor/package.nix +++ b/pkgs/by-name/zl/zlcompressor/package.nix @@ -75,11 +75,16 @@ clangStdenv.mkDerivation (finalAttrs: { "-lXrandr" ]); - # LTO needs special setup on Linux - postPatch = lib.optionalString clangStdenv.hostPlatform.isLinux '' - substituteInPlace CMakeLists.txt \ - --replace-fail 'juce::juce_recommended_lto_flags' '# Not forcing LTO' - ''; + env.NIX_CFLAGS_COMPILE = lib.optionalString clangStdenv.hostPlatform.isLinux (toString [ + # juce, compiled in this build as part of a Git submodule, uses `-flto` as + # a Link Time Optimization flag, and instructs the plugin compiled here to + # use this flag to. This breaks the build for us. Using _fat_ LTO allows + # successful linking while still providing LTO benefits. If our build of + # `juce` was used as a dependency, we could have patched that `-flto` line + # in our juce's source, but that is not possible because it is used as a + # Git Submodule. + "-ffat-lto-objects" + ]); cmakeFlags = [ # see: https://github.com/ZL-Audio/ZlEqualizer#clone-and-build diff --git a/pkgs/by-name/zl/zlequalizer/package.nix b/pkgs/by-name/zl/zlequalizer/package.nix index 6beeec3a47df..c5b40446ea20 100644 --- a/pkgs/by-name/zl/zlequalizer/package.nix +++ b/pkgs/by-name/zl/zlequalizer/package.nix @@ -75,11 +75,16 @@ clangStdenv.mkDerivation (finalAttrs: { "-lXrandr" ]); - # LTO needs special setup on Linux - postPatch = lib.optionalString clangStdenv.hostPlatform.isLinux '' - substituteInPlace CMakeLists.txt \ - --replace-fail 'juce::juce_recommended_lto_flags' '# Not forcing LTO' - ''; + env.NIX_CFLAGS_COMPILE = lib.optionalString clangStdenv.hostPlatform.isLinux (toString [ + # juce, compiled in this build as part of a Git submodule, uses `-flto` as + # a Link Time Optimization flag, and instructs the plugin compiled here to + # use this flag to. This breaks the build for us. Using _fat_ LTO allows + # successful linking while still providing LTO benefits. If our build of + # `juce` was used as a dependency, we could have patched that `-flto` line + # in our juce's source, but that is not possible because it is used as a + # Git Submodule. + "-ffat-lto-objects" + ]); cmakeFlags = [ # see: https://github.com/ZL-Audio/ZLEqualizer#clone-and-build diff --git a/pkgs/by-name/zl/zlsplitter/package.nix b/pkgs/by-name/zl/zlsplitter/package.nix index 8923fdd3c230..31d1be13f68a 100644 --- a/pkgs/by-name/zl/zlsplitter/package.nix +++ b/pkgs/by-name/zl/zlsplitter/package.nix @@ -75,11 +75,16 @@ clangStdenv.mkDerivation (finalAttrs: { "-lXrandr" ]); - # LTO needs special setup on Linux - postPatch = lib.optionalString clangStdenv.hostPlatform.isLinux '' - substituteInPlace CMakeLists.txt \ - --replace-fail 'juce::juce_recommended_lto_flags' '# Not forcing LTO' - ''; + env.NIX_CFLAGS_COMPILE = lib.optionalString clangStdenv.hostPlatform.isLinux (toString [ + # juce, compiled in this build as part of a Git submodule, uses `-flto` as + # a Link Time Optimization flag, and instructs the plugin compiled here to + # use this flag to. This breaks the build for us. Using _fat_ LTO allows + # successful linking while still providing LTO benefits. If our build of + # `juce` was used as a dependency, we could have patched that `-flto` line + # in our juce's source, but that is not possible because it is used as a + # Git Submodule. + "-ffat-lto-objects" + ]); cmakeFlags = [ # see: https://github.com/ZL-Audio/ZlEqualizer#clone-and-build diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 0796e19867c8..01956edfda2f 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -33,13 +33,13 @@ stdenv.mkDerivation rec { pname = "elementary-greeter"; - version = "8.1.1"; + version = "8.1.2"; src = fetchFromGitHub { owner = "elementary"; repo = "greeter"; tag = version; - hash = "sha256-eoZ4WkIUesWTFipC6ji1QdU0dy9iMGCbQSkI74c0VRA="; + hash = "sha256-PIhvSY+p66B/dYmgmAioVbVLEUQgoMKNnKGE4HSquI4="; }; patches = [ diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix index d7eeee3eb739..84bdf1d93684 100644 --- a/pkgs/development/compilers/gcc/patches/default.nix +++ b/pkgs/development/compilers/gcc/patches/default.nix @@ -164,7 +164,10 @@ optionals noSysDirs ( ## Darwin # Fixes detection of Darwin on x86_64-darwin and aarch64-darwin. Otherwise, GCC uses a deployment target of 10.5, which crashes ld64. -++ optional (is14 && stdenv.hostPlatform.isDarwin) ../patches/14/libgcc-darwin-detection.patch +++ optional ( + # this one would conflict with gcc-14-darwin-aarch64-support.patch + is14 && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 +) ../patches/14/libgcc-darwin-detection.patch ++ optional (atLeast15 && stdenv.hostPlatform.isDarwin) ../patches/15/libgcc-darwin-detection.patch # Fix libgcc_s.1.dylib build on Darwin 11+ by not reexporting unwind symbols that don't exist diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 4cd12db0b152..42dd8bc59971 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -55,19 +55,19 @@ rustPlatform.buildRustPackage.override zlib ]; - env = { - # cargo uses git-rs which is made for a version of libgit2 from recent master that - # is not compatible with the current version in nixpkgs. - #LIBGIT2_SYS_USE_PKG_CONFIG = 1; + # cargo uses git-rs which is made for a version of libgit2 from recent master that + # is not compatible with the current version in nixpkgs. + #LIBGIT2_SYS_USE_PKG_CONFIG = 1; - # fixes: the cargo feature `edition` requires a nightly version of Cargo, but this is the `stable` channel - RUSTC_BOOTSTRAP = 1; + # fixes: the cargo feature `edition` requires a nightly version of Cargo, but this is the `stable` channel + RUSTC_BOOTSTRAP = 1; - } - // lib.optionalAttrs (stdenv.hostPlatform.rust.rustcTargetSpec == "x86_64-unknown-linux-gnu") { - # Upstream defaults to lld on x86_64-unknown-linux-gnu, we want to use our linker - RUSTFLAGS = "-Clinker-features=-lld -Clink-self-contained=-linker"; - }; + RUSTFLAGS = + if stdenv.hostPlatform.rust.rustcTargetSpec == "x86_64-unknown-linux-gnu" then + # Upstream defaults to lld on x86_64-unknown-linux-gnu, we want to use our linker + "-Clinker-features=-lld -Clink-self-contained=-linker" + else + null; postInstall = '' wrapProgram "$out/bin/cargo" --suffix PATH : "${rustc}/bin" diff --git a/pkgs/development/compilers/rust/clippy.nix b/pkgs/development/compilers/rust/clippy.nix index e5f1b3544f0b..fa33c9e9f315 100644 --- a/pkgs/development/compilers/rust/clippy.nix +++ b/pkgs/development/compilers/rust/clippy.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage { buildInputs = [ rustc.llvm ]; # fixes: error: the option `Z` is only accepted on the nightly compiler - env.RUSTC_BOOTSTRAP = 1; + RUSTC_BOOTSTRAP = 1; # Without disabling the test the build fails with: # error: failed to run custom build command for `rustc_llvm v0.0.0 diff --git a/pkgs/development/compilers/rust/rustfmt.nix b/pkgs/development/compilers/rust/rustfmt.nix index 0398dcc9fe0a..b002d665518a 100644 --- a/pkgs/development/compilers/rust/rustfmt.nix +++ b/pkgs/development/compilers/rust/rustfmt.nix @@ -38,15 +38,13 @@ rustPlatform.buildRustPackage { install_name_tool -add_rpath "${rustc.unwrapped}/lib" "$out/bin/git-rustfmt" ''; - env = { - # As of 1.0.0 and rustc 1.30 rustfmt requires a nightly compiler - RUSTC_BOOTSTRAP = 1; + # As of 1.0.0 and rustc 1.30 rustfmt requires a nightly compiler + RUSTC_BOOTSTRAP = 1; - # As of rustc 1.45.0, these env vars are required to build rustfmt (due to - # https://github.com/rust-lang/rust/pull/72001) - CFG_RELEASE = rustc.version; - CFG_RELEASE_CHANNEL = if asNightly then "nightly" else "stable"; - }; + # As of rustc 1.45.0, these env vars are required to build rustfmt (due to + # https://github.com/rust-lang/rust/pull/72001) + CFG_RELEASE = rustc.version; + CFG_RELEASE_CHANNEL = if asNightly then "nightly" else "stable"; postInstall = '' wrapProgram $out/bin/cargo-fmt \ diff --git a/pkgs/development/cuda-modules/packages/nccl-tests.nix b/pkgs/development/cuda-modules/packages/nccl-tests.nix index 1c3c77abff6d..519f6e3e0f5f 100644 --- a/pkgs/development/cuda-modules/packages/nccl-tests.nix +++ b/pkgs/development/cuda-modules/packages/nccl-tests.nix @@ -30,13 +30,13 @@ backendStdenv.mkDerivation (finalAttrs: { # NOTE: Depends on the CUDA package set, so use cudaNamePrefix. name = "${cudaNamePrefix}-${finalAttrs.pname}-${finalAttrs.version}"; pname = "nccl-tests"; - version = "2.17.7"; + version = "2.17.8"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "nccl-tests"; rev = "v${finalAttrs.version}"; - hash = "sha256-MSzvfuZuyXj1qzThJ/6JrQkTIlYkw1cO1hQNJ/DIYdc="; + hash = "sha256-vZ3PP1NbNBv3bvJaiKq5rkIzaT7bcZpHawu3nbSqK60="; }; postPatch = '' diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6a9f36829d2b..d566e4f66f9d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1560,7 +1560,16 @@ with haskellLib; # PortMidi needs an environment variable to have ALSA find its plugins: # https://github.com/NixOS/nixpkgs/issues/6860 PortMidi = overrideCabal (drv: { - patches = (drv.patches or [ ]) ++ [ ./patches/portmidi-alsa-plugins.patch ]; + patches = (drv.patches or [ ]) ++ [ + ./patches/portmidi-alsa-plugins.patch + # Fixes compilation with GCC15 which defaults to C23 + # https://github.com/PortMidi/PortMidi-haskell/pull/24 + (pkgs.fetchpatch { + name = "PortMidi-C23.patch"; + url = "https://github.com/PortMidi/PortMidi-haskell/commit/24b6ce1c77137b055ae57a99080d5f1616490197.patch"; + sha256 = "sha256-PqnWA/DMW00Gtfa4YDV6iC/MXwQ3gFsNESbx+daw4C4="; + }) + ]; postPatch = (drv.postPatch or "") + '' substituteInPlace portmidi/pm_linux/pmlinuxalsa.c \ --replace @alsa_plugin_dir@ "${pkgs.alsa-plugins}/lib/alsa-lib" diff --git a/pkgs/development/libraries/ngtcp2/gnutls.nix b/pkgs/development/libraries/ngtcp2/gnutls.nix index 371f14cbcafd..669203acb2be 100644 --- a/pkgs/development/libraries/ngtcp2/gnutls.nix +++ b/pkgs/development/libraries/ngtcp2/gnutls.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "1.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = "ngtcp2"; rev = "v${version}"; - hash = "sha256-sywzNSyr237U1codaEHtHvz7nqYDiJwjVpr4hpLHE60="; + hash = "sha256-u+dgcC/MWzRCIeynvZimR8EB/GX7Z33T8BFZ1O++YLk="; }; outputs = [ diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix index 05ef18209dfb..a7ba89b0b1f1 100644 --- a/pkgs/development/libraries/nss/latest.nix +++ b/pkgs/development/libraries/nss/latest.nix @@ -5,8 +5,8 @@ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert import ./generic.nix { - version = "3.119.1"; - hash = "sha256-GxLTqHcVWGiFezcwdctXJ8k9wqizVJPHyLBPZzphLro="; + version = "3.120"; + hash = "sha256-HZBiSwiGJs6Ff40SpY8p6kSTl1j793+A8BTjyMH4YQg="; filename = "latest.nix"; versionRegex = "NSS_(\\d+)_(\\d+)(?:_(\\d+))?_RTM"; } diff --git a/pkgs/development/python-modules/aiocomelit/default.nix b/pkgs/development/python-modules/aiocomelit/default.nix index bdd7eed0d445..bb7202500c83 100644 --- a/pkgs/development/python-modules/aiocomelit/default.nix +++ b/pkgs/development/python-modules/aiocomelit/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiocomelit"; - version = "1.1.2"; + version = "2.0.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "chemelli74"; repo = "aiocomelit"; tag = "v${version}"; - hash = "sha256-MPX9WXK2Z+QLGfQSJUlPrUhpjI2oNh7T6u6IfaVglO0="; + hash = "sha256-gk/WYeSl+962Nd0V3VQOy1aYDaSH82qjW1VU2siqU98="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/aiohomematic/default.nix b/pkgs/development/python-modules/aiohomematic/default.nix index de78b384e023..ded3445a9874 100644 --- a/pkgs/development/python-modules/aiohomematic/default.nix +++ b/pkgs/development/python-modules/aiohomematic/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "aiohomematic"; - version = "2026.1.13"; + version = "2026.1.20"; pyproject = true; src = fetchFromGitHub { owner = "SukramJ"; repo = "aiohomematic"; tag = version; - hash = "sha256-47Ts6KmT5oNo67sn1xr7k4saKwHyOSQPnJ5MDT4R1fg="; + hash = "sha256-kMDkNd7Rm2MbGn//BOScZ3UhyO3142w6260+sMU4EUs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aiohttp-retry/default.nix b/pkgs/development/python-modules/aiohttp-retry/default.nix index 34651b41fe0a..3f2b3fc5b785 100644 --- a/pkgs/development/python-modules/aiohttp-retry/default.nix +++ b/pkgs/development/python-modules/aiohttp-retry/default.nix @@ -5,7 +5,6 @@ fetchFromGitHub, pytestCheckHook, pytest-aiohttp, - pythonOlder, setuptools, }: @@ -14,8 +13,6 @@ buildPythonPackage rec { version = "2.9.1"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "inyutin"; repo = "aiohttp_retry"; @@ -23,6 +20,11 @@ buildPythonPackage rec { hash = "sha256-8S4gjeN8ktdDNd8GUsejaZdCaG/VXYPo0RJpwrrttGQ="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace-fail 'version="2.9.0"' 'version="${version}"' + ''; + build-system = [ setuptools ]; dependencies = [ aiohttp ]; diff --git a/pkgs/development/python-modules/aiounittest/default.nix b/pkgs/development/python-modules/aiounittest/default.nix index 064dd13703ef..320b1ed0dcdc 100644 --- a/pkgs/development/python-modules/aiounittest/default.nix +++ b/pkgs/development/python-modules/aiounittest/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, setuptools, pytestCheckHook, + pythonAtLeast, wrapt, }: @@ -12,6 +13,9 @@ buildPythonPackage rec { version = "1.5.0"; pyproject = true; + # https://github.com/kwarunek/aiounittest/issues/28 + disabled = pythonAtLeast "3.14"; + src = fetchFromGitHub { owner = "kwarunek"; repo = "aiounittest"; diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index 364b014d86ae..1750159e29a6 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -8,14 +8,14 @@ stdenv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "awscrt"; - version = "0.30.0"; + version = "0.31.0"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-4aEzQw5xEW6cDxAbDREif0e3xWGtUwP1rwD2wzoW84I="; + inherit (finalAttrs) pname version; + hash = "sha256-3sYhdPC5viwybu2gYudE67+qi27HKH9SaHt61DARW78="; }; build-system = [ setuptools ]; @@ -34,9 +34,9 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/awslabs/aws-crt-python"; - changelog = "https://github.com/awslabs/aws-crt-python/releases/tag/v${version}"; + changelog = "https://github.com/awslabs/aws-crt-python/releases/tag/v${finalAttrs.version}"; description = "Python bindings for the AWS Common Runtime"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ davegallant ]; }; -} +}) diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix index 4010935371ed..ba6469bfdc56 100644 --- a/pkgs/development/python-modules/b2sdk/default.nix +++ b/pkgs/development/python-modules/b2sdk/default.nix @@ -1,36 +1,33 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, - glibcLocales, - importlib-metadata, logfury, annotated-types, packaging, pdm-backend, - pyfakefs, pytest-lazy-fixtures, pytest-mock, + pytest-timeout, pytestCheckHook, + pythonAtLeast, pythonOlder, requests, + responses, tqdm, typing-extensions, }: buildPythonPackage rec { pname = "b2sdk"; - version = "2.9.4"; + version = "2.10.2"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "Backblaze"; repo = "b2-sdk-python"; tag = "v${version}"; - hash = "sha256-VXdvRJvmozrDsUu1J5Jz9I2733Cwe8OBbafc1fCEuGw="; + hash = "sha256-RWHD1ARPSKHmGKY0xdCBn3Qj4GxAfn4o8eacMQ5RT1k="; }; build-system = [ pdm-backend ]; @@ -41,33 +38,25 @@ buildPythonPackage rec { logfury requests ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ] ++ lib.optionals (pythonOlder "3.12") [ typing-extensions ]; nativeCheckInputs = [ pytest-lazy-fixtures pytest-mock + pytest-timeout pytestCheckHook + responses tqdm - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ glibcLocales ]; - - disabledTestPaths = [ - # requires aws s3 auth - "test/integration/test_download.py" - "test/integration/test_upload.py" - - # Requires backblaze auth - "test/integration/test_bucket.py" ]; - disabledTests = [ - # Test requires an API key - "test_raw_api" - "test_files_headers" - "test_large_file" - "test_file_info_b2_attributes" - "test_sync_folder" + enabledTestPaths = [ + "test/unit" + ]; + + disabledTests = lib.optionals (pythonAtLeast "3.14") [ + # - 'could not be accessed (no permissions to read?)', + # + 'could not be accessed (broken symlink?)', + "test_dir_without_exec_permission" ]; pythonImportsCheck = [ "b2sdk" ]; diff --git a/pkgs/development/python-modules/bleak-esphome/default.nix b/pkgs/development/python-modules/bleak-esphome/default.nix index d957c8271837..7c3f3e36e7bc 100644 --- a/pkgs/development/python-modules/bleak-esphome/default.nix +++ b/pkgs/development/python-modules/bleak-esphome/default.nix @@ -7,6 +7,7 @@ buildPythonPackage, cython, fetchFromGitHub, + fetchpatch, habluetooth, lru-dict, poetry-core, @@ -29,6 +30,14 @@ buildPythonPackage rec { hash = "sha256-BFF4SqJxrQ+aaFtrNqS9fNqTV2Q+pOu5FFdYKeHkKj8="; }; + patches = [ + (fetchpatch { + name = "bleak-2.0.0-compat.patch"; + url = "https://github.com/Bluetooth-Devices/bleak-esphome/commit/a186eca427d1c0924ce29cbb46cde876e0c6e246.patch"; + hash = "sha256-QPyN/k/xG03rZqYbexzN1GJaAqOe5FqfrDJ2fjiIkJs="; + }) + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace-fail "setuptools>=75.8.2" setuptools diff --git a/pkgs/development/python-modules/bleak-retry-connector/default.nix b/pkgs/development/python-modules/bleak-retry-connector/default.nix index 3c4acd157be3..a4f9b495b621 100644 --- a/pkgs/development/python-modules/bleak-retry-connector/default.nix +++ b/pkgs/development/python-modules/bleak-retry-connector/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "bleak-retry-connector"; - version = "4.4.4"; + version = "4.5.0"; pyproject = true; src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = "bleak-retry-connector"; tag = "v${version}"; - hash = "sha256-T7mJUj/AF+ZuTiGGFHUT7Ftnz+A0O5nGjj4a75obsuc="; + hash = "sha256-aGk5wNrQ8ti2qu1FxmOqPtDpivm5DRaKvwzDNz9rFmQ="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix index 3351fe872a8b..cf73031fa5a3 100644 --- a/pkgs/development/python-modules/bleak/default.nix +++ b/pkgs/development/python-modules/bleak/default.nix @@ -4,10 +4,12 @@ async-timeout, bluez, buildPythonPackage, + bumble, dbus-fast, fetchFromGitHub, poetry-core, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, typing-extensions, @@ -18,16 +20,14 @@ buildPythonPackage rec { pname = "bleak"; - version = "1.1.1"; + version = "2.0.0"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "hbldh"; repo = "bleak"; tag = "v${version}"; - hash = "sha256-z0Mxr1pUQWNEK01PKMV/CzpW+GeCRcv/+9BADts1FuU="; + hash = "sha256-UrKJoEyLa75HMCOgxmOqJi1z+32buMra+dwVe5qbBds="; }; postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' @@ -56,7 +56,9 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + bumble pytest-asyncio + pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 0db45ec1d229..27e8d5ec0832 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -358,13 +358,13 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.42.23"; + version = "1.42.24"; pyproject = true; src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-QMdhJiN8flf/bt7iAfj/9Cu5jLaiuyxEEibq35lVQ+4="; + hash = "sha256-ehxEk2ss1kr7niYmrSZAZWXgHxYviLeokOWj/65C0Ok="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 121dd4a3af58..e1eef1740f2b 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.42.23"; + version = "1.42.24"; pyproject = true; src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-U4jpi+1dNU6Eh3LvBQr+urTHqmTva3qpwDBmyP6crO4="; + hash = "sha256-9fviQCZ7JwNrEhejBN40vyv5kwh+BJowDRfW9S13mIs="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/bumble/default.nix b/pkgs/development/python-modules/bumble/default.nix new file mode 100644 index 000000000000..005f6317713f --- /dev/null +++ b/pkgs/development/python-modules/bumble/default.nix @@ -0,0 +1,93 @@ +{ + aiohttp, + appdirs, + buildPythonPackage, + click, + cryptography, + fetchFromGitHub, + grpcio, + humanize, + lib, + libusb-package, + libusb1, + platformdirs, + prettytable, + prompt-toolkit, + protobuf, + pyee, + pyserial, + pyserial-asyncio, + pytest-asyncio, + pytestCheckHook, + pyusb, + setuptools, + setuptools-scm, + tomli, + websockets, +}: + +buildPythonPackage rec { + pname = "bumble"; + version = "0.0.221"; + pyproject = true; + + src = fetchFromGitHub { + owner = "google"; + repo = "bumble"; + tag = "v${version}"; + hash = "sha256-GCcvbYLHChvrsQuhFjeYnncjrzFqOlmL+LlG7t2iAkE="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + pythonRelaxDeps = [ + "libusb-package" + ]; + + dependencies = [ + aiohttp + appdirs + click + cryptography + grpcio + humanize + libusb-package + libusb1 + platformdirs + prettytable + prompt-toolkit + protobuf + pyee + pyserial + pyserial-asyncio + pyusb + tomli + websockets + ]; + + pythonImportsCheck = [ "bumble" ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pytestFlags = [ "--asyncio-mode=auto" ]; + + disabledTests = [ + # tests require networking + "test_android_netsim_connection" + "test_open_transport_with_metadata" + ]; + + meta = { + changelog = "https://github.com/google/bumble/releases/tag/${src.tag}"; + description = "Bluetooth Stack for Apps, Emulation, Test and Experimentation"; + homepage = "https://github.com/google/bumble"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index 0717a2a66b8d..137c8c3e9172 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -39,14 +39,14 @@ buildPythonPackage rec { pname = "celery"; - version = "5.6.1"; + version = "5.6.2"; pyproject = true; src = fetchFromGitHub { owner = "celery"; repo = "celery"; tag = "v${version}"; - hash = "sha256-zKvkQ9/1N6ht4yrL+KDr3QDcWseoZBUkuwdFORKqctI="; + hash = "sha256-S84hLGwVVgxnUB6wnqU58tN56t/tQ79ZUni/iP5sx94="; }; patches = lib.optionals (!withAmqpRepl) [ diff --git a/pkgs/development/python-modules/dbt-common/default.nix b/pkgs/development/python-modules/dbt-common/default.nix index 092ab62a40ae..0cf7b916d11a 100644 --- a/pkgs/development/python-modules/dbt-common/default.nix +++ b/pkgs/development/python-modules/dbt-common/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "dbt-common"; - version = "1.37.2-unstable-2025-12-15"; + version = "1.37.2-unstable-2026-01-07"; pyproject = true; src = fetchFromGitHub { owner = "dbt-labs"; repo = "dbt-common"; - rev = "88b14473573d0e4e8c3b02d6ee573d346c84b0db"; # They don't tag releases - hash = "sha256-NnuYga3pHo0dIg6nr15DQINskF1bkKGfWXcUaEK38Kc="; + rev = "c152c995e77eed72bc6b488f34728221aaa7fb0e"; # They don't tag releases + hash = "sha256-hdmW4jZMxJIZaffLD67QB7oRq7qxXMWjWIzkewb2CF4="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/deebot-client/default.nix b/pkgs/development/python-modules/deebot-client/default.nix index 53eeac1a9f1b..90dc97a34259 100644 --- a/pkgs/development/python-modules/deebot-client/default.nix +++ b/pkgs/development/python-modules/deebot-client/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "deebot-client"; - version = "17.0.0"; + version = "17.0.1"; pyproject = true; disabled = pythonOlder "3.13"; @@ -31,12 +31,12 @@ buildPythonPackage rec { owner = "DeebotUniverse"; repo = "client.py"; tag = version; - hash = "sha256-QreF2ivdPfu2KiYY4At3zpif8bx7d7AzbpXNgL3zXzE="; + hash = "sha256-evd0wqID9kEBzhJgRSpcd95ALp9LPSb5RM3wEIKuY0Y="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-n3lvezBP7oT9jLqPCFZ7hwdBGuSJYos+hob9HBX2zIY="; + hash = "sha256-cLNFUDT74NrBgUL6vGC6lbFy2A2W1jYF7A8H3BQ/s8A="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/dm-control/default.nix b/pkgs/development/python-modules/dm-control/default.nix index b05ea253034f..471f6c2437e0 100644 --- a/pkgs/development/python-modules/dm-control/default.nix +++ b/pkgs/development/python-modules/dm-control/default.nix @@ -27,16 +27,16 @@ etils, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dm-control"; - version = "1.0.34"; + version = "1.0.36"; pyproject = true; src = fetchFromGitHub { owner = "google-deepmind"; repo = "dm_control"; - tag = version; - hash = "sha256-AESUqrUw8EEUKNtZJ5M/dD7xDr+6VGi4yYacJw0q8Ls="; + tag = finalAttrs.version; + hash = "sha256-W6szuGayJRflA88VxYB1LcQE9jlNlz/3SWWAZEfrQKY="; }; build-system = [ @@ -82,10 +82,10 @@ buildPythonPackage rec { doCheck = false; meta = { - changelog = "https://github.com/google-deepmind/dm_control/releases/tag/${src.tag}"; + changelog = "https://github.com/google-deepmind/dm_control/releases/tag/${finalAttrs.src.tag}"; description = "Google DeepMind's software stack for physics-based simulation and Reinforcement Learning environments, using MuJoCo"; homepage = "https://github.com/google-deepmind/dm_control"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ GaetanLepage ]; }; -} +}) diff --git a/pkgs/development/python-modules/energyzero/default.nix b/pkgs/development/python-modules/energyzero/default.nix index e7641538a784..576281b92091 100644 --- a/pkgs/development/python-modules/energyzero/default.nix +++ b/pkgs/development/python-modules/energyzero/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "energyzero"; - version = "2.1.1"; + version = "4.0.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-energyzero"; tag = "v${version}"; - hash = "sha256-KOeYdTruD8AN/NkLEKKJDUB/JkOoQwfAMZkp/RvvUQE="; + hash = "sha256-Tisng08X/jyNtT27qy1hH6qM6Nqho/X8bg1tFg1oIx8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/eternalegypt/default.nix b/pkgs/development/python-modules/eternalegypt/default.nix index 914d51bb2bc5..94a0e404f3ab 100644 --- a/pkgs/development/python-modules/eternalegypt/default.nix +++ b/pkgs/development/python-modules/eternalegypt/default.nix @@ -4,31 +4,21 @@ attrs, buildPythonPackage, fetchFromGitHub, - fetchpatch, setuptools, }: buildPythonPackage rec { pname = "eternalegypt"; - version = "0.0.16"; + version = "0.0.18"; pyproject = true; src = fetchFromGitHub { owner = "amelchio"; repo = "eternalegypt"; tag = "v${version}"; - hash = "sha256-ubKepd3yBaoYrIUe5WCt1zd4CjvU7SeftOR+2cBaEf0="; + hash = "sha256-dS4APZWOI8im1Ls1A5750FedTWBy3UpXvJmYpd1po94="; }; - patches = [ - # https://github.com/amelchio/eternalegypt/pull/38 - (fetchpatch { - name = "move-from-async_timeout.timeout-to-asyncio.timeout.patch"; - url = "https://github.com/amelchio/eternalegypt/commit/f496ae2d38b5d4a3f676310b5bb45c7c34b5262f.patch"; - hash = "sha256-8AHFEP/2yMeyoSWCxNyG+ARS7T40hkEwJ/rp9S8ouSE="; - }) - ]; - build-system = [ setuptools ]; dependencies = [ @@ -44,8 +34,8 @@ buildPythonPackage rec { meta = { description = "Python API for Netgear LTE modems"; homepage = "https://github.com/amelchio/eternalegypt"; - changelog = "https://github.com/amelchio/eternalegypt/releases/tag/v${version}"; - license = with lib.licenses; [ mit ]; + changelog = "https://github.com/amelchio/eternalegypt/releases/tag/${src.tag}"; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/fastavro/default.nix b/pkgs/development/python-modules/fastavro/default.nix index f19380ca73cf..f70077caa379 100644 --- a/pkgs/development/python-modules/fastavro/default.nix +++ b/pkgs/development/python-modules/fastavro/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "fastavro"; - version = "1.12.0"; + version = "1.12.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "fastavro"; repo = "fastavro"; tag = version; - hash = "sha256-r/dNXBmsNnvYbvXdZC5++1B9884dQV76pLga6u3XtO8="; + hash = "sha256-r/zaQ44ZPuSR1HxaqxD26kZPWREhmKP+oTOSa5QCEU4="; }; preBuild = '' diff --git a/pkgs/development/python-modules/fitbit-web-api/default.nix b/pkgs/development/python-modules/fitbit-web-api/default.nix new file mode 100644 index 000000000000..7bfb4f5e8749 --- /dev/null +++ b/pkgs/development/python-modules/fitbit-web-api/default.nix @@ -0,0 +1,53 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + aiohttp, + aiohttp-retry, + pydantic, + pytest-aiohttp, + pytestCheckHook, + python-dateutil, + typing-extensions, + urllib3, +}: + +buildPythonPackage rec { + pname = "fitbit-web-api"; + version = "2.13.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "allenporter"; + repo = "fitbit-web-api"; + tag = "v${version}"; + hash = "sha256-HqlySvC6EGnetrh0t8shapS/ggSRVoI8xPXta2eBqlk="; + }; + + build-system = [ hatchling ]; + + dependencies = [ + aiohttp + aiohttp-retry + pydantic + python-dateutil + typing-extensions + urllib3 + ]; + + pythonImportsCheck = [ "fitbit_web_api" ]; + + nativeCheckInputs = [ + pytest-aiohttp + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/allenporter/fitbit-web-api/blob/${src.tag}/CHANGELOG.md"; + description = "Access data from Fitbit activity trackers, Aria scale, and manually entered logs"; + homepage = "https://github.com/allenporter/fitbit-web-api"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/flask-alembic/default.nix b/pkgs/development/python-modules/flask-alembic/default.nix index b196c995f962..c8d17403074c 100644 --- a/pkgs/development/python-modules/flask-alembic/default.nix +++ b/pkgs/development/python-modules/flask-alembic/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonAtLeast, flit-core, alembic, flask, @@ -14,7 +13,7 @@ buildPythonPackage rec { pname = "flask-alembic"; - version = "3.1.1"; + version = "3.2.0"; pyproject = true; @@ -22,7 +21,7 @@ buildPythonPackage rec { owner = "pallets-eco"; repo = "flask-alembic"; tag = version; - hash = "sha256-iHJr9l3w1WwZXDl573IV7+A7RDcawGL20sxxhAQQ628="; + hash = "sha256-g5xl5CEfSZUbZxCLYykjd94eVjxzBAkgoBcR4y7IYfM="; }; build-system = [ flit-core ]; @@ -42,8 +41,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "flask_alembic" ]; meta = { - # https://github.com/pallets-eco/flask-alembic/issues/47 - broken = pythonAtLeast "3.13"; homepage = "https://github.com/pallets-eco/flask-alembic"; changelog = "https://github.com/pallets-eco/flask-alembic/blob/${src.tag}/CHANGES.md"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/flit-gettext/default.nix b/pkgs/development/python-modules/flit-gettext/default.nix index 819cefbe437c..f3d7d110623e 100644 --- a/pkgs/development/python-modules/flit-gettext/default.nix +++ b/pkgs/development/python-modules/flit-gettext/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "flit-gettext"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; src = fetchFromGitHub { owner = "codingjoe"; repo = "flit-gettext"; rev = version; - hash = "sha256-rrGRkZ7GeFdDZ7m1oLq/7nEjx6NY2+YWvLrtfRr4+Jw="; + hash = "sha256-rCIMwAiXXCJ+PH26/hoPWsuKd68crWStBErAOh9wzUg="; }; patches = [ diff --git a/pkgs/development/python-modules/google-generativeai/default.nix b/pkgs/development/python-modules/google-generativeai/default.nix index c393c85e65ce..0d7c1c8af08d 100644 --- a/pkgs/development/python-modules/google-generativeai/default.nix +++ b/pkgs/development/python-modules/google-generativeai/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-generativeai"; - version = "0.8.5"; + version = "0.8.6"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "google"; repo = "generative-ai-python"; tag = "v${version}"; - hash = "sha256-wc35JSc98xvepI7Gpe5jSJ+c8n7WLKa96axoWVcH7UM="; + hash = "sha256-zUNgQqpGgMyCBhW+Z9EiSJIyuIQh2XhwlCdgrTymCVk="; }; pythonRelaxDeps = [ "google-ai-generativelanguage" ]; diff --git a/pkgs/development/python-modules/heatmiserv3/default.nix b/pkgs/development/python-modules/heatmiserv3/default.nix index ee926a0bebbc..f498091e3b03 100644 --- a/pkgs/development/python-modules/heatmiserv3/default.nix +++ b/pkgs/development/python-modules/heatmiserv3/default.nix @@ -2,34 +2,38 @@ appdirs, buildPythonPackage, fetchFromGitHub, + hatchling, importlib-resources, lib, - poetry-core, pyserial, - pyserial-asyncio, pytestCheckHook, pyyaml, }: buildPythonPackage rec { pname = "heatmiserv3"; - version = "2.0.3"; + version = "2.0.6"; pyproject = true; src = fetchFromGitHub { owner = "andylockran"; repo = "heatmiserV3"; tag = version; - hash = "sha256-Ia0QUMDvuvn2af52lW7ObSQ9MSPNOgWyBuFBnqfYrpM="; + hash = "sha256-mwzW52g3Uz7zxL9R5zePDyxMSramEiaiVm6VPlNyNts="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; + + pythonRemoveDeps = [ + # https://github.com/andylockran/heatmiserV3/pull/113 + "pytest" + "pytest-cov" + ]; dependencies = [ appdirs importlib-resources pyserial - pyserial-asyncio pyyaml ]; diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index ae105aadbed7..84bfc095319e 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.202601071"; + version = "0.1.202601081"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-jU7FSz961lAlAkuxQ8gZJS+R6VXda4mKBvdzrcon3a4="; + hash = "sha256-vn2Uyt9N6i8pHupTYXQC5EodGKR3tdYOh0tx6Fyezx4="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/incomfort-client/default.nix b/pkgs/development/python-modules/incomfort-client/default.nix index a1ac630b6e40..138cf9286f28 100644 --- a/pkgs/development/python-modules/incomfort-client/default.nix +++ b/pkgs/development/python-modules/incomfort-client/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "incomfort-client"; - version = "0.6.10"; + version = "0.6.11"; pyproject = true; src = fetchFromGitHub { owner = "zxdavb"; repo = "incomfort-client"; tag = "v${version}"; - hash = "sha256-+RSKmWVNLiI/NzfbM/xu+/sCNYvkZ2l/AE5TwnF4RCc="; + hash = "sha256-HCawa+eFpC0t/dC8fQ+teMaPpuxrYBprEV8SxnhZ1ls="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/jaraco-test/default.nix b/pkgs/development/python-modules/jaraco-test/default.nix index dfd0a2829924..8b4d3572c249 100644 --- a/pkgs/development/python-modules/jaraco-test/default.nix +++ b/pkgs/development/python-modules/jaraco-test/default.nix @@ -1,54 +1,47 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, setuptools-scm, - toml, jaraco-functools, jaraco-context, - more-itertools, jaraco-collections, pytestCheckHook, }: buildPythonPackage rec { pname = "jaraco-test"; - version = "5.5.1"; + version = "5.6.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "jaraco"; repo = "jaraco.test"; tag = "v${version}"; - hash = "sha256-jbnU6PFVUd/eD9CWHyJvaTFkcZaIIwztkN9UbQZH1RU="; + hash = "sha256-Ym0r92xCh+DNpFexqPlRVgcDGYNvnaJHEs5/RMaUr+s="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"coherent.licensed",' "" + ''; + build-system = [ setuptools-scm ]; dependencies = [ - toml jaraco-functools jaraco-context - more-itertools jaraco-collections ]; nativeCheckInputs = [ pytestCheckHook ]; - disabledTestPaths = [ - # https://github.com/jaraco/jaraco.test/issues/6 - "jaraco/test/cpython.py" - ]; - pythonImportsCheck = [ "jaraco.test" ]; meta = { description = "Testing support by jaraco"; homepage = "https://github.com/jaraco/jaraco.test"; - changelog = "https://github.com/jaraco/jaraco.test/blob/${src.rev}/NEWS.rst"; + changelog = "https://github.com/jaraco/jaraco.test/blob/${src.tag}/NEWS.rst"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/librehardwaremonitor-api/default.nix b/pkgs/development/python-modules/librehardwaremonitor-api/default.nix index fb3e23ac8e7d..f387f4358048 100644 --- a/pkgs/development/python-modules/librehardwaremonitor-api/default.nix +++ b/pkgs/development/python-modules/librehardwaremonitor-api/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "librehardwaremonitor-api"; - version = "1.5.0"; + version = "1.6.0"; pyproject = true; src = fetchFromGitHub { owner = "Sab44"; repo = "librehardwaremonitor-api"; tag = "v${version}"; - hash = "sha256-LWh0kZp+8OUfBohQMLFXI/kkHsVuJt99YqwSGeq4EvA="; + hash = "sha256-dyhS7vb+qcumtWZsj3G3x66KhHUVDQxMG8+2GngkK70="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/linode-metadata/default.nix b/pkgs/development/python-modules/linode-metadata/default.nix index 77e67873e4ef..1eeccb8c576b 100644 --- a/pkgs/development/python-modules/linode-metadata/default.nix +++ b/pkgs/development/python-modules/linode-metadata/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "linode-metadata"; - version = "0.3.2"; + version = "0.3.3"; src = fetchPypi { pname = "linode_metadata"; inherit version; - hash = "sha256-5/tHYwP/acIdyCW1vu+zKSPywatHWwxcUNbC59TIcBc="; + hash = "sha256-E4qOA7xNuexf/nvTY8qGodLtlD1oGz81eSsA3oIHmGs="; }; pyproject = true; 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 4392ae4cd5be..b7137d912311 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.5"; + version = "0.8.6"; pyproject = true; src = fetchPypi { pname = "llama_index_embeddings_ollama"; inherit version; - hash = "sha256-UYS3L2RjEJodPF1y6s/4CESde8GRqVmhlrlHHASWh7g="; + hash = "sha256-szwgaHLLM9vdu63lPSeKbXcSUUMAbds3K/PtY8MEuXU="; }; pythonRelaxDeps = [ "ollama" ]; diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix index 986aa799e015..c93fe1269bb0 100644 --- a/pkgs/development/python-modules/llm/default.nix +++ b/pkgs/development/python-modules/llm/default.nix @@ -6,7 +6,6 @@ fetchFromGitHub, fetchpatch, pytestCheckHook, - pythonAtLeast, pythonOlder, replaceVars, setuptools, @@ -250,13 +249,6 @@ let # TypeError: CliRunner.__init__() got an unexpected keyword argument 'mix_stderr # https://github.com/simonw/llm/issues/1293 "test_embed_multi_files_encoding" - ] - ++ lib.optionals (pythonAtLeast "3.14") [ - # Index out of range - # https://github.com/simonw/llm/issues/1335 - "test_logs_fragments" - "test_expand_fragment_json" - "test_expand_fragment_markdown" ]; pythonImportsCheck = [ "llm" ]; diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index b8bd1b6e9607..7f5ecda01c9b 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1424,8 +1424,8 @@ in "sha256-bxh+mhwsHHwt/cx/njegTa/QGHu+xa7YPg4SRos1deM="; mypy-boto3-workspaces = - buildMypyBoto3Package "workspaces" "1.42.3" - "sha256-YfqjqAgZDNBUqqhwXG/GXF+rkAaYa1NTkKW02zt7yjE="; + buildMypyBoto3Package "workspaces" "1.42.24" + "sha256-M+FLFC+5NZyLL9opOIIqXF6H5g3YvbqHJ4rpDKL0uKw="; mypy-boto3-workspaces-web = buildMypyBoto3Package "workspaces-web" "1.42.14" diff --git a/pkgs/development/python-modules/nmcli/default.nix b/pkgs/development/python-modules/nmcli/default.nix index d893f645a985..2f16ca8d6947 100644 --- a/pkgs/development/python-modules/nmcli/default.nix +++ b/pkgs/development/python-modules/nmcli/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "nmcli"; - version = "1.6.0"; + version = "1.7.0"; pyproject = true; src = fetchFromGitHub { owner = "ushiboy"; repo = "nmcli"; tag = "v${version}"; - hash = "sha256-F8cZvsW51dhE+KBKF0OKCTN0mDKOJBm1CEtn1MAa+gA="; + hash = "sha256-OQwvSg8IzBsZJgAAjoKvHyXBE/gSyhcvFLuEidqstzI="; }; build-system = [ diff --git a/pkgs/development/python-modules/pdfplumber/default.nix b/pkgs/development/python-modules/pdfplumber/default.nix index 8570eb147bac..483015cd4021 100644 --- a/pkgs/development/python-modules/pdfplumber/default.nix +++ b/pkgs/development/python-modules/pdfplumber/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "pdfplumber"; - version = "0.11.8"; + version = "0.11.9"; pyproject = true; src = fetchFromGitHub { owner = "jsvine"; repo = "pdfplumber"; tag = "v${version}"; - hash = "sha256-BTAeZymk6attFVu+2FMYyg8jS911Lyu+H/WuuKGK5KI="; + hash = "sha256-vOtr+9qRpd+VXUpVL2whflbA7Gchd4yuA47FBl5BYfE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pgcli/default.nix b/pkgs/development/python-modules/pgcli/default.nix index d867cb4187a1..7821a0d96e76 100644 --- a/pkgs/development/python-modules/pgcli/default.nix +++ b/pkgs/development/python-modules/pgcli/default.nix @@ -16,6 +16,7 @@ pendulum, pytestCheckHook, setuptools, + setuptools-scm, sshtunnel, mock, tzlocal, @@ -25,15 +26,20 @@ # integrating with ipython-sql buildPythonPackage rec { pname = "pgcli"; - version = "4.3.0"; + version = "4.4.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-dlrhVQxVCKSB8Z8WqZcWwlP+ka+yVXl63S1jXaILau8="; + hash = "sha256-vV+NaK8o/WlVGjy0iihJytX2hUqkgCLp2YxiNtEJ7q4="; }; - build-system = [ setuptools ]; + pythonRelaxDeps = [ "click" ]; + + build-system = [ + setuptools + setuptools-scm + ]; dependencies = [ cli-helpers @@ -57,8 +63,9 @@ buildPythonPackage rec { ]; disabledTests = [ - # requires running postgres + # requires running postgres and postgresqlTestHook does not work "test_application_name_in_env" + "test_init_command_option" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_application_name_db_uri" ]; diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix index 5a1b1a421db8..617091524324 100644 --- a/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/pkgs/development/python-modules/playwrightcapture/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "playwrightcapture"; - version = "1.36.0"; + version = "1.36.1"; pyproject = true; src = fetchFromGitHub { owner = "Lookyloo"; repo = "PlaywrightCapture"; tag = "v${version}"; - hash = "sha256-Iqk7VFhlmzjQPvm08HwYkopV9Q/TNwSVedGH5GiMdWE="; + hash = "sha256-EXF4X+KM7AvwvxkU9KFUM4pc1q8IGLo8fpycdVmTnuY="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 2a04d326b1d2..78ef71f85f3b 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "1.0.2.20251229"; + version = "1.0.2.20260108"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-v+BeApvsCqf4QNaN+b+6oYyKz7/KUSRf8fgIFcYIz/4="; + hash = "sha256-Jrm70tRfc8kRf4K7+81yGFxBqfl0uyVaYLTNaE5kEQw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/py-improv-ble-client/default.nix b/pkgs/development/python-modules/py-improv-ble-client/default.nix index c878698e0bea..70270e72cb07 100644 --- a/pkgs/development/python-modules/py-improv-ble-client/default.nix +++ b/pkgs/development/python-modules/py-improv-ble-client/default.nix @@ -4,28 +4,25 @@ bleak, buildPythonPackage, fetchFromGitHub, - pythonOlder, setuptools, }: buildPythonPackage rec { pname = "py-improv-ble-client"; - version = "1.0.4"; + version = "2.0.1"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "py-improv-ble-client"; tag = version; - hash = "sha256-leYSDB5/jFqlvX78OYzlFkkVxIkJ7iOUoLHBuVj7tAo="; + hash = "sha256-PkAZhKgj+xQtOOCccBXbR2QkwlkYavJe1pfU9nMhuVs="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools~=65.6" "setuptools" \ - --replace-fail "wheel~=0.37.1" "wheel" + --replace-fail "setuptools>=65.6,<81.0" "setuptools" \ + --replace-fail "wheel>=0.37.1,<0.46.0" "wheel" ''; build-system = [ setuptools ]; @@ -43,7 +40,7 @@ buildPythonPackage rec { meta = { description = "Module to provision devices which implement Improv via BLE"; homepage = "https://github.com/home-assistant-libs/py-improv-ble-client"; - changelog = "https://github.com/home-assistant-libs/py-improv-ble-client/releases/tag/${version}"; + changelog = "https://github.com/home-assistant-libs/py-improv-ble-client/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pyanglianwater/default.nix b/pkgs/development/python-modules/pyanglianwater/default.nix index 4ea302be6037..20d43a8ade68 100644 --- a/pkgs/development/python-modules/pyanglianwater/default.nix +++ b/pkgs/development/python-modules/pyanglianwater/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyanglianwater"; - version = "2.2.0"; + version = "3.1.0"; pyproject = true; src = fetchFromGitHub { owner = "pantherale0"; repo = "pyanglianwater"; tag = version; - hash = "sha256-GfFRqQb1RXh6a7giy7eJWp4nAJzDtpQkWFfEfe9jxfY="; + hash = "sha256-NlAntGrc42jMxjaimG4AVvpsmDZfju9tHt3pZ8rldV0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index 4b49b52abe82..c4505f01ea50 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -14,6 +14,9 @@ numpy, pytest, makeSetupHook, + # Build tests to verify cross-compilation works, but only when CPU bit + # depth matches (otherwise Python headers cause LONG_BIT mismatch errors) + buildTests ? stdenv.hostPlatform.parsed.cpu.bits == stdenv.buildPlatform.parsed.cpu.bits, }: let setupHook = makeSetupHook { @@ -44,9 +47,7 @@ buildPythonPackage rec { pybind11.passthru.scikit-build-core-no-tests ]; - buildInputs = [ - # Used only for building tests - something we do even when cross - # compiling. + buildInputs = lib.optionals buildTests [ catch2 boost eigen @@ -65,13 +66,11 @@ buildPythonPackage rec { ]; cmakeFlags = [ - # Always build tests, because even when cross compiling building the tests - # is another confirmation that everything is OK. - (lib.cmakeBool "BUILD_TESTING" true) + (lib.cmakeBool "BUILD_TESTING" buildTests) # Override the `PYBIND11_NOPYTHON = true` in `pyproject.toml`. This # is required to build the tests. - (lib.cmakeBool "PYBIND11_NOPYTHON" false) + (lib.cmakeBool "PYBIND11_NOPYTHON" (!buildTests)) ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/pydevd/default.nix b/pkgs/development/python-modules/pydevd/default.nix index 8e7bda0f9008..0511af1d318d 100644 --- a/pkgs/development/python-modules/pydevd/default.nix +++ b/pkgs/development/python-modules/pydevd/default.nix @@ -1,20 +1,24 @@ { - stdenv, lib, + stdenv, buildPythonPackage, fetchFromGitHub, + + # build-system cython, setuptools, + + # tests numpy, psutil, - pytest-xdist, pytestCheckHook, + pytest-xdist, pythonAtLeast, trio, untangle, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pydevd"; version = "3.4.1"; pyproject = true; @@ -22,17 +26,10 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fabioz"; repo = "PyDev.Debugger"; - tag = "pydev_debugger_${lib.replaceStrings [ "." ] [ "_" ] version}"; + tag = "pydev_debugger_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; hash = "sha256-srcYeN4IsnX/B0AWLynr62UC5o+DcjnUrGjcTpvHTCM="; }; - # https://github.com/fabioz/PyDev.Debugger/issues/316 - disabled = pythonAtLeast "3.14"; - - postPatch = '' - sed -i '/addopts/d' pytest.ini - ''; - __darwinAllowLocalNetworking = true; build-system = [ @@ -43,7 +40,7 @@ buildPythonPackage rec { nativeCheckInputs = [ numpy psutil - #pytest-xdist + pytest-xdist pytestCheckHook trio untangle @@ -64,9 +61,11 @@ buildPythonPackage rec { "test_attach_to_pid" "test_terminate" "test_gui_event_loop_custom" + # AssertionError: assert '/usr/bin/' == '/usr/bin' # https://github.com/fabioz/PyDev.Debugger/issues/227 "test_to_server_and_to_client" + # Times out "test_case_sys_exit_multiple_exception_attach" ] @@ -75,6 +74,44 @@ buildPythonPackage rec { # https://github.com/fabioz/PyDev.Debugger/issues/269 "test_evaluate_expression" ] + ++ lib.optionals (pythonAtLeast "3.14") [ + # AssertionError (strings do not match) + "test_build_tuple" + "test_collect_try_except_info" + "test_collect_try_except_info2" + "test_collect_try_except_info3" + "test_collect_try_except_info4" + "test_collect_try_except_info4a" + "test_collect_try_except_info_in_single_line_1" + "test_collect_try_except_info_in_single_line_2" + "test_collect_try_except_info_multiple_except" + "test_collect_try_except_info_raise_unhandled10" + "test_collect_try_except_info_raise_unhandled7" + "test_collect_try_except_info_return_on_except" + "test_collect_try_except_info_with" + "test_separate_future_import" + "test_simple_code_to_bytecode_cls_method" + "test_simple_code_to_bytecode_repr_return_tuple" + "test_simple_code_to_bytecode_repr_return_tuple_with_call" + "test_simple_code_to_bytecode_repr_simple_method_calls" + "test_simple_code_to_bytecode_repr_tuple" + "test_smart_step_into_bytecode_info_023a" + + # AssertionError: False is not true + "test_if_code_obj_equals" + + # AssertionError: TimeoutError (note: error trying to dump threads on timeout: [Errno 9] Bad file descriptor). + "test_m_switch" + "test_module_entry_point" + "test_multiprocessing_simple" + "test_stop_on_start_entry_point" + "test_stop_on_start_m_switch" + + # Failed: remains unmatched: 'Worked' + "test_run" + # Failed: remains unmatched: 'WorkedLocalFoo' + "test_run_on_local_module_without_adding_to_pythonpath" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_multiprocessing_simple" "test_evaluate_exception_trace" @@ -89,4 +126,4 @@ buildPythonPackage rec { maintainers = with lib.maintainers; [ onny ]; mainProgram = "pydevd"; }; -} +}) diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index b0aa72f92149..81771c923b99 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.3.7"; + version = "0.3.8"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-S5Uiu5Boz0674pEE+Mbt/xvD6UAwHVHQHeAwJ8SyVWc="; + hash = "sha256-e75D6QukP7uvxySj3dMkWhTlM0wooHkSzIzlX2S2n8I="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix index 38bab408d31e..1a585027c692 100644 --- a/pkgs/development/python-modules/pyinsteon/default.nix +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -8,26 +8,23 @@ fetchFromGitHub, pypubsub, pyserial, - pyserial-asyncio, + pyserial-asyncio-fast, pytestCheckHook, pythonAtLeast, - pythonOlder, setuptools, voluptuous, }: buildPythonPackage rec { pname = "pyinsteon"; - version = "1.6.3"; + version = "1.6.4"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "pyinsteon"; repo = "pyinsteon"; tag = version; - hash = "sha256-SyhPM3NS7iJX8jwTJ4YWZ72eYLn9JT6eESekPf5eCKI="; + hash = "sha256-iC0qeiTHtrdzQtJ3R01nJDCfdBKBg0jw1v49ZII24/4="; }; build-system = [ setuptools ]; @@ -38,7 +35,7 @@ buildPythonPackage rec { async-timeout pypubsub pyserial - pyserial-asyncio + pyserial-asyncio-fast voluptuous ]; @@ -47,16 +44,6 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # RuntimeError: BUG: Dead Listener called, still subscribed! - "test_linking_with_i1_device" - ]; - - disabledTestPaths = lib.optionals (pythonAtLeast "3.12") [ - # Tests are blocking or failing - "tests/test_handlers/" - ]; - pythonImportsCheck = [ "pyinsteon" ]; meta = { diff --git a/pkgs/development/python-modules/pykaleidescape/default.nix b/pkgs/development/python-modules/pykaleidescape/default.nix index b8d26ee2a909..92bff22c4e79 100644 --- a/pkgs/development/python-modules/pykaleidescape/default.nix +++ b/pkgs/development/python-modules/pykaleidescape/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pykaleidescape"; - version = "2022.2.3"; + version = "1.1.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "SteveEasley"; repo = "pykaleidescape"; tag = "v${version}"; - hash = "sha256-h5G7wV4Z+sf8Qq4GNFsp8DVDSgQgS0dLGf+DzK/egYM="; + hash = "sha256-HhHlgQ94aPac6zRgXBSsHxXuAj2OnGdWkJHMOqTwKcI="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pymicro-vad/default.nix b/pkgs/development/python-modules/pymicro-vad/default.nix deleted file mode 100644 index 8c796390bf15..000000000000 --- a/pkgs/development/python-modules/pymicro-vad/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - - # build-system - pybind11, - setuptools, - - # tests - pytestCheckHook, -}: - -buildPythonPackage rec { - pname = "pymicro-vad"; - version = "1.0.2"; - pyproject = true; - - src = fetchFromGitHub { - owner = "rhasspy"; - repo = "pymicro-vad"; - tag = version; - hash = "sha256-yKy/oD6nl2qZW64+aAHZRAEFextCXT6RpMfPThB8DXE="; - }; - - build-system = [ - pybind11 - setuptools - ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - pythonImportsCheck = [ "pymicro_vad" ]; - - meta = { - changelog = "https://github.com/rhasspy/pymicro-vad/releases/tag/${version}"; - description = "Self-contained voice activity detector"; - homepage = "https://github.com/rhasspy/pymicro-vad"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ hexa ]; - }; -} diff --git a/pkgs/development/python-modules/pyportainer/default.nix b/pkgs/development/python-modules/pyportainer/default.nix index 40862ff174d8..b56e7674c12c 100644 --- a/pkgs/development/python-modules/pyportainer/default.nix +++ b/pkgs/development/python-modules/pyportainer/default.nix @@ -3,10 +3,10 @@ aresponses, buildPythonPackage, fetchFromGitHub, + hatchling, lib, mashumaro, orjson, - poetry-core, pytest-cov-stub, pytestCheckHook, syrupy, @@ -15,17 +15,17 @@ buildPythonPackage rec { pname = "pyportainer"; - version = "1.0.16"; + version = "1.0.22"; pyproject = true; src = fetchFromGitHub { owner = "erwindouna"; repo = "pyportainer"; tag = "v${version}"; - hash = "sha256-sLjNCSPzEtws6mzvVYRPUq/TsJ6q4Oui5li6L0uU/Qg="; + hash = "sha256-rbRXrfORFxU0ar4scmAA1Rgaaci5zHSceItTwOOTogQ="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ aiohttp diff --git a/pkgs/development/python-modules/pysilero-vad/default.nix b/pkgs/development/python-modules/pysilero-vad/default.nix index 8030df431d92..c7f2296bf646 100644 --- a/pkgs/development/python-modules/pysilero-vad/default.nix +++ b/pkgs/development/python-modules/pysilero-vad/default.nix @@ -7,42 +7,38 @@ # build-system setuptools, - # dependencies - numpy, - onnxruntime, - # tests pytestCheckHook, }: buildPythonPackage rec { pname = "pysilero-vad"; - version = "2.1.1"; + version = "3.0.1"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "pysilero-vad"; tag = "v${version}"; - hash = "sha256-zxvYvPnL99yIVHrzbRbKmTazzlefOS+s2TAWLweRSYE="; + hash = "sha256-DZjinW4jXsygJSUq3iNt82mbnVj7DN8hUxUDe1NkpHM="; }; build-system = [ setuptools ]; - dependencies = [ - numpy - onnxruntime - ]; - nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pysilero_vad" ]; # aarch64-linux onnxruntime tries to get cpu information from /sys, which isn't available # inside the nix build sandbox. - doCheck = stdenv.buildPlatform.system != "aarch64-linux"; + #doCheck = stdenv.buildPlatform.system != "aarch64-linux"; dontUsePythonImportsCheck = stdenv.buildPlatform.system == "aarch64-linux"; + preCheck = '' + # don't shadow the build result during tests + rm -rf pysilero_vad + ''; + meta = { description = "Pre-packaged voice activity detector using silero-vad"; homepage = "https://github.com/rhasspy/pysilero-vad"; diff --git a/pkgs/development/python-modules/pytensor/default.nix b/pkgs/development/python-modules/pytensor/default.nix index 38e8c53c0d93..2180cb70247f 100644 --- a/pkgs/development/python-modules/pytensor/default.nix +++ b/pkgs/development/python-modules/pytensor/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "pytensor"; - version = "2.36.2"; + version = "2.36.3"; pyproject = true; src = fetchFromGitHub { @@ -43,7 +43,7 @@ buildPythonPackage rec { postFetch = '' sed -i 's/git_refnames = "[^"]*"/git_refnames = " (tag: ${src.tag})"/' $out/pytensor/_version.py ''; - hash = "sha256-v6C3LL7ws+K7STqmd4j7/jNnMnnAmEUHzTHKv4446LU="; + hash = "sha256-FiqNE97tZw8rHF6VAQScGoiibMI+7KHzAy3tzmZBya4="; }; build-system = [ diff --git a/pkgs/development/python-modules/python-bsblan/default.nix b/pkgs/development/python-modules/python-bsblan/default.nix index 38ffcdaf1155..6764fe60f377 100644 --- a/pkgs/development/python-modules/python-bsblan/default.nix +++ b/pkgs/development/python-modules/python-bsblan/default.nix @@ -13,20 +13,21 @@ pytest-asyncio, pytest-cov-stub, pytest-mock, + pytest-xdist, pytestCheckHook, yarl, }: buildPythonPackage rec { pname = "python-bsblan"; - version = "3.1.1"; + version = "3.1.4"; pyproject = true; src = fetchFromGitHub { owner = "liudger"; repo = "python-bsblan"; tag = "v${version}"; - hash = "sha256-U/JlwJoNlRUm7gMEw5AHuazl+qXeF+pnqfICbVuvnQQ="; + hash = "sha256-P063G4YD4IlNP0ezYGhELjK4AKFQ4wPXFhgYb9OjRf0="; }; postPatch = '' @@ -52,6 +53,7 @@ buildPythonPackage rec { pytest-asyncio pytest-cov-stub pytest-mock + pytest-xdist pytestCheckHook ]; diff --git a/pkgs/development/python-modules/python-homewizard-energy/default.nix b/pkgs/development/python-modules/python-homewizard-energy/default.nix index 8c2f163de5b4..8a847dfed082 100644 --- a/pkgs/development/python-modules/python-homewizard-energy/default.nix +++ b/pkgs/development/python-modules/python-homewizard-energy/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "python-homewizard-energy"; - version = "9.3.0"; + version = "10.0.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "DCSBL"; repo = "python-homewizard-energy"; tag = "v${version}"; - hash = "sha256-qDLYvFl2gAPNAHJ4uwy0TqzkMUxx9hJ96QwyhbMaLqQ="; + hash = "sha256-nrQI3yuIetcM7/Abwvxr4ffZb91N2Hhti/YBaI11uKc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-pooldose/default.nix b/pkgs/development/python-modules/python-pooldose/default.nix index e0cc2e089ea3..14fadd6d424b 100644 --- a/pkgs/development/python-modules/python-pooldose/default.nix +++ b/pkgs/development/python-modules/python-pooldose/default.nix @@ -12,20 +12,16 @@ buildPythonPackage rec { pname = "python-pooldose"; - version = "0.8.0"; + version = "0.8.1"; pyproject = true; src = fetchFromGitHub { owner = "lmaertin"; repo = "python-pooldose"; tag = version; - hash = "sha256-zOl+c/bJmCH3ZUKcZDbRhnfctiQoq6z+C6LGHN6Jrhc="; + hash = "sha256-NhUl9wFUuMhkarswVSM4I98rkCFV/iPYoq49Hl59i00="; }; - postPatch = '' - rm -r src/pooldose/values/__pycache__ - ''; - build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/sipsimple/default.nix b/pkgs/development/python-modules/python3-sipsimple/default.nix similarity index 59% rename from pkgs/development/python-modules/sipsimple/default.nix rename to pkgs/development/python-modules/python3-sipsimple/default.nix index abd560d70175..0cb17e89985b 100644 --- a/pkgs/development/python-modules/sipsimple/default.nix +++ b/pkgs/development/python-modules/python3-sipsimple/default.nix @@ -20,40 +20,7 @@ x264, python3-application, }: - let - extDeps = { - pjsip = rec { - # Hardcoded in get_dependencies.sh, checked at buildtime - # need tarball specifically for buildscript to detect it - version = "2.10"; - src = fetchurl { - url = "https://github.com/pjsip/pjproject/archive/${version}.tar.gz"; - hash = "sha256-k2pMW5hgG1IyVGOjl93xGrQQbGp7BPjcfN03fvu1l94="; - }; - patches = [ - # Backported https://github.com/pjsip/pjproject/commit/4a8d180529d6ffb0760838b1f8cadc4cb5f7ac03 - ./pjsip-0001-NEON.patch - - # Backported https://github.com/pjsip/pjproject/commit/f56fd48e23982c47f38574a3fd93ebf248ef3762 - ./pjsip-0002-RISC-V.patch - - # Backported https://github.com/pjsip/pjproject/commit/f94b18ef6e0c0b5d34eb274f85ac0a3b2cf9107a - ./pjsip-0003-LoongArch64.patch - ]; - }; - zrtpcpp = rec { - # Hardcoded in get_dependencies.sh, NOT checked at buildtime - rev = "6b3cd8e6783642292bad0c21e3e5e5ce45ff3e03"; - src = fetchFromGitHub { - owner = "wernerd"; - repo = "ZRTPCPP"; - inherit rev; - hash = "sha256-kJlGPVA+yfn7fuRjXU0p234VcZBAf1MU4gRKuPotfog="; - }; - }; - }; - applyPatchesWhenAvailable = extDep: dir: lib.optionalString (extDep ? patches) ( @@ -63,7 +30,7 @@ let '') extDep.patches ); in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "python3-sipsimple"; version = "5.3.3.2"; pyproject = true; @@ -71,7 +38,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "AGProjects"; repo = "python3-sipsimple"; - tag = "${version}-mac"; + tag = "${finalAttrs.version}-mac"; hash = "sha256-kDXVzLmgfXxm8phKrV7DvPuZ9O2iNFo1s6Lc0jcc/dM="; }; @@ -118,13 +85,13 @@ buildPythonPackage rec { ]; preConfigure = '' - ln -s ${passthru.extDeps.pjsip.src} deps/${passthru.extDeps.pjsip.version}.tar.gz - cp -r --no-preserve=all ${passthru.extDeps.zrtpcpp.src} deps/ZRTPCPP + ln -s ${finalAttrs.passthru.extDeps.pjsip.src} deps/${finalAttrs.passthru.extDeps.pjsip.version}.tar.gz + cp -r --no-preserve=all ${finalAttrs.passthru.extDeps.zrtpcpp.src} deps/ZRTPCPP bash ./get_dependencies.sh '' - + applyPatchesWhenAvailable extDeps.pjsip "deps/pjsip" - + applyPatchesWhenAvailable extDeps.zrtpcpp "deps/ZRTPCPP" + + applyPatchesWhenAvailable finalAttrs.passthru.extDeps.pjsip "deps/pjsip" + + applyPatchesWhenAvailable finalAttrs.passthru.extDeps.zrtpcpp "deps/ZRTPCPP" + '' # Fails to link some static libs due to missing -lc DSO. Just use the compiler frontend instead of raw ld. substituteInPlace deps/pjsip/build/rules.mak \ @@ -141,13 +108,47 @@ buildPythonPackage rec { pythonImportsCheck = [ "sipsimple" ]; passthru = { - inherit extDeps; updateScript = nix-update-script { extraArgs = [ "--version-regex" "^(.*)-mac$" ]; }; + extDeps = { + pjsip = rec { + # Hardcoded in get_dependencies.sh, checked at buildtime + # need tarball specifically for buildscript to detect it + version = "2.10"; + src = fetchurl { + url = "https://github.com/pjsip/pjproject/archive/${version}.tar.gz"; + hash = "sha256-k2pMW5hgG1IyVGOjl93xGrQQbGp7BPjcfN03fvu1l94="; + }; + patches = [ + # Backported https://github.com/pjsip/pjproject/commit/4a8d180529d6ffb0760838b1f8cadc4cb5f7ac03 + ./pjsip-0001-NEON.patch + + # Backported https://github.com/pjsip/pjproject/commit/f56fd48e23982c47f38574a3fd93ebf248ef3762 + ./pjsip-0002-RISC-V.patch + + # Backported https://github.com/pjsip/pjproject/commit/f94b18ef6e0c0b5d34eb274f85ac0a3b2cf9107a + ./pjsip-0003-LoongArch64.patch + ]; + }; + zrtpcpp = rec { + # Hardcoded in get_dependencies.sh, NOT checked at buildtime + rev = "6b3cd8e6783642292bad0c21e3e5e5ce45ff3e03"; + src = fetchFromGitHub { + owner = "wernerd"; + repo = "ZRTPCPP"; + inherit rev; + hash = "sha256-pGng1Y9N51nGBpiZbn2NTx4t2NGg4qkmbghTscJVhIA="; + postFetch = '' + # fix build with gcc15 + sed -e '9i #include ' -i $out/zrtp/EmojiBase32.cpp + ''; + }; + }; + }; }; meta = { @@ -158,4 +159,4 @@ buildPythonPackage rec { teams = [ lib.teams.ngi ]; maintainers = [ lib.maintainers.ethancedwards8 ]; }; -} +}) diff --git a/pkgs/development/python-modules/sipsimple/pjsip-0001-NEON.patch b/pkgs/development/python-modules/python3-sipsimple/pjsip-0001-NEON.patch similarity index 100% rename from pkgs/development/python-modules/sipsimple/pjsip-0001-NEON.patch rename to pkgs/development/python-modules/python3-sipsimple/pjsip-0001-NEON.patch diff --git a/pkgs/development/python-modules/sipsimple/pjsip-0002-RISC-V.patch b/pkgs/development/python-modules/python3-sipsimple/pjsip-0002-RISC-V.patch similarity index 100% rename from pkgs/development/python-modules/sipsimple/pjsip-0002-RISC-V.patch rename to pkgs/development/python-modules/python3-sipsimple/pjsip-0002-RISC-V.patch diff --git a/pkgs/development/python-modules/sipsimple/pjsip-0003-LoongArch64.patch b/pkgs/development/python-modules/python3-sipsimple/pjsip-0003-LoongArch64.patch similarity index 100% rename from pkgs/development/python-modules/sipsimple/pjsip-0003-LoongArch64.patch rename to pkgs/development/python-modules/python3-sipsimple/pjsip-0003-LoongArch64.patch diff --git a/pkgs/development/python-modules/qpageview/default.nix b/pkgs/development/python-modules/qpageview/default.nix index 78d6a62de293..8ba43af1dcc4 100644 --- a/pkgs/development/python-modules/qpageview/default.nix +++ b/pkgs/development/python-modules/qpageview/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "qpageview"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; src = fetchFromGitHub { owner = "frescobaldi"; repo = "qpageview"; tag = "v${version}"; - hash = "sha256-5D+fumQVCfl9ZEHIQmbdXkAuAkiKy6P5+StMWSE+a0A="; + hash = "sha256-bUZI3ML3MN+0KLQxrPfQOC7lxdpvl3sxJ4zi0phsiCw="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix b/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix index 6e4f3efadadb..1783e28f58a3 100644 --- a/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix +++ b/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix @@ -1,5 +1,6 @@ { lib, + config, buildPythonPackage, fetchFromGitHub, @@ -19,6 +20,9 @@ pytestCheckHook, requests, + + cudaSupport ? config.cudaSupport, + rapidocr-onnxruntime, }: let version = "1.4.4"; @@ -115,10 +119,27 @@ buildPythonPackage { "test_long_img" ]; + # Tests require access to a physical GPU to work, otherwise the interpreter crashes: + # Fatal Python error: Aborted + # File "/nix/store/..onnxruntime/capi/onnxruntime_inference_collection.py", line 561 in _create_inference_session + doCheck = !cudaSupport; + # rapidocr-onnxruntime has been renamed to rapidocr by upstream since 2.0.0. However, some packages like open-webui still requires rapidocr-onnxruntime 1.4.4. Therefore we set no auto update here. # nixpkgs-update: no auto update passthru.skipBulkUpdate = true; + passthru.gpuCheck = rapidocr-onnxruntime.overridePythonAttrs (old: { + requiredSystemFeatures = [ "cuda" ]; + doCheck = true; + + disabledTests = + (old.disabledTests or [ ]) + ++ lib.optionals cudaSupport [ + # IndexError: list index out of range + "test_ort_cuda_warning" + ]; + }); + meta = { changelog = "https://github.com/RapidAI/RapidOCR/releases/tag/${src.tag}"; description = "Cross platform OCR Library based on OnnxRuntime"; diff --git a/pkgs/development/python-modules/serialx/default.nix b/pkgs/development/python-modules/serialx/default.nix new file mode 100644 index 000000000000..a338ecf3ae0e --- /dev/null +++ b/pkgs/development/python-modules/serialx/default.nix @@ -0,0 +1,67 @@ +{ + buildPythonPackage, + cargo, + fetchFromGitHub, + lib, + pytest-asyncio, + pytest-xdist, + pytestCheckHook, + rustPlatform, + rustc, + setuptools, + setuptools-rust, + setuptools-scm, + socat, + typing-extensions, +}: + +buildPythonPackage (finalAttrs: { + pname = "serialx"; + version = "0.6.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "puddly"; + repo = "serialx"; + tag = "v${finalAttrs.version}"; + hash = "sha256-hko0xVpqcmu7NhsS3MZRjfCY21E0g7qUDqAf5bqfw2I="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) pname version src; + hash = "sha256-mI/6Buuk0VMofcD2LmE3+FpZhISAMzSYxe2IDC2iyAE="; + }; + + build-system = [ + setuptools + setuptools-rust + setuptools-scm + ]; + + nativeBuildInputs = [ + cargo + rustPlatform.cargoSetupHook + rustc + ]; + + dependencies = [ + typing-extensions + ]; + + pythonImportsCheck = [ "serialx" ]; + + nativeCheckInputs = [ + pytest-asyncio + pytest-xdist + pytestCheckHook + socat + ]; + + meta = { + changelog = "https://github.com/puddly/serialx/releases/tag/${finalAttrs.src.tag}"; + description = "Serial library with native async support for Windows and POSIX"; + homepage = "https://github.com/puddly/serialx"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.dotlambda ]; + }; +}) diff --git a/pkgs/development/python-modules/tesla-fleet-api/default.nix b/pkgs/development/python-modules/tesla-fleet-api/default.nix index 6d50e7e59922..8943f16d775b 100644 --- a/pkgs/development/python-modules/tesla-fleet-api/default.nix +++ b/pkgs/development/python-modules/tesla-fleet-api/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "tesla-fleet-api"; - version = "1.2.7"; + version = "1.4.0"; pyproject = true; src = fetchFromGitHub { owner = "Teslemetry"; repo = "python-tesla-fleet-api"; tag = "v${version}"; - hash = "sha256-wZS/o795v5luHdSKBDnEgPeX8HQdN190UQspXJV/dQE="; + hash = "sha256-ey0HJw1IE6vNmTeUN26Vusz6D+90hSzgvx1hJ7O5QOc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/testcontainers/default.nix b/pkgs/development/python-modules/testcontainers/default.nix index 7c774efef349..54d194d3fe57 100644 --- a/pkgs/development/python-modules/testcontainers/default.nix +++ b/pkgs/development/python-modules/testcontainers/default.nix @@ -14,20 +14,20 @@ wrapt, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "testcontainers"; - version = "4.13.3"; + version = "4.14.0"; pyproject = true; src = fetchFromGitHub { owner = "testcontainers"; repo = "testcontainers-python"; - tag = "testcontainers-v${version}"; - hash = "sha256-/lIjrJO+Mw0gv0Ym98A4TrISvmKkCKLFeoJu6t9q9kE="; + tag = "testcontainers-v${finalAttrs.version}"; + hash = "sha256-Zquh1tY9Z2BU6BPsEGR4eBjcHVB4KsxOQ81Tk6YTyTQ="; }; postPatch = '' - echo "${version}" > VERSION + echo "${finalAttrs.version}" > VERSION ''; build-system = [ poetry-core ]; @@ -51,8 +51,8 @@ buildPythonPackage rec { meta = { description = "Allows using docker containers for functional and integration testing"; homepage = "https://github.com/testcontainers/testcontainers-python"; - changelog = "https://github.com/testcontainers/testcontainers-python/releases/tag/testcontainers-v${version}"; + changelog = "https://github.com/testcontainers/testcontainers-python/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ onny ]; }; -} +}) diff --git a/pkgs/development/python-modules/timm/default.nix b/pkgs/development/python-modules/timm/default.nix index cd300cbc4eb5..a190ca413e7b 100644 --- a/pkgs/development/python-modules/timm/default.nix +++ b/pkgs/development/python-modules/timm/default.nix @@ -23,14 +23,14 @@ buildPythonPackage (finalAttrs: { pname = "timm"; - version = "1.0.23"; + version = "1.0.24"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "pytorch-image-models"; tag = "v${finalAttrs.version}"; - hash = "sha256-TOIg5/ddkAvFqqpnq/P0yURb/1wF2bgyQ0Odzc9WPEc="; + hash = "sha256-uimOYftxX3zRvrLlT8Y23g3LdlGUDVs3AMMyKNFbsPg="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/titlecase/default.nix b/pkgs/development/python-modules/titlecase/default.nix index 00d6a7fa6919..79c38ed2a51e 100644 --- a/pkgs/development/python-modules/titlecase/default.nix +++ b/pkgs/development/python-modules/titlecase/default.nix @@ -3,28 +3,25 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, - pythonOlder, regex, setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "titlecase"; - version = "2.4"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + version = "2.4.1"; + pyproject = true; src = fetchFromGitHub { owner = "ppannuto"; repo = "python-titlecase"; - tag = "v${version}"; - hash = "sha256-aJbbfNnQvmmYPXVOO+xx7ADetsxE+jnVQOVDzV5jUp8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-s+C0UOKLEpMksfePIB6VzTv0dFLeamurdxjf5u1ek3g="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ regex ]; + dependencies = [ regex ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -39,4 +36,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/total-connect-client/default.nix b/pkgs/development/python-modules/total-connect-client/default.nix index 20f8b3c9d449..642b2fc6eaaf 100644 --- a/pkgs/development/python-modules/total-connect-client/default.nix +++ b/pkgs/development/python-modules/total-connect-client/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "total-connect-client"; - version = "2025.5"; + version = "2025.12.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "craigjmidwinter"; repo = "total-connect-client"; tag = version; - hash = "sha256-xVpR5gd185eZBoqUhVVcFGPbPFjCavwOZP7yFObzGic="; + hash = "sha256-ofbGW5OCKAFW+BXYvegHmFrnJKmRx/Ez86Na00bp9cw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/uiprotect/default.nix b/pkgs/development/python-modules/uiprotect/default.nix index bcaf1d417bb7..31a87ad75008 100644 --- a/pkgs/development/python-modules/uiprotect/default.nix +++ b/pkgs/development/python-modules/uiprotect/default.nix @@ -11,6 +11,7 @@ aiohttp, aioshutil, async-timeout, + av, convertertools, dateparser, orjson, @@ -39,14 +40,14 @@ buildPythonPackage rec { pname = "uiprotect"; - version = "7.33.3"; + version = "8.0.0"; pyproject = true; src = fetchFromGitHub { owner = "uilibs"; repo = "uiprotect"; tag = "v${version}"; - hash = "sha256-sVWgomaCrfZSlJpoLfYLkZXgJE0dw8ki8+VTbhkoDaE="; + hash = "sha256-YYF7YERl9pKpnfD1Q00NlL8zWfEohMBO3UuidedLHn0="; }; build-system = [ poetry-core ]; @@ -61,6 +62,7 @@ buildPythonPackage rec { aiohttp aioshutil async-timeout + av convertertools dateparser orjson diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix index 27eec40c661e..9d811ac4b06f 100644 --- a/pkgs/development/python-modules/unstructured/default.nix +++ b/pkgs/development/python-modules/unstructured/default.nix @@ -116,7 +116,7 @@ grpcio, }: let - version = "0.18.24"; + version = "0.18.27"; in buildPythonPackage rec { pname = "unstructured"; @@ -127,7 +127,7 @@ buildPythonPackage rec { owner = "Unstructured-IO"; repo = "unstructured"; tag = version; - hash = "sha256-rB+PGRpJGQLJv6L4gzNLADIQhAApwfxWfHBYg2+dhoI="; + hash = "sha256-QPCnMDKk10AeiMRNFMRekvSdqKoAyCJmwMnr9qJIzmg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/vispy/default.nix b/pkgs/development/python-modules/vispy/default.nix index ccb571e998a6..494100a5e8b9 100644 --- a/pkgs/development/python-modules/vispy/default.nix +++ b/pkgs/development/python-modules/vispy/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "vispy"; - version = "0.15.2"; + version = "0.16.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1S0QwGl/SJkFVc6iorrT+fWncjkYVv2jZOpLvGn9B1w="; + hash = "sha256-CeF3RKmn7CAjPtAP8h6z8YekdyDEd1ybL9VZjObRtak="; }; patches = lib.optionals (!stdenv.hostPlatform.isDarwin) [ diff --git a/pkgs/development/python-modules/volkswagencarnet/default.nix b/pkgs/development/python-modules/volkswagencarnet/default.nix index a024ee6b81c7..2c4953333851 100644 --- a/pkgs/development/python-modules/volkswagencarnet/default.nix +++ b/pkgs/development/python-modules/volkswagencarnet/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "volkswagencarnet"; - version = "5.3.4"; + version = "5.4.0"; pyproject = true; src = fetchFromGitHub { owner = "robinostlund"; repo = "volkswagencarnet"; tag = "v${version}"; - hash = "sha256-hGOoST7u42uaCKrbHoJsghamiH8sw91bQ8WKOtYWKrI="; + hash = "sha256-9p01sCxXosaCPTo/QN1LJ4E5SvicqAjqpx7Wl7OsRtE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/weatherflow4py/default.nix b/pkgs/development/python-modules/weatherflow4py/default.nix index 7bb1530056fa..35e4e1883e86 100644 --- a/pkgs/development/python-modules/weatherflow4py/default.nix +++ b/pkgs/development/python-modules/weatherflow4py/default.nix @@ -36,6 +36,8 @@ buildPythonPackage rec { websockets ]; + pythonRelaxDeps = [ "marshmallow" ]; + nativeCheckInputs = [ aioresponses pytest-asyncio diff --git a/pkgs/development/python-modules/weheat/default.nix b/pkgs/development/python-modules/weheat/default.nix index 44a6e1715883..f19c54c60620 100644 --- a/pkgs/development/python-modules/weheat/default.nix +++ b/pkgs/development/python-modules/weheat/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "weheat"; - version = "2025.6.10"; + version = "2025.12.24"; pyproject = true; src = fetchFromGitHub { owner = "wefabricate"; repo = "wh-python"; tag = version; - hash = "sha256-CBW+LehZPZCHZ2zFeCOWwNAVlGcGdKQ5XgmCOv8jr5Q="; + hash = "sha256-aO4mU+7lfb4eQwK8ijtJwDBIhzxg+V5veWNwNsnxKu4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index 762277040f40..0c0fec50106e 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "xknx"; - version = "3.12.0"; + version = "3.13.0"; pyproject = true; src = fetchFromGitHub { owner = "XKNX"; repo = "xknx"; tag = version; - hash = "sha256-Sb/qPLINeYt96s7NkRARcb0ZrcE6A0ByyENVd5aiHxk="; + hash = "sha256-mfcPbxThl69XqTSUwPz/m+wiAAOOuaQe8PSgBJRMdzM="; }; build-system = [ setuptools ]; @@ -35,6 +35,8 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlags = [ "--asyncio-mode=auto" ]; + pythonImportsCheck = [ "xknx" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/yamlcore/default.nix b/pkgs/development/python-modules/yamlcore/default.nix new file mode 100644 index 000000000000..ce1d590ac54e --- /dev/null +++ b/pkgs/development/python-modules/yamlcore/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pyyaml, + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "yamlcore"; + version = "0.0.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "perlpunk"; + repo = "pyyaml-core"; + tag = "v${finalAttrs.version}"; + hash = "sha256-TBVNmuhBfEo9HmDkalnn6VDVHF+sh/MIZ8f46Zdyxw8="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + pyyaml + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + enabledTestPaths = [ "tests/*.py" ]; + + pythonImportsCheck = [ "yamlcore" ]; + + meta = { + description = "YAML 1.2 Support for PyYAML"; + homepage = "https://github.com/perlpunk/pyyaml-core"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ gonsolo ]; + }; +}) diff --git a/pkgs/development/python-modules/youtubeaio/default.nix b/pkgs/development/python-modules/youtubeaio/default.nix index be397e8385e7..b97727cc91e3 100644 --- a/pkgs/development/python-modules/youtubeaio/default.nix +++ b/pkgs/development/python-modules/youtubeaio/default.nix @@ -25,11 +25,6 @@ buildPythonPackage rec { hash = "sha256-2PqVFZ5816g8Ilc0Mhlm+Gzw/eOSaC1JYPY/t2yzxCU="; }; - postPatch = '' - substituteInPlace tests/__snapshots__/test_video.ambr \ - --replace-fail "TzInfo(0)" "TzInfo(UTC)" - ''; - build-system = [ poetry-core ]; dependencies = [ diff --git a/pkgs/development/tools/misc/coreboot-toolchain/default.nix b/pkgs/development/tools/misc/coreboot-toolchain/default.nix index 21310886cbc7..403f8601a2f6 100644 --- a/pkgs/development/tools/misc/coreboot-toolchain/default.nix +++ b/pkgs/development/tools/misc/coreboot-toolchain/default.nix @@ -26,12 +26,12 @@ let stdenvNoCC.mkDerivation (finalAttrs: { pname = "coreboot-toolchain-${arch}"; - version = "25.09"; + version = "25.12"; src = fetchgit { url = "https://review.coreboot.org/coreboot"; rev = finalAttrs.version; - hash = "sha256-GMLhGspaS+SsldYFwhMoxzpFgU6alm6WASv3lp/FRRY="; + hash = "sha256-zm1M+iveBxE/8/vIXZz1KoFkMaKW+bsQM4me5T6WqVY="; fetchSubmodules = false; leaveDotGit = true; postFetch = '' diff --git a/pkgs/development/tools/misc/coreboot-toolchain/stable.nix b/pkgs/development/tools/misc/coreboot-toolchain/stable.nix index ffe9ffadf177..192c1e3fe3e0 100644 --- a/pkgs/development/tools/misc/coreboot-toolchain/stable.nix +++ b/pkgs/development/tools/misc/coreboot-toolchain/stable.nix @@ -29,17 +29,17 @@ }; } { - name = "binutils-2.44.tar.xz"; + name = "binutils-2.45.tar.xz"; archive = fetchurl { - sha256 = "0dvj6zs7fcfm5bln1k9ma1h96a4wqi79s3i4p7fnfgnnb7h1f86f"; - url = "mirror://gnu/binutils/binutils-2.44.tar.xz"; + sha256 = "1lpmpszs3lk9mcg7yn0m312745kbc8vlazn95h79i25ikizhw365"; + url = "mirror://gnu/binutils/binutils-2.45.tar.xz"; }; } { - name = "acpica-unix-20250404.tar.gz"; + name = "acpica-unix-20250807.tar.gz"; archive = fetchurl { - sha256 = "0593dicbdx5qcx13ari1c0rhsay09bwwsq6w94pcjbfbws4m92f0"; - url = "https://downloadmirror.intel.com/852044/acpica-unix-20250404.tar.gz"; + sha256 = "0cwfm7i5a2fqq35hznnal38pgxgmnkm0v2xkb82jm1yv9014rjpa"; + url = "https://downloadmirror.intel.com/864114/acpica-unix-20250807.tar.gz"; }; } { diff --git a/pkgs/kde/gear/okular/default.nix b/pkgs/kde/gear/okular/default.nix index 141d1dc24702..03844585e207 100644 --- a/pkgs/kde/gear/okular/default.nix +++ b/pkgs/kde/gear/okular/default.nix @@ -31,12 +31,6 @@ mkKdeDerivation { ebook_tools discount ]; - patches = [ - (fetchpatch { - name = "okular-extreme-downsample-fix.patch"; - url = "https://invent.kde.org/graphics/okular/-/commit/554b4c12aecd5c84c9d47b29de091af1afe8e346.patch"; - hash = "sha256-S338z+92nBYMP6uqvk7rP9AsIoZ0JJCVu9Wo4NVSufk="; - }) - ]; + meta.mainProgram = "okular"; } diff --git a/pkgs/kde/generated/sources/gear.json b/pkgs/kde/generated/sources/gear.json index d89f3e1af8ac..92d13d79708f 100644 --- a/pkgs/kde/generated/sources/gear.json +++ b/pkgs/kde/generated/sources/gear.json @@ -1,1247 +1,1247 @@ { "accessibility-inspector": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/accessibility-inspector-25.12.0.tar.xz", - "hash": "sha256-bFlWQfUKjbYUmStf1uWrCmScIm/cabHdmQkNr2Yk/Kc=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/accessibility-inspector-25.12.1.tar.xz", + "hash": "sha256-GiSkrqOflUVoEfgpKttF34IuqbB7faXpXzQtyzB3Z3U=" }, "akonadi": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/akonadi-25.12.0.tar.xz", - "hash": "sha256-idD/yebwZYV+XW/7CF81LJmK4vMcnd+BL1aW09FmYNw=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/akonadi-25.12.1.tar.xz", + "hash": "sha256-+g/5AH4PsYA5EaLxpc2t8r8/cUhFpYOHK3h/e1JxT/A=" }, "akonadi-calendar": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/akonadi-calendar-25.12.0.tar.xz", - "hash": "sha256-uPmLZTFUQuO4Zt2gLs19itxYxJdBPMh/GFzPOCqw6RI=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/akonadi-calendar-25.12.1.tar.xz", + "hash": "sha256-pCeJu/Fo3kPukoUoOJd/JZIhjran+mSQzv+LRBdnH6I=" }, "akonadi-calendar-tools": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/akonadi-calendar-tools-25.12.0.tar.xz", - "hash": "sha256-rHvUxuHSyBfPE+VpXyL6eCjRosK3wULe131WO2Nqh3o=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/akonadi-calendar-tools-25.12.1.tar.xz", + "hash": "sha256-Nq7/d1jnIrenkaCIEs8+9OGYOfPaRuAilQEToZPrCLM=" }, "akonadi-contacts": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/akonadi-contacts-25.12.0.tar.xz", - "hash": "sha256-X1KBhu7Dim+drR2cNn9ZQbnMve531hKfHG5dbxNSVHU=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/akonadi-contacts-25.12.1.tar.xz", + "hash": "sha256-Y266oE5bKGFCq1dJopNVBK+fkXpGgS+JVq6jp+YZ5P8=" }, "akonadi-import-wizard": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/akonadi-import-wizard-25.12.0.tar.xz", - "hash": "sha256-7lNnh/jKT4KZvnKZC5TPJLYWNOTIMY489bahKtUTYos=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/akonadi-import-wizard-25.12.1.tar.xz", + "hash": "sha256-LtuPv/TKI/uvVHEM2CSlrFoPTvRNGr1r2SVS31U0qzQ=" }, "akonadi-mime": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/akonadi-mime-25.12.0.tar.xz", - "hash": "sha256-jd3yQCVfSzLkaX5dqgS8LxTbeJAbUiThvimTWrME9fg=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/akonadi-mime-25.12.1.tar.xz", + "hash": "sha256-Nhn5G/UQRnG86W/sKXRuB+v7u+gFWUdnI8jvhEyPB5g=" }, "akonadi-search": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/akonadi-search-25.12.0.tar.xz", - "hash": "sha256-jcSc9/NAiObeuxOHMU0DO7fc3k2vrXwRe3039KVMuPY=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/akonadi-search-25.12.1.tar.xz", + "hash": "sha256-lApKECVFi49HPcswsZxkSUaQAycr+79qTzp1KFRxgSY=" }, "akonadiconsole": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/akonadiconsole-25.12.0.tar.xz", - "hash": "sha256-GINFkQ9xjxDJ3BG9i3RcGPCr8+Yr40x5eqXugeYehVU=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/akonadiconsole-25.12.1.tar.xz", + "hash": "sha256-9F88balMqGnxjoyJEj3/GGp3fefLU6j0rVgJDP3dUvI=" }, "akregator": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/akregator-25.12.0.tar.xz", - "hash": "sha256-d1LeUp3D0FL0E4nSxup2jHEKztmnaKiKlatQJy3UUZ0=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/akregator-25.12.1.tar.xz", + "hash": "sha256-hcHFl5nPc9FdNmoJthYvZPAT3SUxpPJGzgN5GMLQ8es=" }, "alligator": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/alligator-25.12.0.tar.xz", - "hash": "sha256-5eTAFkch+ywWMYUTiWyrea/OZshSIxRYObTszMDqnRQ=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/alligator-25.12.1.tar.xz", + "hash": "sha256-IVisJiWxPvxD8Gqkaq0qdenEqS5BbYJQGPybgFndo18=" }, "analitza": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/analitza-25.12.0.tar.xz", - "hash": "sha256-7XXsx+hn2A+2wjtAtXzXlL47ebF9OnvdCBqGioqgHr0=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/analitza-25.12.1.tar.xz", + "hash": "sha256-hFXHWTOZZpxCBzJRPG2Q88WVsNBjFgkmPUqgUbo49/4=" }, "angelfish": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/angelfish-25.12.0.tar.xz", - "hash": "sha256-XIBKUQMtpgM3bh/wcQ+t+A1a7oFxUoeLdatRMYtSJcs=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/angelfish-25.12.1.tar.xz", + "hash": "sha256-k9AjDQwnOMd4LLUJYjuOa3EGlQsQo6+JHMGCBkCCP04=" }, "arianna": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/arianna-25.12.0.tar.xz", - "hash": "sha256-A0Mot3MJ+lz85SVLkJs67jaHDlw3KWuQK0pfSH2+Hkg=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/arianna-25.12.1.tar.xz", + "hash": "sha256-x2nuOoXthe7BZRFVUTxhdk+5C0WLnnSLr8x80QL4cVg=" }, "ark": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/ark-25.12.0.tar.xz", - "hash": "sha256-oRB+AQSfNFeCwgsquuMXHstuljuwL/u4FOA1ewJLtcA=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/ark-25.12.1.tar.xz", + "hash": "sha256-6ZYf/fqQiVnOxl1ENXLLjM7aqNYmUfKl9tcs+Vr/J/4=" }, "artikulate": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/artikulate-25.12.0.tar.xz", - "hash": "sha256-wAslVXw1WVp1rrQe6WmlUCKe/UXu3T2rceYPM3asYaY=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/artikulate-25.12.1.tar.xz", + "hash": "sha256-3gihG8elq0O5GzjFA1JNNWpuPe6waLM6/XAFKdv/rEE=" }, "audex": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/audex-25.12.0.tar.xz", - "hash": "sha256-imIVuFoxXh1eSOfYetYapZadbCtUOokUJt5TSVm6fLg=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/audex-25.12.1.tar.xz", + "hash": "sha256-358Y0L/O9aDzLHWzd++FXc6ZmiUkPYHNA9YTh3xvlPM=" }, "audiocd-kio": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/audiocd-kio-25.12.0.tar.xz", - "hash": "sha256-6QrXfkbPXKkfkcnq6k8hQghU0Sv5LpHxBAW0ogSVVoo=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/audiocd-kio-25.12.1.tar.xz", + "hash": "sha256-eWAe14jFc55c8YnrR6aLA5SXXtREHu35avA9C3t7Phg=" }, "audiotube": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/audiotube-25.12.0.tar.xz", - "hash": "sha256-LYfq20L+RS0BcSBs46HmACZ64VLHWrWH1L9glPS/G3M=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/audiotube-25.12.1.tar.xz", + "hash": "sha256-VUnCrc+He/dod2pP/IOUWnalGaQiszd1i0r6lvnBfKc=" }, "baloo-widgets": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/baloo-widgets-25.12.0.tar.xz", - "hash": "sha256-jt+FX7k0e+00jIviuvwB0YOAp4h6Javi5xbAoR2ab4M=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/baloo-widgets-25.12.1.tar.xz", + "hash": "sha256-ZlqVCG8pEwVNWmYElOV94w+HfP5I1g8iSyHDGx6+MGk=" }, "blinken": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/blinken-25.12.0.tar.xz", - "hash": "sha256-qIeNVt18MbXV1T6A4juQEAqZkVLjh9CNqtoFh7LDVts=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/blinken-25.12.1.tar.xz", + "hash": "sha256-8Qgsxhbw78LNE2amFCTrTHiZAKb9BSUO/oygWOMwkr4=" }, "bomber": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/bomber-25.12.0.tar.xz", - "hash": "sha256-OEz4Ai0LVBvuCFETWXdBfFogW6Knhp+YZvwFTCFNHh0=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/bomber-25.12.1.tar.xz", + "hash": "sha256-iKcCn5WZNCg4DK3VSZhks47Mc00c+XAWFbIKwtadWiY=" }, "bovo": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/bovo-25.12.0.tar.xz", - "hash": "sha256-dtvYXrqSYpUJWVBEfSt5Ya+INfE6DDb5d8nDeOECJ5s=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/bovo-25.12.1.tar.xz", + "hash": "sha256-ylussBRAja5TuxhVVOaYfKwnC8QKURIQpnSp3d9LR/U=" }, "calendarsupport": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/calendarsupport-25.12.0.tar.xz", - "hash": "sha256-G2+fEWsXZ0dXYgDk5xwnlD18LlbtjT1QdF3epOBmtnE=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/calendarsupport-25.12.1.tar.xz", + "hash": "sha256-lhIEZslv13i+aoXIm2A2ZesXgXxjiFgh3RJZHHV2yAg=" }, "calindori": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/calindori-25.12.0.tar.xz", - "hash": "sha256-hgcVWX0hGhDMG+4tyjVOLm/F0jWwg3cfVX6JxFc/m7U=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/calindori-25.12.1.tar.xz", + "hash": "sha256-1b4uulsFFlIF1eUUOoAwqeEjPKST/8KpHqI8heJM7SY=" }, "calligra": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/calligra-25.12.0.tar.xz", - "hash": "sha256-DhWQlhExxcp2kPbWkRMSObaFQD0U80bAE428fi+Kafs=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/calligra-25.12.1.tar.xz", + "hash": "sha256-ufgqS6Ck+fB1ECGSvTM9Q9lKMoTJRxQ5zDx5/ecd6IY=" }, "cantor": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/cantor-25.12.0.tar.xz", - "hash": "sha256-Byo7viOGVEBPF/71HE4KrbG3hi7tjrj5/tfUJiiALYk=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/cantor-25.12.1.tar.xz", + "hash": "sha256-7LGGvZIZMJjve8YvqT+YDAANi3vPPEVqB0NqHRSM9ek=" }, "colord-kde": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/colord-kde-25.12.0.tar.xz", - "hash": "sha256-c8FCQeseaI9KIxOJtywmZHqfOngfpI34wZy5Cs6izIM=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/colord-kde-25.12.1.tar.xz", + "hash": "sha256-98Ip664MauXXnR74LA/cuOwpqEy4Tc7RGSr2Knc/l/g=" }, "dolphin": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/dolphin-25.12.0.tar.xz", - "hash": "sha256-AtZwWcE8Wkz3SEfw8cDPmm3kc0XKgPLjuluo9AhIG/8=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/dolphin-25.12.1.tar.xz", + "hash": "sha256-hjFTJ0IhdaSD4+/GH35//5VNT3YO/c//X4cTo9ENtmQ=" }, "dolphin-plugins": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/dolphin-plugins-25.12.0.tar.xz", - "hash": "sha256-9u42YKdGvT0JPECs0QKy4e6kUWHNBh1upNwYc8sqnGw=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/dolphin-plugins-25.12.1.tar.xz", + "hash": "sha256-w213Vq/dMoa/YfQYQSIgPCDto7zvxLIDsnsFOVxFnOc=" }, "dragon": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/dragon-25.12.0.tar.xz", - "hash": "sha256-zvMmhMwZfwxWGysY3fU7s6ms8KjJziKY3IhJMe9G7pk=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/dragon-25.12.1.tar.xz", + "hash": "sha256-9/dRpLbL8/GwKvwhXs/qMdDL6sTH6K3W5QoMvq//CUg=" }, "elisa": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/elisa-25.12.0.tar.xz", - "hash": "sha256-3EcGcueQztHkyqzub7QWVVUmgvNLGj6iq/4ACd0yogs=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/elisa-25.12.1.tar.xz", + "hash": "sha256-dtPc7682YMg42dV1HULrnbL4TDB8YncHExlHgu4AGp4=" }, "eventviews": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/eventviews-25.12.0.tar.xz", - "hash": "sha256-OZlITWv03dYRnbYHrLXdfYHG3qt/j1G6nRz5Ao8Yh0A=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/eventviews-25.12.1.tar.xz", + "hash": "sha256-TGEEHECg2u96w2xrYEEHLws0zPVIgyMXgVSTWs19hzM=" }, "falkon": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/falkon-25.12.0.tar.xz", - "hash": "sha256-bZtNuhveDQRXBzbte7m8EojNf7lLT/6TSpkJErm3qVk=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/falkon-25.12.1.tar.xz", + "hash": "sha256-Zc9oI4vIr6T6YZKnAa1IedSbRDNk+k4tEcTHH7ZVdbs=" }, "ffmpegthumbs": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/ffmpegthumbs-25.12.0.tar.xz", - "hash": "sha256-5HhO79GvV+0GYJLOWRvOhRXP/aXZlmjX5xka8FzMa88=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/ffmpegthumbs-25.12.1.tar.xz", + "hash": "sha256-q4JDPP2i+yh2fnud4J6ktrb20aujZ+n8d9789FF0jF8=" }, "filelight": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/filelight-25.12.0.tar.xz", - "hash": "sha256-NVOGzBDoiAjuv3b7yECUvCS5DXav4oqb2kG2tJOBpas=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/filelight-25.12.1.tar.xz", + "hash": "sha256-yGG6wATJ5H7nSxNHsWz1FJixtQgZ4wHQJ7ijF8orNuo=" }, "francis": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/francis-25.12.0.tar.xz", - "hash": "sha256-jgLEvfXEoubuxM8j0gAw+a1Nrgz96frVOlInrDdu+Os=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/francis-25.12.1.tar.xz", + "hash": "sha256-TQf6X73t996iGjy33NN5MXsLxQEp/Z0VKagPjVNH8mk=" }, "ghostwriter": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/ghostwriter-25.12.0.tar.xz", - "hash": "sha256-1enTy230FTxkM7dnLQEYpinbbL2skv4V+18j6CTBGhI=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/ghostwriter-25.12.1.tar.xz", + "hash": "sha256-3IskzUiNu8ftPC1+zDerR15prA1lxM/dgzop9BeZeSw=" }, "granatier": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/granatier-25.12.0.tar.xz", - "hash": "sha256-p0ns1FsrV3e7F/ZxhVcsTfengwu74JJi8kzdF7Y4DkY=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/granatier-25.12.1.tar.xz", + "hash": "sha256-p9opRpUznqy1JzZH+qRatvaQDfq/ZrtWOMaYHRV9wtI=" }, "grantlee-editor": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/grantlee-editor-25.12.0.tar.xz", - "hash": "sha256-R9LNJq93FlS0gjXA45kvlugtV1mgYNRw/LyCKOeKuzw=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/grantlee-editor-25.12.1.tar.xz", + "hash": "sha256-BV+Qq92GGNGThhrwDCscJPcEWP1SHXAnGKJY+f4lMmE=" }, "grantleetheme": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/grantleetheme-25.12.0.tar.xz", - "hash": "sha256-H+Se8Ebf93LjcARfOccLyYcxDoY/nSDZRs03y7OLXEc=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/grantleetheme-25.12.1.tar.xz", + "hash": "sha256-HK9Sa5MSf7NTumINZBnoVUxcxvuNU0VGTPUsTSFemM8=" }, "gwenview": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/gwenview-25.12.0.tar.xz", - "hash": "sha256-zzKKVoxe84XIrQUAuIXRMEndWZSS0kefXYMeI0EL94w=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/gwenview-25.12.1.tar.xz", + "hash": "sha256-av+f3/2zvDLdeDhxxIC1PU+8kRuoPVqkFLkcIraTkvw=" }, "incidenceeditor": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/incidenceeditor-25.12.0.tar.xz", - "hash": "sha256-baIc5GY64RuvAGh9QiXGXMqBzq6cpDaqz7aE5xca588=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/incidenceeditor-25.12.1.tar.xz", + "hash": "sha256-mhIcrdXnmzbcv5NIfBps5cjhOXtdOTjJYKjYMIdyrNQ=" }, "isoimagewriter": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/isoimagewriter-25.12.0.tar.xz", - "hash": "sha256-uqqMYZdHy/emW26D6kUJIaE3/j43QomoC3zJ2o5187k=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/isoimagewriter-25.12.1.tar.xz", + "hash": "sha256-yxUSha3K5wkjKOzq1vK+Zr/acdVHXRqOt8NxRisjrMg=" }, "itinerary": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/itinerary-25.12.0.tar.xz", - "hash": "sha256-9kxjS7UhpGBKTrKNoqmkmJqe/byBsKOdepwjiQXioLw=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/itinerary-25.12.1.tar.xz", + "hash": "sha256-YUZK09BoDebX0qftNHFWOCRkETuTYtfpvZSrmTN/zGw=" }, "juk": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/juk-25.12.0.tar.xz", - "hash": "sha256-qy1yAc1LD2TOjeXOXrOBrnwyOtiGckh0alPGwbteS9o=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/juk-25.12.1.tar.xz", + "hash": "sha256-irBLPlg3gYap+V/Ah581dg4lk+05cwdupe7fq5pCyt4=" }, "k3b": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/k3b-25.12.0.tar.xz", - "hash": "sha256-XS3LLHBysYLqAlbzuE/3gIexorBpm9+1c3ChaX7z9YM=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/k3b-25.12.1.tar.xz", + "hash": "sha256-fTryOChbEpo2h3EhsuTP0FcgcqtmAa2heLKWH1K7SW4=" }, "kaccounts-integration": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kaccounts-integration-25.12.0.tar.xz", - "hash": "sha256-1sY+V3duOFG1WabmS/DeRl0sx1HvoH0SsMKpBB6/RxE=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kaccounts-integration-25.12.1.tar.xz", + "hash": "sha256-pElCboSbBWJiJYXRGhL4tAe7+c06mICDto8Xpldye0U=" }, "kaccounts-providers": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kaccounts-providers-25.12.0.tar.xz", - "hash": "sha256-qR+2aQR8ZFYR0St3El1gvGsT9lBDvUN7vmi5A1f9sow=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kaccounts-providers-25.12.1.tar.xz", + "hash": "sha256-Loupc0XyJpeMbPNJD6R5eoQpjoHS1OXpWGWSFRfl6qs=" }, "kaddressbook": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kaddressbook-25.12.0.tar.xz", - "hash": "sha256-j8lxInwa4dBZrfjk0hfy0/rKymn91Jea9z8Je5QX2V4=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kaddressbook-25.12.1.tar.xz", + "hash": "sha256-WMnG/sLZix2hO71jU6UvgKBMsOWIPi+q3GE5EpGlFjQ=" }, "kajongg": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kajongg-25.12.0.tar.xz", - "hash": "sha256-slektzNijcAte+/NzkqXpTljpnQPO3ERuZBYC+S2mBs=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kajongg-25.12.1.tar.xz", + "hash": "sha256-QQIQV1r3EtjN9S5djV/ZdraeL7l5aw3Wzp4tdiAv+qg=" }, "kalarm": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kalarm-25.12.0.tar.xz", - "hash": "sha256-gL2cxV/KkWU8F1fx9ReyeyPQxeKHlvhMg9OWEofh8d4=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kalarm-25.12.1.tar.xz", + "hash": "sha256-w0X58EGa4xHUs8CNsaP/v0n3RzcofVPyMlLe8+kVfN0=" }, "kalgebra": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kalgebra-25.12.0.tar.xz", - "hash": "sha256-+1eV2e/gPe2Pi2sZ12cwIEkThB3ICfBvpFP2mudDfNU=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kalgebra-25.12.1.tar.xz", + "hash": "sha256-5lhHxRiA2byGo5cyJsbr68KuFNaWrqS8lwS4fspVeZ0=" }, "kalk": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kalk-25.12.0.tar.xz", - "hash": "sha256-bwNpkZYUatnk568gyOxBAKCQu+HOsWWEuW1P2WqjKc0=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kalk-25.12.1.tar.xz", + "hash": "sha256-Uv9qA0lzWxcwypMrkvkUL1InN24RZ1n+dcWkIvnbRsA=" }, "kalm": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kalm-25.12.0.tar.xz", - "hash": "sha256-2PUuRVtrhDkZK5SSNkE7jmH23pTZ1KHl33vFwfl0Y2M=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kalm-25.12.1.tar.xz", + "hash": "sha256-QrGcYCGdRsGUW6AYxmcRWF9z61tSV2nPK1qsDU5oj+s=" }, "kalzium": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kalzium-25.12.0.tar.xz", - "hash": "sha256-n/U6WOZVpnQFZhhSK3oqRPpUt+H3L5G00gEEwo/oKws=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kalzium-25.12.1.tar.xz", + "hash": "sha256-pi6LRvqownM3zwqy2cYCqNDzXAxkHRek5/Kv9uHkuMI=" }, "kamera": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kamera-25.12.0.tar.xz", - "hash": "sha256-CyQC61dh+cbTNQOYoLepdhURw9+eqcUS8SA8aA/YIrY=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kamera-25.12.1.tar.xz", + "hash": "sha256-AdIqwnx9xXXGaou4ls6j27WHYa7c/g6IUhiCJAmIK/g=" }, "kamoso": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kamoso-25.12.0.tar.xz", - "hash": "sha256-641Zoq7kP1mKNv+2uyc+zNAWflBR9m1wEa90yNcN5q8=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kamoso-25.12.1.tar.xz", + "hash": "sha256-t8Vyz2df9OjuTsB7bBdtcvtoOBRsihYADbFIN0//lSY=" }, "kanagram": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kanagram-25.12.0.tar.xz", - "hash": "sha256-cXXBoQlyOXqCr7D+lW9X2WMlFX+b/VxXQ3mVxUs/udI=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kanagram-25.12.1.tar.xz", + "hash": "sha256-dxbg+5FDbgXdMniQRKSuTRYyFn2zt4UPuzFpofAMEMc=" }, "kapman": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kapman-25.12.0.tar.xz", - "hash": "sha256-SlTWgNNDoe1H/LCYzOtQmeMLpCEbe0dLLL0Ap8XeMyY=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kapman-25.12.1.tar.xz", + "hash": "sha256-mAt2PNeIv5B9bHmCNkO2gDWGZCHc/jwQvqAbpuzGtvo=" }, "kapptemplate": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kapptemplate-25.12.0.tar.xz", - "hash": "sha256-cNaaScUz04cYDocHuHUeUPthW/tgUjHhk+miPZ68u34=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kapptemplate-25.12.1.tar.xz", + "hash": "sha256-JFi6A+a2Mv/dP7aP33bplehMf3mDImSdmKZN9Wi/tGo=" }, "kasts": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kasts-25.12.0.tar.xz", - "hash": "sha256-z/JTdCKpdSnlWjwrn1fjPgrmdXSWWD+xK0UCZklpUoI=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kasts-25.12.1.tar.xz", + "hash": "sha256-6LegJOETuQR5M8TlAvv7D1qBTiQ+qSMCwpq9ZiaWhmI=" }, "kate": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kate-25.12.0.tar.xz", - "hash": "sha256-6kFCxA7rOSrtUzVIVaAOPIFsRX3+JVtAfF0wyGk3f1Y=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kate-25.12.1.tar.xz", + "hash": "sha256-EyMBTKQFSsYk3VgFwRKLpmaoYa4sOiL7oecD30L5KEQ=" }, "katomic": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/katomic-25.12.0.tar.xz", - "hash": "sha256-M/oDzHmfc4HQ4CgXnEUVlPIi6fqkjaaWBgaD7Py8fBE=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/katomic-25.12.1.tar.xz", + "hash": "sha256-xHt+NXFoTNOe7cb1aw9AZXQSQlWlFnZ4U10vk9jsJKo=" }, "kbackup": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kbackup-25.12.0.tar.xz", - "hash": "sha256-kWYcBkqXv///TxnbHU2k6geTxoTRrJEyHFgdMAoxTNA=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kbackup-25.12.1.tar.xz", + "hash": "sha256-rQrLYflyYLiPsrzWeodqOkK8h28/FBafoHvAy3Y+qgU=" }, "kblackbox": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kblackbox-25.12.0.tar.xz", - "hash": "sha256-y6V3DhsCuQtPMiYjwA54lQwfzPFq+YyOC123QxZnggI=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kblackbox-25.12.1.tar.xz", + "hash": "sha256-871/NBVeMKIM1uqI8p+lipmtv+2TsQZA3bfuUtEyo8c=" }, "kblocks": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kblocks-25.12.0.tar.xz", - "hash": "sha256-nU9498kODpAz4jADTlJ9ZLu2rnBVL/QmrUByeJkeUFg=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kblocks-25.12.1.tar.xz", + "hash": "sha256-hbE7LDyQCp73GfeyqJNPwN8N/3hTv8auTkQYCkqkdPw=" }, "kbounce": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kbounce-25.12.0.tar.xz", - "hash": "sha256-xWFE0Cu55SSwz7JkpQ4CNvHMJkARgcSyfywzxSDImKg=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kbounce-25.12.1.tar.xz", + "hash": "sha256-NFCy2MGZ6H3BzmcyIkoxmg6U+VVaKgv+ZgzNsajnaO0=" }, "kbreakout": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kbreakout-25.12.0.tar.xz", - "hash": "sha256-9VDPh1Dn+BjmtbYMBOFAJO12CorOcPe5zku4XT1cbR4=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kbreakout-25.12.1.tar.xz", + "hash": "sha256-uCFywt63/yvQV7Ux1d4zrKWVU18lzBhZWWTFxXEwDtk=" }, "kbruch": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kbruch-25.12.0.tar.xz", - "hash": "sha256-A0q3SYD57FiX65bbT20+SlPD1N53NglCYzDyxmcENr4=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kbruch-25.12.1.tar.xz", + "hash": "sha256-eZIv0OUoKbuzWVnoGMmqIixyrcX4qOF8Vq4Brzh6FgU=" }, "kcachegrind": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kcachegrind-25.12.0.tar.xz", - "hash": "sha256-dmlv3t0K3WJpEZG8xR7eOc1C7jGhck3kPziky7W9/Ag=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kcachegrind-25.12.1.tar.xz", + "hash": "sha256-8pHN2tcS6E3rGSAqqGQdaVDP1SIo318zQbdr/Fdoc30=" }, "kcalc": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kcalc-25.12.0.tar.xz", - "hash": "sha256-QxgTaPYwMFAyFyK2NEihFUgH00AT35l+DorIsdBdPww=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kcalc-25.12.1.tar.xz", + "hash": "sha256-NJ9CNbFJX2CcSH+k9UnO5GmgWC3Lp7ez77zRyr3DlAU=" }, "kcalutils": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kcalutils-25.12.0.tar.xz", - "hash": "sha256-QwSBNOBV/6PnV/3jTr0b7eyN/28mjnPscMjO/7lDPMA=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kcalutils-25.12.1.tar.xz", + "hash": "sha256-WcIjEBHyoePnS05jxTSx4HKUrIQhDDcp9ahoJ6Ru9VE=" }, "kcharselect": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kcharselect-25.12.0.tar.xz", - "hash": "sha256-yudTTHgwmYtUheV+wrMxwSsN9gIhNRbAu422guNP+NM=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kcharselect-25.12.1.tar.xz", + "hash": "sha256-qHhqb3Ft3jeIW9nQMMGAv5lUJtIEIiUYYc728IWzYYc=" }, "kclock": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kclock-25.12.0.tar.xz", - "hash": "sha256-iUekqVEOLZ+uSSOMwmfAFcwbHJHgLNBy8C2n8CBSryM=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kclock-25.12.1.tar.xz", + "hash": "sha256-4DZ9mgidJihExOkl3XobOQV+JYS3hvxkCmA+3y5yMzU=" }, "kcolorchooser": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kcolorchooser-25.12.0.tar.xz", - "hash": "sha256-+emXHtoXXLQG5sCSqlS3Tgi7hPC2PJya+uoRAf83Z/Y=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kcolorchooser-25.12.1.tar.xz", + "hash": "sha256-RflYEPLSHFcZEoWSZFIeItd7pNhJPNR0AvIcKffgAb0=" }, "kcron": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kcron-25.12.0.tar.xz", - "hash": "sha256-7y1o2rqiNGGKpn5pB3+ZOmySAXsdR0/DPFXgMAaHGIA=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kcron-25.12.1.tar.xz", + "hash": "sha256-c9cjekQoNs/fG3hvSg9Jwg5ZOe9QJ1OSjxvrb6SeohI=" }, "kde-dev-scripts": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kde-dev-scripts-25.12.0.tar.xz", - "hash": "sha256-cds7BjeemO+nZWHwjFzYyngKXWRGXkbVUIopny92BJw=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kde-dev-scripts-25.12.1.tar.xz", + "hash": "sha256-hJ7TMTDCjHwf7/WvO7EKWkSCN6UUgac1jFoouaYur3Q=" }, "kde-dev-utils": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kde-dev-utils-25.12.0.tar.xz", - "hash": "sha256-oORc3CBpsRGJWiuPnV+yr9Q2zDi0lrw7ow0umk3vQAw=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kde-dev-utils-25.12.1.tar.xz", + "hash": "sha256-0id9y/2Ll6BppKXddM2xf9pg1BVScivTj3JLjf+z3fk=" }, "kde-inotify-survey": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kde-inotify-survey-25.12.0.tar.xz", - "hash": "sha256-zyTNVgmvuy88cKDBAbxBoeUKrt5LFUT5GGEZ7l1+Ua4=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kde-inotify-survey-25.12.1.tar.xz", + "hash": "sha256-RNx+gIY+ZUeSDp3nwLnSHSqbnos+s19ta+a79wjqaPE=" }, "kdebugsettings": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kdebugsettings-25.12.0.tar.xz", - "hash": "sha256-0ZfGsVJJNRGyMlQ9OujHTs43tb2zjdbXyjiaJwnQyck=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kdebugsettings-25.12.1.tar.xz", + "hash": "sha256-yKVxSd8BKkeWaRHgkfZV47HBwHXn8Ez0vNzvokDKEsk=" }, "kdeconnect-kde": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kdeconnect-kde-25.12.0.tar.xz", - "hash": "sha256-D/8k03HM/vyFjX1uAThcTVfcQL9G1nAqNNG/ZyfMcqg=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kdeconnect-kde-25.12.1.tar.xz", + "hash": "sha256-fWOFe34cJ6ANvbqyb6OE/H2Tv+MtgrlZQ6lE1He+Wtc=" }, "kdeedu-data": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kdeedu-data-25.12.0.tar.xz", - "hash": "sha256-FAjaXTEzFFs7AiwTQ0diCYUBHKCBXZn2yAWx/CRIrh4=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kdeedu-data-25.12.1.tar.xz", + "hash": "sha256-6rspwNppkWGIglaYcxSnUQ0aIxKEBOpUtwoMkJiLYL8=" }, "kdegraphics-mobipocket": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kdegraphics-mobipocket-25.12.0.tar.xz", - "hash": "sha256-9RX2Qn4lP4xYuaj+ZP5uplqsnngOSxm14M4pnzKScA0=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kdegraphics-mobipocket-25.12.1.tar.xz", + "hash": "sha256-Mn+uAT4GsmM2+tEpp0G2ufkxoTSPUXStPMJ5IHNd0uM=" }, "kdegraphics-thumbnailers": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kdegraphics-thumbnailers-25.12.0.tar.xz", - "hash": "sha256-Hn7mYg2e8Cq87tW66xJ1YK9T/n6zeMoWkrEv2knN2rU=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kdegraphics-thumbnailers-25.12.1.tar.xz", + "hash": "sha256-OxgGGYWI7LjNJ//laZnVOEoZ7z7Gvg388E1nlH2q1/k=" }, "kdenetwork-filesharing": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kdenetwork-filesharing-25.12.0.tar.xz", - "hash": "sha256-GvHw8VddWUc6paLKg2r83xcMHCLhXCmMXt0Ap9H9TLA=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kdenetwork-filesharing-25.12.1.tar.xz", + "hash": "sha256-QJxXAgMJ9/7hFnCFi513vcYCY8xdBEm19E+yfN8e+E0=" }, "kdenlive": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kdenlive-25.12.0.tar.xz", - "hash": "sha256-yv7p2Owp6Z9QdyDyjWC/wJY6hzP2eg/9amhCc7gkLKU=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kdenlive-25.12.1.tar.xz", + "hash": "sha256-q0DaMYlqHgkx5qzVmCAILA4QzF78WZ1AAl/AoOuAOcA=" }, "kdepim-addons": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kdepim-addons-25.12.0.tar.xz", - "hash": "sha256-vWdpqeyLlOLLsMsIm1EIyOkH9eL3HIx/Oq9zsQJvD8c=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kdepim-addons-25.12.1.tar.xz", + "hash": "sha256-t2y4AbFROmbv+0mgFgwGlk1FJc/4iITBZq3lJ6s60Sc=" }, "kdepim-runtime": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kdepim-runtime-25.12.0.tar.xz", - "hash": "sha256-F1noziYQWXrkR8baZPAreTsKdwK6u0Enoe1xap4OQUg=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kdepim-runtime-25.12.1.tar.xz", + "hash": "sha256-HnJs57YBvqyH/sCkKnvkZjim09bZdN/Ow3qWfw/Nr/U=" }, "kdesdk-kio": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kdesdk-kio-25.12.0.tar.xz", - "hash": "sha256-OtvMhClEPMmcCjagsQjfC1uFI7b48eahK3Rw9LPCUfU=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kdesdk-kio-25.12.1.tar.xz", + "hash": "sha256-RIXNyn3jjFpQ8I082x/1YJUjNfztPMg3RFFWvnOzk6A=" }, "kdesdk-thumbnailers": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kdesdk-thumbnailers-25.12.0.tar.xz", - "hash": "sha256-f01Ck+PmfN0D0ZcchfSPTCp4jCmV3g9ewf+76iS9ct0=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kdesdk-thumbnailers-25.12.1.tar.xz", + "hash": "sha256-WYBidUSXEsMux8Uv+TukrLpAAZZHaFWWSVVRfOYPZLo=" }, "kdev-php": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kdev-php-25.12.0.tar.xz", - "hash": "sha256-f76Pa2gUY29mQPKzFDaaIlUeNP9ab7fSZuFOIPKCO80=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kdev-php-25.12.1.tar.xz", + "hash": "sha256-7+NHbVzvwGvpt3tP6IOV5LTcWJFBHIclXghWNgNFvgs=" }, "kdev-python": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kdev-python-25.12.0.tar.xz", - "hash": "sha256-+zezaFVkgzZGbs3JSLNx6w2r4wsS4xMTfKL2nbYCuR0=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kdev-python-25.12.1.tar.xz", + "hash": "sha256-EdQZUhdGzl5ovlMCBqJaheXFxObdPIeTLB8JIbfaHPU=" }, "kdevelop": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kdevelop-25.12.0.tar.xz", - "hash": "sha256-7/91i9WGr12CMp0vNAq/5kZnPYn8b1dwg4rqSfc/P18=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kdevelop-25.12.1.tar.xz", + "hash": "sha256-RsUcL7sqH3qAZlECBJalPFZbPZgrbUWhUcZm5TWyqK0=" }, "kdf": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kdf-25.12.0.tar.xz", - "hash": "sha256-RfipRdjlkcqSry6iGioCz3kymmuBHvZ5y5X8Af+gk9Q=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kdf-25.12.1.tar.xz", + "hash": "sha256-bplWvC2fqoru8G+NDNpZKrNPHkEX/vpi8y7tKigtPiM=" }, "kdialog": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kdialog-25.12.0.tar.xz", - "hash": "sha256-7wZLPnuoPhrBhhR7QwxELEchOAHm9mwNPjYXRooAdKE=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kdialog-25.12.1.tar.xz", + "hash": "sha256-EC1hNVMbh2LCwzeEQtHP+C89ZxgJcmLfF1AxIeCuKgI=" }, "kdiamond": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kdiamond-25.12.0.tar.xz", - "hash": "sha256-ar+Ypho/oI926Z/LsUn1++m5ZQZplDA3oPW7HCJRGes=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kdiamond-25.12.1.tar.xz", + "hash": "sha256-cBgf7AD93dX9jGplwujFgc7qMuKaDMqSzKSfVWiwvOM=" }, "keditbookmarks": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/keditbookmarks-25.12.0.tar.xz", - "hash": "sha256-674VmMxtvXinLWNWb9jksISb9LXjvLS7e4tXjxewokc=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/keditbookmarks-25.12.1.tar.xz", + "hash": "sha256-srLSM6/5jLeb74lRHi4miP8HEaj17APKl/VEn8m9O7w=" }, "keysmith": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/keysmith-25.12.0.tar.xz", - "hash": "sha256-KhIlCibBGCXiSlDOsupTj4X5pRvRci5dZVTacl9tzpA=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/keysmith-25.12.1.tar.xz", + "hash": "sha256-m0iYeDOYRtGnzdnXs03aT9iJJHjI02qSZ9y7fWjayBQ=" }, "kfind": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kfind-25.12.0.tar.xz", - "hash": "sha256-U9B9zF8ZeRWgcDpbqok41zhhlh2cWaM7yyGdulF26n4=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kfind-25.12.1.tar.xz", + "hash": "sha256-lg0leCWy/5kymCO+Wllkg2wug+QygN33lsj58WgfjPQ=" }, "kfourinline": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kfourinline-25.12.0.tar.xz", - "hash": "sha256-wOaQ3mJRHkfj8jhiUgRXMo3f4XOTli6Dk8EXHAZQxaI=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kfourinline-25.12.1.tar.xz", + "hash": "sha256-0zmg+JvkNJpafYus2wAs+jEYW1nv7LUTjR3RZ96LkZE=" }, "kgeography": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kgeography-25.12.0.tar.xz", - "hash": "sha256-jJQVRc3u2UfyI6DC/F4iLldIBVnlmG1yj+JjXAnC158=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kgeography-25.12.1.tar.xz", + "hash": "sha256-1nZIIixKKPP2UcNdcX3T+8i9xCCvHhwxmNFAu3ZaOe0=" }, "kget": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kget-25.12.0.tar.xz", - "hash": "sha256-vRDCZsXyK7cWt1WcG5qobNEcKF++dkitDysK6PNXmSE=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kget-25.12.1.tar.xz", + "hash": "sha256-0gX4X6co9+i42/kO1iGojNRhv69WKZhlsfJLOrNs88Y=" }, "kgoldrunner": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kgoldrunner-25.12.0.tar.xz", - "hash": "sha256-7oIxDl5KXzR5RvTWMn0Lppy/iCjvXJJVM9ertQFoirU=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kgoldrunner-25.12.1.tar.xz", + "hash": "sha256-6xCus47JTA/w+6TuUGxiOqqIOBDZ+YGN+vq1myH7AQ0=" }, "kgpg": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kgpg-25.12.0.tar.xz", - "hash": "sha256-XjIuvUlXH6OBxPG5mz70Qdf/rtw1ZOOPNV/FNqSFpeA=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kgpg-25.12.1.tar.xz", + "hash": "sha256-t3bvnloQoV4ZXzRrtBEfJh07/tOLaSHrNOnXdhSGLWY=" }, "kgraphviewer": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kgraphviewer-25.12.0.tar.xz", - "hash": "sha256-wmqy8cY/MO+Qm/Yt0/h4gpR+JDJWtTwB3H1BQscFOPY=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kgraphviewer-25.12.1.tar.xz", + "hash": "sha256-XHcLOW4oPiCqEnE0A4OkcwrfUKgbhJA8E60iPpq8LkE=" }, "khangman": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/khangman-25.12.0.tar.xz", - "hash": "sha256-A0G3/p4ROqMZYClDpiyiqq/9iMiASa/xCYzSJCA0Gvw=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/khangman-25.12.1.tar.xz", + "hash": "sha256-lxLcwWm1kkPSoyNAh6PI+lFQDGYGVEMOFsVlcWZ4u18=" }, "khealthcertificate": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/khealthcertificate-25.12.0.tar.xz", - "hash": "sha256-R8VKrGOqPVIaCCazGvzDXi/PjH9yTXWUeKLYO6zDWJA=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/khealthcertificate-25.12.1.tar.xz", + "hash": "sha256-oalvkOoSEKXqDwnlgKpwQ9lNfyY2p8G9QLLI7z+nbgY=" }, "khelpcenter": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/khelpcenter-25.12.0.tar.xz", - "hash": "sha256-B6UXRIfHYTsVDZiw32G05lcmxJfKOBHiwFTyVJSSfag=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/khelpcenter-25.12.1.tar.xz", + "hash": "sha256-aaPNiwM7sRo1cVJy6TRJ/AdK/dqqjDYwpOLj9ilZHlA=" }, "kidentitymanagement": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kidentitymanagement-25.12.0.tar.xz", - "hash": "sha256-eY4Fm7kiGKJ+/+RArWYWIDpD4E/lUtenuNnpnu8Gtts=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kidentitymanagement-25.12.1.tar.xz", + "hash": "sha256-cLZqE8ZKM+U9NUg+ny9CKUCXkUvPV8iYTl8uve2gqjQ=" }, "kig": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kig-25.12.0.tar.xz", - "hash": "sha256-0KSiBtBp3ef62PHNOD5phSTqBb1QI4pnPylCdpHQqLs=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kig-25.12.1.tar.xz", + "hash": "sha256-klk/X7/siQKYBfBDwjZk/eSDHR19YyPiVwfYDt0gPl0=" }, "kigo": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kigo-25.12.0.tar.xz", - "hash": "sha256-Ion2IHHyRjpuupBRyHrYskV+kxaOluAxSr7tbC6E95U=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kigo-25.12.1.tar.xz", + "hash": "sha256-qCURKjezgWe7o/tPEkHsEt0MiRU2JxGg/Em8iDP3BJ4=" }, "killbots": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/killbots-25.12.0.tar.xz", - "hash": "sha256-aHFbEtKMOWA8VNpyBIl6GcAvg7+HP1Ek+GZFHl4cLog=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/killbots-25.12.1.tar.xz", + "hash": "sha256-Z2AQgsv+x0+T7wqBstD4l6PFIdzyRXMJO9/af4LE9I4=" }, "kimagemapeditor": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kimagemapeditor-25.12.0.tar.xz", - "hash": "sha256-4beaQRRyrHtXwHI9hqHbvCuoV0An9cFXpcgjFQ/f+dM=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kimagemapeditor-25.12.1.tar.xz", + "hash": "sha256-X9F5fDge8bbtEqQEkxbvvSb/ygLWK6zmaM76gyjvnEE=" }, "kimap": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kimap-25.12.0.tar.xz", - "hash": "sha256-xSD02tZMPHGQNbjw7WhCVRqFAIw2U4PLoi7GTMmXo7Q=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kimap-25.12.1.tar.xz", + "hash": "sha256-tGbyiOg3EUlPM56AbymviAHbPxOj5KPfqJ8R2fKmN3I=" }, "kio-admin": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kio-admin-25.12.0.tar.xz", - "hash": "sha256-YbsmucNd0j0YnagF7OlhdKRDI6UmIqnVxiJK1byNWxQ=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kio-admin-25.12.1.tar.xz", + "hash": "sha256-qWwOJWQgXECuEnMyMEEEgK2UKdqmSzsK5c27jRuViDk=" }, "kio-extras": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kio-extras-25.12.0.tar.xz", - "hash": "sha256-RTVj/vhWPmdoDa9azhe08aWr0svfgNUOHPm9rb3o30E=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kio-extras-25.12.1.tar.xz", + "hash": "sha256-30ZOPPnug9cvU0bjeUG+0F7qHQ5fSd/YHJQK6uw2nVc=" }, "kio-gdrive": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kio-gdrive-25.12.0.tar.xz", - "hash": "sha256-Z7PiJj/IxpwGGwllj9d+1QxNjWmjWNQMDm1N3qb5R34=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kio-gdrive-25.12.1.tar.xz", + "hash": "sha256-LV9uVxi0czgKvnQKepubbrtDl7iKbFKf4WMsnig2oYI=" }, "kio-zeroconf": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kio-zeroconf-25.12.0.tar.xz", - "hash": "sha256-InyT4BZz1+tpYG5F/J8QYLDygOh5MTxiOx8kI0U84qg=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kio-zeroconf-25.12.1.tar.xz", + "hash": "sha256-c+OhDsfdNEdRhgIOafkGp4OO4XjsWHRrlGZ0R7iLHas=" }, "kirigami-gallery": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kirigami-gallery-25.12.0.tar.xz", - "hash": "sha256-0Yc5AJ66t3paoMXKDj4wU/9UkWTGpSJmlnlbVjhzplQ=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kirigami-gallery-25.12.1.tar.xz", + "hash": "sha256-32UfDVZZm+zBuKkFGBTFCQaKXolvEaoXCvWu07+K1po=" }, "kiriki": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kiriki-25.12.0.tar.xz", - "hash": "sha256-Vll995EfPKpwv0UnWJqcPnslMj0orKWETcrjT2IJTn8=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kiriki-25.12.1.tar.xz", + "hash": "sha256-b7IpdTHxiejJIYaShHtFD9LlAOpSCIOTGeFVWXls4Nc=" }, "kiten": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kiten-25.12.0.tar.xz", - "hash": "sha256-mFY7Of6uC+AzoPM7tCY3ndif8rPTcgnuvbVZSZC6mYI=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kiten-25.12.1.tar.xz", + "hash": "sha256-DvYG8i/Eb6/r0sITGqQI3QYopj7ChRhJUAhO2VXDCdc=" }, "kitinerary": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kitinerary-25.12.0.tar.xz", - "hash": "sha256-dQlqSVJjQ15uHfrvj5+0j60hUwxIrq66kfc+DThNXww=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kitinerary-25.12.1.tar.xz", + "hash": "sha256-oup7bItMo/sG4mwUuq4sI4fEDk00qTg8FYsctIylzao=" }, "kjournald": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kjournald-25.12.0.tar.xz", - "hash": "sha256-vohxKqHQf81lGfqc9wFByAsmybLdyzEbf4F1oJjJXgk=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kjournald-25.12.1.tar.xz", + "hash": "sha256-1DlcsblscuCrbRIP4fjVU6o0bp1DBui0FNKOopG7Jqg=" }, "kjumpingcube": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kjumpingcube-25.12.0.tar.xz", - "hash": "sha256-l2Q7vpuaFSoCnavBY90s6P1gSNgnH0EX20NTOz2+kTQ=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kjumpingcube-25.12.1.tar.xz", + "hash": "sha256-9bdi2n6cim3zv29rBEwZuqtxvc9K0lqM7mCmOwIhe38=" }, "kldap": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kldap-25.12.0.tar.xz", - "hash": "sha256-sSWbBK+cUD0dmXpx+MlAXCuJlvJ+6O46ZnRj7CYzSlc=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kldap-25.12.1.tar.xz", + "hash": "sha256-Bkwvkoc8qoYBdXeMrh5SRkAiwt51xj2mvJKrbaIDkbM=" }, "kleopatra": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kleopatra-25.12.0.tar.xz", - "hash": "sha256-A1yXfWLmsmNYe5aefe+jGLAXu5pgtzzYEpkHU1jSu9o=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kleopatra-25.12.1.tar.xz", + "hash": "sha256-HD06Ny3meIAKgzR5nluM2huWvvidO9Dv6zIaElBAO9c=" }, "klettres": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/klettres-25.12.0.tar.xz", - "hash": "sha256-MRjc1fvkNFgVEKRMFajV49n27+gZWB7DXnoXgiUETpc=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/klettres-25.12.1.tar.xz", + "hash": "sha256-Lf78xFSyrBmUCsUMLGvDhU0GFT7S97OJpru7F66pn24=" }, "klickety": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/klickety-25.12.0.tar.xz", - "hash": "sha256-+VsNmGIM8v6l008SRO+p58VzKjznmb41o+4YBJIBhNg=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/klickety-25.12.1.tar.xz", + "hash": "sha256-OHFoOykUtWEqKpLT4kp2lDnR8u/s1yVeLJy7WLBllMw=" }, "klines": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/klines-25.12.0.tar.xz", - "hash": "sha256-5wLwTfYRJbnJ29udwPY3xzHmN86vZ5hWJmVlSBWGxcA=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/klines-25.12.1.tar.xz", + "hash": "sha256-yaZkgOPTXi2/KlQ43wb/oblcb8WVG+ivU6aYBeGxRuU=" }, "kmag": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kmag-25.12.0.tar.xz", - "hash": "sha256-Cnx+Pse80mOZFYctBXFlN+6nhUvtLCmXJer8+ky1dG0=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kmag-25.12.1.tar.xz", + "hash": "sha256-PlHw+xc0Fhp/97cPAuoAxD89o393iyY69JXwVpAYggQ=" }, "kmahjongg": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kmahjongg-25.12.0.tar.xz", - "hash": "sha256-ivJK0EZA2jB2zBVV+hsBQ4S5Bre0EaNWZubQB/pU7ro=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kmahjongg-25.12.1.tar.xz", + "hash": "sha256-v92ntK/8ipANMt7+Olue0+jLYq/5VyYLrOB3YCkSrKE=" }, "kmail": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kmail-25.12.0.tar.xz", - "hash": "sha256-YskEthSRsOmJAq7o2GxaSZ6wZw6Zr7d9xP4luv8mZl0=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kmail-25.12.1.tar.xz", + "hash": "sha256-f/JfI1qSEGnMXBHuNo1JA2TxO6lNHeKxsqVYT0oPTo8=" }, "kmail-account-wizard": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kmail-account-wizard-25.12.0.tar.xz", - "hash": "sha256-yFExJKdfb9R7C06E0H1mzt+DtSO3yVBW1Yz4VYGnZb4=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kmail-account-wizard-25.12.1.tar.xz", + "hash": "sha256-Tsb0Z5OFCG+3QSE2ryXkr7SWHiL0RCP5MxrkyeVOnOc=" }, "kmailtransport": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kmailtransport-25.12.0.tar.xz", - "hash": "sha256-SA/92S1lfSrbv44v4Xs/cj/INcE/rD1RnuJlG/wt4b8=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kmailtransport-25.12.1.tar.xz", + "hash": "sha256-iU5TeQv6JcLeBEok9Q9lMmAvANGvMUbFEwRnWu63NjA=" }, "kmbox": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kmbox-25.12.0.tar.xz", - "hash": "sha256-OmoQm9xKFkiRjU0zKqrCRH9ncQ2H7pobz6wWmRuOk+g=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kmbox-25.12.1.tar.xz", + "hash": "sha256-CxmBQ3JzpL7YD9garXMu7HpOpBABrWz4PPOJa20VLxw=" }, "kmime": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kmime-25.12.0.tar.xz", - "hash": "sha256-wh8XsfymgmSHzY4izVUd7pNApSI3xZZwzIxDJlsPRjU=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kmime-25.12.1.tar.xz", + "hash": "sha256-yHUo/Wec0nxkuz/ws09PfTUY4/w8npdArQGhR/4DxHk=" }, "kmines": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kmines-25.12.0.tar.xz", - "hash": "sha256-wVYaXrSW24/H1i1V9DUqYYXt3dUYUxTVfZwVx3Ndyfs=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kmines-25.12.1.tar.xz", + "hash": "sha256-/6e8GFFaCZVte+j5OIY/QkyrRvGWgW7oCFaff+mNqM8=" }, "kmix": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kmix-25.12.0.tar.xz", - "hash": "sha256-r/bALcEd/ULFdVnMTCnZ6mwO3FwYRK52LKcxU7zWVT4=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kmix-25.12.1.tar.xz", + "hash": "sha256-m8NcJagZHOqrRBSoCjjFeQQVNoUo/3moJhXX9b2TjGo=" }, "kmousetool": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kmousetool-25.12.0.tar.xz", - "hash": "sha256-lt8RjeXDHSGzNvAIjMSteBD29+VsWlRrLKhsT1WZDJ0=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kmousetool-25.12.1.tar.xz", + "hash": "sha256-z8csHyZKr5dJxJHpfOqxjyMZw7Pg35BOR/eY8rW/PX8=" }, "kmouth": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kmouth-25.12.0.tar.xz", - "hash": "sha256-84zSe28eMgvDgC/QhFu0/j5tYjol+6KaPEsZ3Ohu+R8=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kmouth-25.12.1.tar.xz", + "hash": "sha256-PE9Z//MTT8x2XfR8N40UEjBnNs8GoXiX2j3WyaGqbaQ=" }, "kmplot": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kmplot-25.12.0.tar.xz", - "hash": "sha256-ivi2IT32qdsCjhSJxKB7+w+zTyiMax6dG7bhXC68Rm4=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kmplot-25.12.1.tar.xz", + "hash": "sha256-3aTZXrGH3SIfvA8Hi8Yr1o2lFT4w6wvXB/Grbv6Emzo=" }, "knavalbattle": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/knavalbattle-25.12.0.tar.xz", - "hash": "sha256-2+vQ0jdO0CoNRwtV1FYTTpwRiXFA/GhzNbIFl1+9Rmw=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/knavalbattle-25.12.1.tar.xz", + "hash": "sha256-0LBEQA6uOokxWuVdpXWcBwy4xPac39UsJrsFf5/Qubg=" }, "knetwalk": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/knetwalk-25.12.0.tar.xz", - "hash": "sha256-CHJYt6EfpTxf9zd9z4nKkyJoO9WHEEKN5bUaH9U45Jk=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/knetwalk-25.12.1.tar.xz", + "hash": "sha256-fpHv/EtzNOoZHsOiklGNMKcJh7RPz2ioLuHJBPBrIaI=" }, "knights": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/knights-25.12.0.tar.xz", - "hash": "sha256-tvWcVbikCqWEjimH4fpPwlzGRyN25dgIjCt9HIgHlG8=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/knights-25.12.1.tar.xz", + "hash": "sha256-lGYazOIMIugjm1Z7tFIqbJ7zZ9CAYHc7+yRs8bnnJlc=" }, "koko": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/koko-25.12.0.tar.xz", - "hash": "sha256-XWwAgrY/hipu/7SZYzstpP1J3W1lEOrnryEYOLS6j58=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/koko-25.12.1.tar.xz", + "hash": "sha256-DB58+9WPD15GfxKMiRpflTF2yJmRjVd3G4O1X3Tf9bs=" }, "kolf": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kolf-25.12.0.tar.xz", - "hash": "sha256-AuyOEPR5SG3CpmJnSV625LtBtZ7bv8/FcNOMVWOiZPQ=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kolf-25.12.1.tar.xz", + "hash": "sha256-rBzbGoBKOZJBU/01wcjyO4tmf/vXltZ81PjCR0NdpOM=" }, "kollision": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kollision-25.12.0.tar.xz", - "hash": "sha256-ms6zjg/DMPVNaoseiP6ulmK8vO+D3jVeDezu4ntHVvU=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kollision-25.12.1.tar.xz", + "hash": "sha256-wZwOg3P35rbkqIF8Yf1KUgTec4C4NUmabTTXpbZ77y8=" }, "kolourpaint": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kolourpaint-25.12.0.tar.xz", - "hash": "sha256-sFlSRZJ18lgPk+EV7BUhqUnf3DrAYstDtcYi4tQg478=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kolourpaint-25.12.1.tar.xz", + "hash": "sha256-EfO4UKu10ThziEMrPgJSF1HqlpATEjEPTgsislUPf0Q=" }, "kompare": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kompare-25.12.0.tar.xz", - "hash": "sha256-hI9cGeXQVHgYRDI89v5bs+p+BVgy2Ef40JvxNymUH0g=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kompare-25.12.1.tar.xz", + "hash": "sha256-3+2933xJvDwnhm7XF+FeiC/9RXsXyH7QzRL76zzb1FE=" }, "kongress": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kongress-25.12.0.tar.xz", - "hash": "sha256-nBQcxDwTHnXKkvM6We0fXXq6PbybheIuKIhETUcgPBM=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kongress-25.12.1.tar.xz", + "hash": "sha256-fOR8ZbF5IskSTEpe5C5cNqUUSJhDI/1N19Hzk2B2rNk=" }, "konqueror": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/konqueror-25.12.0.tar.xz", - "hash": "sha256-MuX2Jwm/rHfOBB/P7+o8yVKvC6a4MrKLTG9lIAHDOKA=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/konqueror-25.12.1.tar.xz", + "hash": "sha256-e32pBn5TnOlZ2gsMyNOiMf2EM2+GyiT3ks/E87wix8s=" }, "konquest": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/konquest-25.12.0.tar.xz", - "hash": "sha256-KAcn3u9BTUE3Uy62E4u8Xo1j7OccW2N85z0/zHL83qQ=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/konquest-25.12.1.tar.xz", + "hash": "sha256-mncLgUtLzEZ6+lHGm00khHXhJbTmXMAmZhFpKiXibDM=" }, "konsole": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/konsole-25.12.0.tar.xz", - "hash": "sha256-v+Oe0iuDDJnjdYOtDmfrKOkSxDI1s6tHiYY3RnYjSjQ=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/konsole-25.12.1.tar.xz", + "hash": "sha256-gIxBjZok3QJJ/6xuqMfz1LxtLeEIfRcGK9mxXGDjVtk=" }, "kontact": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kontact-25.12.0.tar.xz", - "hash": "sha256-xGkWtpF9KWIdKZeN9T469/KxmmaPTuyRvB9tbIpP+S8=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kontact-25.12.1.tar.xz", + "hash": "sha256-ThB3w2OXuJ0WEKWoIykSbGqyQb0fL569iqNBtK/rEmM=" }, "kontactinterface": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kontactinterface-25.12.0.tar.xz", - "hash": "sha256-sPL1yhcXhRgsU7DF97E7/WZ++9EWt2MHNTWF9hl/AmY=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kontactinterface-25.12.1.tar.xz", + "hash": "sha256-Q1hcn2ofED0H1es6+jU8rp7+g+dKgI2s7/F9ST2CJAM=" }, "kontrast": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kontrast-25.12.0.tar.xz", - "hash": "sha256-tz0LU7UKimYCz6Bnlj2Ey++DZ80A+lwER9N1zmH9I1g=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kontrast-25.12.1.tar.xz", + "hash": "sha256-vbRH3cbdm7mJqB61tDa7NkGC+OsAwGAcSqK3lwUnolM=" }, "konversation": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/konversation-25.12.0.tar.xz", - "hash": "sha256-vIqO9JAMB9Jf1VAEmZS1fC0/xy/zcM3plt9XUggaWGg=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/konversation-25.12.1.tar.xz", + "hash": "sha256-hm+AKBBXnxhdQsobgGVWHnGK4hUH7kbzskAtdlV57ZE=" }, "kopeninghours": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kopeninghours-25.12.0.tar.xz", - "hash": "sha256-pOQoDJW9fxt4eSWw4rjFvA6H5ex/NYt/18i3yt+3+kc=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kopeninghours-25.12.1.tar.xz", + "hash": "sha256-ZB/9G/1XAuR/OShnR/cvMNEWveJTVr3b0awfsYbViq8=" }, "korganizer": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/korganizer-25.12.0.tar.xz", - "hash": "sha256-Az+F9h1eaBuqX6S2NfQ5UsxOcf7knl+H7hB2FZauUSE=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/korganizer-25.12.1.tar.xz", + "hash": "sha256-QEeInLYtedmo8gYX3qyX45NWDGNGocWIu8o0Jpx3ZWc=" }, "kosmindoormap": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kosmindoormap-25.12.0.tar.xz", - "hash": "sha256-PLtCGuLkQuv/QYjx1IvLgOXq7CDpmu3hi/kZbR87TtQ=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kosmindoormap-25.12.1.tar.xz", + "hash": "sha256-mP+T1AvFGQpb3MzCq4Na9X7rpig+9nPXlfxo2Cm+d/s=" }, "kpat": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kpat-25.12.0.tar.xz", - "hash": "sha256-SF+G3Z7hA+1eTxAcRWKBva9Qotv9pgKh5UEfsNb9gXA=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kpat-25.12.1.tar.xz", + "hash": "sha256-ewa7gLavcc28eaQbg8aWmDLiRXZV84hjxhKNtqvp6ZQ=" }, "kpimtextedit": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kpimtextedit-25.12.0.tar.xz", - "hash": "sha256-T69psp1pR0Zl4PYtq6MnmjJXa7/z33Z2Z/+BdLn19i4=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kpimtextedit-25.12.1.tar.xz", + "hash": "sha256-DnsOYUsxTkkQRyd/ECmQsre4tZWc+ca4PIcpZv9Zn8Q=" }, "kpkpass": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kpkpass-25.12.0.tar.xz", - "hash": "sha256-WSz6Fuj3x6tpx0mMD6zelyxdmOnPPhmdn109qZs/U/Y=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kpkpass-25.12.1.tar.xz", + "hash": "sha256-ROhxaEk5KrO7srrIEtar67ODhDmCwHDyUg402eg1TZc=" }, "kpmcore": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kpmcore-25.12.0.tar.xz", - "hash": "sha256-9pz8LrA718PA/hxWVUM43TGbub18OgnuhjH+5yDkzsw=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kpmcore-25.12.1.tar.xz", + "hash": "sha256-GNHUbRyGbtkxKPWO6YUMmTvAqzdcwnyhzU7CDY/Nxis=" }, "kpublictransport": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kpublictransport-25.12.0.tar.xz", - "hash": "sha256-Xbu/ojE5UKDU4MuHyMkaJD3mTjeGQ46+kkBUUFfgWjU=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kpublictransport-25.12.1.tar.xz", + "hash": "sha256-pGDue6CZfTzo3uK30fROntNdNSFMjcCj2TOull9fNkg=" }, "kqtquickcharts": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kqtquickcharts-25.12.0.tar.xz", - "hash": "sha256-touLBPK65GuMxgMeXbX5cT0OAaNwlqKtV8bbo9qMaFM=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kqtquickcharts-25.12.1.tar.xz", + "hash": "sha256-+z2/ph412FcyWaCN5nfMFNvb1M59jl1kQcJ+lcqt108=" }, "krdc": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/krdc-25.12.0.tar.xz", - "hash": "sha256-kgzAwFA9FRsAxrWnjH4RDhtZjXdSiMm/0uYRGAC1lkU=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/krdc-25.12.1.tar.xz", + "hash": "sha256-U0fhHK8Kdm7RLRJpe3DVMxqRFclLvjMAyOrCgFRzf+4=" }, "krecorder": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/krecorder-25.12.0.tar.xz", - "hash": "sha256-yBTLW2R0+5tmCvtyF4S5BTdY5bxYeNa8MdJ+6a2pkrU=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/krecorder-25.12.1.tar.xz", + "hash": "sha256-49humPe4XU6sq+sK3Ne2fVk12vxZC4jRaYamcIKys+U=" }, "kreversi": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kreversi-25.12.0.tar.xz", - "hash": "sha256-cKWVUCsM6IwtPw5dTbXlRpIedFpJepZRDxiWtd11gac=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kreversi-25.12.1.tar.xz", + "hash": "sha256-Knn7wc6CTaPYdmbgUb6y8ECXfw7yWah+8bdlwrntsl4=" }, "krfb": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/krfb-25.12.0.tar.xz", - "hash": "sha256-AWoK9UtFHixrRY/4IBDh3qUcXVCL+rMCSLz78lBJLY0=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/krfb-25.12.1.tar.xz", + "hash": "sha256-5qQxYf2p8KXPGnUPu5CGYEmqGYqeDDmHrd7VQAnyiWk=" }, "kruler": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kruler-25.12.0.tar.xz", - "hash": "sha256-xezV9nT+fYW/RPO1O6QwkP6vyOykdbe2oZUfbQQWc9w=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kruler-25.12.1.tar.xz", + "hash": "sha256-vHBUjPyBvvwwRVpqIpdzQ1qIYLDkHC3Dh6lRSF+zYYE=" }, "ksanecore": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/ksanecore-25.12.0.tar.xz", - "hash": "sha256-YX0B2W6ni61MPWgVF+ZLFvA3+co4fCWgXs77xZ482zI=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/ksanecore-25.12.1.tar.xz", + "hash": "sha256-X4bhpvNpcOOwqQ4WPxd0a4PgDa9Llno0Loc5RzMdNP4=" }, "kshisen": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kshisen-25.12.0.tar.xz", - "hash": "sha256-z1WXo+QDXpNP5ayF21hBELJXcpeVjRa0ktuCtcZyZag=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kshisen-25.12.1.tar.xz", + "hash": "sha256-Z84LDB4HRygZkgPc3AEDgIM6UriVfMMdcJe3fj1gbIQ=" }, "ksirk": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/ksirk-25.12.0.tar.xz", - "hash": "sha256-TxbwaAyj8gX0S1OM+jGdGHq65oNwIpRIlhEAKfebItQ=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/ksirk-25.12.1.tar.xz", + "hash": "sha256-p7qJ7Or2XolpACC+fJT1ZIfZLs/M6tDvAMrgtTNZD7E=" }, "ksmtp": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/ksmtp-25.12.0.tar.xz", - "hash": "sha256-FdZuzdxX/jw2ABvsUsc6jGgF4E/oQ9KxM1Oj8/UGGkU=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/ksmtp-25.12.1.tar.xz", + "hash": "sha256-P6XePH/YX5tKmaBGt0qZ/QiyCDkEz7sxmVwCkrkogOA=" }, "ksnakeduel": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/ksnakeduel-25.12.0.tar.xz", - "hash": "sha256-MmIpP4MVPKOUSef67huo072B+8OUg5vEjaWObhzFvJ0=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/ksnakeduel-25.12.1.tar.xz", + "hash": "sha256-KZ/XRRg3G6nzDkHTcgF8Vl4wOjf9jCPuZjQ8SvUsMCg=" }, "kspaceduel": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kspaceduel-25.12.0.tar.xz", - "hash": "sha256-CL3NpOYYfS7JxAPD3iwZt/m5Cni7OzeUpUGPbBEmsDM=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kspaceduel-25.12.1.tar.xz", + "hash": "sha256-dWZUzIYY0SCcmroWGJcjtlf4AR+99iDsDpW6rFnaXjg=" }, "ksquares": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/ksquares-25.12.0.tar.xz", - "hash": "sha256-YDLtgqAjPT7W0jE36Jp2Rf8HHJB3djaiJPgXx44VDQE=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/ksquares-25.12.1.tar.xz", + "hash": "sha256-5ykfIRF3f07Y7iOpcVHKEiKO2QmdRuTc/CUmRmEF3M4=" }, "ksudoku": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/ksudoku-25.12.0.tar.xz", - "hash": "sha256-Y1XhFpMjKwbwwEiOkEkp+nlYL5miiLzHi/o/C6DTdsc=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/ksudoku-25.12.1.tar.xz", + "hash": "sha256-Hb10WUe/eoKJL2SKctSmy0IYTdaLj+XMWbOdta77m/c=" }, "ksystemlog": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/ksystemlog-25.12.0.tar.xz", - "hash": "sha256-xnKH2bgATtR4dRgVOZjeM7ytEBXZiWvySQDh8FVX3yU=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/ksystemlog-25.12.1.tar.xz", + "hash": "sha256-L1KsycT11KWLych/NFyZUenPMRcodbzkllGhLWG7Yf0=" }, "kteatime": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kteatime-25.12.0.tar.xz", - "hash": "sha256-6ydf5em3hz5rPsdGKEhs+BHBD3+93X4vBB7kq+QQh5I=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kteatime-25.12.1.tar.xz", + "hash": "sha256-//kDL6ABuZvyZG6RnX/COF48ripxKRj0cfZB13to3H4=" }, "ktimer": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/ktimer-25.12.0.tar.xz", - "hash": "sha256-kt4eFpn6WpMEwpHfL5Tf6JMfxbueqJ1nX7RVLn+OglE=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/ktimer-25.12.1.tar.xz", + "hash": "sha256-tUwEuewXqCpPDgzMfawktmhGKi7yKTgOyXBN4ZsXses=" }, "ktnef": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/ktnef-25.12.0.tar.xz", - "hash": "sha256-y/f92975QpZaT9mUHc2X0hEAK0YS8NcLZz9D4DQ8sPA=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/ktnef-25.12.1.tar.xz", + "hash": "sha256-ihbRA+Cj1BOTRFBzGcsi0xu3sfBHHdc5QnGLLOBFylU=" }, "ktorrent": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/ktorrent-25.12.0.tar.xz", - "hash": "sha256-w9O03t4XwCwBloaBVAQzGeYksPM83O2V9s17wJt9dOM=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/ktorrent-25.12.1.tar.xz", + "hash": "sha256-mTaocMTYxDVniWEKcE1dHPLlhObB1jdv9XDcvuOCsFA=" }, "ktouch": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/ktouch-25.12.0.tar.xz", - "hash": "sha256-wz/NiA5wtQP31aSgy2ugHDIY2bPPjAIxUFYC8nKm9K0=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/ktouch-25.12.1.tar.xz", + "hash": "sha256-W1su4RzTkDMwLPxH7qCG+IFFF5Go4/qKVTidc6HG6Uo=" }, "ktrip": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/ktrip-25.12.0.tar.xz", - "hash": "sha256-M7X46XhVV3tlTLfMdV4u3b9TTOApDWglguKUhpLWC30=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/ktrip-25.12.1.tar.xz", + "hash": "sha256-cNTIy/0S21qKLnln+wU1nYCXIcXvOgbDbQ575XpGulg=" }, "ktuberling": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/ktuberling-25.12.0.tar.xz", - "hash": "sha256-7pbaNLUz674MH0aU+jXBP4WSiAiXeOerSVQKtyBhN6g=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/ktuberling-25.12.1.tar.xz", + "hash": "sha256-ZBq3/ozDXa3PpyMAcDyOQdy5ka9npvEEuoSIeTXKgkQ=" }, "kturtle": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kturtle-25.12.0.tar.xz", - "hash": "sha256-wZYktzqGQR7r4C3haKYRPlbOniQd65XoInLpoBOurZ4=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kturtle-25.12.1.tar.xz", + "hash": "sha256-pz+It4x/LKkPw7V4eGqB2z+JUdurrXpVph7eIxQbNG4=" }, "kubrick": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kubrick-25.12.0.tar.xz", - "hash": "sha256-fg0UyulR2FqIFgFd3txzQeKRxxXBuhWPIx1siYhGWgs=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kubrick-25.12.1.tar.xz", + "hash": "sha256-KjXenan6crlYlB3fPpKqBkugJ2KHnz0HOKVY/3tXDQQ=" }, "kunifiedpush": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kunifiedpush-25.12.0.tar.xz", - "hash": "sha256-N1kdHdEpFnjg00Rw7Pp/bPGIo3I6sNsRcELRHUO2D/4=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kunifiedpush-25.12.1.tar.xz", + "hash": "sha256-aN55TjwSB0ajaXVE95A5qDUjAveURRPJkbjjIGNlYIc=" }, "kwalletmanager": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kwalletmanager-25.12.0.tar.xz", - "hash": "sha256-X2Uv6WJTnYkd25zD6qh+CsnME0CNl2WG4zkc+DHEnXg=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kwalletmanager-25.12.1.tar.xz", + "hash": "sha256-P6aZx0Mp+DMD9wbD2NDh3Wf4cYM2fWqASyqPDt2BNro=" }, "kwave": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kwave-25.12.0.tar.xz", - "hash": "sha256-xlu8gj+UMkntBd7Xvltit/daa89pcin3MzMt4Px8f6g=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kwave-25.12.1.tar.xz", + "hash": "sha256-0O0NNjZJQzm+ay6fSkbWYaYXy0EDKY8i6xO/NySZLXI=" }, "kweather": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kweather-25.12.0.tar.xz", - "hash": "sha256-5jO6SCr97Yuj6wD625DrTQY0LeOLm/KxZvWnV4EfSbE=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kweather-25.12.1.tar.xz", + "hash": "sha256-HAOXaSkGGZbVTaxTRtB3SswoVicXPhDgqAxqeO1S5pc=" }, "kweathercore": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kweathercore-25.12.0.tar.xz", - "hash": "sha256-LDDxTJcPeVSezbeYvMGVIhxzxBkjoQRMeK1ttdLIgBI=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kweathercore-25.12.1.tar.xz", + "hash": "sha256-BxxWejP018GEmrA892LSleofiyJ1UDapFXFa0BNQiQc=" }, "kwordquiz": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/kwordquiz-25.12.0.tar.xz", - "hash": "sha256-UjAt4NlTXAPiWXj0YYF/1V65W0yApj+7DLIIHr5tESg=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/kwordquiz-25.12.1.tar.xz", + "hash": "sha256-NqK54I3YXYAZaKu9Dq4oan7AsJT2xQG1iXfknaMRZxI=" }, "libgravatar": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/libgravatar-25.12.0.tar.xz", - "hash": "sha256-5EtXOj3iXMWcx+FH6FeZOa73LEV74uPkrUwW09n0r34=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/libgravatar-25.12.1.tar.xz", + "hash": "sha256-7r0Kx66kirX1H0iJ+315NM+K9UX42IYe01njSx3wmtI=" }, "libkcddb": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/libkcddb-25.12.0.tar.xz", - "hash": "sha256-ffJehHxE8IqwmYXMsJdfKTMux7FgSbVppy4k4ZNKEZs=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/libkcddb-25.12.1.tar.xz", + "hash": "sha256-YJsCnKEQQtVG+KgUQGu+hX94EYJLoiGUjietELcmpFE=" }, "libkcompactdisc": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/libkcompactdisc-25.12.0.tar.xz", - "hash": "sha256-105+BD4Xy9k7tdX+Nazjb/pJbiBZPZcvrpMQp7+XdWE=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/libkcompactdisc-25.12.1.tar.xz", + "hash": "sha256-TwtAmi+zMuapSlkEZffBeCiD0u12B4ElxzSxzAfxM8w=" }, "libkdcraw": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/libkdcraw-25.12.0.tar.xz", - "hash": "sha256-UVZAGll4QxOmYO7A3FUzJ8Ie8K8Cj8MUUlkm0Sr4T9Q=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/libkdcraw-25.12.1.tar.xz", + "hash": "sha256-/Ep0YSZah2aAERtr4dkUfrYpcelzcHj3V8DmmSx8SFc=" }, "libkdegames": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/libkdegames-25.12.0.tar.xz", - "hash": "sha256-Goj5mjoHo3RcGng8MC1UYc04wdp4Le4eGjZcRbdQBvE=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/libkdegames-25.12.1.tar.xz", + "hash": "sha256-aSkMojzvhTdH/6W3Z6oF/AOX6MMUZKJYKDkKFusKgoc=" }, "libkdepim": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/libkdepim-25.12.0.tar.xz", - "hash": "sha256-HApcy/vfS+Uzvx5S/hemNNc2aH4qlJqxH+mh+b0qjbw=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/libkdepim-25.12.1.tar.xz", + "hash": "sha256-b825Vw3MMHbjay8rNrrGvwQEvQ1QCp7EGA/i7xdGGQQ=" }, "libkeduvocdocument": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/libkeduvocdocument-25.12.0.tar.xz", - "hash": "sha256-YVmOx6PKCCZT+wlyVgc4mhCJHYBO5kGJ08max9AvrnA=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/libkeduvocdocument-25.12.1.tar.xz", + "hash": "sha256-t4EDiXCc88qzah9P0bJVWBhEzibMlIfL/JVqaOYRQ+I=" }, "libkexiv2": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/libkexiv2-25.12.0.tar.xz", - "hash": "sha256-HesPpvJwtYiqPd2UbEKwCpdPedL8B58RJczI/w6ZuZY=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/libkexiv2-25.12.1.tar.xz", + "hash": "sha256-xb1byJT8eHimESutGceNCXihhxUb+1rDlQWMozCQ5lA=" }, "libkgapi": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/libkgapi-25.12.0.tar.xz", - "hash": "sha256-KJ3JHa/+AusaUk1sgo/0upc8zWHRYQgF1zhtmdm0pL4=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/libkgapi-25.12.1.tar.xz", + "hash": "sha256-/myDx5/c/MBUqsI6rIdkIsZdEHGIRof/O0Pmi7E2at4=" }, "libkleo": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/libkleo-25.12.0.tar.xz", - "hash": "sha256-/7qb1WPtI7rdxiR0dgr6JiogEGTOH1FMHyaRA/E1qtk=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/libkleo-25.12.1.tar.xz", + "hash": "sha256-q5r7w/MR0QAYFdugPW1g7NqOYhnG5DiZ/DpaxO7JQy0=" }, "libkmahjongg": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/libkmahjongg-25.12.0.tar.xz", - "hash": "sha256-fbBVPEc5BRWrk2nEKhV/IlHD9mUj1y+WVinp9cO528c=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/libkmahjongg-25.12.1.tar.xz", + "hash": "sha256-bn8w1CU5Xr68+ed0VL58hL4SyTYjhmZEOD4c2X9KU4g=" }, "libkomparediff2": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/libkomparediff2-25.12.0.tar.xz", - "hash": "sha256-k/pswsXsX+DFpOIiL1djWxj9w1meoiI1u7EMe4zqoHk=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/libkomparediff2-25.12.1.tar.xz", + "hash": "sha256-5zFqyoPxocBiEEz3kggNB4CEHRe9+I6o/LFpaRADAII=" }, "libksane": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/libksane-25.12.0.tar.xz", - "hash": "sha256-tP3kxqkVFnntUuTVcu1miN1LSJqiojU02PEyz73Tq5A=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/libksane-25.12.1.tar.xz", + "hash": "sha256-5IXk4YaG9FB1pQtivtyr4SR7rYIi3crhe0mIFvqtya0=" }, "libksieve": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/libksieve-25.12.0.tar.xz", - "hash": "sha256-vl7+L+rSoPJ6I74/R8qGwKjpC1TElt9toCYBP9grhCE=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/libksieve-25.12.1.tar.xz", + "hash": "sha256-yNpo9q6O9sc4/5il2HA13euRnI2MqnuNNBNtlxnNSVQ=" }, "libktorrent": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/libktorrent-25.12.0.tar.xz", - "hash": "sha256-+1lz0jE5LCcRhlndRG+roSPJnNbHfCfettqW7w44MEw=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/libktorrent-25.12.1.tar.xz", + "hash": "sha256-JqObLnpQJaB9sIwoY4ORqL1MM2C7SlckGVuH2Fburt4=" }, "lokalize": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/lokalize-25.12.0.tar.xz", - "hash": "sha256-56XfxtrcEhfj1/kmzh5rLsNBlap7z5+vSTqoB/aw6i4=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/lokalize-25.12.1.tar.xz", + "hash": "sha256-XUUh3KFEIna3gmGzydgiRdYYQLDCC9rB44lt21+o+s0=" }, "lskat": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/lskat-25.12.0.tar.xz", - "hash": "sha256-Mva6n3swC5c/pRqK+jxVFvSJ8ns+u/P/jbbQwbJkKAA=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/lskat-25.12.1.tar.xz", + "hash": "sha256-T0E2nMs0RQXZ8jWydTny5iTc8GX5VSFU2/GEqdBuwYs=" }, "mailcommon": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/mailcommon-25.12.0.tar.xz", - "hash": "sha256-GIMa1akrLIcFhz1Hdq1GDTs4y85gD25g/rYJO+Sx1lI=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/mailcommon-25.12.1.tar.xz", + "hash": "sha256-i2c53PdzUZm0eC3RD2xq6Dd0o4M82oawrnpMt95PINg=" }, "mailimporter": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/mailimporter-25.12.0.tar.xz", - "hash": "sha256-tmmsiTFdr8H0Lrl4pkNmxPdRYl8zuo6yqqiB+PJmShU=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/mailimporter-25.12.1.tar.xz", + "hash": "sha256-iKFCkVDW64Eedw1Z0k0YrUPHQjmzpN0OJwcRob3X4gY=" }, "marble": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/marble-25.12.0.tar.xz", - "hash": "sha256-rim9mbCe7zUHn/bFj180wb6/i3cIvLeOtnBAlQyq3Hs=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/marble-25.12.1.tar.xz", + "hash": "sha256-CcKoRZZAs7EU6kDYGbxhsAUc+YJXL2GusxwEGQ9Ihxc=" }, "markdownpart": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/markdownpart-25.12.0.tar.xz", - "hash": "sha256-riIRwD/muwq6Vw6QUXV9PYuxOdIRwxU/yc4R3hIEKeg=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/markdownpart-25.12.1.tar.xz", + "hash": "sha256-bRsB4Q9I8I1qP3N0bhoyhlKBeaRVccrKD49QLio36No=" }, "massif-visualizer": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/massif-visualizer-25.12.0.tar.xz", - "hash": "sha256-8GdN8bd+SwyPeMBtLux8OrfvSsRP1zPVwQFWGoFvYGg=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/massif-visualizer-25.12.1.tar.xz", + "hash": "sha256-RqW2J2U4VsZUmg1Y3JHucqwI1RxShviJKmTkubDQbhA=" }, "mbox-importer": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/mbox-importer-25.12.0.tar.xz", - "hash": "sha256-LyBqLejhqXO4V4KTSWMGU5IzEdhp9kXhtQij1vxkdRk=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/mbox-importer-25.12.1.tar.xz", + "hash": "sha256-oLM+6saJaseZcx2muyuUl0G1z7yrXj/stGnq+bwnVq8=" }, "merkuro": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/merkuro-25.12.0.tar.xz", - "hash": "sha256-WVSX3BGr4vxQ98NJVD9YhtxxdnU4pk9JALLov2N5LAg=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/merkuro-25.12.1.tar.xz", + "hash": "sha256-yCSNploSOD4AmPOx0Yy2/5lOjgufwR/CQZ/3INlkTGA=" }, "messagelib": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/messagelib-25.12.0.tar.xz", - "hash": "sha256-mku/7JeHAID1K6nQt89N9o4/tC8Xk1Hgr5QK1mxzz3w=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/messagelib-25.12.1.tar.xz", + "hash": "sha256-xwKj7arqdZtDOcZYTm1tdPc0VoD+2CawePURJx1AhP8=" }, "mimetreeparser": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/mimetreeparser-25.12.0.tar.xz", - "hash": "sha256-Y2YjZ4QuJbjhPHUj0FQoR6HP+zbHIHK/47KULszdeEE=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/mimetreeparser-25.12.1.tar.xz", + "hash": "sha256-IAq+fPx1DC4NY3pTlHtiPTIkYEcFaPeI+NwL//3IMe0=" }, "minuet": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/minuet-25.12.0.tar.xz", - "hash": "sha256-nywTq0fYgZOOJO8UuvxxXoISGsFkRyj5EHlj0OtXizw=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/minuet-25.12.1.tar.xz", + "hash": "sha256-1W77lkvx9MS7htNygcMtD25DRTYqR7YRGW41/odBONE=" }, "neochat": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/neochat-25.12.0.tar.xz", - "hash": "sha256-pS0SAtU9obupnVa30EhjjkDoFnXPdzdZGp2k2n4n/vw=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/neochat-25.12.1.tar.xz", + "hash": "sha256-BpwcH9At5F1wXKYknVFT8ETIxCZ7NaZNW2kMDyUnRaI=" }, "okular": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/okular-25.12.0.tar.xz", - "hash": "sha256-zwWlFbunjuXn+1qgnmesQv55bz9kWkNTxrblVeYchJA=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/okular-25.12.1.tar.xz", + "hash": "sha256-mJBExkSJ8DSVhOVKPfISmE6juLEwuOLfeihd+ksW5us=" }, "palapeli": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/palapeli-25.12.0.tar.xz", - "hash": "sha256-SF0B5gCYqshClw/eLR8S8P+B1kYPO4rFhs2ji134VnU=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/palapeli-25.12.1.tar.xz", + "hash": "sha256-dvT/K8vc6idvoIrWNL7CLSYZ8OgltNI+aSVQMIUPx48=" }, "parley": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/parley-25.12.0.tar.xz", - "hash": "sha256-KcW/Bq0GSmwjd3haeRhWf7kLh9ugzUJ5d9/yekcfO94=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/parley-25.12.1.tar.xz", + "hash": "sha256-jHluORnK5cx+lNY7eBG8FtfW2le/cIZoXNp4JGmKrT0=" }, "partitionmanager": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/partitionmanager-25.12.0.tar.xz", - "hash": "sha256-OuYDBPc4MHE0illufysAKWNb9WhlT1duE/vKAlaVovo=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/partitionmanager-25.12.1.tar.xz", + "hash": "sha256-+eum4SSpKM/PnuZYhlCCgYvikQU6uB0bpufAifLFluQ=" }, "picmi": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/picmi-25.12.0.tar.xz", - "hash": "sha256-6SIgMwsJyjyZt8qlZJRi4vhh5jTS4FbT5NlR3eAh1xg=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/picmi-25.12.1.tar.xz", + "hash": "sha256-HMIYKSuYH7vhHYP9UlQ+R0OncxsoYTkvBaYOrkHn6+Q=" }, "pim-data-exporter": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/pim-data-exporter-25.12.0.tar.xz", - "hash": "sha256-So83Fpc35yrHyXim43JZhrbbGOffps1HeLoxey48bBQ=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/pim-data-exporter-25.12.1.tar.xz", + "hash": "sha256-0Kj8TCEnru6rue4sWSkPODx7McrxLeyZfWKqusq4OPs=" }, "pim-sieve-editor": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/pim-sieve-editor-25.12.0.tar.xz", - "hash": "sha256-P+vvIebqSetFx9o4kS4RnhGxIHJsIaF5Oudl+/Cajqc=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/pim-sieve-editor-25.12.1.tar.xz", + "hash": "sha256-B+PHXmdKYBx3F3eDZN3WgGxHvvArnQIPn2bU0QGRB30=" }, "pimcommon": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/pimcommon-25.12.0.tar.xz", - "hash": "sha256-EeD66gk6hjS7zK14jjHbvvrwKHUeXRMThO9IDN8LC7I=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/pimcommon-25.12.1.tar.xz", + "hash": "sha256-QgfsOoRWmdRSeYyr7ZRmMefB7Uqfl9COOOx/Hzv2NRk=" }, "plasmatube": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/plasmatube-25.12.0.tar.xz", - "hash": "sha256-SaFfmzhASozSSwOyIAEXopg+RPgww4U9v6jjr6QP0rI=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/plasmatube-25.12.1.tar.xz", + "hash": "sha256-2emYAgZm2BpVIdnBI0lHXUQHQpq+muN//Tc9AHXEUxM=" }, "poxml": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/poxml-25.12.0.tar.xz", - "hash": "sha256-7xSZAE4h2Fm9ZS7gn/ElemC6ZHjvq2oO2FLbtKIXyMw=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/poxml-25.12.1.tar.xz", + "hash": "sha256-gt84JAnxWo0Cm/dn7kAjUJUjXWcq+2/VQ3YQ36ccWVY=" }, "qmlkonsole": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/qmlkonsole-25.12.0.tar.xz", - "hash": "sha256-lsFvEUsPmJUX6nP7NWpV8IO8nzMcTthzTIaoRvSlucI=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/qmlkonsole-25.12.1.tar.xz", + "hash": "sha256-97EB27qvrKNaJBTd52KiwOdAjhiZcpseicqVGUdefws=" }, "qrca": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/qrca-25.12.0.tar.xz", - "hash": "sha256-X0UjexAV9NISxs1MCza2W6GvKk7cmwk4yBdSvu14e8M=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/qrca-25.12.1.tar.xz", + "hash": "sha256-87CkCXGxzlsi/nAFKObSA6ZAPhMEg7xrdy6W3Dap0o8=" }, "rocs": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/rocs-25.12.0.tar.xz", - "hash": "sha256-Ym1haoir3En9Eg0xs4kWeAp6ub1Q36DKuQrbexTMf4c=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/rocs-25.12.1.tar.xz", + "hash": "sha256-lWS8vjihQ6WRy+YUi0fxJh6FCDgnGsEevEq0Uw5cRB4=" }, "signon-kwallet-extension": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/signon-kwallet-extension-25.12.0.tar.xz", - "hash": "sha256-MMGHVBeGa27jz8sgh9odafybAxbvmAVyhwy3wtF6tx4=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/signon-kwallet-extension-25.12.1.tar.xz", + "hash": "sha256-J4D3yZ+da6SUrWlIjB+FDN+yt9JF+jr6EYc2eA5CA8w=" }, "skanlite": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/skanlite-25.12.0.tar.xz", - "hash": "sha256-UlKHu5A4aL51uWMLNMEa5f1s4FvhP8YW2jAxXlINRs0=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/skanlite-25.12.1.tar.xz", + "hash": "sha256-ziRoBtiabQucppVa4uX4IPOSaMon0l07NIo1VFQcuZk=" }, "skanpage": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/skanpage-25.12.0.tar.xz", - "hash": "sha256-IwQuJ92shpEq4vCn8gCM4IdVOQz4QEsSyC1ejwJo7Ik=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/skanpage-25.12.1.tar.xz", + "hash": "sha256-hn54OPtd6ew76qaToLjcaFkIIX4N1WKZTvP6aSr/ySw=" }, "skladnik": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/skladnik-25.12.0.tar.xz", - "hash": "sha256-aujdElYk1uS6yGZrIAJ78Rh5sh+m24TEUfz9cAJbx0M=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/skladnik-25.12.1.tar.xz", + "hash": "sha256-mexX10A4lwPM3yNKSk6Rw7BmCFalfpTsmoaRCzsGfwA=" }, "step": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/step-25.12.0.tar.xz", - "hash": "sha256-yAxU2LbWHhpwtjEkHMQKymk2jQyV5AQI/DNCo5zLCyM=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/step-25.12.1.tar.xz", + "hash": "sha256-3MRSGLhZyRX9erKz3MopmZdFO+xpoa7lQ1AGX8VknsM=" }, "svgpart": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/svgpart-25.12.0.tar.xz", - "hash": "sha256-ifp+VexoAURe0iAFL34cRkdNvSk79VRyi4mP6FTqOjg=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/svgpart-25.12.1.tar.xz", + "hash": "sha256-8tbM1pRNPHxGxE5mE8xhvUT8h2S90FUQ782/TFoFDNM=" }, "sweeper": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/sweeper-25.12.0.tar.xz", - "hash": "sha256-4HIhmnX71iK3O15nBvgqUjPrlsald2N+xupAms7ieW8=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/sweeper-25.12.1.tar.xz", + "hash": "sha256-BPKKVzYQypEAElhs6ZGkkO+7yyq+2iwQRzQE7WC3fa4=" }, "telly-skout": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/telly-skout-25.12.0.tar.xz", - "hash": "sha256-QYvME03/D4OENlqVPSEI4381Ssr1mN/XpS4ptP2gT04=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/telly-skout-25.12.1.tar.xz", + "hash": "sha256-ARlWYsMCXXLOh5mhphQs73+IV7vO4GO/AOTDkFrMtwU=" }, "tokodon": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/tokodon-25.12.0.tar.xz", - "hash": "sha256-ciPNOVfoR1Xw+3OHFRDAg0VLwElSL7rMiFDWG711XG8=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/tokodon-25.12.1.tar.xz", + "hash": "sha256-sCya0Dy6+cKoS4HWj7BlGmWdJpwlnlJ7ctgLAaqVwTc=" }, "umbrello": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/umbrello-25.12.0.tar.xz", - "hash": "sha256-G2Jk3qLJKuRCDDhWfUegufDGFj6n7/Zvg1T50Zgnk/c=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/umbrello-25.12.1.tar.xz", + "hash": "sha256-ExRsp9UQKRlrX/cGo3GDgV7J7vWweTjdEnxJiCT7JAg=" }, "yakuake": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/yakuake-25.12.0.tar.xz", - "hash": "sha256-Wj+IVOdAlLFhzR1ih0WxdUW1qcQcst/hHHROUkv7PJ4=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/yakuake-25.12.1.tar.xz", + "hash": "sha256-wfwFtKpO5+uJa6YDKoqqe/Hx2MotxQSO2b+WR10TUio=" }, "zanshin": { - "version": "25.12.0", - "url": "mirror://kde/stable/release-service/25.12.0/src/zanshin-25.12.0.tar.xz", - "hash": "sha256-1Hn+ZRqMs2PCopa6hdGLu31AnGjPPTiQry0p/9KlW/E=" + "version": "25.12.1", + "url": "mirror://kde/stable/release-service/25.12.1/src/zanshin-25.12.1.tar.xz", + "hash": "sha256-yrZz4SHKrLqp21ID3DB/sTdpbU/2FZaLfuzSFGzvns0=" } } \ No newline at end of file diff --git a/pkgs/kde/misc/kirigami-addons/default.nix b/pkgs/kde/misc/kirigami-addons/default.nix index 8e4cf7571853..60c13e979a87 100644 --- a/pkgs/kde/misc/kirigami-addons/default.nix +++ b/pkgs/kde/misc/kirigami-addons/default.nix @@ -8,11 +8,11 @@ }: mkKdeDerivation rec { pname = "kirigami-addons"; - version = "1.10.0"; + version = "1.11.0"; src = fetchurl { url = "mirror://kde/stable/kirigami-addons/kirigami-addons-${version}.tar.xz"; - hash = "sha256-yY+Sv3xFLhL23EA0BCFUE9s5Wf6QStgw6tDba7CbPRE="; + hash = "sha256-bc36Mk9xDwCIfmMhIS/IWCo8RxJFDRKdkUNbse3Y1SM="; }; extraNativeBuildInputs = [ qttools ]; diff --git a/pkgs/kde/misc/ktextaddons/default.nix b/pkgs/kde/misc/ktextaddons/default.nix index 1e8229daaa1d..4559f20ec6c5 100644 --- a/pkgs/kde/misc/ktextaddons/default.nix +++ b/pkgs/kde/misc/ktextaddons/default.nix @@ -8,11 +8,11 @@ }: mkKdeDerivation rec { pname = "ktextaddons"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { url = "mirror://kde/stable/ktextaddons/ktextaddons-${version}.tar.xz"; - hash = "sha256-FZxgXT0DG/gY4WTqQQFQEDxfn4fOo14peeQthsMxjJk="; + hash = "sha256-BTvPhORcFBBCGGqRFajdUacmKAL+lUd0XkS0GQFblpQ="; }; extraBuildInputs = [ diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index 039a6879369b..873d0d4c97a6 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -109,10 +109,14 @@ lib.makeExtensible (self: { xcode_16_4 = requireXcode "16.4" "sha256-voCEZlKrp9NYGmXAsf1FHxO69EgWZHDIWtQZ2qEzElA="; xcode_26 = requireXcode "26_Universal" "sha256-p4INqf85CSIzd7xHRCS9tCigQkOQPKnS/+D5nue3PsY="; xcode_26_Apple_silicon = requireXcode "26_Apple_silicon" "sha256-dlfZ2sM6a9pUPdukoMoqvQAj7EEUyj0a/VkXKwkkFT8="; - xcode_26_0_1 = requireXcode "26.0.1" "sha256-PsEIjrzxgXFqCWeHs/bsvrlxy8aN899jMhesczMbPfE="; + xcode_26_0_1 = requireXcode "26.0.1_Universal" "sha256-PsEIjrzxgXFqCWeHs/bsvrlxy8aN899jMhesczMbPfE="; xcode_26_0_1_Apple_silicon = requireXcode "26.0.1_Apple_silicon" "sha256-UBDey19uBljjRw84bY4rzxetFEkHiXLEj39Q578jYL8="; - xcode_26_1 = requireXcode "26.1" "sha256-SLIn1xAjaYhKGN6EEKslzmVZv+Zoq7QNGdtNreWJ5L8="; + xcode_26_1 = requireXcode "26.1_Universal" "sha256-SLIn1xAjaYhKGN6EEKslzmVZv+Zoq7QNGdtNreWJ5L8="; xcode_26_1_Apple_silicon = requireXcode "26.1_Apple_silicon" "sha256-xFMknk3RxxJi/5IOb2mmw7vyC1xOaY5ZwCZ09AARtJU="; + xcode_26_1_1 = requireXcode "26.1.1_Universal" "sha256-IkmrerBysM4eqMf/wCQHCBcEL0go/ivFlMpJ4SYQmOU="; + xcode_26_1_1_Apple_silicon = requireXcode "26.1.1_Apple_silicon" "sha256-5dZ1O7iD2CF8R4TBeBLkaKLe/WOi8CMJJ1/Bg+uitCw="; + xcode_26_2 = requireXcode "26.2_Universal" "sha256-uCw71PjAuvtKTIpcYsiFSjUZQnIBIpIoOm1QaaYHD7k="; + xcode_26_2_Apple_silicon = requireXcode "26.2_Apple_silicon" "sha256-YxMVppJwRzTA6xWOILxVjLdl0bNmtZSifG/KQx6inRE="; xcode = self."xcode_${ lib.replaceStrings [ "." ] [ "_" ] ( diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 4f854def55b4..6c071d109a41 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -684,6 +684,8 @@ let TMPFS = yes; TMPFS_POSIX_ACL = yes; FS_ENCRYPTION = yes; + FS_VERITY = yes; + FS_VERITY_BUILTIN_SIGNATURES = yes; EXT2_FS_XATTR = yes; EXT2_FS_POSIX_ACL = yes; @@ -796,6 +798,12 @@ let # This does not have any effect if a program does not support it SECURITY_LANDLOCK = whenAtLeast "5.13" yes; + # IPE (Integrity Policy Enforcement) - LSM that can enforce file integrity based on + # fs-verity measurements or dm-verity. Useful for verified boot and immutable /nix/store. + SECURITY_IPE = whenAtLeast "6.12" yes; + IPE_PROP_FS_VERITY = whenAtLeast "6.12" yes; + IPE_PROP_FS_VERITY_BUILTIN_SIG = whenAtLeast "6.12" yes; + DEVKMEM = lib.mkIf (!stdenv.hostPlatform.isAarch64) (whenOlder "5.13" no); # Disable /dev/kmem USER_NS = yes; # Support for user namespaces diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 8996ab9388ab..3ea3be0917cf 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,7 +1,7 @@ { "testing": { - "version": "6.19-rc3", - "hash": "sha256:1ps2bq9jag0ypr9nj2zfqak81sc12l2hrj2065k2jnvwqcx0vhw3", + "version": "6.19-rc4", + "hash": "sha256:1ivkpgmmpy7my1vcly82pnnz3ynmdjz62n4q251j970zk8m42r9s", "lts": false }, "6.1": { @@ -25,13 +25,13 @@ "lts": true }, "6.12": { - "version": "6.12.63", - "hash": "sha256:1cvxvwlmnqw71nf6nizf0hpp710a8dsczz5bjwy3i55qwkzwa0lm", + "version": "6.12.64", + "hash": "sha256:18j9ivimvlm1afzfiw03n3r35qv91nbjhh2gi3z8w5416sir9bfi", "lts": true }, "6.18": { - "version": "6.18.3", - "hash": "sha256:16kzgpxrmaxd2kcsmlnsvc2ryxih457rrwynfzhbmi49gcb7k23s", + "version": "6.18.4", + "hash": "sha256:1asza9m4vb7lghxaiy5fpnbwmb9a44pgjclbpgv1p77plnf16l7q", "lts": false } } diff --git a/pkgs/os-specific/linux/mstflint_access/default.nix b/pkgs/os-specific/linux/mstflint_access/default.nix index 01160a4cc26a..a13b4c9d43f7 100644 --- a/pkgs/os-specific/linux/mstflint_access/default.nix +++ b/pkgs/os-specific/linux/mstflint_access/default.nix @@ -10,12 +10,9 @@ stdenv.mkDerivation rec { pname = "mstflint_access"; - inherit (mstflint) version; + inherit (mstflint) version src; - src = fetchurl { - url = "https://github.com/Mellanox/mstflint/releases/download/v${version}/kernel-mstflint-${version}.tar.gz"; - hash = "sha256-VO4nXGlqp955xmNyAD/TdOfLEA2CKouOJmLnRCvjnaw="; - }; + sourceRoot = "source/kernel"; nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index fa79a63a08a7..bb877469c76d 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2025.12.5"; + version = "2026.1.0"; components = { "3_day_blinds" = ps: with ps; [ @@ -33,8 +33,8 @@ home-assistant-intents ifaddr mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise zeroconf ]; @@ -124,6 +124,9 @@ ps: with ps; [ airos ]; + "airpatrol" = + ps: with ps; [ + ]; # missing inputs: airpatrol "airq" = ps: with ps; [ aioairq @@ -154,8 +157,8 @@ home-assistant-intents ifaddr mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise zeroconf ]; @@ -275,7 +278,10 @@ ]; "anglian_water" = ps: with ps; [ + fnv-hash-fast + psutil-home-assistant pyanglianwater + sqlalchemy ]; "anova" = ps: with ps; [ @@ -292,7 +298,7 @@ hassil home-assistant-intents mutagen - pymicro-vad + pysilero-vad pyspeex-noise ]; "anwb_energie" = @@ -380,8 +386,8 @@ home-assistant-intents ifaddr mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise zeroconf ]; @@ -422,7 +428,7 @@ hassil home-assistant-intents mutagen - pymicro-vad + pysilero-vad pyspeex-noise ]; "assist_satellite" = @@ -431,7 +437,7 @@ hassil home-assistant-intents mutagen - pymicro-vad + pysilero-vad pyspeex-noise ]; "asuswrt" = @@ -463,7 +469,7 @@ hassil home-assistant-intents mutagen - pymicro-vad + pysilero-vad pyspeex-noise python-matter-server pyturbojpeg @@ -652,8 +658,8 @@ home-assistant-intents ifaddr mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise zeroconf ]; @@ -699,8 +705,8 @@ home-assistant-intents ifaddr mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise zeroconf ]; @@ -725,8 +731,8 @@ home-assistant-intents ifaddr mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise zeroconf ]; @@ -826,8 +832,8 @@ home-assistant-intents ifaddr mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise zeroconf ]; @@ -883,7 +889,7 @@ plexauth plexwebsocket pychromecast - pymicro-vad + pysilero-vad pyspeex-noise python-matter-server pyturbojpeg @@ -946,7 +952,7 @@ hassil home-assistant-intents mutagen - pymicro-vad + pysilero-vad pyspeex-noise python-matter-server pyturbojpeg @@ -1147,9 +1153,9 @@ numpy pillow psutil-home-assistant - pymicro-vad pynacl pyserial + pysilero-vad pyspeex-noise python-matter-server pyturbojpeg @@ -1307,8 +1313,8 @@ ifaddr mutagen py-dormakaba-dkey - pymicro-vad pyserial + pysilero-vad pyspeex-noise zeroconf ]; @@ -1432,6 +1438,9 @@ ps: with ps; [ pythonegardia ]; + "egauge" = + ps: with ps; [ + ]; # missing inputs: egauge-async "eheimdigital" = ps: with ps; [ eheimdigital @@ -1596,8 +1605,8 @@ home-assistant-intents ifaddr mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise zeroconf ]; @@ -1627,8 +1636,8 @@ home-assistant-intents ifaddr mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise zeroconf ]; @@ -1666,8 +1675,8 @@ home-assistant-intents ifaddr mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise zeroconf ]; @@ -1777,9 +1786,13 @@ ps: with ps; [ pymata-express ]; + "fish_audio" = + ps: with ps; [ + ]; # missing inputs: fish-audio-sdk "fitbit" = ps: with ps; [ fitbit + fitbit-web-api ]; "fivem" = ps: with ps; [ @@ -1811,8 +1824,8 @@ home-assistant-intents ifaddr mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise zeroconf ]; @@ -1850,6 +1863,9 @@ ps: with ps; [ pyflume ]; + "fluss" = + ps: with ps; [ + ]; # missing inputs: fluss-api "flux" = ps: with ps; [ ]; @@ -1909,6 +1925,9 @@ ps: with ps; [ pyfreedompro ]; + "fressnapf_tracker" = + ps: with ps; [ + ]; # missing inputs: fressnapftracker "fritz" = ps: with ps; @@ -1994,8 +2013,8 @@ home-assistant-intents ifaddr mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise zeroconf ]; @@ -2030,6 +2049,9 @@ ps: with ps; [ geniushub-client ]; + "gentex_homelink" = + ps: with ps; [ + ]; # missing inputs: homelink-integration-api "geo_json_events" = ps: with ps; [ aio-geojson-generic-client @@ -2131,7 +2153,7 @@ hassil home-assistant-intents mutagen - pymicro-vad + pysilero-vad pyspeex-noise ]; "google_mail" = @@ -2195,8 +2217,8 @@ home-assistant-intents ifaddr mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise zeroconf ]; @@ -2377,6 +2399,7 @@ ha-silabs-firmware-client psutil-home-assistant pyserial + serialx universal-silabs-flasher ]; "homeassistant_green" = @@ -2386,6 +2409,7 @@ ha-silabs-firmware-client psutil-home-assistant pyserial + serialx universal-silabs-flasher ]; "homeassistant_hardware" = @@ -2394,6 +2418,7 @@ aiousbwatcher ha-silabs-firmware-client pyserial + serialx universal-silabs-flasher ]; "homeassistant_sky_connect" = @@ -2403,6 +2428,7 @@ ha-silabs-firmware-client psutil-home-assistant pyserial + serialx universal-silabs-flasher ]; "homeassistant_yellow" = @@ -2412,6 +2438,7 @@ ha-silabs-firmware-client psutil-home-assistant pyserial + serialx universal-silabs-flasher ]; "homee" = @@ -2451,9 +2478,9 @@ home-assistant-intents ifaddr mutagen - pymicro-vad pyroute2 pyserial + pysilero-vad pyspeex-noise python-otbr-api zeroconf @@ -2524,8 +2551,8 @@ hueble ifaddr mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise zeroconf ]; @@ -2570,8 +2597,8 @@ home-assistant-intents ifaddr mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise zeroconf ]; @@ -2626,8 +2653,8 @@ ibeacon-ble ifaddr mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise zeroconf ]; @@ -2657,8 +2684,8 @@ idasen-ha ifaddr mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise zeroconf ]; @@ -2736,8 +2763,8 @@ ifaddr mutagen py-improv-ble-client - pymicro-vad pyserial + pysilero-vad pyspeex-noise zeroconf ]; @@ -2781,8 +2808,8 @@ ifaddr inkbird-ble mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise zeroconf ]; @@ -2895,9 +2922,9 @@ home-assistant-intents ifaddr mutagen - pymicro-vad pynecil pyserial + pysilero-vad pyspeex-noise zeroconf ]; @@ -3025,8 +3052,8 @@ ifaddr kegtron-ble mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise zeroconf ]; @@ -3059,9 +3086,9 @@ home-assistant-intents ifaddr mutagen - pymicro-vad pymicrobot pyserial + pysilero-vad pyspeex-noise zeroconf ]; @@ -3139,8 +3166,8 @@ ifaddr mutagen pykulersky - pymicro-vad pyserial + pysilero-vad pyspeex-noise zeroconf ]; @@ -3181,8 +3208,8 @@ ifaddr mutagen pylamarzocco - pymicro-vad pyserial + pysilero-vad pyspeex-noise zeroconf ]; @@ -3242,8 +3269,8 @@ ifaddr ld2410-ble mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise zeroconf ]; @@ -3269,8 +3296,8 @@ ifaddr leaone-ble mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise zeroconf ]; @@ -3296,8 +3323,8 @@ ifaddr led-ble mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise zeroconf ]; @@ -3312,6 +3339,9 @@ ps: with ps; [ letpot ]; + "levoit" = + ps: with ps; [ + ]; "lg_netcast" = ps: with ps; [ ifaddr @@ -3451,7 +3481,7 @@ home-assistant-intents loqedapi mutagen - pymicro-vad + pysilero-vad pyspeex-noise python-matter-server pyturbojpeg @@ -3591,8 +3621,8 @@ ifaddr medcom-ble mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise zeroconf ]; @@ -3643,8 +3673,8 @@ ifaddr melnor-bluetooth mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise zeroconf ]; @@ -3765,8 +3795,8 @@ ifaddr moat-ble mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise zeroconf ]; @@ -3780,8 +3810,8 @@ home-assistant-intents mutagen pillow - pymicro-vad pynacl + pysilero-vad pyspeex-noise python-matter-server pyturbojpeg @@ -3852,8 +3882,8 @@ ifaddr mopeka-iot-ble mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise zeroconf ]; @@ -3884,8 +3914,8 @@ ifaddr motionblindsble mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise zeroconf ]; @@ -4026,7 +4056,7 @@ home-assistant-intents mutagen pyatmo - pymicro-vad + pysilero-vad pyspeex-noise python-matter-server pyturbojpeg @@ -4240,7 +4270,7 @@ home-assistant-intents mutagen ollama - pymicro-vad + pysilero-vad pyspeex-noise ]; "ombi" = @@ -4271,7 +4301,7 @@ home-assistant-intents mutagen onedrive-personal-sdk - pymicro-vad + pysilero-vad pyspeex-noise python-matter-server pyturbojpeg @@ -4303,7 +4333,7 @@ home-assistant-intents mutagen openai - pymicro-vad + pysilero-vad pyspeex-noise python-open-router ]; @@ -4314,7 +4344,7 @@ home-assistant-intents mutagen openai - pymicro-vad + pysilero-vad pyspeex-noise ]; "openalpr_cloud" = @@ -4404,8 +4434,8 @@ ifaddr mutagen oralb-ble - pymicro-vad pyserial + pysilero-vad pyspeex-noise zeroconf ]; @@ -4438,6 +4468,7 @@ pyroute2 pyserial python-otbr-api + serialx universal-silabs-flasher zeroconf zha @@ -4463,7 +4494,7 @@ hassil home-assistant-intents mutagen - pymicro-vad + pysilero-vad pyspeex-noise python-matter-server python-overseerr @@ -4484,8 +4515,8 @@ home-assistant-intents mutagen paho-mqtt - pymicro-vad pynacl + pysilero-vad pyspeex-noise python-matter-server pyturbojpeg @@ -4608,8 +4639,8 @@ hassil home-assistant-intents mutagen - pymicro-vad pyplaato + pysilero-vad pyspeex-noise python-matter-server pyturbojpeg @@ -4691,8 +4722,8 @@ home-assistant-intents ifaddr mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise zeroconf ]; @@ -4717,9 +4748,9 @@ home-assistant-intents ifaddr mutagen - pymicro-vad pyprobeplus pyserial + pysilero-vad pyspeex-noise zeroconf ]; @@ -4854,8 +4885,8 @@ home-assistant-intents ifaddr mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise qingping-ble zeroconf @@ -4907,7 +4938,7 @@ hassil home-assistant-intents mutagen - pymicro-vad + pysilero-vad pyspeex-noise python-matter-server pyturbojpeg @@ -4974,8 +5005,8 @@ home-assistant-intents ifaddr mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise rapt-ble zeroconf @@ -5016,7 +5047,7 @@ home-assistant-frontend home-assistant-intents mutagen - pymicro-vad + pysilero-vad pyspeex-noise python-matter-server pyturbojpeg @@ -5220,8 +5251,8 @@ home-assistant-intents ifaddr mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise ruuvitag-ble zeroconf @@ -5347,8 +5378,8 @@ home-assistant-intents ifaddr mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise sensirion-ble zeroconf @@ -5383,8 +5414,8 @@ home-assistant-intents ifaddr mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise sensorpro-ble zeroconf @@ -5410,8 +5441,8 @@ home-assistant-intents ifaddr mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise sensorpush-ble zeroconf @@ -5671,8 +5702,8 @@ home-assistant-intents ifaddr mutagen - pymicro-vad pyserial + pysilero-vad pysnooz pyspeex-noise zeroconf @@ -5913,8 +5944,8 @@ home-assistant-intents ifaddr mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise pyswitchbot zeroconf @@ -6108,8 +6139,8 @@ home-assistant-intents ifaddr mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise thermobeacon-ble zeroconf @@ -6138,8 +6169,8 @@ home-assistant-intents ifaddr mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise thermopro-ble zeroconf @@ -6205,8 +6236,8 @@ home-assistant-intents ifaddr mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise tilt-ble zeroconf @@ -6271,7 +6302,7 @@ hassil home-assistant-intents mutagen - pymicro-vad + pysilero-vad pyspeex-noise python-matter-server pyturbojpeg @@ -6599,8 +6630,8 @@ home-assistant-intents ifaddr mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise zeroconf ]; # missing inputs: victron-ble-ha-parser @@ -6642,7 +6673,7 @@ home-assistant-intents ifaddr mutagen - pymicro-vad + pysilero-vad pyspeex-noise voip-utils ]; @@ -6691,6 +6722,21 @@ ps: with ps; [ watergate-local-api ]; + "watts" = + ps: with ps; [ + aiohasupervisor + cronsim + ha-ffmpeg + hass-nabucasa + hassil + home-assistant-intents + mutagen + pysilero-vad + pyspeex-noise + python-matter-server + pyturbojpeg + securetar + ]; # missing inputs: visionpluspython "watttime" = ps: with ps; [ aiowatttime @@ -6714,6 +6760,9 @@ ps: with ps; [ apple-weatherkit ]; + "web_rtc" = + ps: with ps; [ + ]; "webdav" = ps: with ps; [ aiowebdav2 @@ -6773,7 +6822,7 @@ hassil home-assistant-intents mutagen - pymicro-vad + pysilero-vad pyspeex-noise python-matter-server pyturbojpeg @@ -6823,7 +6872,7 @@ hassil home-assistant-intents mutagen - pymicro-vad + pysilero-vad pyspeex-noise wyoming ]; @@ -6867,8 +6916,8 @@ home-assistant-intents ifaddr mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise xiaomi-ble zeroconf @@ -6901,7 +6950,7 @@ hassil home-assistant-intents mutagen - pymicro-vad + pysilero-vad pyspeex-noise python-matter-server pyturbojpeg @@ -6934,8 +6983,8 @@ home-assistant-intents ifaddr mutagen - pymicro-vad pyserial + pysilero-vad pyspeex-noise yalexs-ble zeroconf @@ -7025,6 +7074,7 @@ aiousbwatcher ha-silabs-firmware-client pyserial + serialx universal-silabs-flasher zha ]; @@ -7404,6 +7454,7 @@ "hdmi_cec" "heos" "here_travel_time" + "hikvision" "hisense_aehw4a1" "history" "history_stats" @@ -8022,6 +8073,7 @@ "vicare" "victron_remote_monitoring" "vilfo" + "vivotek" "vizio" "vlc_telnet" "vodafone_station" @@ -8042,6 +8094,7 @@ "weatherflow" "weatherflow_cloud" "weatherkit" + "web_rtc" "webdav" "webhook" "webmin" diff --git a/pkgs/servers/home-assistant/custom-components/frigate/package.nix b/pkgs/servers/home-assistant/custom-components/frigate/package.nix index 8c1cbc8afd82..71249bf586e9 100644 --- a/pkgs/servers/home-assistant/custom-components/frigate/package.nix +++ b/pkgs/servers/home-assistant/custom-components/frigate/package.nix @@ -5,6 +5,7 @@ # dependencies hass-web-proxy-lib, + titlecase, # tests homeassistant, @@ -18,16 +19,19 @@ buildHomeAssistantComponent rec { owner = "blakeblackshear"; domain = "frigate"; - version = "5.13.0"; + version = "5.14.1"; src = fetchFromGitHub { owner = "blakeblackshear"; repo = "frigate-hass-integration"; tag = "v${version}"; - hash = "sha256-etYPrWa4xzfFm1QQuxh+rJqeoQ3P/nITM6GxJA/tPAA="; + hash = "sha256-fiy1G/gi2nr8uh6VaC48p/uXat+Q1uiThbg3kn6jRxs="; }; - dependencies = [ hass-web-proxy-lib ]; + dependencies = [ + hass-web-proxy-lib + titlecase + ]; nativeCheckInputs = [ homeassistant diff --git a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix index 42b5bf0f2763..6c48ff710d2b 100644 --- a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix +++ b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix @@ -13,13 +13,13 @@ buildHomeAssistantComponent rec { owner = "SukramJ"; domain = "homematicip_local"; - version = "2.0.5"; + version = "2.1.0"; src = fetchFromGitHub { owner = "SukramJ"; repo = "custom_homematic"; tag = version; - hash = "sha256-lbmhC2vpHWGLweTXlpA9Bz8kO4SsxtcL7xzDfmOl4S0="; + hash = "sha256-zXosnxVbJ/rADzbOvm6GIJLAx+EIK3vQ50qNck5sYwg="; }; postPatch = '' diff --git a/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix b/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix index 010573f67498..da53566751ed 100644 --- a/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix +++ b/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix @@ -10,13 +10,13 @@ buildHomeAssistantComponent rec { owner = "mill1000"; domain = "midea_ac"; - version = "2015.12.0"; + version = "2026.1.1"; src = fetchFromGitHub { owner = "mill1000"; repo = "midea-ac-py"; tag = version; - hash = "sha256-PXCL3vaCdIOHuv2eUSLxVwVBZNzfynzcKRfQqm1PGvw="; + hash = "sha256-7024kXheMUAhlWGCp4S8xn0qGmlJFphiIqTYQi3NXYo="; }; dependencies = [ msmart-ng ]; diff --git a/pkgs/servers/home-assistant/custom-components/moonraker/package.nix b/pkgs/servers/home-assistant/custom-components/moonraker/package.nix index 592a4a59bd11..660d04cfff4f 100644 --- a/pkgs/servers/home-assistant/custom-components/moonraker/package.nix +++ b/pkgs/servers/home-assistant/custom-components/moonraker/package.nix @@ -14,13 +14,13 @@ buildHomeAssistantComponent rec { owner = "marcolivierarsenault"; domain = "moonraker"; - version = "1.12.1"; + version = "1.12.2"; src = fetchFromGitHub { owner = "marcolivierarsenault"; repo = "moonraker-home-assistant"; tag = version; - hash = "sha256-jTL6hdS3jcIWivo+3qnIq3tTdLQ7AhxHERdZ41CGbR8="; + hash = "sha256-EkdkP3NLcw0Zv5qdVrScu8ks3QRoDeVYCCMT6XP2j2I="; }; dependencies = [ diff --git a/pkgs/servers/home-assistant/custom-components/opensprinkler/package.nix b/pkgs/servers/home-assistant/custom-components/opensprinkler/package.nix index b8a8a61d4ef4..769077ec36e0 100644 --- a/pkgs/servers/home-assistant/custom-components/opensprinkler/package.nix +++ b/pkgs/servers/home-assistant/custom-components/opensprinkler/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "vinteo"; domain = "opensprinkler"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "vinteo"; repo = "hass-opensprinkler"; tag = "v${version}"; - hash = "sha256-R8en3MFVUAhNT9KNxHk6wYkCNHrbm6BNKNA0Y2mIc/Q="; + hash = "sha256-i7RQBkHxzxcOyBJ7dOALRqJjef0eb/rlYiSjZKluH+A="; }; dependencies = [ diff --git a/pkgs/servers/home-assistant/custom-components/rct_power/package.nix b/pkgs/servers/home-assistant/custom-components/rct_power/package.nix index 5e90be09b62c..e0045966172e 100644 --- a/pkgs/servers/home-assistant/custom-components/rct_power/package.nix +++ b/pkgs/servers/home-assistant/custom-components/rct_power/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "weltenwort"; domain = "rct_power"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "weltenwort"; repo = "home-assistant-rct-power-integration"; tag = "v${version}"; - hash = "sha256-wM66MyRhBsMfUr+KlqV4jSuXcnKfW0fkbDAyuU2crsc="; + hash = "sha256-AsDMHPKCpbne2ZcRelcIgxm1i/RZcFU8fLOvkwEodOE="; }; dependencies = [ diff --git a/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix b/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix index 0ce8c481003b..6b1aafa72ca6 100644 --- a/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix +++ b/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix @@ -2,21 +2,28 @@ buildHomeAssistantComponent, fetchFromGitHub, lib, + numpy, + scipy, gitUpdater, }: buildHomeAssistantComponent rec { owner = "jmcollin78"; domain = "versatile_thermostat"; - version = "8.3.2"; + version = "8.5.0"; src = fetchFromGitHub { inherit owner; repo = domain; rev = "refs/tags/${version}"; - hash = "sha256-kHDLFxhrGTCpqkTvvjbplYSqXbrmN9KPhQuszTtoGQc="; + hash = "sha256-YTil0wFniMbTUjM62oJS6wnGvhaHUlcUSJvsasmlrXw="; }; + dependencies = [ + numpy + scipy + ]; + passthru.updateScript = gitUpdater { ignoredVersions = "(Alpha|Beta|alpha|beta).*"; }; meta = { diff --git a/pkgs/servers/home-assistant/custom-components/volkswagencarnet/package.nix b/pkgs/servers/home-assistant/custom-components/volkswagencarnet/package.nix index 02c2c6b71a95..f707cb19dd83 100644 --- a/pkgs/servers/home-assistant/custom-components/volkswagencarnet/package.nix +++ b/pkgs/servers/home-assistant/custom-components/volkswagencarnet/package.nix @@ -10,13 +10,13 @@ buildHomeAssistantComponent rec { owner = "robinostlund"; domain = "volkswagencarnet"; - version = "5.3.5"; + version = "5.4.0"; src = fetchFromGitHub { owner = "robinostlund"; repo = "homeassistant-volkswagencarnet"; tag = "v${version}"; - hash = "sha256-zEdKortZq/OK0yMJJBj4fNWKuXedc27oPcH3kxDNBdI="; + hash = "sha256-uIsOuc+UXhLbPm4/koANQjzPFfRVwt/rMhYw6keVgYI="; }; postPatch = '' diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_home/package.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_home/package.nix index b9d5ef27d8a4..101a9baff601 100644 --- a/pkgs/servers/home-assistant/custom-components/xiaomi_home/package.nix +++ b/pkgs/servers/home-assistant/custom-components/xiaomi_home/package.nix @@ -13,13 +13,13 @@ buildHomeAssistantComponent rec { owner = "XiaoMi"; domain = "xiaomi_home"; - version = "0.4.5"; + version = "0.4.7"; src = fetchFromGitHub { owner = "XiaoMi"; repo = "ha_xiaomi_home"; rev = "v${version}"; - hash = "sha256-uwerYCqaqGwOFKZ0uIU78t7+U6U+KqQCQFjLiy623Dg="; + hash = "sha256-rI7uYYCvTRXcuCOQu052SjNTRUyux0Cp6mIj4WGyTy0="; }; dependencies = [ diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/button-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/button-card/package.nix index adab8aafae02..04d8c935ec25 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/button-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/button-card/package.nix @@ -10,18 +10,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "button-card"; - version = "4.1.2"; + version = "7.0.1"; src = fetchFromGitHub { owner = "custom-cards"; repo = "button-card"; tag = "v${finalAttrs.version}"; - hash = "sha256-Ntg1sNgAehcL2fT0rP0YHzV5q6rB5p1TyFXtbZyB3Vo="; + hash = "sha256-UJ9DzoT0XAWTxUXtnfOrpd0MQihBw9LY7QI0TXEbUNk="; }; offlineCache = fetchYarnDeps { inherit (finalAttrs) src; - hash = "sha256-OFnsRR9zA9D22xBdh4XfLueGVA2ERXmGEp54x0OFDFY="; + hash = "sha256-zbuurXlIz13zCAMKOl+/VvsVHrDscNkweZG1eiqrnUM="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/clock-weather-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/clock-weather-card/package.nix index fd34753ff48f..59a5b9c5bab1 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/clock-weather-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/clock-weather-card/package.nix @@ -9,18 +9,18 @@ }: stdenvNoCC.mkDerivation rec { pname = "clock-weather-card"; - version = "2.9.1"; + version = "2.9.2"; src = fetchFromGitHub { owner = "pkissling"; repo = "clock-weather-card"; tag = "v${version}"; - hash = "sha256-5FHGFuvMYi40+6C9NDzrOsp2gIrIgtaA8qHM+oNIilg="; + hash = "sha256-8srE601xz8AcFv+5swIUUqUlHif/Qfm1TdfA5HfDAnU="; }; offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-DhOQG9+0YOOVv3Y1qnZPuR4ZQEdT9NLIcdiBnplSBvg="; + hash = "sha256-hCniXzBsnTozR0PWEleTo7K9P/lqoKNF+L8EErjOdEg="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix index 874e39ee50a5..af482b1604fa 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix @@ -10,19 +10,19 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "custom-sidebar"; - version = "10.7.0"; + version = "11.1.0"; src = fetchFromGitHub { owner = "elchininet"; repo = "custom-sidebar"; tag = "v${finalAttrs.version}"; - hash = "sha256-aV4dMt79t9ZZm+Z08odSONf/ghow4U+/aryk2+GJZvw="; + hash = "sha256-4nkkYaoVchmIlVLKdnCpDksadBqeZxHG1rNsKnI8kwQ="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; fetcherVersion = 1; - hash = "sha256-gfjRgq75hKxgfOn0wnWIzcFcdWVe7PZ4z8YHxLTCsjo="; + hash = "sha256-R9EZxGEX1bFd0qS1e47nygre7I564zfJwS5YUNXSc0E="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/lg-webos-remote-control/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/lg-webos-remote-control/package.nix index 21a5e5fb99e6..680d00ea6ab2 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/lg-webos-remote-control/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/lg-webos-remote-control/package.nix @@ -6,13 +6,13 @@ buildNpmPackage rec { pname = "lg-webos-remote-control"; - version = "2.0.3"; + version = "2.0.4"; src = fetchFromGitHub { owner = "madmicio"; repo = "LG-WebOS-Remote-Control"; rev = version; - hash = "sha256-ICOAi8q8dWrBFCv18JYSWc6MIwqxfDXOcc6kCKLGehs="; + hash = "sha256-Da/43D2PPL7ElwukJ6VR+O/c3z1UPnxrDW4oMWbWwr0="; }; npmDepsHash = "sha256-kN+i0ic1JWs6kqnAliiO4yVMDXwfZaQsRGKeV9A0MxE="; diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/navbar-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/navbar-card/package.nix index 1e79b62731be..1341511ebfa4 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/navbar-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/navbar-card/package.nix @@ -9,13 +9,13 @@ let pname = "navbar-card"; - version = "0.18.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "joseluis9595"; repo = "lovelace-navbar-card"; tag = "v${version}"; - hash = "sha256-uw90tm8KI7tqZwMNaRuxuIKVXhCLe0wVNisk91jLwwk="; + hash = "sha256-lFsQPyIMhyVHCNwRiGXVu8bMvmlfCI7KTu2Hk90agIE="; }; # Create node_modules as a separate derivation @@ -57,7 +57,7 @@ let # Required else we get errors that our fixed-output derivation references store paths dontFixup = true; - outputHash = "sha256-enQSr+HAnoIk2NiuKDx4fmFnIrG0tg23QImicQqDgpk="; + outputHash = "sha256-3IGzPEUPVnlD/K8a3Mp53vBEkTdlvrEYNpWCA/rIBwc="; outputHashAlgo = "sha256"; outputHashMode = "recursive"; }; diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/dont-call-git.patch b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/dont-call-git.patch deleted file mode 100644 index 411500f42a10..000000000000 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/dont-call-git.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/rspack.config.js b/rspack.config.js -index 30b7568..dc10273 100644 ---- a/rspack.config.js -+++ b/rspack.config.js -@@ -2,11 +2,7 @@ - const path = require('path'); - const { execSync } = require('child_process'); - --let env = -- execSync('git branch --show-current').toString().trim() == 'main' -- ? 'production' -- : 'development'; --env = 'production'; -+let env = 'production'; - - module.exports = { - mode: env, diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix index 77fdc9e6891e..1f6af90374c5 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix @@ -6,18 +6,16 @@ buildNpmPackage rec { pname = "universal-remote-card"; - version = "4.9.3"; + version = "4.9.4"; src = fetchFromGitHub { owner = "Nerwyn"; repo = "android-tv-card"; rev = version; - hash = "sha256-Xy2qtck1ZrB5y4SPkWC/JrSsoZciBdI7rm2HdakHu3I="; + hash = "sha256-gPzFF6MeA9JDCUp6Vz0HokKcxyV3Qw71dW3CBexsv1U="; }; - patches = [ ./dont-call-git.patch ]; - - npmDepsHash = "sha256-Js9HlQOQUFDU2wIe9JdXqkcKlsAgoE8/d74Zw+9iyN4="; + npmDepsHash = "sha256-TcaA73aG9CNxu4KUfYsbs9vOwKgz70lEoI8KSCro61M="; installPhase = '' runHook preInstall diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/vacuum-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/vacuum-card/package.nix index 372b798f08b9..8228cfce1828 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/vacuum-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/vacuum-card/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "vacuum-card"; - version = "2.11.0"; + version = "2.11.3"; src = fetchFromGitHub { owner = "denysdovhan"; repo = "vacuum-card"; rev = "v${version}"; - hash = "sha256-egWseYspxm+zkfFwTEBYQfBox3sswYMuOYqU6oEQTb4="; + hash = "sha256-3FhlcZVI1M8Ci2C/exwYvlHUBXlGAIFT/1jL6Dl72Ns="; }; - npmDepsHash = "sha256-dfsKBTJV1QC8pmb/EIh4n5I9CDnOjy7+sPwQA/eLEi0="; + npmDepsHash = "sha256-eTFwW/vo+h7Dz7cow2A06M6cc1Ha9eSmDTXEI8WzCdk="; installPhase = '' runHook preInstall diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index bd13da4c6956..d704e285a749 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -228,15 +228,6 @@ let ]; }); - pykaleidescape = super.pykaleidescape.overridePythonAttrs (oldAttrs: rec { - version = "1.0.1"; - src = fetchFromGitHub { - inherit (oldAttrs.src) owner repo; - rev = "refs/tags/v${version}"; - hash = "sha256-KM/gtpsQ27QZz2uI1t/yVN5no0zp9LZag1duAJzK55g="; - }; - }); - pysnooz = super.pysnooz.overridePythonAttrs (oldAttrs: rec { version = "0.8.6"; src = fetchFromGitHub { @@ -301,13 +292,13 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2025.12.5"; + hassVersion = "2026.1.0"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; version = - assert (componentPackages.version == hassVersion); + #assert (componentPackages.version == hassVersion); hassVersion; pyproject = true; @@ -322,13 +313,13 @@ python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; tag = version; - hash = "sha256-RSrWk7SZIOvOhvVXBwc10w9Yyqd2rcxdUVuq2snMm9g="; + hash = "sha256-LoB8hm5ruC6kvulHmtYxbJ6JkkTmgzCbiyBjVdaHFGI="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-cl5kTpYhsZnf7etPRSgVWd/fH9zTc1OnkRTjbUp/M3U="; + hash = "sha256-D6p/pMN7jM8e7ckXlMaQQvj4VZ8ufCBfHCeQaCYr3sY="; }; build-system = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index ccc058636994..d8b539acdcf4 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20251203.3"; + version = "20260107.0"; format = "wheel"; src = fetchPypi { @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-jccOeuv1QdU8nRrtAnRNrZu8s5Mw5KpXE+O/XLYhZ+A="; + hash = "sha256-bRkcIoy12gaHNZdRypFdaArsZiM/5Sm4YNMUD1AMYUI="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix index ad059c8c2f1a..13e29d09ff1d 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "home-assistant-intents"; - version = "2025.12.2"; + version = "2026.1.6"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { repo = "intents-package"; tag = version; fetchSubmodules = true; - hash = "sha256-7fav3h8/Eu4Q4I0deDWov5UP5aEyS/ypIGLvuQlGWCI="; + hash = "sha256-pCAyzx7iJL96OUSpODdjV0uzb6QU3YDROTX7pVcjWu8="; }; build-system = [ diff --git a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix index 0ce170d51545..ec59e6b98103 100644 --- a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix +++ b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pytest-homeassistant-custom-component"; - version = "0.13.301"; + version = "0.13.305"; pyproject = true; disabled = pythonOlder "3.13"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "MatthewFlamm"; repo = "pytest-homeassistant-custom-component"; tag = version; - hash = "sha256-ayLMdWz2KrHkAUc46QdjsikdO96YtpaPeDNGEfkYo9w="; + hash = "sha256-wxoG5xnlvViWgu0cYIG84coOGJrFVuaX5jHoHXm9s9s="; }; build-system = [ setuptools ]; diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 15be7a421cc9..0349a3d8c2af 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2025.12.5"; + version = "2026.1.0"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; tag = version; - hash = "sha256-c2Vr5S7WxaT0q4/Zc3yJmSU4ErhogCBKOISj1WVXflY="; + hash = "sha256-1gJtsQo3OOki1hjRnD8Bb+800k8fCd0TJS3BZW76Osg="; }; build-system = [ diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index 18d106265f79..e4d03fa3f9da 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -144,6 +144,7 @@ let unifiprotect = getComponentDeps "camera"; universal = getComponentDeps "camera" ++ getComponentDeps "conversation"; uvc = getComponentDeps "camera"; + vivotek = getComponentDeps "camera"; voicerss = getComponentDeps "tts"; weather = getComponentDeps "conversation"; websocket_api = getComponentDeps "camera" ++ getComponentDeps "conversation"; diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix index 72724ac7d65b..7828fc37ecae 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "grafana-metricsdrilldown-app"; - version = "1.0.26"; - zipHash = "sha256-XLcsIH8gxWYRlPUy9WGwsxQClj13Ct/xHLh2pseJYB0="; + version = "1.0.27"; + zipHash = "sha256-w+GxgYBVrNnanznS6xjXsibq08rhCP8fQvtIYoBCTNw="; meta = { description = "Queryless experience for browsing Prometheus-compatible metrics. Quickly find related metrics without writing PromQL queries"; license = lib.licenses.agpl3Only; diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix index 2ebec603281e..1ed957e1bd3f 100644 --- a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "postfix_exporter"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "Hsn723"; repo = "postfix_exporter"; tag = "v${version}"; - sha256 = "sha256-PIZBzDZJkjttxy2pYUAs9G9C/byCNpnhWYuqWJlGgfM="; + sha256 = "sha256-xpzYhdmryUV3RKGgvqJkTpi3mv/0LMHoMiAZX+i0BmI="; }; - vendorHash = "sha256-FY2bynGrgxBsSlQQ6bnr/NYHt9pmzF/6ST/Ea3cDfF8="; + vendorHash = "sha256-3jZWyaLoSAqjutmKp1RowvLuFVNnp+Vz+v8jL7fvzbo="; ldflags = [ "-s" diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix index fe8ad54daf08..02ffa2bddb18 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "ibus-rime"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "rime"; repo = "ibus-rime"; rev = version; - sha256 = "sha256-6lqPdcIJmwHcr4G6BhIDMhEtEOpOPgWqfkKXqaDjUY0="; + sha256 = "sha256-prxXFC5l7JKmrKJe2R5U7kKJmb2m06B+Tic+m6LGthM="; }; buildInputs = [ diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index 6e26f2991449..11b63888d8e9 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -29,13 +29,13 @@ }: stdenv.mkDerivation rec { pname = "tlp"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "linrunner"; repo = "TLP"; rev = version; - hash = "sha256-aM/4+cgtUe6qv3MNT4moXvNzqG5gKvwMbg14L8ifWlc="; + hash = "sha256-23B+KV0VrvfSneKIFB9sm9iZZm8uZRk+r60W13++J4g="; }; # XXX: See patch files for relevant explanations. diff --git a/pkgs/tools/security/ghidra/extensions/kaiju/default.nix b/pkgs/tools/security/ghidra/extensions/kaiju/default.nix index c01f642bf279..b03bfc71571a 100644 --- a/pkgs/tools/security/ghidra/extensions/kaiju/default.nix +++ b/pkgs/tools/security/ghidra/extensions/kaiju/default.nix @@ -26,13 +26,13 @@ let self = buildGhidraExtension (finalAttrs: { pname = "kaiju"; - version = "250828"; + version = "251218"; src = fetchFromGitHub { owner = "CERTCC"; repo = "kaiju"; rev = finalAttrs.version; - hash = "sha256-edsQIBoOTY+WxVBtH1bbM7TZZHhA0jgVb2iJKC66iVM="; + hash = "sha256-oSbYinEysFHMdFUQCA60wVDCTCIDvEDzW76ZFa0ANbg="; }; buildInputs = [ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2d3d3fdf8b7d..455034d43cc9 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1425,6 +1425,7 @@ mapAliases { quorum = throw "'quorum' has been removed as it was broken and unmaintained upstream"; # Added 2025-11-07 qv2ray = throw "'qv2ray' has been removed as it was unmaintained"; # Added 2025-06-03 ra-multiplex = lib.warnOnInstantiate "'ra-multiplex' has been renamed to/replaced by 'lspmux'" lspmux; # Added 2025-10-27 + radiance = throw "'radiance' has been removed as it was broken for a long time"; # Added 2026-01-02 radicale3 = throw "'radicale3' has been renamed to/replaced by 'radicale'"; # Converted to throw 2025-10-27 railway-travel = throw "'railway-travel' has been renamed to/replaced by 'diebahn'"; # Converted to throw 2025-10-27 rambox-pro = throw "'rambox-pro' has been renamed to/replaced by 'rambox'"; # Converted to throw 2025-10-27 diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 9a87aa6555ba..b8328fe2a482 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -177,6 +177,10 @@ makeScopeWithSplicing' { xcode_26_0_1_Apple_silicon xcode_26_1 xcode_26_1_Apple_silicon + xcode_26_1_1 + xcode_26_1_1_Apple_silicon + xcode_26_2 + xcode_26_2_Apple_silicon xcode requireXcode ; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 10d2ff773b8b..2f3492e9628a 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -348,6 +348,7 @@ mapAliases { pylit = throw "'pylit' has been removed as it was broken and unmaintained upstream"; # Added 2025-11-29 pymc3 = throw "'pymc3' has been renamed to/replaced by 'pymc'"; # Converted to throw 2025-10-29 pymelcloud = throw "'pymelcloud' has been renamed to/replaced by 'python-melcloud'"; # Converted to throw 2025-10-29 + pymicro-vad = throw "'pymicro-vad' was removed because Home Assistant switched to 'pysilero-vad'"; # added 2026-01-08 PyMVGLive = throw "'PyMVGLive' has been renamed to/replaced by 'pymvglive'"; # Converted to throw 2025-10-29 pymyq = throw "'pymyq' has been renamed to/replaced by 'python-myq'"; # Converted to throw 2025-10-29 pyownet = throw "pyownet was removed because Home Assistant switched to aio-ownet"; # added 2025-10-31 @@ -453,6 +454,7 @@ mapAliases { sharkiqpy = throw "'sharkiqpy' has been renamed to/replaced by 'sharkiq'"; # Converted to throw 2025-10-29 shippai = throw "shippai has been removed because the upstream repository was archived in 2023"; # added 2025-07-09 sip_4 = throw "'sip_4' has been renamed to/replaced by 'sip4'"; # Converted to throw 2025-10-29 + sipsimple = lib.warnOnInstantiate "'sipsimple' has been renamed to 'python3-sipsimple' to fit upstream naming" python3-sipsimple; # added 2026-01-05 slackclient = throw "'slackclient' has been renamed to/replaced by 'slack-sdk'"; # Converted to throw 2025-10-29 smart_open = throw "'smart_open' has been renamed to/replaced by 'smart-open'"; # Converted to throw 2025-10-29 smpp_pdu = throw "'smpp_pdu' has been renamed to/replaced by 'smpp-pdu'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ad35132d2799..3cc9852d57ac 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2317,6 +2317,8 @@ self: super: with self; { buildstream-plugins = callPackage ../development/python-modules/buildstream-plugins { }; + bumble = callPackage ../development/python-modules/bumble { }; + bump-my-version = callPackage ../development/python-modules/bump-my-version { }; bump2version = callPackage ../development/python-modules/bump2version { }; @@ -5448,6 +5450,8 @@ self: super: with self; { fitbit = callPackage ../development/python-modules/fitbit { }; + fitbit-web-api = callPackage ../development/python-modules/fitbit-web-api { }; + fitdecode = callPackage ../development/python-modules/fitdecode { }; fitfile = callPackage ../development/python-modules/fitfile { }; @@ -13899,8 +13903,6 @@ self: super: with self; { pymfy = callPackage ../development/python-modules/pymfy { }; - pymicro-vad = callPackage ../development/python-modules/pymicro-vad { }; - pymicrobot = callPackage ../development/python-modules/pymicrobot { }; pymiele = callPackage ../development/python-modules/pymiele { }; @@ -15652,6 +15654,8 @@ self: super: with self; { python3-saml = callPackage ../development/python-modules/python3-saml { }; + python3-sipsimple = callPackage ../development/python-modules/python3-sipsimple { }; + pythondialog = callPackage ../development/python-modules/pythondialog { }; pythonefl = callPackage ../development/python-modules/python-efl { }; @@ -17096,6 +17100,8 @@ self: super: with self; { serializable = callPackage ../development/python-modules/serializable { }; + serialx = callPackage ../development/python-modules/serialx { }; + serpent = callPackage ../development/python-modules/serpent { }; serpy = callPackage ../development/python-modules/serpy { }; @@ -17322,8 +17328,6 @@ self: super: with self; { siphashc = callPackage ../development/python-modules/siphashc { }; - sipsimple = callPackage ../development/python-modules/sipsimple { }; - sipyco = callPackage ../development/python-modules/sipyco { }; sirius = toPythonModule ( @@ -20927,6 +20931,8 @@ self: super: with self; { yamale = callPackage ../development/python-modules/yamale { }; + yamlcore = callPackage ../development/python-modules/yamlcore { }; + yamlfix = callPackage ../development/python-modules/yamlfix { }; yamllint = callPackage ../development/python-modules/yamllint { };