diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml index a333688f0344..29489f008140 100644 --- a/.github/workflows/bot.yml +++ b/.github/workflows/bot.yml @@ -88,7 +88,7 @@ jobs: GH_TOKEN: ${{ steps.app-token.outputs.token || github.token }} run: gh api /rate_limit | jq - - uses: actions/labeler@b8dd2d9be0f68b860e7dae5dae7d772984eacd6d # v6.2.0 + - uses: actions/labeler@bf12e9b00b37c5c0ca2b87b79b2daf7891dbda13 # v7.0.0 name: Labels from touched files if: | github.event_name == 'pull_request_target' && @@ -98,7 +98,7 @@ jobs: configuration-path: .github/labeler.yml # default sync-labels: true - - uses: actions/labeler@b8dd2d9be0f68b860e7dae5dae7d772984eacd6d # v6.2.0 + - uses: actions/labeler@bf12e9b00b37c5c0ca2b87b79b2daf7891dbda13 # v7.0.0 name: Labels from touched files (no sync) if: | github.event_name == 'pull_request_target' && @@ -108,7 +108,7 @@ jobs: configuration-path: .github/labeler-no-sync.yml sync-labels: false - - uses: actions/labeler@b8dd2d9be0f68b860e7dae5dae7d772984eacd6d # v6.2.0 + - uses: actions/labeler@bf12e9b00b37c5c0ca2b87b79b2daf7891dbda13 # v7.0.0 name: Labels from touched files (development branches) # Development branches like staging-next, haskell-updates and python-updates get special labels. # This is to avoid the mass of labels there, which is mostly useless - and really annoying for diff --git a/ci/pinned.json b/ci/pinned.json index 6f50e7e09f51..32f5e186650c 100644 --- a/ci/pinned.json +++ b/ci/pinned.json @@ -9,9 +9,22 @@ }, "branch": "nixpkgs-unstable", "submodules": false, - "revision": "421eebfd0ec7bccd4abe826ce62d7e6e83129493", - "url": "https://github.com/NixOS/nixpkgs/archive/421eebfd0ec7bccd4abe826ce62d7e6e83129493.tar.gz", - "hash": "sha256:1lxfhfgiv1sz2v7fg43gny57sa6wf59n98q7ldsyb2p06f4sal7w" + "revision": "7525d999cd850b9a488817abc89c75dc733acf17", + "url": "https://github.com/NixOS/nixpkgs/archive/7525d999cd850b9a488817abc89c75dc733acf17.tar.gz", + "hash": "sha256-4IHyyLgLBdKefkljdKod4IMn023pQiDXAWJA187cmdY=" + }, + "nixpkgs-26.05-darwin": { + "type": "Git", + "repository": { + "type": "GitHub", + "owner": "NixOS", + "repo": "nixpkgs" + }, + "branch": "nixpkgs-26.05-darwin", + "submodules": false, + "revision": "51fe96f9107566e6b8eeb7fc4ba696c01e548b04", + "url": "https://github.com/NixOS/nixpkgs/archive/51fe96f9107566e6b8eeb7fc4ba696c01e548b04.tar.gz", + "hash": "sha256-yj0LPLnsmYoLmA3FGANjeTEwej0/DHjZBXWnDQDUuIs=" } }, "version": 8 diff --git a/flake.nix b/flake.nix index 6c3321e8c7fe..5c5d89f241ad 100644 --- a/flake.nix +++ b/flake.nix @@ -199,7 +199,8 @@ && system != "riscv64-linux" # Exclude x86_64-freebsd because "Package ‘go-1.22.12-freebsd-amd64-bootstrap’ in /nix/store/0yw40qnrar3lvc5hax5n49abl57apjbn-source/pkgs/development/compilers/go/binary.nix:50 is not available on the requested hostPlatform" && system != "x86_64-freebsd" - ) (forAllSystems (system: (import ./ci { inherit system; }).fmt.pkg)); + # TODO: revert to importing fmt.pkg directly from ./ci when support for 26.05 ends + ) (forAllSystems (system: (import ./shell.nix { inherit system; }).formatter)); /** A nested structure of [packages](https://nix.dev/manual/nix/latest/glossary#package-attribute-set) and other values. diff --git a/lib/licenses/licenses.nix b/lib/licenses/licenses.nix index 01f530fa8044..7e2f779cc49b 100644 --- a/lib/licenses/licenses.nix +++ b/lib/licenses/licenses.nix @@ -1259,6 +1259,11 @@ lib.mapAttrs mkLicense ( fullName = "SIL Open Font License 1.1"; }; + ogluk30 = { + spdxId = "OGL-UK-3.0"; + fullName = "Open Government Licence v3.0"; + }; + oml = { spdxId = "OML"; fullName = "Open Market License"; @@ -1421,9 +1426,8 @@ lib.mapAttrs mkLicense ( }; stk = { - shortName = "stk"; - fullName = "Synthesis Tool Kit 4.3"; - url = "https://github.com/thestk/stk/blob/master/LICENSE"; + spdxId = "MIT-STK"; + fullName = "MIT-STK License"; }; sudo = { diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c82bed9ae9a0..a0724337763f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3423,13 +3423,6 @@ githubId = 32903896; keys = [ { fingerprint = "CB5C 7B3C 3E6F 2A59 A583 A90A 8A60 0376 7BE9 5976"; } ]; }; - benesim = { - name = "Benjamin Isbarn"; - email = "benjamin.isbarn@gmail.com"; - github = "BeneSim"; - githubId = 29384538; - keys = [ { fingerprint = "D35E C9CE E631 638F F1D8 B401 6F0E 410D C3EE D02"; } ]; - }; bengsparks = { email = "benjamin.sparks@protonmail.com"; github = "bengsparks"; @@ -7340,6 +7333,13 @@ githubId = 39825; name = "Dominik Honnef"; }; + donottellmetonottellyou = { + name = "Jade Masker"; + email = "donottellmetonottellyou@gmail.com"; + github = "donottellmetonottellyou"; + githubId = 115233539; + keys = [ { fingerprint = "5C8B 7128 4AB3 000D 4AC6 6234 9B81 35A2 4A75 CB86"; } ]; + }; donovanglover = { github = "donovanglover"; githubId = 2374245; @@ -12960,11 +12960,6 @@ name = "Jez Cope"; keys = [ { fingerprint = "D9DA 3E47 E8BD 377D A317 B3D0 9E42 CE07 1C45 59D1"; } ]; }; - jf-uu = { - github = "jf-uu"; - githubId = 181011550; - name = "jf-uu"; - }; jfchevrette = { email = "jfchevrette@gmail.com"; github = "jfchevrette"; @@ -13581,6 +13576,12 @@ name = "Jonas Wunderlich"; matrix = "@matrix:03j.de"; }; + jonascarpay = { + name = "Jonas Carpay"; + email = "jonascarpay@gmail.com"; + github = "jonascarpay"; + githubId = 3593851; + }; jonasfranke = { name = "Jonas Franke"; email = "info@jonasfranke.xyz"; @@ -18868,6 +18869,11 @@ githubId = 45770; name = "Mitsuhiro Nakamura"; }; + MNThomson = { + github = "MNThomson"; + githubId = 73045936; + name = "Max Thomson"; + }; moaxcp = { email = "moaxcp@gmail.com"; github = "moaxcp"; @@ -20282,6 +20288,12 @@ github = "niklaskorz"; githubId = 590517; }; + niklasravnsborg = { + name = "Niklas Ravnsborg"; + github = "niklasravnsborg"; + githubId = 6717303; + keys = [ { fingerprint = "0C90 DD8A 0EE9 93DF 8D58 7AF9 8360 E6C5 8AE8 F3ED"; } ]; + }; niklasthorild = { name = "Niklas Thorild"; email = "niklas@thorild.se"; @@ -23315,6 +23327,13 @@ github = "DaRacci"; githubId = 90304606; }; + rachalaraj = { + name = "Rachala Raj Kumar"; + email = "rachaalaraj@gmail.com"; + matrix = "@rachalaraj:matrix.org"; + github = "rachalaraj"; + githubId = 124191100; + }; RadxaYuntian = { # This is the work account for @MakiseKurisu name = "ZHANG Yuntian"; @@ -29372,6 +29391,11 @@ github = "UnsolvedCypher"; githubId = 3170853; }; + untio11 = { + name = "Robin Kneepkens"; + github = "untio11"; + githubId = 14060658; + }; uralbash = { email = "root@uralbash.ru"; github = "uralbash"; @@ -29699,6 +29723,13 @@ githubId = 116078858; keys = [ { fingerprint = "CDEA 7E04 69E3 0885 A754 4B05 0104 BC05 F41B 77B8"; } ]; }; + vherrmann = { + name = "Valentin Herrmann"; + email = "me@valentin-herrmann.de"; + github = "vherrmann"; + githubId = 50072577; + keys = [ { fingerprint = "309D A29B 4070 FDFD C01A 3AB4 9E60 CB44 5C4B BC4C"; } ]; + }; videl = { email = "thibaut.smith@mailbox.org"; github = "videl"; diff --git a/nixos/README-modular-services.md b/nixos/README-modular-services.md index 82a398f504b4..b068d3628670 100644 --- a/nixos/README-modular-services.md +++ b/nixos/README-modular-services.md @@ -43,7 +43,7 @@ When reviewing a modular service, you should check the following. Details and ra ### NixOS VM test See the initial [Modular Services PR](https://github.com/NixOS/nixpkgs/pull/372170) for an [example](https://github.com/NixOS/nixpkgs/pull/372170/files#diff-e7fe16489cf3cd08ecc22b2c7896039d407a329b75691c046c95447423b3153f) of a NixOS VM test. -TBD: describe best practices here. +Best practices: keep tests minimal and focused (boot a VM, enable the service, and assert a basic request succeeds). For general guidance, see the [NixOS Tests chapter](https://nixos.org/manual/nixos/unstable/#sec-nixos-tests). ### `_class = "service"` diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index 155943510abf..73f460d97369 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -129,7 +129,7 @@ - [nvme-rs](https://github.com/liberodark/nvme-rs), NVMe monitoring [services.nvme-rs](#opt-services.nvme-rs.enable). -- [Overseerr](https://overseerr.dev), a request management and media discovery tool for the Plex ecosystem. Available as [services.overseerr](#opt-services.overseerr.enable). +- [Overseerr](https://overseerr.dev), a request management and media discovery tool for the Plex ecosystem. Available as {option}`opt-services.overseerr.enable`. - [PairDrop](https://github.com/schlagmichdoch/pairdrop), a peer-to-peer file transfer web app. Available as [services.pairdrop](#opt-services.pairdrop.enable). diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md index 8cdd2f9b64d6..d811f1f8e786 100644 --- a/nixos/doc/manual/release-notes/rl-2605.section.md +++ b/nixos/doc/manual/release-notes/rl-2605.section.md @@ -84,7 +84,7 @@ - [PdfDing](https://www.pdfding.com/), manage, view and edit your PDFs seamlessly on all your devices wherever you are. Available as [services.pdfding](#opt-services.pdfding.enable). -- [mangowc](https://github.com/DreamMaoMao/mangowc), a lightweight and feature-rich Wayland compositor based on dwl. Available as [programs.mangowc](#opt-programs.mangowc.enable). +- [mangowc](https://github.com/DreamMaoMao/mangowc), a lightweight and feature-rich Wayland compositor based on dwl. Available as [programs.mangowc](#opt-programs.mango.enable). - [reaction](https://reaction.ppom.me/), a daemon that scans program outputs for repeated patterns, and takes action. A common usage is to scan ssh and webserver logs, and to ban hosts that cause multiple authentication errors. A modern alternative to fail2ban. Available as [services.reaction](#opt-services.reaction.enable). diff --git a/nixos/doc/manual/release-notes/rl-2611.section.md b/nixos/doc/manual/release-notes/rl-2611.section.md index 2b7750602776..d4b6c2ce9a16 100644 --- a/nixos/doc/manual/release-notes/rl-2611.section.md +++ b/nixos/doc/manual/release-notes/rl-2611.section.md @@ -89,9 +89,9 @@ - Apache Kafka has dropped support for ZooKeeper mode. The `apacheKafka_3_9` and `apacheKafka_4_0` packages have been removed, as every remaining packaged version is KRaft-only. The `services.apache-kafka.zookeeper` option (previously an alias for `services.apache-kafka.settings."zookeeper.connect"`) has been removed; migrate your cluster to [KRaft](#module-services-apache-kafka-kraft) mode instead. -- `virtualisation.registries.block` / `insecure` / `search` were deprecated, +- `virtualisation.containers.registries.block` / `insecure` / `search` were deprecated, because they mapped to the deprecated V1 `registries.conf` format. - See the new option {option}`virtualisation.registries.settings` + See the new option {option}`virtualisation.containers.registries.settings` and [containers-registries.conf(5)](https://github.com/containers/image/blob/main/docs/containers-registries.conf.5.md) to migrate to the new configuration format. @@ -113,6 +113,8 @@ - `services.komodo-periphery` has been updated to support version 2.0.0. Some options have been renamed to match the new configuration structure; compatibility aliases are provided for the renamed options. The `passkeys` and `outbound.onboardingKey` options have been removed; use `passkeyFiles`, `auth.privateKey`/`auth.corePublicKeys`, or `outbound.onboardingKeyFile` instead. New outbound mode configuration is available under `outbound.*`. +- Package `overseerr` has been removed as the `overseerr` and `jellyseerr` projects were merged under `seerr`. + ## Other Notable Changes {#sec-release-26.11-notable-changes} @@ -140,6 +142,8 @@ - `security.run0.persistentAuth` options have been added to support persistent Authentication of session. Timeout configurable via `security.polkit.settings.Polkitd.ExpirationSeconds`. +- [`virtualisation.qemu.firmware.enable`](#opt-virtualisation.qemu.firmware.enable) has been added to install QEMU firmware descriptors to {file}`/etc/qemu/firmware`, making the corresponding firmware images discoverable by tools such as `systemd-vmspawn`. By default this exposes the firmware bundled with QEMU. Further firmware can be added via [`virtualisation.qemu.firmware.packages`](#opt-virtualisation.qemu.firmware.packages), for example the new `OVMF-amdsev` and `OVMF-inteltdx` packages, which provide UEFI firmware for AMD SEV-SNP and Intel TDX confidential VMs. + - `boot.loader.systemd-boot` gained support for [Automatic Boot Assessment](https://systemd.io/AUTOMATIC_BOOT_ASSESSMENT/) via the new [`boot.loader.systemd-boot.bootCounting`](#opt-boot.loader.systemd-boot.bootCounting.enable) options, allowing automatic detection of and recovery from bad NixOS generations. As part of this change, boot loader entries on the ESP/XBOOTLDR partition are now named `nixos-.conf` instead of `nixos-generation-.conf`; existing entries are migrated automatically on the next `nixos-rebuild boot`/`switch`. - `services.nginx` gained a [`lua`](#opt-services.nginx.lua.enable) option to enable Lua scripting via OpenResty's lua-nginx-module on a stock nginx, configuring `lua_package_path`/`lua_package_cpath` from the packages listed in [`services.nginx.lua.extraPackages`](#opt-services.nginx.lua.extraPackages). Use this to add Lua to a regular nginx; for the full OpenResty platform (libraries that rely on its bundled lualib, such as `lua-resty-openidc`), set `services.nginx.package` to `pkgs.openresty` instead — the option configures the Lua search path for it too. diff --git a/nixos/lib/test-driver/src/test_driver/__init__.py b/nixos/lib/test-driver/src/test_driver/__init__.py index 774f3afdf49e..568ac5758d05 100644 --- a/nixos/lib/test-driver/src/test_driver/__init__.py +++ b/nixos/lib/test-driver/src/test_driver/__init__.py @@ -89,6 +89,11 @@ def main() -> None: type=Path, required=True, ) + arg_parser.add_argument( + "--test-script", + help="path to a test script to run, taking precedence over the one defined in the config file", + type=Path, + ) arg_parser.add_argument( "--keep-vm-state", help=argparse.SUPPRESS, @@ -163,8 +168,12 @@ def main() -> None: if args.debug_hook_attach is not None: debugger = Debug(logger, args.debug_hook_attach) + config = load_driver_configuration(args.config) + if args.test_script is not None: + config.test_script = args.test_script + with Driver( - config=load_driver_configuration(args.config), + config=config, out_dir=output_directory, logger=logger, keep_machine_state=args.keep_machine_state, diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index de6172266d5e..ffe037697d95 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -355,7 +355,7 @@ ./programs/wayland/hyprland.nix ./programs/wayland/hyprlock.nix ./programs/wayland/labwc.nix - ./programs/wayland/mangowc.nix + ./programs/wayland/mango.nix ./programs/wayland/miracle-wm.nix ./programs/wayland/niri.nix ./programs/wayland/pinnacle.nix @@ -938,7 +938,6 @@ ./services/misc/open-webui.nix ./services/misc/orthanc.nix ./services/misc/osrm.nix - ./services/misc/overseerr.nix ./services/misc/owncast.nix ./services/misc/packagekit.nix ./services/misc/paisa.nix @@ -2052,6 +2051,7 @@ ./virtualisation/openvswitch.nix ./virtualisation/parallels-guest.nix ./virtualisation/podman/default.nix + ./virtualisation/qemu-firmware.nix ./virtualisation/qemu-guest-agent.nix ./virtualisation/rosetta.nix ./virtualisation/spice-usb-redirection.nix diff --git a/nixos/modules/programs/miriway.nix b/nixos/modules/programs/miriway.nix index b9a6288c4c2a..bfe6acb338da 100644 --- a/nixos/modules/programs/miriway.nix +++ b/nixos/modules/programs/miriway.nix @@ -14,56 +14,93 @@ in Miriway, a Mir based Wayland compositor. You can manually launch Miriway by executing "exec miriway" on a TTY, or launch it from a display manager. Copy /etc/xdg/xdg-miriway/miriway-shell.config to ~/.config/miriway-shell.config + and /etc/xdg/xdg-miriway/miriway-shell.settings to ~/.config/miriway-shell.settings to modify the system-wide configuration on a per-user basis. See , and "miriway --help" for more information''; config = lib.mkOption { + description = '' + Contents of system-wide miriway-shell.config. See Miriway's configuration documentation for details. + ''; type = lib.types.lines; default = '' x11-window-title=Miriway (Mir-on-X) idle-timeout=600 - ctrl-alt=t:miriway-terminal # Default "terminal emulator finder" - - shell-component=dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY - - meta=Left:@dock-left - meta=Right:@dock-right - meta=Space:@toggle-maximized - meta=Home:@workspace-begin - meta=End:@workspace-end - meta=Page_Up:@workspace-up - meta=Page_Down:@workspace-down - ctrl-alt=BackSpace:@exit ''; example = '' idle-timeout=300 - ctrl-alt=t:weston-terminal add-wayland-extensions=all - shell-components=dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY - shell-component=waybar shell-component=wbg Pictures/wallpaper - - shell-meta=a:synapse - - meta=Left:@dock-left - meta=Right:@dock-right - meta=Space:@toggle-maximized - meta=Home:@workspace-begin - meta=End:@workspace-end - meta=Page_Up:@workspace-up - meta=Page_Down:@workspace-down - ctrl-alt=BackSpace:@exit ''; + }; + + settings = lib.mkOption { description = '' - Miriway's config. This will be installed system-wide. - The default will install the miriway package's barebones example config. + Contents of system-wide miriway-shell.settings. See Miriway's configuration documentation for details. + ''; + type = lib.types.lines; + default = '' + command_ctrl_alt=t:miriway-terminal # Default "terminal emulator finder" + + command_meta=Left:@dock-left + command_meta=Right:@dock-right + command_meta=Space:@toggle-maximized + command_meta=Home:@workspace-begin + command_meta=End:@workspace-end + command_meta=Page_Up:@workspace-up + command_meta=Page_Down:@workspace-down + command_ctrl_alt=BackSpace:@exit + ''; + example = '' + command_ctrl_alt=t:weston-terminal + command_shell_meta=a:synapse + + command_meta=Left:@dock-left + command_meta=Right:@dock-right + command_meta=Space:@toggle-maximized + command_meta=Home:@workspace-begin + command_meta=End:@workspace-end + command_meta=Page_Up:@workspace-up + command_meta=Page_Down:@workspace-down + command_ctrl_alt=BackSpace:@exit ''; }; }; config = lib.mkIf cfg.enable { + warnings = + let + optionsNoLongerInConfig = [ + "ctrl-alt" + "meta" + "shell-ctrl-alt" + "shell-meta" + "shell-plain" + + "command_ctrl_alt" + "command_meta" + "command_shell_ctrl_alt" + "command_shell_meta" + "command_plain" + ]; + in + # Added 2026-07-17 + lib.optional + (builtins.foldl' ( + acc: option: acc || (lib.strings.hasInfix "${option}=" cfg.config) + ) false optionsNoLongerInConfig) + '' + Since Miriway 26.06, configuration options got partially renamed and split across different files. + A new option `programs.miriway.settings` got introduced for options that belong into miriway-shell.settings + instead of miriway-shell.config. + + You appear to have one of the following options in `programs.miriway.config` that should now go into + `programs.miriway.settings`, and may need to be renamed: + ${lib.strings.concatStringsSep ", " optionsNoLongerInConfig} + ''; + environment = { systemPackages = with pkgs; [ miriway @@ -71,6 +108,7 @@ in ]; etc = { "xdg/xdg-miriway/miriway-shell.config".text = cfg.config; + "xdg/xdg-miriway/miriway-shell.settings".text = cfg.settings; }; }; diff --git a/nixos/modules/programs/regreet.nix b/nixos/modules/programs/regreet.nix index 84781449a0c1..bd5e2821f6a5 100644 --- a/nixos/modules/programs/regreet.nix +++ b/nixos/modules/programs/regreet.nix @@ -15,14 +15,13 @@ in description = '' Enable ReGreet, a clean and customizable greeter for greetd. - To use ReGreet, {option}`services.greetd` has to be enabled and - {option}`services.greetd.settings.default_session` should contain the - appropriate configuration to launch - {option}`config.programs.regreet.package`. For examples, see the - [ReGreet Readme](https://github.com/rharish101/ReGreet#set-as-default-session). + By default enables {option}`services.greetd` and configures a + {command}`default_session` to launch ReGreet using the + {command}`cage` compositor. - A minimal configuration that launches ReGreet in {command}`cage` is - enabled by this module by default. + See the + [ReGreet Readme](https://github.com/rharish101/ReGreet#set-as-default-session) + for other examples. ''; }; @@ -48,8 +47,8 @@ in [ "-s" "-d" "-m" "last" ] ''; description = '' - Additional arguments to be passed to - [cage](https://github.com/cage-kiosk/cage). + Arguments to be passed to [cage](https://github.com/cage-kiosk/cage) + when using it as the default compositor. ''; }; diff --git a/nixos/modules/programs/wayland/mangowc.nix b/nixos/modules/programs/wayland/mango.nix similarity index 68% rename from nixos/modules/programs/wayland/mangowc.nix rename to nixos/modules/programs/wayland/mango.nix index 18744f0e8b4d..32066a84d703 100644 --- a/nixos/modules/programs/wayland/mangowc.nix +++ b/nixos/modules/programs/wayland/mango.nix @@ -6,18 +6,22 @@ }: let - cfg = config.programs.mangowc; + cfg = config.programs.mango; in { - options.programs.mangowc = { - enable = lib.mkEnableOption "MangoWC, a Wayland compositor based on dwl and scenefx"; + options.programs.mango = { + enable = lib.mkEnableOption "Mango, a Wayland compositor based on dwl and scenefx"; - package = lib.mkPackageOption pkgs "mangowc" { - default = [ "mangowc" ]; - example = "pkgs.mangowc.override { enableXWayland = false; }"; + package = lib.mkPackageOption pkgs "mango" { + default = [ "mango" ]; + example = "pkgs.mango.override { enableXWayland = false; }"; }; }; + imports = [ + (lib.mkRenamedOptionModule [ "programs" "mangowc" ] [ "programs" "mango" ]) + ]; + config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 54664ae769ba..b5f8e4977990 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -403,6 +403,11 @@ in as the underlying package isn't being maintained. Working alternatives are libinput and synaptics. '') + (mkRemovedOptionModule [ "services" "xserver" "windowManager" "afterstep" ] '' + The services.xserver.windowManager.afterstep module and the corresponding + package have been removed from Nixpkgs because they were unmaintained + upstream. + '') (mkRemovedOptionModule [ "services" "xserver" "windowManager" "ragnarwm" ] '' The services.xserver.windowManager.ragnarwm module has been removed because the corresponding package was removed from nixpkgs. @@ -534,6 +539,13 @@ in (mkRemovedOptionModule [ "services" "xserver" "cmt" ] '' services.xserver.cmt has been removed as it was broken and unmaintained upstream '') + (mkRemovedOptionModule + [ + "services" + "overseerr" + ] + "`services.overseerr` has been replaced by `services.seerr` as the project has been merged with Jellyseerr under Seerr." + ) # Do NOT add any option renames here, see top of the file ]; } diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 240020c19374..c6e0bee172e8 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -1422,7 +1422,6 @@ let modulePath = config.security.pam.pam_unixModulePath; settings = { nullok = true; - yescrypt = lib.mkIf config.security.pam.enableLegacySettings true; }; } { diff --git a/nixos/modules/services/display-managers/gdm.nix b/nixos/modules/services/display-managers/gdm.nix index ea912d70b0af..3f8501f1ece5 100644 --- a/nixos/modules/services/display-managers/gdm.nix +++ b/nixos/modules/services/display-managers/gdm.nix @@ -577,7 +577,6 @@ in control = "requisite"; modulePath = config.security.pam.pam_unixModulePath; settings.nullok = true; - settings.yescrypt = true; } ]; diff --git a/nixos/modules/services/display-managers/greetd.nix b/nixos/modules/services/display-managers/greetd.nix index dd0d6a04effe..2f5746911cd1 100644 --- a/nixos/modules/services/display-managers/greetd.nix +++ b/nixos/modules/services/display-managers/greetd.nix @@ -1,6 +1,7 @@ { config, lib, + utils, pkgs, ... }: @@ -76,9 +77,37 @@ in services.greetd.settings.default_session.user = lib.mkDefault "greeter"; security.pam.services.greetd = { - allowNullPassword = true; - startSession = true; - enableGnomeKeyring = lib.mkDefault config.services.gnome.gnome-keyring.enable; + useDefaultRules = false; + rules = { + auth = utils.pam.autoOrderRules [ + { + name = "login"; + control = "substack"; + modulePath = "login"; + } + ]; + account = utils.pam.autoOrderRules [ + { + name = "login"; + control = "include"; + modulePath = "login"; + } + ]; + password = utils.pam.autoOrderRules [ + { + name = "login"; + control = "substack"; + modulePath = "login"; + } + ]; + session = utils.pam.autoOrderRules [ + { + name = "login"; + control = "include"; + modulePath = "login"; + } + ]; + }; }; # This prevents nixos-rebuild from killing greetd by activating getty again diff --git a/nixos/modules/services/display-managers/ly.nix b/nixos/modules/services/display-managers/ly.nix index 7bc23926db36..c2cecc1d239c 100644 --- a/nixos/modules/services/display-managers/ly.nix +++ b/nixos/modules/services/display-managers/ly.nix @@ -100,9 +100,37 @@ in security.pam.services = { ly = { - startSession = true; - unixAuth = true; - enableGnomeKeyring = lib.mkDefault config.services.gnome.gnome-keyring.enable; + useDefaultRules = false; + rules = { + auth = utils.pam.autoOrderRules [ + { + name = "login"; + control = "substack"; + modulePath = "login"; + } + ]; + account = utils.pam.autoOrderRules [ + { + name = "login"; + control = "include"; + modulePath = "login"; + } + ]; + password = utils.pam.autoOrderRules [ + { + name = "login"; + control = "substack"; + modulePath = "login"; + } + ]; + session = utils.pam.autoOrderRules [ + { + name = "login"; + control = "include"; + modulePath = "login"; + } + ]; + }; }; } // optionalAttrs dmcfg.autoLogin.enable { diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index 382c09cb0fa3..083199a784e3 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -242,7 +242,9 @@ let "elkm1" "elv" "enocean" + "homeassistant_connect_zbt2" "homeassistant_hardware" + "homeassistant_sky_connect" "homeassistant_yellow" "firmata" "flexit" diff --git a/nixos/modules/services/misc/overseerr.nix b/nixos/modules/services/misc/overseerr.nix deleted file mode 100644 index 3ea8cc26eb28..000000000000 --- a/nixos/modules/services/misc/overseerr.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: - -let - cfg = config.services.overseerr; -in -{ - meta.maintainers = [ lib.maintainers.jf-uu ]; - - options.services.overseerr = { - enable = lib.mkEnableOption "Overseerr, a request management and media discovery tool for the Plex ecosystem"; - - package = lib.mkPackageOption pkgs "overseerr" { }; - - openFirewall = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Open a port in the firewall for the Overseerr web interface."; - }; - - port = lib.mkOption { - type = lib.types.port; - default = 5055; - description = "The port which the Overseerr web UI should listen on."; - }; - }; - - config = lib.mkIf cfg.enable { - systemd.services.overseerr = { - description = "Request management and media discovery tool for the Plex ecosystem"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - environment = { - CONFIG_DIRECTORY = "/var/lib/overseerr"; - PORT = toString cfg.port; - }; - serviceConfig = { - CapabilityBoundingSet = ""; - DynamicUser = true; - ExecStart = lib.getExe cfg.package; - LockPersonality = true; - NoNewPrivileges = true; - PrivateDevices = true; - PrivateIPC = true; - PrivateMounts = true; - PrivateTmp = true; - PrivateUsers = true; - ProcSubset = "pid"; - ProtectClock = true; - ProtectControlGroups = true; - ProtectHome = true; - ProtectHostname = true; - ProtectKernelLogs = true; - ProtectKernelModules = true; - ProtectKernelTunables = true; - ProtectProc = "invisible"; - ProtectSystem = "strict"; - RemoveIPC = true; - Restart = "on-failure"; - RestrictAddressFamilies = [ - "AF_INET" - "AF_INET6" - "AF_UNIX" - ]; - RestrictNamespaces = true; - RestrictRealtime = true; - RestrictSUIDSGID = true; - StateDirectory = "overseerr"; - StateDirectoryMode = "0700"; - SystemCallArchitectures = "native"; - SystemCallErrorNumber = "EPERM"; - SystemCallFilter = [ - "@system-service" - "~@privileged" - "~@resources" - ]; - Type = "exec"; - }; - }; - - networking.firewall = lib.mkIf cfg.openFirewall { - allowedTCPPorts = [ cfg.port ]; - }; - }; -} diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index c45039458b26..c0c820cadb63 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -988,8 +988,9 @@ in systemd.services.nsd = { description = "NSD authoritative only domain name service"; - after = [ "network.target" ]; + after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; startLimitBurst = 4; startLimitIntervalSec = 5 * 60; # 5 mins diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix index af8664fd3137..5bafebcf10f4 100644 --- a/nixos/modules/services/networking/unbound.nix +++ b/nixos/modules/services/networking/unbound.nix @@ -115,7 +115,7 @@ in default = true; description = '' Whether unbound should resolve local queries (i.e. add 127.0.0.1 to - /etc/resolv.conf). + /etc/resolv.conf and set name servers to localhost respectively). ''; }; @@ -276,6 +276,7 @@ in resolvconf = { useLocalResolver = mkDefault true; }; + nameservers = lib.mkBefore ([ "127.0.0.1" ] ++ (optional config.networking.enableIPv6 "::1")); }; environment.etc."unbound/unbound.conf".source = confFile; diff --git a/nixos/modules/services/system/userborn.nix b/nixos/modules/services/system/userborn.nix index eeb0f6a40f35..a6042c752c0d 100644 --- a/nixos/modules/services/system/userborn.nix +++ b/nixos/modules/services/system/userborn.nix @@ -36,8 +36,14 @@ let userbornConfigJson = pkgs.writeText "userborn.json" (builtins.toJSON userbornConfig); userbornStaticFiles = - pkgs.runCommand "static-userborn" { } - "mkdir -p $out; ${lib.getExe cfg.package} ${userbornConfigJson} $out"; + pkgs.runCommand "static-userborn" + { + nativeBuildInputs = [ cfg.package ]; + } + '' + mkdir -p $out + userborn ${userbornConfigJson} $out + ''; previousConfigPath = "/var/lib/userborn/previous-userborn.json"; immutableEtc = config.system.etc.overlay.enable && !config.system.etc.overlay.mutable; diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index d0d2d8de4411..c5f881c9eb84 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -458,7 +458,6 @@ in control = "requisite"; modulePath = config.security.pam.pam_unixModulePath; settings.nullok = true; - settings.yescrypt = true; } ]; diff --git a/nixos/modules/services/x11/window-managers/afterstep.nix b/nixos/modules/services/x11/window-managers/afterstep.nix deleted file mode 100644 index d88be7db3757..000000000000 --- a/nixos/modules/services/x11/window-managers/afterstep.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -with lib; - -let - cfg = config.services.xserver.windowManager.afterstep; -in -{ - ###### interface - options = { - services.xserver.windowManager.afterstep.enable = mkEnableOption "afterstep"; - }; - - ###### implementation - config = mkIf cfg.enable { - services.xserver.windowManager.session = singleton { - name = "afterstep"; - start = '' - ${pkgs.afterstep}/bin/afterstep & - waitPID=$! - ''; - }; - environment.systemPackages = [ pkgs.afterstep ]; - }; -} diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index b4565cb17490..388089fcc024 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -8,7 +8,6 @@ in { imports = [ ./2bwm.nix - ./afterstep.nix ./berry.nix ./bspwm.nix ./cwm.nix diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix index 5e4dbe7d97f1..966ddd396e11 100644 --- a/nixos/modules/system/boot/resolved.nix +++ b/nixos/modules/system/boot/resolved.nix @@ -30,8 +30,9 @@ let dnsmasqResolve = config.services.dnsmasq.enable && config.services.dnsmasq.resolveLocalQueries; - transformSettings = settings: { - Resolve = lib.mapAttrs ( + transformSettings = + settings: + lib.mapAttrs ( key: value: # concat lists for options that should result in space-separated values if @@ -45,10 +46,9 @@ let concatStringsSep " " value else value - ) settings.Resolve; - }; + ) settings; - resolvedConf = settingsToSections (transformSettings cfg.settings); + resolvedConf = settingsToSections { Resolve = transformSettings cfg.settings.Resolve; }; in { imports = [ diff --git a/nixos/modules/tasks/filesystems/envfs.nix b/nixos/modules/tasks/filesystems/envfs.nix index 4b1846f5c1a8..6c16008e72c0 100644 --- a/nixos/modules/tasks/filesystems/envfs.nix +++ b/nixos/modules/tasks/filesystems/envfs.nix @@ -69,7 +69,7 @@ in config = lib.mkIf (cfg.enable) { environment.systemPackages = [ cfg.package ]; # we also want these mounts in virtual machines. - fileSystems = if config.virtualisation ? qemu then lib.mkVMOverride mounts else mounts; + fileSystems = if config.virtualisation.qemu ? package then lib.mkVMOverride mounts else mounts; # We no longer need those when using envfs system.activationScripts.usrbinenv = lib.mkForce ""; diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index de2cb3d2afc8..3a24c9272a6b 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -196,7 +196,7 @@ in # that do not specify any nodes, or an empty attr set as nodes) will not # have the QEMU module loaded and thuse these options can't and should not # be set. - virtualisation = lib.optionalAttrs (options ? virtualisation.qemu) { + virtualisation = lib.optionalAttrs (options ? virtualisation.qemu.package) { qemu = { # NOTE: optionalAttrs # test-instrumentation.nix appears to be used without qemu-vm.nix, so diff --git a/nixos/modules/virtualisation/qemu-firmware.nix b/nixos/modules/virtualisation/qemu-firmware.nix new file mode 100644 index 000000000000..9be3708171ac --- /dev/null +++ b/nixos/modules/virtualisation/qemu-firmware.nix @@ -0,0 +1,50 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.virtualisation.qemu.firmware; +in + +{ + options.virtualisation.qemu.firmware = { + enable = lib.mkEnableOption "QEMU firmware descriptors in {file}`/etc/qemu/firmware`"; + + packages = lib.mkOption { + type = lib.types.listOf lib.types.package; + default = [ pkgs.qemu ]; + defaultText = lib.literalExpression "[ pkgs.qemu ]"; + example = lib.literalExpression "[ pkgs.qemu pkgs.OVMF-amdsev.fd ]"; + description = '' + Packages providing QEMU firmware descriptors under + {file}`share/qemu/firmware`, following the QEMU firmware interop + convention (see {file}`docs/interop/firmware.json` in the QEMU + source tree). The descriptors are merged and linked to + {file}`/etc/qemu/firmware`, where tools like + {command}`systemd-vmspawn` discover the firmware available for + running virtual machines. + + The default exposes the descriptors of the firmware images + bundled with QEMU. Note that setting this option replaces the + default, so include `pkgs.qemu` when adding further firmware. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + environment.etc."qemu/firmware".source = + let + merged = pkgs.buildEnv { + name = "qemu-firmware-descriptors"; + paths = cfg.packages; + pathsToLink = [ "/share/qemu/firmware" ]; + }; + in + "${merged}/share/qemu/firmware"; + }; + + meta.maintainers = [ lib.maintainers.katexochen ]; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index f892390cefd5..5d06b7326e94 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -153,6 +153,7 @@ in console-log = runTest ./nixos-test-driver/console-log.nix; containers = runTest ./nixos-test-driver/containers.nix; nspawn-daemon-reexec-dbus = runTest ./nspawn-daemon-reexec-dbus.nix; + multi-arch-test = runTest ./nixos-test-driver/multi-arch-test.nix; skip-typecheck = runTest ./nixos-test-driver/skip-typecheck.nix; console-timeout = runTest ./nixos-test-driver/console-timeout.nix; options-doc-regression = import ./nixos-test-driver/options-doc-regression.nix { inherit pkgs; }; @@ -1302,7 +1303,6 @@ in osrm-backend = runTest ./osrm-backend.nix; outline = runTest ./outline.nix; overlayfs = runTest ./overlayfs.nix; - overseerr = runTest ./overseerr.nix; owi = runTest ./owi.nix; owncast = runTest ./owncast.nix; oxidized = handleTest ./oxidized.nix { }; @@ -1448,6 +1448,7 @@ in pykms = runTest ./pykms.nix; qbittorrent = runTest ./qbittorrent.nix; qboot = runTestOn [ "x86_64-linux" "i686-linux" ] ./qboot.nix; + qemu-firmware = runTestOn [ "x86_64-linux" ] ./qemu-firmware.nix; qemu-vm-external-disk-image = runTest ./qemu-vm-external-disk-image.nix; qemu-vm-restrictnetwork = handleTest ./qemu-vm-restrictnetwork.nix { }; qemu-vm-store = runTest ./qemu-vm-store.nix; diff --git a/nixos/tests/login-nosuid.nix b/nixos/tests/login-nosuid.nix index f5582382891f..bf1299a00654 100644 --- a/nixos/tests/login-nosuid.nix +++ b/nixos/tests/login-nosuid.nix @@ -57,6 +57,7 @@ with subtest("create user"): machine.succeed("useradd -m alice") machine.succeed("(echo foobar; echo foobar) | passwd alice") + machine.succeed("grep -F 'alice:$y$' /etc/shadow") with subtest("Check whether switching VTs works"): machine.fail("pgrep -f 'agetty.*tty2'") diff --git a/nixos/tests/login.nix b/nixos/tests/login.nix index bd0d3b7bc005..0eb0f8bf6ee3 100644 --- a/nixos/tests/login.nix +++ b/nixos/tests/login.nix @@ -28,6 +28,7 @@ with subtest("create user"): machine.succeed("useradd -m alice") machine.succeed("(echo foobar; echo foobar) | passwd alice") + machine.succeed("grep -F 'alice:$y$' /etc/shadow") with subtest("Check whether switching VTs works"): machine.fail("pgrep -f 'agetty.*tty2'") diff --git a/nixos/tests/miriway.nix b/nixos/tests/miriway.nix index bb450bf4ca0a..d5b146ed6dc5 100644 --- a/nixos/tests/miriway.nix +++ b/nixos/tests/miriway.nix @@ -33,13 +33,12 @@ add-wayland-extensions=all enable-x11= - ctrl-alt=t:foot --maximized - ctrl-alt=a:env WINIT_UNIX_BACKEND=x11 WAYLAND_DISPLAY= alacritty --option window.startup_mode=\"maximized\" - - shell-component=dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY - shell-component=foot --maximized ''; + settings = '' + command_ctrl_alt=t:foot --maximized + command_ctrl_alt=a:env WINIT_UNIX_BACKEND=x11 WAYLAND_DISPLAY= alacritty --option window.startup_mode=\"maximized\" + ''; }; environment = { @@ -59,8 +58,9 @@ etc."xdg/foot/foot.ini".source = (pkgs.formats.ini { }).generate "foot.ini" { main = { font = "inconsolata:size=16"; + initial-color-theme = "light"; }; - colors = rec { + colors-light = rec { foreground = "000000"; background = "ffffff"; regular2 = foreground; diff --git a/nixos/tests/nixos-test-driver/multi-arch-test.nix b/nixos/tests/nixos-test-driver/multi-arch-test.nix new file mode 100644 index 000000000000..33b9973c7f89 --- /dev/null +++ b/nixos/tests/nixos-test-driver/multi-arch-test.nix @@ -0,0 +1,55 @@ +{ pkgs, lib, ... }: +{ + name = "multi-arch-test"; + meta.maintainers = with pkgs.lib.maintainers; [ tfc ]; + + node.pkgsReadOnly = false; + + nodes = { + # Setting build = host platform because such standard VM setups + # are well-cached by the multi-arch build infrastructure of the + # project. + vmIntel = { + nixpkgs.buildPlatform = "x86_64-linux"; + nixpkgs.hostPlatform = "x86_64-linux"; + }; + vmArm = { + nixpkgs.buildPlatform = "aarch64-linux"; + nixpkgs.hostPlatform = "aarch64-linux"; + }; + }; + + defaults = { + # not needed for this test and shrinks the closure + # because we dont' need qemu for all architectures + virtualisation.qemu.guestAgent.enable = false; + + # the test is already very slow but we don't need DHCP anyway + networking.dhcpcd.enable = false; + + # fix the network-online target, otherwise it doesn't work + # properly as a synchronization mechanism. + systemd.network.wait-online.enable = true; + systemd.network.wait-online.anyInterface = true; + }; + + # slow due to SW emulation but shouldn't be slower than that + globalTimeout = 5 * 60; + + testScript = { nodes, ... }: /* python */ '' + start_all() + + vmIntel.systemctl("start network-online.target") + vmArm.systemctl("start network-online.target") + vmIntel.wait_for_unit("network-online.target") + vmArm.wait_for_unit("network-online.target") + + vmIntel.succeed("ping -c 1 vmArm") + vmArm.succeed("ping -c 1 vmIntel") + + archIntel = vmIntel.succeed("uname -m") + t.assertIn("${nodes.vmIntel.nixpkgs.hostPlatform.qemuArch}", archIntel, "machine1 is an intel VM") + archArm = vmArm.succeed("uname -m") + t.assertIn("${nodes.vmArm.nixpkgs.hostPlatform.qemuArch}", archArm, "machine1 is an ARM VM") + ''; +} diff --git a/nixos/tests/overseerr.nix b/nixos/tests/overseerr.nix deleted file mode 100644 index f6e38b5d746c..000000000000 --- a/nixos/tests/overseerr.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, pkgs, ... }: -{ - name = "overseerr"; - meta.maintainers = with lib.maintainers; [ jf-uu ]; - - nodes.machine = - { pkgs, ... }: - { - environment.systemPackages = [ pkgs.jq ]; - services.overseerr.enable = true; - }; - - testScript = '' - machine.wait_for_unit("overseerr.service") - machine.wait_for_open_port(5055) - - version = machine.succeed("curl --fail http://localhost:5055/api/v1/status | jq --raw-output .version").rstrip("\n") - assert version == "${pkgs.overseerr.version}", f"expected version to be ${pkgs.overseerr.version}, got {version}" - ''; -} diff --git a/nixos/tests/qemu-firmware.nix b/nixos/tests/qemu-firmware.nix new file mode 100644 index 000000000000..c6ed6b9f0029 --- /dev/null +++ b/nixos/tests/qemu-firmware.nix @@ -0,0 +1,41 @@ +{ lib, ... }: + +{ + name = "qemu-firmware"; + meta.maintainers = [ lib.maintainers.katexochen ]; + + nodes.machine = + { pkgs, ... }: + { + virtualisation.qemu.firmware = { + enable = true; + packages = [ + pkgs.qemu + pkgs.OVMF-amdsev.fd + pkgs.OVMF-inteltdx.fd + ]; + }; + environment.systemPackages = [ pkgs.jq ]; + }; + + testScript = '' + machine.wait_for_unit("multi-user.target") + + with subtest("descriptors are merged into /etc/qemu/firmware"): + machine.succeed("test -e /etc/qemu/firmware/60-edk2-x86_64.json") + machine.succeed("test -e /etc/qemu/firmware/61-edk2-ovmf-x64-amdsev.json") + machine.succeed("test -e /etc/qemu/firmware/61-edk2-ovmf-x64-inteltdx.json") + + with subtest("descriptors reference existing firmware images"): + machine.succeed( + "jq -er '.mapping | .filename // .executable.filename' " + + "/etc/qemu/firmware/*.json | xargs stat --" + ) + + with subtest("systemd-vmspawn discovers the descriptors"): + listed = machine.succeed("systemd-vmspawn --firmware=list") + assert "61-edk2-ovmf-x64-amdsev.json" in listed + assert "61-edk2-ovmf-x64-inteltdx.json" in listed + assert "60-edk2-x86_64.json" in listed + ''; +} diff --git a/nixos/tests/vaultwarden.nix b/nixos/tests/vaultwarden.nix index 66432a7e4e8a..1304f2fa9b78 100644 --- a/nixos/tests/vaultwarden.nix +++ b/nixos/tests/vaultwarden.nix @@ -91,6 +91,9 @@ let click_when_unobstructed((By.XPATH, "//a[contains(., 'Skip to web app')]")) + # Skip the tour on first login + click_when_unobstructed((By.XPATH, "//button[contains(., 'Skip')]")) + click_when_unobstructed((By.XPATH, "//button[contains(., 'New item')]")) driver.find_element(By.XPATH, '//input[@formcontrolname="name"]').send_keys( diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/b4-review-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/b4-review-mode/package.nix new file mode 100644 index 000000000000..ac762925fe75 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/b4-review-mode/package.nix @@ -0,0 +1,19 @@ +{ + lib, + b4, + melpaBuild, +}: +melpaBuild { + pname = "b4-review-mode"; + inherit (b4) version; + + src = b4.src-misc; + sourceRoot = "${b4.src-misc.name}/misc/emacs"; + + meta = { + description = "Emacs major mode with highlighting for the b4 review reply editor"; + homepage = "https://git.kernel.org/pub/scm/utils/b4/b4.git/about"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ fzakaria ]; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/majutsu/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/majutsu/package.nix index 46aa2e404c91..a32bb7980fd5 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/majutsu/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/majutsu/package.nix @@ -6,22 +6,26 @@ magit, transient, with-editor, + consult, + plz, }: melpaBuild { pname = "majutsu"; - version = "0.6.0-unstable-2026-07-09"; + version = "0.6.0-unstable-2026-07-23"; src = fetchFromGitHub { owner = "0WD0"; repo = "majutsu"; - rev = "59aff9b93eac575fbccc1f4ab2d48d048e0ead9b"; - hash = "sha256-GJ62hsHgLEFIY0ghij0VPFt1jMUGRKhI2eCroBjkxtc="; + rev = "8eaf8cb4db2f0737d0a131ef8b61ce6393660369"; + hash = "sha256-QqvzRfqWa4Ql7bpuShqHmXzXJCu1VU8ObnImiK7ZyvE="; }; packageRequires = [ magit transient with-editor + consult + plz ]; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch=main" ]; }; diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index f7cddf1c9cb2..995e28d298e9 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -107,10 +107,10 @@ in { emacs31 = import ./make-emacs.nix (mkArgs { pname = "emacs"; - version = "31.0.90"; + version = "31.0.91"; variant = "mainline"; - rev = "emacs-31.0.90"; - hash = "sha256-Rzlnn+NKQ+jICXLNop27RnVInq79myn4hueJieDO2Ck="; + rev = "emacs-31.0.91"; + hash = "sha256-3nvCiLiEtII1C57CLfDIbVqhiwadYViF9Nv32yDtLIQ="; }); emacs30 = import ./make-emacs.nix (mkArgs { diff --git a/pkgs/applications/editors/vim/plugins/non-generated/b4-review-vim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/b4-review-vim/default.nix new file mode 100644 index 000000000000..f9de458f3f9b --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/non-generated/b4-review-vim/default.nix @@ -0,0 +1,19 @@ +{ + lib, + vimUtils, + b4, +}: +vimUtils.buildVimPlugin { + pname = "b4-review-vim"; + inherit (b4) version; + + src = b4.src-misc; + sourceRoot = "${b4.src-misc.name}/misc/vim"; + + meta = { + description = "Vim syntax highlighting for the b4 review reply editor"; + homepage = "https://git.kernel.org/pub/scm/utils/b4/b4.git/about"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ fzakaria ]; + }; +} diff --git a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix index d6bbea45d0fd..a855d947d3a4 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix @@ -74,6 +74,9 @@ let ]; env = { + # Build zlob for a portable CPU baseline (https://github.com/dmtrKovalenko/fff/issues/705) + CI = "1"; + OPENSSL_NO_VENDOR = true; # Allow undefined symbols on Darwin - they will be provided by Neovim's LuaJIT runtime 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 7d9174b46e19..d0c613da8788 100644 --- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix +++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix @@ -21,22 +21,22 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-Y6MXjJBmhMzuQMwhkPLHK/vtciTdjsGvkEblH3ofju0="; + hash = "sha256-Z/tQ+KV+3MdbknA/1kmiIpVfOsUM8NUu+0iHlPVbYV0="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-8VvDtb+8SoLTRC7pXwH40amRurxTQgCmhdi0u7e5AfU="; + hash = "sha256-d2GjWr0FHOoORI5KRdwUQvcFfBB8xV6j9wj5OS9VL9o="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-bqjEgsjY+zyG1g/KtkRNxAlazIpc+HwGWvsMQNnPI2M="; + hash = "sha256-dlfGTxf2EoiNb0g9uqwjTNW8fi2d1tzubGdIDyp4xTw="; }; }; in { name = "claude-code"; publisher = "anthropic"; - version = "2.1.218"; + version = "2.1.219"; } // sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); diff --git a/pkgs/applications/editors/vscode/extensions/dbaeumer.vscode-eslint/default.nix b/pkgs/applications/editors/vscode/extensions/dbaeumer.vscode-eslint/default.nix index fb92fbcdbb38..809fa8c22bb2 100644 --- a/pkgs/applications/editors/vscode/extensions/dbaeumer.vscode-eslint/default.nix +++ b/pkgs/applications/editors/vscode/extensions/dbaeumer.vscode-eslint/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-eslint"; publisher = "dbaeumer"; - version = "3.0.24"; - hash = "sha256-ZQVzpSSLf3tpO4QtLjbCOje3L5/EqzT9A9IOssl6e54="; + version = "3.0.34"; + hash = "sha256-ynCPFzne4YS4WNjQSmGky+e2IaE3SLxj6FkjKyLPcAs="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/oxc.oxc-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/oxc.oxc-vscode/default.nix index 9b60246c80f4..4e7fab49ea87 100644 --- a/pkgs/applications/editors/vscode/extensions/oxc.oxc-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/oxc.oxc-vscode/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "oxc"; name = "oxc-vscode"; - version = "1.58.0"; - hash = "sha256-30dFeguNbY8WM3fLym6aUMkHYH5wA5scSNn04Ukbj9U="; + version = "1.59.0"; + hash = "sha256-avfW91oF8PGCoDYocC744wpQ3zE8fv5582n55Ugb8k8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/emulators/libretro/cores/beetle-vb.nix b/pkgs/applications/emulators/libretro/cores/beetle-vb.nix index 2368ed316d72..89f3cd32c600 100644 --- a/pkgs/applications/emulators/libretro/cores/beetle-vb.nix +++ b/pkgs/applications/emulators/libretro/cores/beetle-vb.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mednafen-vb"; - version = "0-unstable-2026-06-14"; + version = "0-unstable-2026-07-22"; src = fetchFromGitHub { owner = "libretro"; repo = "beetle-vb-libretro"; - rev = "38e7a0ec9ac7079ca1c1e3dd9aaf5b56f527efca"; - hash = "sha256-+57qsfH2wygKdD66yauzKD9XDf01q4LeiWdIeYbVUmc="; + rev = "7cc663e9044459b3dab1790bdce8f48dc7358ed6"; + hash = "sha256-ntw8SXzyu0PTDQgaLmT5Wy172A8TI3JLN6A5WQ2T/OI="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/melonds.nix b/pkgs/applications/emulators/libretro/cores/melonds.nix index 099248a22c0d..b4e425270b5a 100644 --- a/pkgs/applications/emulators/libretro/cores/melonds.nix +++ b/pkgs/applications/emulators/libretro/cores/melonds.nix @@ -7,13 +7,13 @@ }: mkLibretroCore { core = "melonds"; - version = "0-unstable-2026-06-25"; + version = "0-unstable-2026-07-19"; src = fetchFromGitHub { owner = "libretro"; repo = "melonds"; - rev = "c9550d18923fe86a5ad9faa159399b55c12b47f1"; - hash = "sha256-xvBdt/TMxZOrC//DLHRWRMqIibt7dNsfLM/FeMTRA60="; + rev = "66b5d2634cd0a79030562811e6e05f5532f800ba"; + hash = "sha256-nQvnXoB8UeaSr6QfYwn18Y18KyLyWvcv/Q3L3SHvaNU="; }; extraBuildInputs = [ diff --git a/pkgs/applications/emulators/libretro/cores/picodrive.nix b/pkgs/applications/emulators/libretro/cores/picodrive.nix index b962c61e834d..3fd2ac7014a3 100644 --- a/pkgs/applications/emulators/libretro/cores/picodrive.nix +++ b/pkgs/applications/emulators/libretro/cores/picodrive.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "picodrive"; - version = "0-unstable-2026-04-02"; + version = "0-unstable-2026-07-23"; src = fetchFromGitHub { owner = "libretro"; repo = "picodrive"; - rev = "f0d4a0118a9733a1f10bce5a4ac772c474f9300d"; - hash = "sha256-q584bnqIbKoXSCRHUAcqSJAIhholnXfbphvLVcbm57o="; + rev = "78a662e3135871a6c657d5e61900f6704152e594"; + hash = "sha256-3+x1ILIUq+/nwfUGXweNIq3PFTAaP56/6G+dX4dEZ/Y="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix new file mode 100644 index 000000000000..88b7f01cdbad --- /dev/null +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -0,0 +1,37 @@ +{ callPackage }: + +let + flavorData = { + browser = { + optStem = "brave"; + fileStem = "brave-browser"; + appIdStem = "com.brave.Browser"; + darwinStem = "Brave Browser"; + changelogFile = "CHANGELOG_DESKTOP.md"; + homepage = "https://brave.com/"; + innerBinary = "brave"; + }; + origin = { + optStem = "brave-origin"; + fileStem = "brave-origin"; + appIdStem = "com.brave.Origin"; + darwinStem = "Brave Origin"; + changelogFile = "CHANGELOG_DESKTOP_ORIGIN.md"; + homepage = "https://brave.com/origin/"; + innerBinary = "brave"; + }; + }; + + mkBrave = + release: + let + pkg = import release; + fd = flavorData.${pkg.flavor or "browser"}; + in + callPackage ./make-brave.nix { } (pkg // fd); + +in +{ + brave = mkBrave ./packages/brave.nix; + brave-origin = mkBrave ./packages/brave-origin.nix; +} diff --git a/pkgs/by-name/br/brave/make-brave.nix b/pkgs/applications/networking/browsers/brave/make-brave.nix similarity index 64% rename from pkgs/by-name/br/brave/make-brave.nix rename to pkgs/applications/networking/browsers/brave/make-brave.nix index fd018d50a3d5..f9e452195066 100644 --- a/pkgs/by-name/br/brave/make-brave.nix +++ b/pkgs/applications/networking/browsers/brave/make-brave.nix @@ -49,26 +49,20 @@ coreutils, libxcb, zlib, - # Darwin dependencies unzip, makeWrapper, - # command line arguments which are always set e.g "--disable-gpu" commandLineArgs ? "", - # Necessary for USB audio devices. pulseSupport ? stdenv.hostPlatform.isLinux, libpulseaudio, - # For GPU acceleration support on Wayland (without the lib it doesn't seem to work) libGL, - # For video acceleration via VA-API (--enable-features=AcceleratedVideoDecodeLinuxGL,AcceleratedVideoEncoder) libvaSupport ? stdenv.hostPlatform.isLinux, libva, enableVideoAcceleration ? libvaSupport, - # For Vulkan support (--enable-features=Vulkan); disabled by default as it seems to break VA-API vulkanSupport ? false, addDriverRunpath, @@ -78,8 +72,22 @@ { pname, version, - hash, - url, + # Map from Nix system strings ("x86_64-linux", "aarch64-darwin", ...) to + # the corresponding upstream `{ url, hash }` record. Encoding the per-system + # sources as data rather than positional arguments lets channel-specific + # package.nix files drop platforms that upstream hasn't published yet. + archives, + # Upstream product flavor: "browser" (the regular Brave) or "origin" (the + # stripped-down Brave Origin). + flavor ? "browser", + # Flavor-specific paths supplied by the caller (default.nix). + optStem, + fileStem, + appIdStem, + darwinStem, + changelogFile, + homepage, + innerBinary, }: let @@ -94,6 +102,19 @@ let escapeShellArg ; + # /opt/brave.com// + optName = optStem; + # Basename used for .desktop, gnome-control-center xml and icon files. + fileBase = fileStem; + # Secondary .desktop app-id. + appId = appIdStem; + # Upstream shell wrapper inside /opt. + innerWrapper = fileStem; + # macOS .app bundle name (inside the zip). + darwinApp = darwinStem; + # Upstream Exec= target in .desktop files (replaced with our wrapper). + upstreamBin = "brave-${flavor}-stable"; + deps = [ alsa-lib at-spi2-atk @@ -156,13 +177,19 @@ let ] # disable automatic updates # The feature disable is needed for VAAPI to work correctly: https://github.com/brave/brave-browser/issues/20935 ++ optionals enableVideoAcceleration [ "UseChromeOSDirectVideoDecoder" ]; + + archive = + assert lib.assertMsg (builtins.hasAttr stdenv.hostPlatform.system archives) + "${pname} is not available for ${stdenv.hostPlatform.system}"; + archives.${stdenv.hostPlatform.system}; in stdenv.mkDerivation { inherit pname version; - src = fetchurl { - inherit url hash; - }; + __structuredAttrs = true; + strictDeps = true; + + src = fetchurl { inherit (archive) url hash; }; dontConfigure = true; dontBuild = true; @@ -201,27 +228,27 @@ stdenv.mkDerivation { cp -R usr/share $out cp -R opt/ $out/opt - export BINARYWRAPPER=$out/opt/brave.com/brave/brave-browser + export BINARYWRAPPER=$out/opt/brave.com/${optName}/${innerWrapper} # Fix path to bash in $BINARYWRAPPER substituteInPlace $BINARYWRAPPER \ --replace-fail /bin/bash ${stdenv.shell} \ --replace-fail 'CHROME_WRAPPER' 'WRAPPER' - ln -sf $BINARYWRAPPER $out/bin/brave + ln -sf $BINARYWRAPPER $out/bin/${pname} - for exe in $out/opt/brave.com/brave/{brave,chrome_crashpad_handler}; do + for exe in $out/opt/brave.com/${optName}/{${innerBinary},chrome_crashpad_handler}; do patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${rpath}" $exe done # Fix paths - substituteInPlace $out/share/applications/{brave-browser,com.brave.Browser}.desktop \ - --replace-fail /usr/bin/brave-browser-stable $out/bin/brave - substituteInPlace $out/share/gnome-control-center/default-apps/brave-browser.xml \ + substituteInPlace $out/share/applications/{${fileBase},${appId}}.desktop \ + --replace-fail /usr/bin/${upstreamBin} $out/bin/${pname} + substituteInPlace $out/share/gnome-control-center/default-apps/${fileBase}.xml \ --replace-fail /opt/brave.com $out/opt/brave.com - substituteInPlace $out/opt/brave.com/brave/default-app-block \ + substituteInPlace $out/opt/brave.com/${optName}/default-app-block \ --replace-fail /opt/brave.com $out/opt/brave.com # Correct icons location @@ -229,13 +256,13 @@ stdenv.mkDerivation { for icon in ''${icon_sizes[*]} do - mkdir -p $out/share/icons/hicolor/$icon\x$icon/apps - ln -s $out/opt/brave.com/brave/product_logo_$icon.png $out/share/icons/hicolor/$icon\x$icon/apps/brave-browser.png + mkdir -p $out/share/icons/hicolor/''${icon}x''${icon}/apps + ln -s $out/opt/brave.com/${optName}/product_logo_''${icon}.png $out/share/icons/hicolor/''${icon}x''${icon}/apps/${fileBase}.png done # Replace xdg-settings and xdg-mime - ln -sf ${xdg-utils}/bin/xdg-settings $out/opt/brave.com/brave/xdg-settings - ln -sf ${xdg-utils}/bin/xdg-mime $out/opt/brave.com/brave/xdg-mime + ln -sf ${xdg-utils}/bin/xdg-settings $out/opt/brave.com/${optName}/xdg-settings + ln -sf ${xdg-utils}/bin/xdg-mime $out/opt/brave.com/${optName}/xdg-mime runHook postInstall '' @@ -244,9 +271,9 @@ stdenv.mkDerivation { mkdir -p $out/{Applications,bin} - cp -r . "$out/Applications/Brave Browser.app" + cp -r . "$out/Applications/${darwinApp}.app" - makeWrapper "$out/Applications/Brave Browser.app/Contents/MacOS/Brave Browser" $out/bin/brave + makeWrapper "$out/Applications/${darwinApp}.app/Contents/MacOS/${darwinApp}" $out/bin/${pname} runHook postInstall ''; @@ -279,22 +306,33 @@ stdenv.mkDerivation { installCheckPhase = '' # Bypass upstream wrapper which suppresses errors - $out/opt/brave.com/brave/brave --version + $out/opt/brave.com/${optName}/brave --version ''; passthru.updateScript = ./update.sh; meta = { - homepage = "https://brave.com/"; - description = "Privacy-oriented browser for Desktop and Laptop computers"; + homepage = homepage; + description = + "Privacy-oriented browser for Desktop and Laptop computers" + + lib.optionalString (flavor == "origin") " (Origin variant)"; changelog = - "https://github.com/brave/brave-browser/blob/master/CHANGELOG_DESKTOP.md#" + "https://github.com/brave/brave-browser/blob/master/${changelogFile}#" + lib.replaceStrings [ "." ] [ "" ] version; - longDescription = '' - Brave browser blocks the ads and trackers that slow you down, - chew up your bandwidth, and invade your privacy. Brave lets you - contribute to your favorite creators automatically. - ''; + longDescription = + if flavor == "origin" then + '' + Brave Origin is a stripped-down variant of the Brave browser that + removes most non-privacy features (rewards, wallet, AI, etc.) while + keeping the core privacy, adblock and Chromium-based browsing + experience. + '' + else + '' + Brave browser blocks the ads and trackers that slow you down, + chew up your bandwidth, and invade your privacy. Brave lets you + contribute to your favorite creators automatically. + ''; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ @@ -302,12 +340,9 @@ stdenv.mkDerivation { jefflabonte nasirhm buckley310 + rachalaraj ]; - platforms = [ - "aarch64-linux" - "x86_64-linux" - "aarch64-darwin" - ]; - mainProgram = "brave"; + platforms = builtins.attrNames archives; + mainProgram = if flavor == "origin" then "brave-origin" else "brave"; }; } diff --git a/pkgs/applications/networking/browsers/brave/packages/brave-origin.nix b/pkgs/applications/networking/browsers/brave/packages/brave-origin.nix new file mode 100644 index 000000000000..8af08a9f7eeb --- /dev/null +++ b/pkgs/applications/networking/browsers/brave/packages/brave-origin.nix @@ -0,0 +1,21 @@ +# Expression generated by update.sh; do not edit it by hand! +rec { + pname = "brave-origin"; + version = "1.92.144"; + flavor = "origin"; + + archives = { + aarch64-linux = { + url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-origin_${version}_arm64.deb"; + hash = "sha256-zqjpiBMogYhtuEhIlPlK8J2j9hzfd1M8RYlT/c74Na8="; + }; + x86_64-linux = { + url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-origin_${version}_amd64.deb"; + hash = "sha256-KF5WXF7GJPLCcEQyASEVfNrYyFJRXBSyWVPPAZPCa/E="; + }; + aarch64-darwin = { + url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-origin-v${version}-darwin-arm64.zip"; + hash = "sha256-kkP8cBRnC34+SjC9EvkpKcDYP3cxW7sdJgni0+zXwbk="; + }; + }; +} diff --git a/pkgs/applications/networking/browsers/brave/packages/brave.nix b/pkgs/applications/networking/browsers/brave/packages/brave.nix new file mode 100644 index 000000000000..c50a2fc89fcc --- /dev/null +++ b/pkgs/applications/networking/browsers/brave/packages/brave.nix @@ -0,0 +1,20 @@ +# Expression generated by update.sh; do not edit it by hand! +rec { + pname = "brave"; + version = "1.92.144"; + + archives = { + aarch64-linux = { + url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; + hash = "sha256-Z9uUJRaMx+P35oXtvAnjHyOQOXt8mW5oyyEtnD754x8="; + }; + x86_64-linux = { + url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; + hash = "sha256-no/KD+3EB6CqvVWEmDB/8k2rv1wau469FBXMNWN7z6k="; + }; + aarch64-darwin = { + url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip"; + hash = "sha256-YidWCVGP36wn1goAulSbVrKFoHI1NA/pLtfPjIXBO48="; + }; + }; +} diff --git a/pkgs/applications/networking/browsers/brave/update.sh b/pkgs/applications/networking/browsers/brave/update.sh new file mode 100755 index 000000000000..dabc718a7429 --- /dev/null +++ b/pkgs/applications/networking/browsers/brave/update.sh @@ -0,0 +1,100 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl nix jq +set -euo pipefail + +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)" +VERSIONS_URL="https://versions.brave.com/latest/brave-versions.json" + +sri_hash() { + nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "$1")" +} + +find_release_with_asset() { + local versionsJson="$1" channel="$2" template="$3" + local match + match="$( + jq -c --arg channel "$channel" --arg tmpl "$template" ' + [.[] + | select(.channel == $channel) + | . as $r + | select( + $r.github.assets + | map(.name) + | any(. == ($tmpl | gsub("\\$\\{version\\}"; $r.name))) + ) + ] + | sort_by(.published) + | last + ' <<<"$versionsJson" + )" + if [[ "$match" != "null" ]]; then + printf '%s' "$match" + return 0 + fi + echo "update.sh: no ${channel} release with asset matching '${template}' found" >&2 + return 1 +} + +emit_archive_entry() { + local releaseJson="$1" version="$2" template="$3" platform="$4" + local name="${template//\$\{version\}/$version}" + local url + url="$( + jq -r --arg n "$name" ' + .github.assets[] + | select(.name == $n) + | .download_url + ' <<<"$releaseJson" + )" + if [[ -z "$url" ]]; then + return 0 + fi + local hash + hash="$(sri_hash "$url")" + local nixUrl="${url//${version}/\$\{version\}}" + cat < ${pname}: ${version}" >&2 + local flavorLine="" + if [[ "$pname" == brave-origin || "$pname" == brave-origin-* ]]; then + flavorLine=' flavor = "origin";' + fi + local outFile="${SCRIPT_DIR}/packages/${pname}.nix" + { + echo '# Expression generated by update.sh; do not edit it by hand!' + echo 'rec {' + echo " pname = \"${pname}\";" + echo " version = \"${version}\";" + [[ -n "$flavorLine" ]] && echo "$flavorLine" + echo '' + echo ' archives = {' + emit_archive_entry "$releaseJson" "$version" "${debStem}_\${version}_arm64.deb" "aarch64-linux" + emit_archive_entry "$releaseJson" "$version" "${debStem}_\${version}_amd64.deb" "x86_64-linux" + emit_archive_entry "$releaseJson" "$version" "${darwinStem}-v\${version}-darwin-arm64.zip" "aarch64-darwin" + echo ' };' + echo '}' + } > "$outFile" +} + +versionsJson="$(curl --fail -s "$VERSIONS_URL")" + +entries=( + "brave brave-browser brave" + "brave-origin brave-origin brave-origin" +) + +for entry in "${entries[@]}"; do + read -r pname debStem darwinStem <<<"$entry" + releaseJson="$(find_release_with_asset "$versionsJson" "release" "${debStem}_\${version}_amd64.deb")" + write_package_nix "$pname" "$releaseJson" "$debStem" "$darwinStem" +done diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index 8953f8ecea4b..8acde91d96de 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -837,7 +837,7 @@ } }, "ungoogled-chromium": { - "version": "150.0.7871.181", + "version": "150.0.7871.186", "deps": { "depot_tools": { "rev": "f4fadaf6a5ba1bced9d3d9021060667b563bf583", @@ -849,16 +849,16 @@ "hash": "sha256-/1A+DkzAQj2zGPe/A/G0Z3VrYJXUxq4Hd/+d/o5p3G8=" }, "ungoogled-patches": { - "rev": "150.0.7871.181-1", - "hash": "sha256-ifqEnOcvi49cFOYan8ShiwteXYnFrLPclrIBZiE1rGY=" + "rev": "150.0.7871.186-1", + "hash": "sha256-kL9xE/w0W4Wf+z9qX5EFLGMYWQ3Hvyzhy7PtF59a/Sk=" }, "npmHash": "sha256-pF0JtwFpPC4/fodbhSJnQKkczA9WlDg4VqEAy9aDVLg=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "24b04c927b23c39cf9c5227cc8dc6f64a744c8e9", - "hash": "sha256-F52wmxyNPEV26v8YgAz+MRhyEGyV7YUX+/wj95H4Lf0=", + "rev": "0fcdce5f4fdec8d442d7df760cb541f1ca6e446d", + "hash": "sha256-6coAYewN8RC5kx0PmmiV6mXQhLqWF3BZP320PmOcPvw=", "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 fbf9abf0d639..2d08ae61490c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -45,11 +45,11 @@ "vendorHash": "sha256-031RZo1EqWrt79NvdrrZ9FW/E+mfwkGmr7wyMYX4SHg=" }, "aliyun_alicloud": { - "hash": "sha256-G52l+5WlcxSNflx0ioD0jEKI1GBWe5D4qW8VH8k6uTA=", + "hash": "sha256-es2ti8tSgShwUWYtZ7OEff88LLiAnK4B/Hq9PaNEEOc=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.285.0", + "rev": "v1.286.0", "spdx": "MPL-2.0", "vendorHash": "sha256-sZeXHTrMUUPllPzvpbFjwA5FjFJXnO1k5h9B5i8U+vs=" }, @@ -445,13 +445,13 @@ "vendorHash": "sha256-FcxAh8EOvnT8r1GHu0Oj2C5Jgbr2WPwD7/vY4/qIvTA=" }, "gitlabhq_gitlab": { - "hash": "sha256-BMOFi/g0W6xo/Kfqw8oqsMeeU3aXyWAKSgF9lIS4AbA=", + "hash": "sha256-eTtmEW3sdCkpojxshhdQq+8qNTYjzin5TmCGil/3F5E=", "homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab", "owner": "gitlabhq", "repo": "terraform-provider-gitlab", - "rev": "v19.1.0", + "rev": "v19.2.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-9aoJGVTC9t76auYy8K3QSWGzSAq9aTxemKNc3aCLjRY=" + "vendorHash": "sha256-uEXZEYlQZ24h4IffJQEmqqrmHbiRSKVGJ1OCv4k1zVQ=" }, "go-gandi_gandi": { "hash": "sha256-fsCtmwyxkXfOtiZG27VEb010jglK35yr4EynnUWlFog=", @@ -905,13 +905,13 @@ "vendorHash": "sha256-t4dbDJNjEQ6/u+/6zqk2Sdd3LVn/L2BCJujpiLdGc58=" }, "metio_migadu": { - "hash": "sha256-Aef1H/L2EFeU9mhecOnlPAbJbt3XfBL0Wz67IqxCI10=", + "hash": "sha256-qeN2Zlx4qSrjb7qxjDf4v3uG1GR/faTiCNKD/HZkoyw=", "homepage": "https://registry.terraform.io/providers/metio/migadu", "owner": "metio", "repo": "terraform-provider-migadu", - "rev": "2026.7.2", + "rev": "2026.7.23", "spdx": "0BSD", - "vendorHash": "sha256-wUX2smEhKUftBCRi7ANq8NpHXpB+EmlVshrhI2ltY2I=" + "vendorHash": "sha256-rwIHdtVVWygfxadoJigGBIUV0xoQ6vqDsHJgjYQ2RBM=" }, "mongey_kafka": { "hash": "sha256-rTa6c7jAMH027V7h/yUGVGz6TS0PDdObilxU0Vpr6FI=", diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index b30c26877e9e..491df0426dc4 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -13,7 +13,6 @@ gst_all_1, gtk2, gtk2-x11, - gtkspell2, intltool, lib, libice, @@ -94,7 +93,6 @@ let ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk2 - gtkspell2 farstream ] ++ lib.optional stdenv.hostPlatform.isDarwin gtk2-x11; @@ -126,16 +124,14 @@ let "--disable-nm" "--disable-tcl" "--disable-gevolution" + "--disable-gtkspell" ] ++ lib.optionals withCyrus_sasl [ "--enable-cyrus-sasl=yes" ] ++ lib.optionals withGnutls [ "--enable-gnutls=yes" "--enable-nss=no" ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - "--disable-gtkspell" - "--disable-vv" - ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-vv" ] ++ lib.optionals stdenv.cc.isClang [ "CFLAGS=-Wno-error=int-conversion" ]; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index f8fadc9d1dca..3ca7e10fca69 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -78,8 +78,8 @@ rec { thunderbird = thunderbird-latest; thunderbird-latest = common { - version = "152.0.1"; - sha512 = "f66c87de4dd73c3c45e420a55d76c3cb6ac091a61794ccf58ba59d1a40cf8001dee19a6a7f4c6bef7d36ea94ed4e4f677449d3006b2004abbd3fab42ad1c9228"; + version = "153.0"; + sha512 = "f77bde3dd0933dd35870a889386c41d55ff0cbe276ec3373b27e9885f7db7e35529e7ecc2fc149ae4f8c5ae53eddb3ad444e7499a850a59a82b8940c7a4c7747"; updateScript = callPackage ./update.nix { attrPath = "thunderbirdPackages.thunderbird-latest"; @@ -89,6 +89,19 @@ rec { # Eventually, switch to an updateScript without versionPrefix hardcoded... thunderbird-esr = thunderbird-140; + thunderbird-153 = common { + applicationName = "Thunderbird ESR"; + + version = "153.0.1esr"; + sha512 = "3773b49b69341aea108a627faa0dd5b7cfb52cdb4c37e625fbb8cbaef7f9166f925ecbc199173302d5bef7994e6bff3b56cd56a3a4c38a9d702cc3e5aeafcf7c"; + + updateScript = callPackage ./update.nix { + attrPath = "thunderbirdPackages.thunderbird-153"; + versionPrefix = "153"; + versionSuffix = "esr"; + }; + }; + thunderbird-140 = common { applicationName = "Thunderbird ESR"; diff --git a/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix b/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix index 0f5090b0bed9..e444787f857c 100644 --- a/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix @@ -12,13 +12,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "droidcam-obs"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "dev47apps"; repo = "droidcam-obs-plugin"; tag = finalAttrs.version; - hash = "sha256-JPAQoGZFzTIdBQ7GpCPaYUVPkkcBdCRFkVPU+nyRa7Q="; + hash = "sha256-T7CQrjQK5OV1bgqa2il9snsK7nScuVhV06NuX2SoIeI="; }; preBuild = '' diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index 42c78bea88a2..a34d78bdcfbd 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -97,6 +97,82 @@ let buildPrefix = "Build/*/*"; + isQemuPlatform = builtins.elem projectDscPath [ + "OvmfPkg/OvmfPkgX64.dsc" + "ArmVirtPkg/ArmVirtQemu.dsc" + "OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc" + "OvmfPkg/LoongArchVirt/LoongArchVirtQemu.dsc" + ]; + + # QEMU firmware interop descriptors to install, keyed by file name. + # Add an attribute to ship an additional descriptor. + qemuDescriptors = + let + description = "${fwPrefix} UEFI firmware for ${cpuName}${lib.optionalString secureBoot " with Secure Boot"}"; + + flashMapping = varsFile: { + device = "flash"; + mode = "split"; + executable = { + filename = "${placeholder "fd"}/FV/${fwPrefix}_CODE.fd"; + format = "raw"; + }; + nvram-template = { + filename = "${placeholder "fd"}/FV/${varsFile}"; + format = "raw"; + }; + }; + + common = { + interface-types = [ "uefi" ]; + targets = [ + { + architecture = cpuName; + machines = + { + x86_64 = + if systemManagementModeRequired then + [ "pc-q35-*" ] + else + [ + "pc-i440fx-*" + "pc-q35-*" + ]; + aarch64 = [ "virt-*" ]; + riscv64 = [ "virt*" ]; + loongarch64 = [ "virt*" ]; + } + .${cpuName} or [ ]; + } + ]; + features = + lib.optionals stdenv.hostPlatform.isx86 [ + "acpi-s3" + "amd-sev" + ] + ++ lib.optionals (stdenv.hostPlatform.isx86 && !systemManagementModeRequired) [ "amd-sev-es" ] + ++ lib.optionals secureBoot [ "secure-boot" ] + ++ lib.optionals systemManagementModeRequired [ "requires-smm" ] + ++ lib.optionals (stdenv.hostPlatform.isx86 && !debug) [ "verbose-dynamic" ]; + tags = [ ]; + }; + in + lib.optionalAttrs isQemuPlatform ( + { + "50-edk2-${cpuName}${lib.optionalString secureBoot "-sb"}.json" = common // { + inherit description; + mapping = flashMapping "${fwPrefix}_VARS.fd"; + }; + } + // lib.optionalAttrs msVarsTemplate { + "40-edk2-${cpuName}${lib.optionalString secureBoot "-sb"}-enrolled.json" = common // { + description = "${description}, Microsoft keys enrolled"; + mapping = flashMapping "${fwPrefix}_VARS.ms.fd"; + features = common.features ++ [ "enrolled-keys" ]; + }; + } + ); + in assert msVarsTemplate -> fdSize4MB; @@ -242,7 +318,17 @@ edk2.mkDerivation projectDscPath (finalAttrs: { mkdir -vp $fd/AAVMF ln -s $fd/FV/AAVMF_CODE.fd $fd/AAVMF/QEMU_EFI-pflash.raw ln -s $fd/FV/AAVMF_VARS.fd $fd/AAVMF/vars-template-pflash.raw - ''; + '' + + lib.optionalString (qemuDescriptors != { }) '' + mkdir -vp $fd/share/qemu/firmware + '' + + lib.concatStrings ( + lib.mapAttrsToList (name: descriptor: '' + python3 -m json.tool > $fd/share/qemu/firmware/${name} <<'EOF' + ${builtins.toJSON descriptor} + EOF + '') qemuDescriptors + ); dontPatchELF = true; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 91be307654fe..7da9fdfbf704 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -143,6 +143,27 @@ let hash = mobyHash; }; + extraMobyPath = lib.optionals stdenv.hostPlatform.isLinux ( + lib.makeBinPath [ + iproute2 + iptables + e2fsprogs + xz + xfsprogs + procps + util-linuxMinimal + gitMinimal + ] + ); + + extraMobyUserPath = lib.optionals (stdenv.hostPlatform.isLinux && !clientOnly) ( + lib.makeBinPath [ + rootlesskit + slirp4netns + fuse-overlayfs + ] + ); + moby = buildGoModule ( lib.optionalAttrs stdenv.hostPlatform.isLinux { pname = "moby"; @@ -170,27 +191,6 @@ let ++ lib.optionals withSystemd [ systemd ] ++ lib.optionals withSeccomp [ libseccomp ]; - extraPath = lib.optionals stdenv.hostPlatform.isLinux ( - lib.makeBinPath [ - iproute2 - iptables - e2fsprogs - xz - xfsprogs - procps - util-linuxMinimal - gitMinimal - ] - ); - - extraUserPath = lib.optionals (stdenv.hostPlatform.isLinux && !clientOnly) ( - lib.makeBinPath [ - rootlesskit - slirp4netns - fuse-overlayfs - ] - ); - postPatch = '' patchShebangs hack/make.sh hack/make/ '' @@ -218,7 +218,9 @@ let install -Dm755 ./bundles/dynbinary-daemon/docker-proxy $out/libexec/docker/docker-proxy makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \ - --prefix PATH : "$out/libexec/docker:$extraPath" + --prefix PATH : "$out/libexec/docker${ + lib.optionalString (extraMobyPath != "") ":${extraMobyPath}" + }" ln -s ${docker-containerd}/bin/containerd $out/libexec/docker/containerd ln -s ${docker-containerd}/bin/containerd-shim${lib.optionalString (lib.versionAtLeast version "29.0.0") "-runc-v2"} $out/libexec/docker/containerd-shim${lib.optionalString (lib.versionAtLeast version "29.0.0") "-runc-v2"} @@ -233,7 +235,9 @@ let # rootless Docker install -Dm755 ./contrib/dockerd-rootless.sh $out/libexec/docker/dockerd-rootless.sh makeWrapper $out/libexec/docker/dockerd-rootless.sh $out/bin/dockerd-rootless \ - --prefix PATH : "$out/libexec/docker:$extraPath:$extraUserPath" + --prefix PATH : "$out/libexec/docker${ + lib.optionalString (extraMobyPath != "") ":${extraMobyPath}" + }${lib.optionalString (extraMobyUserPath != "") ":${extraMobyUserPath}"}" runHook postInstall ''; @@ -335,7 +339,7 @@ let install -Dm755 ./build/docker $out/libexec/docker/docker makeWrapper $out/libexec/docker/docker $out/bin/docker \ - --prefix PATH : "$out/libexec/docker:$extraPath" \ + --prefix PATH : "$out/libexec/docker" \ --prefix DOCKER_CLI_PLUGIN_DIRS : "${dockerCliPluginsDirs}" '' + lib.optionalString (!clientOnly) '' diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-darkwindow.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-darkwindow.nix index 9a1f00e07b0d..74b57dd395e6 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-darkwindow.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-darkwindow.nix @@ -7,13 +7,13 @@ mkHyprlandPlugin (finalAttrs: { pluginName = "hypr-darkwindow"; - version = "0.55.4"; + version = "0.56.0"; src = fetchFromGitHub { owner = "micha4w"; repo = "Hypr-DarkWindow"; tag = "v${finalAttrs.version}"; - hash = "sha256-91l5TD46OMfvmhd1WqWxm42cEnjR1yAj2Qk/73mr3ks="; + hash = "sha256-2upGTy7IRhrhxf+5VPjzrua8ebOtED6i8kSN8ka+ffg="; }; installPhase = '' diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix index b3406d062449..d1151b2befa2 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix @@ -349,6 +349,7 @@ runCommandLocal name inherit nativeBuildInputs; __structuredAttrs = true; + strictDeps = true; passthru = passthru // { env = diff --git a/pkgs/build-support/replace-vars/replace-vars-with.nix b/pkgs/build-support/replace-vars/replace-vars-with.nix index abbb9a1cc1a0..d4e126157c7f 100644 --- a/pkgs/build-support/replace-vars/replace-vars-with.nix +++ b/pkgs/build-support/replace-vars/replace-vars-with.nix @@ -122,7 +122,8 @@ in stdenvNoCC.mkDerivation ( { - name = baseNameOf src; + name = + if (attrs ? pname && attrs ? version) then "${attrs.pname}-${attrs.version}" else baseNameOf src; } // optionalAttrs // forcedAttrs diff --git a/pkgs/by-name/af/afterstep/fix-build-with-c23.patch b/pkgs/by-name/af/afterstep/fix-build-with-c23.patch deleted file mode 100644 index f68a636af50c..000000000000 --- a/pkgs/by-name/af/afterstep/fix-build-with-c23.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 081d9c3284075c65b70837079bd67621c3b64da7 Mon Sep 17 00:00:00 2001 -From: Moraxyc -Date: Sun, 28 Dec 2025 00:39:49 +0800 -Subject: [PATCH] fix build with c23 - ---- - libAfterBase/fs.c | 2 +- - src/ASDocGen/ASDocGen.c | 2 +- - src/Ident/Ident.c | 2 +- - src/afterstep/dirtree.c | 2 +- - src/afterstep/menus.h | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/libAfterBase/fs.c b/libAfterBase/fs.c -index 731bfd3..954bfd6 100644 ---- a/libAfterBase/fs.c -+++ b/libAfterBase/fs.c -@@ -818,7 +818,7 @@ my_scandir (char *dirname, struct direntry *(*namelist[]), - } - /* Optionally sort the list */ - if (dcomp) -- qsort (*namelist, n, sizeof (struct direntry *), (int (*)())dcomp); -+ qsort (*namelist, n, sizeof (struct direntry *), (int (*)(const void *, const void *))dcomp); - - /* Return the count of the entries */ - return n; -diff --git a/src/ASDocGen/ASDocGen.c b/src/ASDocGen/ASDocGen.c -index 31d7a70..9a86219 100644 ---- a/src/ASDocGen/ASDocGen.c -+++ b/src/ASDocGen/ASDocGen.c -@@ -667,7 +667,7 @@ write_options_keywords(const char *source_dir, const char *syntax_dir, SyntaxDef - sorted_list = safecalloc( max_i, sizeof(TermDef*)); - for (i = 0; i < max_i; i++) - sorted_list[i] = &(syntax->terms[i]) ; -- qsort(sorted_list, max_i, sizeof(TermDef*), (int (*)())sort_terms_by_alpha ); -+ qsort(sorted_list, max_i, sizeof(TermDef*), (int (*)(const void *, const void *))sort_terms_by_alpha ); - for (i = 0; i < max_i; i++) - { - SyntaxDef *sub_syntax = sorted_list[i]->sub_syntax ; -diff --git a/src/Ident/Ident.c b/src/Ident/Ident.c -index 1497d06..d6ddad6 100644 ---- a/src/Ident/Ident.c -+++ b/src/Ident/Ident.c -@@ -89,7 +89,7 @@ void HandleEvents(); - void DispatchEvent (ASEvent * event); - void process_message (send_data_type type, send_data_type *body); - --Window make_ident_window(); -+Window make_ident_window(int width, int height); - void fill_window_data(); - void display_window_data(); - void add_property( const char *name, const char *value, unsigned long value_encoding, Bool span_cols ); -diff --git a/src/afterstep/dirtree.c b/src/afterstep/dirtree.c -index 46ce782..48f7e30 100644 ---- a/src/afterstep/dirtree.c -+++ b/src/afterstep/dirtree.c -@@ -675,7 +675,7 @@ void dirtree_sort (dirtree_t * tree) - list = (dirtree_t **) safemalloc (n * sizeof (dirtree_t *)); - for (n = 0, t = tree->child; t != NULL; t = t->next, n++) - list[n] = t; -- qsort (list, n, sizeof (dirtree_t *), (int (*)())dirtree_compar); -+ qsort (list, n, sizeof (dirtree_t *), (int (*)(const void *, const void *))dirtree_compar); - tree->child = list[0]; - for (i = 1; i < n; i++) - list[i - 1]->next = list[i]; -diff --git a/src/afterstep/menus.h b/src/afterstep/menus.h -index 98b2ad3..bb2a5b1 100644 ---- a/src/afterstep/menus.h -+++ b/src/afterstep/menus.h -@@ -95,7 +95,7 @@ MenuData* FindPopup( const char* name, int quiet ); - - void DeleteMenuItem( MenuDataItem* item ); - --MenuData *CreateMenuData(); -+MenuData *CreateMenuData(char *name); - MenuData *NewMenuData (char *name); - void DeleteMenuData (MenuData * menu); - --- -2.51.2 - diff --git a/pkgs/by-name/af/afterstep/package.nix b/pkgs/by-name/af/afterstep/package.nix deleted file mode 100644 index 4fc264ec020e..000000000000 --- a/pkgs/by-name/af/afterstep/package.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchpatch, - dbus, - fltk_1_3, - gtk2, - libice, - libsm, - libtiff, - pkg-config, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "afterstep"; - version = "2.2.12"; - - src = fetchFromGitHub { - owner = "afterstep"; - repo = "afterstep"; - rev = finalAttrs.version; - hash = "sha256-j1ADTRZ3Mxv9VNZWhWCFMnM/CJfkphdrgbw9Ca3bBw0="; - }; - - patches = [ - (fetchpatch { - url = "https://salsa.debian.org/debian/afterstep/raw/master/debian/patches/44-Fix-build-with-gcc-5.patch"; - hash = "sha256-RNLB6PuFVA1PsYt2VwLyLyvY2OO3oIl1xk+0/6nwN+4="; - }) - - # Fix pending upstream inclusion for binutils-2.36 support: - # https://github.com/afterstep/afterstep/pull/7 - (fetchpatch { - name = "binutils-2.36.patch"; - url = "https://github.com/afterstep/afterstep/commit/5e9e897cf8c455390dd6f5b27fec49707f6b9088.patch"; - hash = "sha256-aGMTyojzXEHGjO9lMT6dwLl01Fd333BUuCIX0FU9ac4="; - }) - - # fix build with c23 - # fs.c:821:66: error: passing argument 4 of 'qsort' from incompatible pointer type [-Wincompatible-pointer-types] - # Ident.c:326:1: error: conflicting types for 'make_ident_window'; have 'Window(int, int)' {aka 'long unsigned int(int, int)'} - # menuitem.c:85:11: error: conflicting types for 'CreateMenuData'; have 'MenuData *(char *)' - ./fix-build-with-c23.patch - ]; - - postPatch = '' - # Causes fatal ldconfig cache generation attempt on non-NixOS Linux - for mkfile in autoconf/Makefile.common.lib.in libAfter{Base,Image}/Makefile.in; do - substituteInPlace $mkfile \ - --replace-fail 'test -w /etc' 'false' - done - ''; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - dbus - fltk_1_3 - gtk2 - libice - libsm - libtiff - ]; - - outputs = [ - "out" - "man" - ]; - - strictDeps = true; - - preConfigure = '' - # A strange type of bug: dbus is not immediately found by pkg-config - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config dbus-1 --cflags)" - ''; - - # Parallel build fails due to missing dependencies between private libraries: - # ld: cannot find ../libAfterConf/libAfterConf.a: No such file or directory - # Let's disable parallel builds until it's fixed upstream: - # https://github.com/afterstep/afterstep/issues/8 - enableParallelBuilding = false; - - meta = { - homepage = "http://www.afterstep.org/"; - description = "NEXTStep-inspired window manager"; - longDescription = '' - AfterStep is a window manager for the Unix X Window System. Originally - based on the look and feel of the NeXTStep interface, it provides end - users with a consistent, clean, and elegant desktop. The goal of AfterStep - development is to provide for flexibility of desktop configuration, - improving aestetics, and efficient use of system resources. - ''; - license = lib.licenses.gpl2Plus; - maintainers = [ ]; - mainProgram = "afterstep"; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/by-name/al/algol68g/package.nix b/pkgs/by-name/al/algol68g/package.nix index f8784dad749f..212b9c040114 100644 --- a/pkgs/by-name/al/algol68g/package.nix +++ b/pkgs/by-name/al/algol68g/package.nix @@ -15,12 +15,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "algol68g"; - version = "3.12.2"; + version = "3.12.3"; src = fetchurl { - # Uses archive.org because the original site removes older versions. - url = "https://web.archive.org/web/20260515052918/https://algol68genie.nl/algol68g-3.12.2.tar.gz"; - hash = "sha256-4fiubqpgoH3YOlCg1bJHQ3kOayKNulW3CYbOK1awE7k"; + url = "https://algol68genie.nl/algol68g-${finalAttrs.version}.tar.gz"; + hash = "sha256-TS5m+Byi+5j4jiOuQbR159QERfNJsQiGNngtoyC9IrE="; }; outputs = [ @@ -48,8 +47,8 @@ stdenv.mkDerivation (finalAttrs: { postInstall = let pdfdoc = fetchurl { - url = "https://web.archive.org/web/20260503174213/https://algol68genie.nl/learning-algol-68-genie.pdf"; - hash = "sha256-eLMRf3XcAkr/Dmk7ieRe62x76VcCj+2QltHH7YtL15s="; + url = "https://algol68genie.nl/learning-algol-68-genie.pdf"; + hash = "sha256-BrVjYXd5sknV0+UCRgQMf0H3QMzMQcLhytEEuiTGkLE="; }; in lib.optionalString withPDFDoc '' diff --git a/pkgs/by-name/al/alistral/package.nix b/pkgs/by-name/al/alistral/package.nix index 609ae97d936d..4363d2f8927c 100644 --- a/pkgs/by-name/al/alistral/package.nix +++ b/pkgs/by-name/al/alistral/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "alistral"; - version = "0.6.7"; + version = "0.6.8"; src = fetchFromGitHub { owner = "RustyNova016"; repo = "Alistral"; tag = "v${finalAttrs.version}"; - hash = "sha256-XsN4UyIXkd0YVtO/q9EcFP/sBYkH9leISmbJZ93ef6E="; + hash = "sha256-NDWQl2Gq4Q0OMMCrHQhybInaJRjY3Fxe3GXrGb32MMY="; }; - cargoHash = "sha256-KFNFioZ/5moC5FNXw+hA+NrPjsqu+3V8A5mtZ4FZUHw="; + cargoHash = "sha256-QxTmjtntp5zy7UijRn0hF3DyOOl3dIpZjPSASCuHaEk="; buildNoDefaultFeatures = true; # Would be cleaner with an "--all-features" option diff --git a/pkgs/by-name/al/all-the-package-names/package.nix b/pkgs/by-name/al/all-the-package-names/package.nix index 3908ee82c0cc..fe35b7eb856f 100644 --- a/pkgs/by-name/al/all-the-package-names/package.nix +++ b/pkgs/by-name/al/all-the-package-names/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "all-the-package-names"; - version = "2.0.2503"; + version = "2.0.2511"; src = fetchFromGitHub { owner = "nice-registry"; repo = "all-the-package-names"; tag = "v${version}"; - hash = "sha256-UtwbQXhX8dmmA6dVuVFcMQkM98kOt/U//OAVMGBImDU="; + hash = "sha256-KnEvFnPXQZ+XhNyweWIE0mjM4vqcqXcJKuus/dFq5f0="; }; - npmDepsHash = "sha256-V7MWSEJT2RtYE1iYJHj2ltrfzke+GO1PfT/wo+MqlZk="; + npmDepsHash = "sha256-Xw/SXRpQkPd+EcemeHO89tC9amDiVV/RD/1H0H8rax0="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/an/anubis/package.nix b/pkgs/by-name/an/anubis/package.nix index 293216843d20..903051ed27bb 100644 --- a/pkgs/by-name/an/anubis/package.nix +++ b/pkgs/by-name/an/anubis/package.nix @@ -15,21 +15,21 @@ buildGoModule (finalAttrs: { pname = "anubis"; - version = "1.25.0"; + version = "1.26.0"; src = fetchFromGitHub { owner = "TecharoHQ"; repo = "anubis"; tag = "v${finalAttrs.version}"; - hash = "sha256-9/XIwSMEmnS3L/Wzg6ABso7R6W3TYkJomC8aFMycxZo="; + hash = "sha256-0ceF4Te0H5edBhvGJgGc/NLJxEAcDVGnnKlqHKnpW60="; }; - vendorHash = "sha256-9CMD8Rn4q8b+hyrph+BqqS32ijZyJRNsop6ML7z5Zuk="; + vendorHash = "sha256-+NPwL4p0p/s74m1Ld0z2GEcsWk5FqhcLbHrTNP3yEzk="; npmDeps = fetchNpmDeps { name = "anubis-npm-deps"; inherit (finalAttrs) src; - hash = "sha256-2U91Dt+ymspjYgTtgCjahCNr6fIs85TT/k+I8M2aC9s="; + hash = "sha256-6sj9C8GHm+RzFl/X5HIPhIDl5l8muBzDSXSRCHumGBs="; }; nativeBuildInputs = [ @@ -75,6 +75,8 @@ buildGoModule (finalAttrs: { export DONT_USE_NETWORK=1 ''; + __darwinAllowLocalNetworking = true; + passthru = { tests = { inherit (nixosTests) anubis; }; updateScript = nix-update-script { extraArgs = [ "--version-regex=^v(\\d+\\.\\d+\\.\\d+)$" ]; }; diff --git a/pkgs/by-name/ap/apriltag/package.nix b/pkgs/by-name/ap/apriltag/package.nix index 6438f8e3bac8..b8f302fe1d56 100644 --- a/pkgs/by-name/ap/apriltag/package.nix +++ b/pkgs/by-name/ap/apriltag/package.nix @@ -9,7 +9,6 @@ let opencv4WithGtk = python3Packages.opencv4.override { - enableGtk2 = true; # For GTK2 support enableGtk3 = true; # For GTK3 support }; in diff --git a/pkgs/by-name/as/as-tree/package.nix b/pkgs/by-name/as/as-tree/package.nix index e8f8cde8739e..c8d28399f874 100644 --- a/pkgs/by-name/as/as-tree/package.nix +++ b/pkgs/by-name/as/as-tree/package.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage { pname = "as-tree"; - version = "unstable-2021-03-09"; + version = "0.12.0-unstable-2021-03-09"; src = fetchFromGitHub { owner = "jez"; diff --git a/pkgs/by-name/as/assh/package.nix b/pkgs/by-name/as/assh/package.nix index fcc73d99955a..a804519bfee9 100644 --- a/pkgs/by-name/as/assh/package.nix +++ b/pkgs/by-name/as/assh/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "assh"; - version = "2.17.2"; + version = "2.17.3"; src = fetchFromGitHub { repo = "assh"; owner = "moul"; tag = "v${finalAttrs.version}"; - hash = "sha256-/w4RluA7py6d75S04czNsgHpmR5rmAUZx8OnZfu9oNg="; + hash = "sha256-CH6QM/dy5fKo7Tq2ekrc06iqjJDZl8JHMG7jalho7BI="; }; - vendorHash = "sha256-EA39KqAN9SHPU362j6/j6okvT+eZb2R4unMA0bB+bVg="; + vendorHash = "sha256-ENCJNgMLTZDlKL0DIt48F1G8TYo2blPdsFH6v8dNC8w="; ldflags = [ "-s" diff --git a/pkgs/by-name/au/aube/package.nix b/pkgs/by-name/au/aube/package.nix index ba47a1f2ba78..0c889ab7bb1d 100644 --- a/pkgs/by-name/au/aube/package.nix +++ b/pkgs/by-name/au/aube/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "aube"; - version = "1.29.1"; + version = "1.32.0"; src = fetchFromGitHub { owner = "jdx"; repo = "aube"; tag = "v${finalAttrs.version}"; - hash = "sha256-87r9qltKUhjnYG9O484OUzKFiO8Xoge9VZ13l6RgrdA="; + hash = "sha256-0BnaxRk6+KY4AGZ31lis0zxc9uWp3OrxCgp9SgOrqNI="; }; - cargoHash = "sha256-Cy5Ea/rF2IJ5WppKKI7E1toy9N+bQEArVW9o2pHzBMc="; + cargoHash = "sha256-vYbbnEpVWG6kjnycl1kk3D+lXuzTzOKuilA0ImBHYAI="; nativeBuildInputs = [ cmake ]; # libz-ng-sys @@ -36,6 +36,7 @@ rustPlatform.buildRustPackage (finalAttrs: { checkFlags = [ # failed on x86_64-linux + "--skip=concurrency::tests::floor_and_ceiling_inclusive" "--skip=http::ticket_cache::tests::max_per_host_evicts_oldest" "--skip=http::ticket_cache::tests::invalidate_removes_all_for_host" # require network access diff --git a/pkgs/by-name/au/automatic-timezoned/package.nix b/pkgs/by-name/au/automatic-timezoned/package.nix index b77dc283face..fe0a9d171b97 100644 --- a/pkgs/by-name/au/automatic-timezoned/package.nix +++ b/pkgs/by-name/au/automatic-timezoned/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "automatic-timezoned"; - version = "2.0.143"; + version = "2.0.149"; src = fetchFromGitHub { owner = "maxbrunet"; repo = "automatic-timezoned"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-bbdhvQ9THiBRf1rLExXQiwlrkgZBFZlaV2CUszDmwo4="; + sha256 = "sha256-FQ4SJcHkdNJcZOncY0BHg+CwnUcyszzfYPCUhWZHhi0="; }; - cargoHash = "sha256-J7h1hVp8wK6UlkstcLCq4uMKJ9ZyLwGR75tcxpWnHT8="; + cargoHash = "sha256-4+gNtQrlaDrSCUFEIByFUQnITSkF9Mo9bq6Ug9d7t1w="; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/au/autoprefixer/package.nix b/pkgs/by-name/au/autoprefixer/package.nix index 76efe7f2cd45..b9feaa95177b 100644 --- a/pkgs/by-name/au/autoprefixer/package.nix +++ b/pkgs/by-name/au/autoprefixer/package.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "autoprefixer"; - version = "10.5.3"; + version = "10.5.4"; src = fetchFromGitHub { owner = "postcss"; repo = "autoprefixer"; tag = finalAttrs.version; - hash = "sha256-hjckcgWojItp2gseQI18zzxizjw/HxQPiTb/JegSCcs="; + hash = "sha256-616VFB6qJiNfsDsaxR4Y+xoqKDrBOtKgWfGMeiaDeGQ="; }; nativeBuildInputs = [ @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version src; pnpm = pnpm_10; fetcherVersion = 4; - hash = "sha256-diOgX9lXKOwCx9V737mmmtrhqDg5beXJH/PjlJHFpto="; + hash = "sha256-+EPzrG2vt2FRIwcJqwwiYPevQFCNAbX7kgFlY+vLbqE="; }; installPhase = '' diff --git a/pkgs/by-name/az/aztfexport/package.nix b/pkgs/by-name/az/aztfexport/package.nix index 30b7ae7663a8..df341c37252e 100644 --- a/pkgs/by-name/az/aztfexport/package.nix +++ b/pkgs/by-name/az/aztfexport/package.nix @@ -7,16 +7,16 @@ }: buildGoModule (finalAttrs: { pname = "aztfexport"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "Azure"; repo = "aztfexport"; tag = "v${finalAttrs.version}"; - hash = "sha256-97lahgEsth2YUeqTe8J58brykpFV0lG6KwB7FJgODAE="; + hash = "sha256-wHI/osu2Jq85zCgh1HfOTuO81mYtQJcSbvlDnXd7Duc="; }; - vendorHash = "sha256-4u40PdRT3E+BZ8bIrnIgRnJkpws6EPK5DRyXu9oY7hc="; + vendorHash = "sha256-QDpoOlu1qGNK0ennplusXBgeQWZP3EH7aSStllP8uzw="; ldflags = [ "-s" diff --git a/pkgs/by-name/az/azure-mcp/package.nix b/pkgs/by-name/az/azure-mcp/package.nix new file mode 100644 index 000000000000..f38943326a5d --- /dev/null +++ b/pkgs/by-name/az/azure-mcp/package.nix @@ -0,0 +1,82 @@ +{ + lib, + stdenv, + fetchzip, + autoPatchelfHook, + azure-cli, + makeWrapper, +}: + +let + version = "3.0.0-beta.10"; + srcs = { + x86_64-linux = { + url = "https://github.com/microsoft/mcp/releases/download/Azure.Mcp.Server-${version}/Azure.Mcp.Server-linux-x64-native.zip"; + hash = "sha256-2wrpyTVunT54dYD1ascVDRTW2AN5NpoV+q3UUt5dQSg="; + }; + aarch64-linux = { + url = "https://github.com/microsoft/mcp/releases/download/Azure.Mcp.Server-${version}/Azure.Mcp.Server-linux-arm64.zip"; + hash = "sha256-K1QRpj5/RzZx2mrmtnB5lGX9CoaAC+pRVGqqHtXWncY="; + }; + x86_64-darwin = { + url = "https://github.com/microsoft/mcp/releases/download/Azure.Mcp.Server-${version}/Azure.Mcp.Server-osx-x64.zip"; + hash = "sha256-ebT6sipbA7IdGx98kF/8GLpHL1fVSVqnmL4rEwsa43k="; + }; + aarch64-darwin = { + url = "https://github.com/microsoft/mcp/releases/download/Azure.Mcp.Server-${version}/Azure.Mcp.Server-osx-arm64.zip"; + hash = "sha256-33rg+fnIB/VJZbVKTP7b8829BbcDnfnaYFMOyPLFzEw="; + }; + }; + unavailable = throw "azure-mcp package is not available for this platform."; + src = fetchzip { + inherit (srcs.${stdenv.hostPlatform.system} or unavailable) url hash; + stripRoot = false; + }; +in +stdenv.mkDerivation { + pname = "azure-mcp"; + inherit version src; + + strictDeps = true; + __structuredAttrs = true; + + nativeBuildInputs = [ + makeWrapper + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + stdenv.cc.cc.lib + ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + install -Dm755 ./azmcp $out/bin/azure-mcp + + wrapProgram $out/bin/azure-mcp \ + --prefix PATH : ${lib.makeBinPath [ azure-cli ]} + + runHook postInstall + ''; + + meta = { + description = "Model Context Protocol server for Azure services"; + longDescription = '' + The Azure MCP Server implements the Model Context Protocol (MCP) + specification to create a seamless connection between AI agents and + Azure services. It provides 321+ tools for interacting with Azure + resources including storage, compute, databases, and more. + ''; + homepage = "https://github.com/microsoft/mcp"; + changelog = "https://github.com/microsoft/mcp/blob/Azure.Mcp.Server-${version}/servers/Azure.Mcp.Server/CHANGELOG.md"; + license = lib.licenses.mit; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + platforms = lib.attrNames srcs; + mainProgram = "azure-mcp"; + maintainers = with lib.maintainers; [ sheeeng ]; + }; +} diff --git a/pkgs/by-name/az/azurehound/package.nix b/pkgs/by-name/az/azurehound/package.nix index b1dd9f8fb4c4..2d1465d77ac3 100644 --- a/pkgs/by-name/az/azurehound/package.nix +++ b/pkgs/by-name/az/azurehound/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "azurehound"; - version = "2.12.2"; + version = "3.0.0"; src = fetchFromGitHub { owner = "SpecterOps"; repo = "AzureHound"; tag = "v${finalAttrs.version}"; - hash = "sha256-w8PmSt+QvU0HELkgdYLfIUgK3R5vCYzlPbMyrHztiPw="; + hash = "sha256-4uc4XSjvuMUSeCsJl9uHBFIaeG1KZ1xDaACXnXkp7v0="; }; vendorHash = "sha256-WF46wXaNU/Em0KpF6hkuuJ+7K1IKLGqpNS/HxpxX5WY="; diff --git a/pkgs/by-name/b4/b4/package.nix b/pkgs/by-name/b4/b4/package.nix index 102cb1dc904d..74d0441c3786 100644 --- a/pkgs/by-name/b4/b4/package.nix +++ b/pkgs/by-name/b4/b4/package.nix @@ -2,6 +2,7 @@ lib, python3Packages, fetchPypi, + fetchgit, patatt, }: @@ -31,6 +32,15 @@ python3Packages.buildPythonApplication (finalAttrs: { textual ]; + passthru = { + src-misc = fetchgit { + url = "https://git.kernel.org/pub/scm/utils/b4/b4.git"; + rev = "v${finalAttrs.version}"; + hash = "sha256-NjYL3RKQpjDkU98qbXyl/cvLTJYVAfIowm8E2Rg8AgI="; + fetchSubmodules = false; + }; + }; + meta = { homepage = "https://git.kernel.org/pub/scm/utils/b4/b4.git/about"; license = lib.licenses.gpl2Only; diff --git a/pkgs/by-name/ba/bant/package.nix b/pkgs/by-name/ba/bant/package.nix index 483a5596f221..0ddb20e49e33 100644 --- a/pkgs/by-name/ba/bant/package.nix +++ b/pkgs/by-name/ba/bant/package.nix @@ -20,13 +20,13 @@ let in buildBazelPackage rec { pname = "bant"; - version = "0.3.0"; + version = "0.3.3"; src = fetchFromGitHub { owner = "hzeller"; repo = "bant"; rev = "v${version}"; - hash = "sha256-T/BQRYCFAHkaGi5T485I9vbr3g7PzgIEHC27w6mg/3A="; + hash = "sha256-6c403+DK1tcQxC16FKEtdhnJEA9LJl8H8Usnw08FBnA="; }; bazelFlags = [ diff --git a/pkgs/by-name/ba/bazel-remote/package.nix b/pkgs/by-name/ba/bazel-remote/package.nix index aaa367147930..19f19808813e 100644 --- a/pkgs/by-name/ba/bazel-remote/package.nix +++ b/pkgs/by-name/ba/bazel-remote/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "bazel-remote"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "buchgr"; repo = "bazel-remote"; rev = "v${finalAttrs.version}"; - hash = "sha256-9vPaTm/HTJ3ftlFg+AkcwXX7xyhmGTgKL3PXhtUHRDk="; + hash = "sha256-wE0l1tBtj44l1Eamd4wCHzjnPhT7W5yZ5MkTA5cOUrg="; }; - vendorHash = "sha256-uh8ST1AQ8OsFMfXly23TMMcheNmhb1MknmPMjB76GIQ="; + vendorHash = "sha256-DGyGQLEAwy79ibWGxAWa7gmaXTajcW3jqGJou2Wnykc="; subPackages = [ "." ]; diff --git a/pkgs/by-name/be/bento/package.nix b/pkgs/by-name/be/bento/package.nix index 430416e810ea..4be3e6cd7dff 100644 --- a/pkgs/by-name/be/bento/package.nix +++ b/pkgs/by-name/be/bento/package.nix @@ -8,17 +8,17 @@ buildGoModule (finalAttrs: { pname = "bento"; - version = "1.18.1"; + version = "1.19.0"; src = fetchFromGitHub { owner = "warpstreamlabs"; repo = "bento"; tag = "v${finalAttrs.version}"; - hash = "sha256-KIlCHOAHShOwrxO9F414PQ07+SzCWhpo8auhyjkuNZA="; + hash = "sha256-3ZISLZzh8FYAE9riZ5Ya5h3LhwzHK4a5jJl8jeHiNoA="; }; proxyVendor = true; - vendorHash = "sha256-uzB98AiJKw9TCbKSdQDiztfw7nIT0mVt80JALAPp2Aw="; + vendorHash = "sha256-h9bH5aewbDAuOVAps3TMihjCITFiBT/bbqNJCUT0NN8="; subPackages = [ "cmd/bento" diff --git a/pkgs/by-name/bi/bisq1/sources.nix b/pkgs/by-name/bi/bisq1/sources.nix index 8b9f276e8cf1..5b62baa44267 100644 --- a/pkgs/by-name/bi/bisq1/sources.nix +++ b/pkgs/by-name/bi/bisq1/sources.nix @@ -1,8 +1,8 @@ -# Generated by ./update.sh - do not update manually! +# Generated by ./update.sh { - version = "1.10.3"; - deb-hash = "sha256-kzLtadq8gfX6j9XU3PD5kNV43wLDoICPlXdJqULkAWE="; - sig-hash = "sha256-+51j+SBp7buukop1T4Gz0YDUga6540BVxDRoU2YE3pY="; + version = "1.10.4"; + deb-hash = "sha256-rOFbiuEbeO2qZntUhO+LNhwX6XlvWRU9v0HIAjyHwd8="; + sig-hash = "sha256-3fAGauXHA8S+XIuHeOIFxp7TsXd1LdqFg8hpWIU4P7k="; key-E222AA02-hash = "sha256-Ue/UmS6F440/ybEEIAR+pdPEIksAt6QSMN6G5TZVWzc="; key-4A133008-hash = "sha256-UijG3DkJNNTakVJd2wl30mDepa27n6R/Xxfl4sjt0sk="; key-387C8307-hash = "sha256-PrRYZLT0xv82dUscOBgQGKNf6zwzWUDhriAffZbNpmI="; diff --git a/pkgs/by-name/bi/bitwarden-desktop/dont-auto-setup-biometrics.patch b/pkgs/by-name/bi/bitwarden-desktop/dont-auto-setup-biometrics.patch index 4102caca56ae..d9456136e2fd 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/dont-auto-setup-biometrics.patch +++ b/pkgs/by-name/bi/bitwarden-desktop/dont-auto-setup-biometrics.patch @@ -1,8 +1,8 @@ -diff --git a/apps/desktop/src/key-management/biometrics/os-biometrics-linux.service.ts b/apps/desktop/src/key-management/biometrics/os-biometrics-linux.service.ts -index 791b4d6f88..dfee0bbf8d 100644 ---- a/apps/desktop/src/key-management/biometrics/os-biometrics-linux.service.ts -+++ b/apps/desktop/src/key-management/biometrics/os-biometrics-linux.service.ts -@@ -115,7 +115,7 @@ export default class OsBiometricsServiceLinux implements OsBiometricService { +diff --git a/apps/desktop/src/key-management/biometrics/native-v2/os-biometrics-linux.service.ts b/apps/desktop/src/key-management/biometrics/native-v2/os-biometrics-linux.service.ts +index 110db23ec79..dfaf600bcdf 100644 +--- a/apps/desktop/src/key-management/biometrics/native-v2/os-biometrics-linux.service.ts ++++ b/apps/desktop/src/key-management/biometrics/native-v2/os-biometrics-linux.service.ts +@@ -83,7 +83,7 @@ export default class OsBiometricsServiceLinux implements OsBiometricService { // The user needs to manually set up the polkit policy outside of the sandbox // since we allow access to polkit via dbus for the sandboxed clients, the authentication works from // the sandbox, once the policy is set up outside of the sandbox. @@ -10,4 +10,4 @@ index 791b4d6f88..dfee0bbf8d 100644 + return false; } - async osBiometricsSetup(): Promise { + async runSetup(): Promise { diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index 00fe90cf9a4d..d1dccec7b1ff 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -5,14 +5,14 @@ copyDesktopItems, dart-sass, darwin, - electron_39, + electron_41, fetchFromGitHub, gnome-keyring, jq, makeDesktopItem, makeWrapper, nix-update-script, - nodejs_22, + nodejs_24, pkg-config, rustc, rustPlatform, @@ -22,17 +22,17 @@ let icon = "bitwarden"; - electron = electron_39; + electron = electron_41; in buildNpmPackage (finalAttrs: { pname = "bitwarden-desktop"; - version = "2026.6.1"; + version = "2026.7.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; tag = "desktop-v${finalAttrs.version}"; - hash = "sha256-ee+C58Y5pZWEmqbRO/w7rdY+e6gy4EL7Sn0S1AxGMXI="; + hash = "sha256-E4glf4G70BuT0GYu1kEb5Z9B76ElIlDPe1rdGSdmCzo="; }; patches = [ @@ -64,7 +64,7 @@ buildNpmPackage (finalAttrs: { rm -r apps/cli ''; - nodejs = nodejs_22; + nodejs = nodejs_24; makeCacheWritable = true; npmFlags = [ @@ -74,7 +74,7 @@ buildNpmPackage (finalAttrs: { npmWorkspace = "apps/desktop"; npmDepsFetcherVersion = 3; - npmDepsHash = "sha256-C5GLei/WWetd4qLv7obBJWbQR9LBy+Sqdbjko3/W7VY="; + npmDepsHash = "sha256-8wjt5wnJG4S4EeGWGxbo6Bwt76GIqrSiwqwwwQ17Y5Y="; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) @@ -84,7 +84,7 @@ buildNpmPackage (finalAttrs: { cargoRoot patches ; - hash = "sha256-xyK3+z2yfCG9K5XAB6LNEeyqMRknONi6ZfY/3oko7Z8="; + hash = "sha256-PLfR+yS+MtscRRuyLaK/qIWJVDoefhOobev1fpNeHNo="; }; cargoRoot = "apps/desktop/desktop_native"; @@ -197,7 +197,7 @@ buildNpmPackage (finalAttrs: { # Extract the polkit policy file from the multiline string in the source code. # This may break in the future but its better than copy-pasting it manually. mkdir -p $out/share/polkit-1/actions/ - pushd apps/desktop/src/key-management/biometrics + pushd apps/desktop/src/key-management/biometrics/native-v2 awk '/const polkitPolicy = `/{gsub(/^.*`/, ""); print; str=1; next} str{if (/`;/) str=0; gsub(/`;/, ""); print}' os-biometrics-linux.service.ts > $out/share/polkit-1/actions/com.bitwarden.Bitwarden.policy popd diff --git a/pkgs/by-name/bo/bobgen/package.nix b/pkgs/by-name/bo/bobgen/package.nix index 76cb9d6e61a4..d9319d437353 100644 --- a/pkgs/by-name/bo/bobgen/package.nix +++ b/pkgs/by-name/bo/bobgen/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "bobgen"; - version = "0.48.0"; + version = "0.49.0"; src = fetchFromGitHub { owner = "stephenafamo"; repo = "bob"; tag = "v${finalAttrs.version}"; - hash = "sha256-iD9GPYBt1s6xx4vNRlArERmv5AyBR6Q4mLLDNDWy1qY="; + hash = "sha256-5uwYw5CraOBUG55MIWa9I6GGIdJz/K+OXHIjOrjFuTQ="; }; - vendorHash = "sha256-tL6f8XkAsBL76idEVxlAAcdYyzo9Rh9fEHy6ysfZWG8="; + vendorHash = "sha256-fQmhAuxl23jRGJ4ysKh9QiiA8dtZlM37dE9aBXrYwao="; subPackages = [ "gen/bobgen-sql" diff --git a/pkgs/by-name/bo/bottom/package.nix b/pkgs/by-name/bo/bottom/package.nix index 8d0d0c7d0fa3..8f4e6d278c1a 100644 --- a/pkgs/by-name/bo/bottom/package.nix +++ b/pkgs/by-name/bo/bottom/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "bottom"; - version = "0.14.4"; + version = "0.14.6"; src = fetchFromGitHub { owner = "ClementTsang"; repo = "bottom"; tag = finalAttrs.version; - hash = "sha256-axzZEviUVosXo5XzQB32A2+sUdiLzEtjZg52Z6hp4lM="; + hash = "sha256-52aUYfFm72nSG7bAlwa18kMu13i+c4myl2QfaA2YZmw="; }; - cargoHash = "sha256-RUFlv95VoRhfHeIXWFWWtbwn71uJnEYoi2NozU4ybK8="; + cargoHash = "sha256-N+dfYORAdWAg5qUrFEgXbiRtYJpcvV1AcbLR5WiD0QI="; nativeBuildInputs = [ autoAddDriverRunpath diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix deleted file mode 100644 index 2ef60eda0800..000000000000 --- a/pkgs/by-name/br/brave/package.nix +++ /dev/null @@ -1,35 +0,0 @@ -# Expression generated by update.sh; do not edit it by hand! -{ stdenv, callPackage, ... }@args: - -let - pname = "brave"; - version = "1.92.143"; - - allArchives = { - aarch64-linux = { - url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; - hash = "sha256-IHBJm9uow2d/X4Z9e117aGdP1Y+3R1ApWu40sPtdbr8="; - }; - x86_64-linux = { - url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-jaxNneurduBiw3jho5Fp7gXnBfSpLB5hlE06i/JK+ic="; - }; - aarch64-darwin = { - url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip"; - hash = "sha256-EvfZgO8FAijof1Ml6gqSOyRndL8KYFdT0MNmVmuxAnU="; - }; - }; - - archive = - if builtins.hasAttr stdenv.system allArchives then - allArchives.${stdenv.system} - else - throw "Unsupported platform."; - -in -callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) ( - archive - // { - inherit pname version; - } -) diff --git a/pkgs/by-name/br/brave/update.sh b/pkgs/by-name/br/brave/update.sh deleted file mode 100755 index ccb7c9b826b0..000000000000 --- a/pkgs/by-name/br/brave/update.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused nix jq - -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)" - -latestVersion="$(curl --fail -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/brave/brave-browser/releases/latest" | jq -r '.tag_name' | sed 's/^v//')" - -hashAarch64="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/brave/brave-browser/releases/download/v${latestVersion}/brave-browser_${latestVersion}_arm64.deb")")" -hashAmd64="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/brave/brave-browser/releases/download/v${latestVersion}/brave-browser_${latestVersion}_amd64.deb")")" -hashAarch64Darwin="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/brave/brave-browser/releases/download/v${latestVersion}/brave-v${latestVersion}-darwin-arm64.zip")")" - -cat > $SCRIPT_DIR/package.nix << EOF -# Expression generated by update.sh; do not edit it by hand! -{ stdenv, callPackage, ... }@args: - -let - pname = "brave"; - version = "${latestVersion}"; - - allArchives = { - aarch64-linux = { - url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-browser_\${version}_arm64.deb"; - hash = "${hashAarch64}"; - }; - x86_64-linux = { - url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-browser_\${version}_amd64.deb"; - hash = "${hashAmd64}"; - }; - aarch64-darwin = { - url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-v\${version}-darwin-arm64.zip"; - hash = "${hashAarch64Darwin}"; - }; - }; - - archive = - if builtins.hasAttr stdenv.system allArchives then - allArchives.\${stdenv.system} - else - throw "Unsupported platform."; - -in -callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) ( - archive - // { - inherit pname version; - } -) -EOF diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 63153baf9f0f..c487d2c8a48b 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -21,13 +21,13 @@ buildNpmPackage rec { pname = "bruno"; - version = "3.5.2"; + version = "4.0.0"; src = fetchFromGitHub { owner = "usebruno"; repo = "bruno"; tag = "v${version}"; - hash = "sha256-Lll/ywDkHv0xvLk8iiBEySek7A3dBmfO4V/q2xaNtBQ="; + hash = "sha256-M4oNx3nSe8hSAtZMVyXIW0qQIQkaOeQgpPsfjmmJ30E="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json @@ -36,7 +36,7 @@ buildNpmPackage rec { nodejs = nodejs_22; - npmDepsHash = "sha256-4VsSXiHj/INCu4ryZ+JxPbfDpsgIb5eYvOUYz+gbKEE="; + npmDepsHash = "sha256-Jrlpztg1JxuPaLD4O9elOaU1eFH3dmr6oWwi4Ch9Zv8="; npmFlags = [ "--legacy-peer-deps" ]; nativeBuildInputs = [ @@ -77,6 +77,10 @@ buildNpmPackage rec { # fix version reported in sidebar and about page ${jq}/bin/jq '.version |= "${version}"' packages/bruno-electron/package.json | ${moreutils}/bin/sponge packages/bruno-electron/package.json ${jq}/bin/jq '.version |= "${version}"' packages/bruno-app/package.json | ${moreutils}/bin/sponge packages/bruno-app/package.json + + # disable remote image download to prevent network calls to comply with build sandboxing + substituteInPlace packages/bruno-app/plugins/remote-images/loader.cjs \ + --replace-fail 'const urls = findRemoteImageUrls(source, domains);' 'const urls = [];' ''; postConfigure = '' diff --git a/pkgs/by-name/bt/btrfs-progs/package.nix b/pkgs/by-name/bt/btrfs-progs/package.nix index e5034da09c2e..52d1d0bb827c 100644 --- a/pkgs/by-name/bt/btrfs-progs/package.nix +++ b/pkgs/by-name/bt/btrfs-progs/package.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "btrfs-progs"; - version = "7.0"; + version = "7.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${finalAttrs.version}.tar.xz"; - hash = "sha256-wobWh2y81yMnoLQX5M/SgDU+wj43tUn9vNeACoMtmpk="; + hash = "sha256-0fVcwpcTmMkULqp50gPmPVhqO0uGf5VmZKHWgyLNTjQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/bu/bumpp/package.nix b/pkgs/by-name/bu/bumpp/package.nix index f18c4c1fd4c0..6ca849afa5b5 100644 --- a/pkgs/by-name/bu/bumpp/package.nix +++ b/pkgs/by-name/bu/bumpp/package.nix @@ -15,20 +15,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "bumpp"; - version = "11.1.0"; + version = "12.0.0"; src = fetchFromGitHub { owner = "antfu-collective"; repo = "bumpp"; tag = "v${finalAttrs.version}"; - hash = "sha256-LzFusuzFpbqh/gNV0c0vhoKE17CzTPJUppdpdKaGOFs="; + hash = "sha256-9o3eUZ4cCusvV+IwQbLqbEI4NhTKkcwgqv4Mqe/VxZ4="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; inherit pnpm; fetcherVersion = 3; - hash = "sha256-KYTz/SO4rV+c57G8dv4ExCZrunA0xvgCNk8Td4HbCig="; + hash = "sha256-Em3HvH5nCiyxgaPQvenqAnOraYnvQNxLVdHQd1lz3+o="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/bu/buzztrax/package.nix b/pkgs/by-name/bu/buzztrax/package.nix index bab43b337694..e028a0e9b3b9 100644 --- a/pkgs/by-name/bu/buzztrax/package.nix +++ b/pkgs/by-name/bu/buzztrax/package.nix @@ -13,7 +13,7 @@ clutter-gtk, gst_all_1, glib, - gtk2, + gtk3, libgsf, libxml2, fluidsynth, @@ -52,7 +52,7 @@ stdenv.mkDerivation { gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good glib - gtk2 + gtk3 libgsf libxml2 # optional packages diff --git a/pkgs/by-name/ca/cargo-binstall/package.nix b/pkgs/by-name/ca/cargo-binstall/package.nix index 92faf3a87a94..856653acdb4e 100644 --- a/pkgs/by-name/ca/cargo-binstall/package.nix +++ b/pkgs/by-name/ca/cargo-binstall/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-binstall"; - version = "1.21.0"; + version = "1.21.1"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; tag = "v${finalAttrs.version}"; - hash = "sha256-6msYAVCN1i2srA4DquqcdJxUrJP1jub34c/a/4RbWCg="; + hash = "sha256-7YXdKK6P6LSf/DGDL6jroR3VVqAD4uGUOGJS/dZbcvw="; }; - cargoHash = "sha256-r9iGWxrLlD83QtvZuWXIxjI2S0RO1GNwOed531FVvJk="; + cargoHash = "sha256-iUYTFtx0KBi4qgJNyuIAGcTCbS4KMyBbTIgR3nDiNAI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix index d0ee4ba4e9fd..4d10d49e4521 100644 --- a/pkgs/by-name/ca/cargo-shear/package.nix +++ b/pkgs/by-name/ca/cargo-shear/package.nix @@ -8,15 +8,15 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-shear"; - version = "1.13.2"; + version = "1.13.3"; src = fetchCrate { pname = "cargo-shear"; version = finalAttrs.version; - hash = "sha256-69OwhT4vc4xwvuVxZ0C7F/Us01TsuYJnnTKT6PHsOF8="; + hash = "sha256-Qaq3nBZZR0biG5kVL15zhI8GwLEWBNzgeD3rHeZZOeU="; }; - cargoHash = "sha256-x0lZ8E/P9IaPSdzUo2O3t5qR2I3959So9uaAm4PBM4E="; + cargoHash = "sha256-3YMdOCCK+rVx0XZfBqiMAw+aep1TBU5Ok6//c433h4o="; env = { # https://github.com/Boshen/cargo-shear/blob/v1.6.2/src/lib.rs#L51-L54 diff --git a/pkgs/by-name/ca/cargo-update/package.nix b/pkgs/by-name/ca/cargo-update/package.nix index 3edff871f022..dfb9f8bc728d 100644 --- a/pkgs/by-name/ca/cargo-update/package.nix +++ b/pkgs/by-name/ca/cargo-update/package.nix @@ -16,14 +16,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-update"; - version = "22.0.0"; + version = "22.1.0"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-7SjJ+v+6PzwV8dTXxSVxKrj4/yUlyGVJtt0A+WaWNc8="; + hash = "sha256-0iXO+cmW1vfKc9sPTnw132fZlqTMfInVCIgT8NLrhwM="; }; - cargoHash = "sha256-xRjPnZPewo/5pCDUem8+9Ko0XJ1p5HJtLLmErtZQb8w="; + cargoHash = "sha256-6yE4zdGosZhXhT3Q3mh/1h33OXqXrAWhZ0b18qaI1vs="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/ca/caribou/package.nix b/pkgs/by-name/ca/caribou/package.nix index 79e1f9fc785f..501a5389e2fd 100644 --- a/pkgs/by-name/ca/caribou/package.nix +++ b/pkgs/by-name/ca/caribou/package.nix @@ -13,7 +13,6 @@ libxml2, libxklavier, libxtst, - gtk2, intltool, libxslt, at-spi2-core, @@ -82,7 +81,6 @@ stdenv.mkDerivation (finalAttrs: { pythonEnv python3.pkgs.pygobject3 libxtst - gtk2 ]; propagatedBuildInputs = [ @@ -90,6 +88,8 @@ stdenv.mkDerivation (finalAttrs: { libxklavier ]; + configureFlags = [ "--enable-gtk2-module=no" ]; + postPatch = '' patchShebangs . substituteInPlace libcaribou/Makefile.am --replace "--shared-library=libcaribou.so.0" "--shared-library=$out/lib/libcaribou.so.0" diff --git a/pkgs/by-name/cc/ccusage/package.nix b/pkgs/by-name/cc/ccusage/package.nix index cad32ecb86ea..459fb554bbd6 100644 --- a/pkgs/by-name/cc/ccusage/package.nix +++ b/pkgs/by-name/cc/ccusage/package.nix @@ -8,40 +8,45 @@ apple-sdk_15, libiconv, versionCheckHook, - nix-update-script, + nix-update, + writeShellApplication, + curl, runCommand, jq, }: let - # ccusage embeds the LiteLLM model-pricing table at build time. Its build - # script otherwise downloads this file from the network, which fails in the - # sandbox. Upstream pins the data via a flake input and points - # CCUSAGE_PRICING_JSON_PATH at it; mirror that exact revision here so the - # build is offline and reproducible (see package.nix + flake.lock in the - # upstream repo at tag v20.0.6). Bump this revision together with the package - # version; nix-update only refreshes the src and cargo hashes. + # ccusage embeds the LiteLLM model-pricing table at build time instead of + # downloading it (the Nix sandbox has no network). Upstream pins the exact + # data revision via its flake.lock and points CCUSAGE_PRICING_JSON_PATH at it; + # we mirror that revision here so the build is offline, reproducible, and + # byte-identical to what upstream ships. + # + # Both values below are kept in sync with the package version by + # passthru.updateScript — do not edit them by hand. + litellmPricingRev = "49ca04d8c3ddea336237ce6f3082dbc26d19e944"; + litellmPricingHash = "sha256-rkUyugxdoD7WlPN//6BQpl4OJQuBbc20db7gt7exqpc="; litellmPricing = fetchurl { - url = "https://raw.githubusercontent.com/BerriAI/litellm/f27df8d516802ce4c1b32973992154fe83b851cf/model_prices_and_context_window.json"; - hash = "sha256-zJa6H2EwP9s+hMVs78Y+hwo4UX1dHRtvX5J3MdGh5aI="; + url = "https://raw.githubusercontent.com/BerriAI/litellm/${litellmPricingRev}/model_prices_and_context_window.json"; + hash = litellmPricingHash; }; in rustPlatform.buildRustPackage (finalAttrs: { pname = "ccusage"; - version = "20.0.6"; + version = "20.0.17"; src = fetchFromGitHub { owner = "ccusage"; repo = "ccusage"; tag = "v${finalAttrs.version}"; - hash = "sha256-uf/FlPprxx4jh74YwjmYMtoIHpTkKrWTLetbNoYiFv4="; + hash = "sha256-486iLPRqQVRnKVbVT93D08RTRzd6/h503ckB//24nho="; }; # The Cargo workspace lives in rust/, not at the repo root. cargoRoot = "rust"; buildAndTestSubdir = "rust"; - cargoHash = "sha256-izA2Gs5nPmt0zn6/e1xM80vyyQHYKGEUDpUFRpyFiB8="; + cargoHash = "sha256-23l/BCCGcZ1i5mFBC6Q+FE7sQRHnPLbU4QoQe7TfoiQ="; __structuredAttrs = true; strictDeps = true; @@ -72,7 +77,40 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; passthru = { - updateScript = nix-update-script { }; + # Plain nix-update only refreshes version + src/cargo hashes; it can't know + # about the LiteLLM pricing pin above. This wrapper bumps the package as + # usual, then reads the litellm revision that ccusage locks at the new tag + # and rewrites litellmPricingRev/litellmPricingHash to match, so automated + # (r-ryantm) bumps stay complete instead of shipping stale pricing data. + updateScript = lib.getExe (writeShellApplication { + name = "ccusage-update"; + runtimeInputs = [ + curl + jq + nix-update + ]; + text = '' + set -euo pipefail + + attr="''${UPDATE_NIX_ATTR_PATH:-ccusage}" + + nix-update "$attr" + + version=$(nix-instantiate --eval --raw -A "$attr.version") + rev=$(curl --fail --silent --show-error --location \ + "https://raw.githubusercontent.com/ccusage/ccusage/v''${version}/flake.lock" \ + | jq --raw-output '.nodes.litellm.locked.rev') + hash=$(nix-prefetch-url --type sha256 \ + "https://raw.githubusercontent.com/BerriAI/litellm/''${rev}/model_prices_and_context_window.json" \ + | xargs nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri) + + file=$(nix-instantiate --eval --raw -A "$attr.meta.position" | sed -re 's/:[0-9]+$//') + sed -i \ + -e "s|litellmPricingRev = \"[0-9a-f]*\"|litellmPricingRev = \"''${rev}\"|" \ + -e "s|litellmPricingHash = \"sha256-[^\"]*\"|litellmPricingHash = \"''${hash}\"|" \ + "$file" + ''; + }); tests = { # With no agent data on disk, ccusage must still emit a valid, empty JSON diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix index dcd0e0b05fb8..74abe9368e1f 100644 --- a/pkgs/by-name/cd/cdncheck/package.nix +++ b/pkgs/by-name/cd/cdncheck/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "cdncheck"; - version = "1.2.44"; + version = "1.2.45"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "cdncheck"; tag = "v${finalAttrs.version}"; - hash = "sha256-8Lte+arj2nqEU8WmaX4bf/WOJV6bdMLskm0BqSyBOuE="; + hash = "sha256-TR7ogxaJ9Vee6bpqWKu75Yf8KWo8bPTBKwIecGkN68I="; }; vendorHash = "sha256-iJ1agL7sZ3ZKbW1wMA+qi8FgHdPa6gZLQ5BBPKJTNaQ="; diff --git a/pkgs/by-name/ci/cine/package.nix b/pkgs/by-name/ci/cine/package.nix index 224bd1b9185a..9534f759da88 100644 --- a/pkgs/by-name/ci/cine/package.nix +++ b/pkgs/by-name/ci/cine/package.nix @@ -19,14 +19,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "cine"; - version = "1.7.0"; + version = "1.7.4"; pyproject = false; src = fetchFromGitHub { owner = "diegopvlk"; repo = "Cine"; tag = "v${finalAttrs.version}"; - hash = "sha256-WBzdBZ7WL6HAd26tJtTaw39jAtdNYNiNmYHhVr+JBtM="; + hash = "sha256-D25/wz9nsxi9Y1D8hnb3S1kNfdUfPM4ojyLovDkUEI4="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ci/cinnamon/package.nix b/pkgs/by-name/ci/cinnamon/package.nix index b8dbff2dacee..9f239adca1c7 100644 --- a/pkgs/by-name/ci/cinnamon/package.nix +++ b/pkgs/by-name/ci/cinnamon/package.nix @@ -75,13 +75,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "cinnamon"; - version = "6.6.8"; + version = "6.6.9"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; tag = finalAttrs.version; - hash = "sha256-ByPn2VV40y+3/FW/KPIsLt43FhVxQAQldCK26KNKdjw="; + hash = "sha256-RQsgfPvdt1xe7HhZamynAvATVlBeLLElatjpN1Tgt2M="; }; patches = [ @@ -93,12 +93,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/linuxmint/cinnamon/commit/3a2d558aa575f0ea364c5b4e30d2eb3ee604ee58.patch"; hash = "sha256-+uAGuQJ0VsIvMvPFafyoXmU4MiHfbbRXLzeW/n62ucw="; }) - - # cinnamon-calendar-server.py: Allow ICal 4.0 - (fetchpatch { - url = "https://github.com/linuxmint/cinnamon/commit/dcf2d986c1ec167b0a8005ef2ca427317438c8d7.patch"; - hash = "sha256-4sCZShUOXPaJoumiuEG558e0l8CIehH0P+C9OouG3vI="; - }) ]; buildInputs = [ diff --git a/pkgs/by-name/cl/claude-code/manifest.json b/pkgs/by-name/cl/claude-code/manifest.json index 8b4658f822a8..3dbc2902dc8c 100644 --- a/pkgs/by-name/cl/claude-code/manifest.json +++ b/pkgs/by-name/cl/claude-code/manifest.json @@ -1,47 +1,47 @@ { - "version": "2.1.218", - "commit": "bce61b433bc397ce68686368abd12f545b0a013a", - "buildDate": "2026-07-22T18:42:19Z", + "version": "2.1.219", + "commit": "7006c4c3acac98e554d3997baeda6a7fa4d1ff7c", + "buildDate": "2026-07-24T03:34:26Z", "platforms": { "darwin-arm64": { "binary": "claude", - "checksum": "71abaff59312c9a9b6a1d818365048b42e4e95cc521a823660eded3e0880d9b7", - "size": 255069680 + "checksum": "a8e806faaefac53c7a0f26523d8a45c60dbef3407b14ef990c75765d08febc82", + "size": 256908272 }, "darwin-x64": { "binary": "claude", - "checksum": "9862b74a083e8a4ed572f99cbd4895185e0dd5a0a601affb0fb8e43d8d1f40e6", - "size": 264548368 + "checksum": "03be9f988ed88391b4a5f08e4c5dc317ce2fffa4a9dc66c01106326e7698ee76", + "size": 266381200 }, "linux-arm64": { "binary": "claude", - "checksum": "295fd30481bd03b38450fdec2a6e25bb6472c2074f04b0c4a566cd5988f230bf", - "size": 269990816 + "checksum": "1f834b322ba9d1291cc7ffeff16a6795a59145bda279dbd59cd7ecebc7b7f15a", + "size": 271825824 }, "linux-x64": { "binary": "claude", - "checksum": "e12071751a9336b8af1012c103358ff04ac18f9aaff4a738cff7ba5cdfaf63f2", - "size": 273177584 + "checksum": "22cfd6f5b3061c0391ba84e9cf8c9deaa37783aac18b004d42ec061e98f00691", + "size": 275004400 }, "linux-arm64-musl": { "binary": "claude", - "checksum": "efcaae48f8f537a0e9a47b4317a5f8c184706c99ddd8ca0a9a21391e2a766ef8", - "size": 263239016 + "checksum": "22b2c2e0f41ab0b7c7b8845be9c49fe6f27e4c344aab1bd174bdf84a4e6b0570", + "size": 265074024 }, "linux-x64-musl": { "binary": "claude", - "checksum": "62986293277153f5db97404cf7e3e96de136f02c28f79ccd5c7bc99766224db4", - "size": 267801168 + "checksum": "487008769dd69599adb779205b6b371de27b4245f0ad2ad70f15baf4eac5f81e", + "size": 269627984 }, "win32-x64": { "binary": "claude.exe", - "checksum": "81fcf59bb7abb558aedc6f2361f4723b3d757d28e799962d88b18b4520df66ca", - "size": 263931552 + "checksum": "10f4c1f85b07f3cf6b8fff930fd26ecd475bd146a378acfafa559a6db9d89637", + "size": 265714848 }, "win32-arm64": { "binary": "claude.exe", - "checksum": "a7959fd87feb9557d56f4e5752f7ed1ddf405f3bea91b2571bf93af636efd193", - "size": 258307232 + "checksum": "6a1db10161b93e81ac55537feeae8a299f0bf67601c1c0f2016e79c850302baa", + "size": 260090016 } }, "sdkCompat": { @@ -68,7 +68,8 @@ "0.3.208", "0.3.209", "0.3.215", - "0.3.217" + "0.3.217", + "0.3.218" ], "harnessSchema": 1 } diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index 4eba181c8c9c..29f758124ead 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -16,11 +16,11 @@ socat, versionCheckHook, writableTmpDirAsHomeHook, + manifest ? lib.importJSON ./manifest.json, }: let stdenv = stdenvNoCC; baseUrl = "https://downloads.claude.ai/claude-code-releases"; - manifest = lib.importJSON ./manifest.json; platformKey = "${stdenv.hostPlatform.node.platform}-${stdenv.hostPlatform.node.arch}"; platformManifestEntry = manifest.platforms.${platformKey}; in diff --git a/pkgs/by-name/cl/clouddrive2/package.nix b/pkgs/by-name/cl/clouddrive2/package.nix index 8eb9b9a0c30e..ed36cb82c269 100644 --- a/pkgs/by-name/cl/clouddrive2/package.nix +++ b/pkgs/by-name/cl/clouddrive2/package.nix @@ -11,15 +11,15 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "clouddrive2"; - version = "1.0.11"; + version = "1.0.12"; src = fetchurl { url = "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v${finalAttrs.version}/clouddrive-2-${os}-${arch}-${finalAttrs.version}.tgz"; hash = { - x86_64-linux = "sha256-X5WAnHyXdAkWrN/AbkDE0eNH4mwdPcZ0Cs5Q21KB6/w="; - aarch64-linux = "sha256-somHyDBG94pGQB+IZd404H1tX0X2qC8LeIcXeihU6yA="; - aarch64-darwin = "sha256-GaL2bCwQdtI3bq2wkwza1OEHFvhppdZpUIq3QRQ0vN8="; + x86_64-linux = "sha256-Z1xAFMXlajdAAZGY7R7UJrOSLPzyMLXC6wbJnrOXtsc="; + aarch64-linux = "sha256-rgRBFCbH3QS/6Db2urDItj825QDFakknAvoIOWv9r0o="; + aarch64-darwin = "sha256-9E9xp4f6mFe+otFaAbetjk5agAH9IXLPkuRa669+AgY="; } .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/by-name/cl/cloudflared/package.nix b/pkgs/by-name/cl/cloudflared/package.nix index 9d18a1b6c502..76bcdc037604 100644 --- a/pkgs/by-name/cl/cloudflared/package.nix +++ b/pkgs/by-name/cl/cloudflared/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "cloudflared"; - version = "2026.7.2"; + version = "2026.7.3"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; tag = finalAttrs.version; - hash = "sha256-fuJfvm5c63koMl46sJmZOiWuNKpOwH17MD20XD7q6s0="; + hash = "sha256-hIDx9Nd7CKlM0vCKqkVHxBMj4QzvnnsYYMjhzOqcECU="; }; vendorHash = null; diff --git a/pkgs/by-name/co/communique/package.nix b/pkgs/by-name/co/communique/package.nix index bf46339cb802..9aa8b7f77250 100644 --- a/pkgs/by-name/co/communique/package.nix +++ b/pkgs/by-name/co/communique/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "communique"; - version = "1.2.1"; + version = "1.2.3"; __structuredAttrs = true; src = fetchFromGitHub { owner = "jdx"; repo = "communique"; tag = "v${finalAttrs.version}"; - hash = "sha256-lQN6LViO3Ta6eCbU6j76OFN95R6A0hP3Pfc38KrHDng="; + hash = "sha256-F7m6PxPOuQlZFIVYBUl650JsaZVJJmC1c+6jMgmGgc8="; }; - cargoHash = "sha256-RJzjpDhxpi7Zmzw9kl48yq6//zTYOeJ+SrgAfqq/tl4="; + cargoHash = "sha256-KyGbkVNi2rHTJfIeeq6nVFDhkWmaKh/IZ6xiVxPaXWQ="; nativeCheckInputs = [ cacert diff --git a/pkgs/by-name/cu/cubeb/package.nix b/pkgs/by-name/cu/cubeb/package.nix index 10c4502c28d9..af120f03171e 100644 --- a/pkgs/by-name/cu/cubeb/package.nix +++ b/pkgs/by-name/cu/cubeb/package.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cubeb"; - version = "0-unstable-2026-07-16"; + version = "0-unstable-2026-07-25"; src = fetchFromGitHub { owner = "mozilla"; repo = "cubeb"; - rev = "0942f635f78049fc8af24939effed255ae0d0044"; - hash = "sha256-RQqmrRXRABsNDjGztsLLjsZlZFBEeAAc/ysoDj6CT1A="; + rev = "ef47ae581df7c2f76058d554b3edde17f9ee7cba"; + hash = "sha256-vGTB0xsIv89ua9tltdjkxLChVvTKra4kxaWCxszG3x0="; }; outputs = [ diff --git a/pkgs/by-name/cu/cutemaze/package.nix b/pkgs/by-name/cu/cutemaze/package.nix index 36b23ffb49f5..cd2f662ad724 100644 --- a/pkgs/by-name/cu/cutemaze/package.nix +++ b/pkgs/by-name/cu/cutemaze/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "cutemaze"; - version = "1.3.6"; + version = "1.3.7"; src = fetchurl { url = "https://gottcode.org/cutemaze/cutemaze-${finalAttrs.version}.tar.bz2"; - hash = "sha256-Fl/fsKB04Kn4HwkNlpcuR3wTJFfn1gGgRGTwRUNDawY="; + hash = "sha256-iaT55oVw5j3ttAiWW5y6QlQDsoUKRppDtNSLKUBNr2E="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/da/davinci-resolve/package.nix b/pkgs/by-name/da/davinci-resolve/package.nix index 657f890d6701..0569e5991ab3 100644 --- a/pkgs/by-name/da/davinci-resolve/package.nix +++ b/pkgs/by-name/da/davinci-resolve/package.nix @@ -56,7 +56,7 @@ let davinci = ( stdenv.mkDerivation rec { pname = "davinci-resolve${lib.optionalString studioVariant "-studio"}"; - version = "21.0.1"; + version = "21.0.3"; nativeBuildInputs = [ appimageTools.appimage-exec @@ -78,9 +78,9 @@ let outputHashAlgo = "sha256"; outputHash = if studioVariant then - "sha256-8JN3ptd8jcacxHihZHXuhdkyambUsnFIj+AruvpztKI=" + "sha256-pEJF+FQlBngEi5YlKq/pFNCzBiQgqjQrTnfrlKEEi6s=" else - "sha256-ioAqvqHjwFX1ec6fDoxg2VUZy1moYoGx/aEewDuN1+g="; + "sha256-3SymaLm3ibyk8yOWcUS9fOfnKEmgVA5XXc5tls27qfo="; impureEnvVars = lib.fetchers.proxyImpureEnvVars; diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index 6627d34277af..b7594ad914c2 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbeaver-bin"; - version = "26.1.1"; + version = "26.1.3"; src = let @@ -31,9 +31,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { aarch64-darwin = "macos-aarch64.dmg"; }; hash = selectSystem { - x86_64-linux = "sha256-atbQ00lq589FlNem85NgzTKGyhTRpFII8OSfVfYQuD0="; - aarch64-linux = "sha256-Sde0q31hXMqX2oxfhgj5EcpeUYYFZJy61usaJVpZkLM="; - aarch64-darwin = "sha256-PwuFwEE+aBEG/ykwNrEBl20yfrade8BdUUHdLJGBkwc="; + x86_64-linux = "sha256-cPRmReV6F+pCkrbF7d1m+bQjOaJCCFndNSThMWPGrsY="; + aarch64-linux = "sha256-bT1bCKzeiAMJbPa6I6fqQq7OrbkKhgDYAUEKuURHP5g="; + aarch64-darwin = "sha256-NYX651gUpEDh2O720ZKl7fUTYLFKpTJzyC/YnN4Vnys="; }; in fetchurl { diff --git a/pkgs/by-name/dd/ddccontrol/package.nix b/pkgs/by-name/dd/ddccontrol/package.nix index 57b148c4ce92..d5d162eb21b7 100644 --- a/pkgs/by-name/dd/ddccontrol/package.nix +++ b/pkgs/by-name/dd/ddccontrol/package.nix @@ -2,36 +2,51 @@ lib, stdenv, fetchFromGitHub, + + # nativeBuildInputs autoreconfHook, intltool, + pkg-config, + rustPlatform, + cargo, + rustc, + + # buildInputs libxml2, pciutils, - pkg-config, - gtk2, + gtk3, ddccontrol-db, }: stdenv.mkDerivation (finalAttrs: { pname = "ddccontrol"; - version = "1.0.3"; + version = "3.2.0"; src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol"; tag = finalAttrs.version; - sha256 = "sha256-qyD6i44yH3EufIW+LA/LBMW20Tejb49zvsDfv6YFD6c="; + sha256 = "sha256-8VqnmWLXt6rXapAqvzvtDQ9XjQ7H6s7pLqPhQ6Zflc4="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) pname version src; + hash = "sha256-UN308Tt9LCRLBSswem06UupjdIFntt6SqpTxteY5O78="; }; nativeBuildInputs = [ autoreconfHook intltool pkg-config + rustPlatform.cargoSetupHook + cargo + rustc ]; buildInputs = [ libxml2 pciutils - gtk2 + gtk3 ddccontrol-db ]; @@ -40,13 +55,14 @@ stdenv.mkDerivation (finalAttrs: { ]; prePatch = '' - substituteInPlace configure.ac \ - --replace \ - "\$""{datadir}/ddccontrol-db" \ + substituteInPlace configure.ac \ + --replace-fail \ + "\$""{datadir}/ddccontrol-db" \ "${ddccontrol-db}/share/ddccontrol-db" - - substituteInPlace src/ddcpci/Makefile.am \ - --replace "chmod 4711" "chmod 0711" + substituteInPlace src/lib/Makefile.am \ + --replace-fail \ + 'DDCONTROL_DATADIR="$(datadir)/ddccontrol-db"' \ + 'DDCONTROL_DATADIR="${ddccontrol-db}/share/ddccontrol-db"' ''; preConfigure = '' @@ -56,6 +72,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Program used to control monitor parameters by software"; homepage = "https://github.com/ddccontrol/ddccontrol"; + mainProgram = "ddccontrol"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix index 761c33d3000e..9ccc1cb21e96 100644 --- a/pkgs/by-name/de/deno/package.nix +++ b/pkgs/by-name/de/deno/package.nix @@ -33,7 +33,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "deno"; - version = "2.9.3"; + version = "2.9.4"; __structuredAttrs = true; @@ -47,10 +47,10 @@ rustPlatform.buildRustPackage (finalAttrs: { repo = "deno"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; # required for tests - hash = "sha256-XMHlWK+lhyn1KO1CSxcuM3KzTjYviVrRw+FUL74bBPc="; + hash = "sha256-ivch++yGRUyWtox/5QqomC4DlTvMBxK+gIcN9/7tt5E="; }; - cargoHash = "sha256-WZxyoD9WMnaLyD3/86R90KWC+9OA15fIMw8SjmovNHA="; + cargoHash = "sha256-ynbHLZXkPPYpsC4dCu6jA6x8ftiTHWZ/uxzdbUcUaa0="; patches = [ ./patches/0002-tests-replace-hardcoded-paths.patch @@ -211,6 +211,8 @@ rustPlatform.buildRustPackage (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isLinux [ # Wants to access /etc/resolv.conf: https://github.com/hickory-dns/hickory-dns/issues/2959 "--skip=tests::test_userspace_resolver" + # We don't have a tmp dir with sticky bit during build + "--skip=util::temp::test::test_ensure_secure_temp_parent_rejects_non_sticky_writable_dir" ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/de/deno/rusty-v8/c_additional_outputs.patch b/pkgs/by-name/de/deno/rusty-v8/c_additional_outputs.patch new file mode 100644 index 000000000000..ba9ad143ea40 --- /dev/null +++ b/pkgs/by-name/de/deno/rusty-v8/c_additional_outputs.patch @@ -0,0 +1,16 @@ +Submodule build contains modified content +diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn +index 11ddb4916..0bd001600 100644 +--- a/build/config/compiler/BUILD.gn ++++ b/build/config/compiler/BUILD.gn +@@ -2827,10 +2827,6 @@ config("split_dwarf") { + # thinlto requires -gsplit-dwarf in ldflags. + if (use_thin_lto && !is_apple) { + ldflags = split_dwarf_flags +- } else { +- # .dwo files are generated when ThinLTO is not used. +- c_additional_outputs = +- [ "{{target_out_dir}}/{{label_name}}/{{source_name_part}}.dwo" ] + } + } + diff --git a/pkgs/by-name/de/deno/rusty-v8/default.nix b/pkgs/by-name/de/deno/rusty-v8/default.nix index 8a61c63adce2..25a56b014ef3 100644 --- a/pkgs/by-name/de/deno/rusty-v8/default.nix +++ b/pkgs/by-name/de/deno/rusty-v8/default.nix @@ -71,26 +71,27 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "rusty-v8"; - version = "149.4.0"; + version = "150.2.0"; src = fetchFromGitHub { owner = "denoland"; repo = "rusty_v8"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-n4dKtki9ov0lWBeLmMDI4Tpk8zQ8YYSf04QW6DTYisY="; + hash = "sha256-Iwgc08bUHR4OiwqopJua6fkQYMOdC5k9TgoCmZQrWIw="; }; patches = [ ./librusty_v8_no_downloads.patch ./llvm22.patch ./gn_inputs_fix.patch + ./c_additional_outputs.patch ] ++ lib.optionals stdenv.targetPlatform.isDarwin [ ./librusty_v8-darwin-fix-__rust_no_alloc_shim_is_unstable_v2.patch ]; - cargoHash = "sha256-bGqg/6sfBaF/JpObgXyP4Mh+4P9zfuzd454m4wjluGw="; + cargoHash = "sha256-M65ODvL+o3njO3SdbJaCvgRupoguCGCIoYY/dYiJPng="; nativeBuildInputs = [ llvmPackages.clang diff --git a/pkgs/by-name/de/devin-desktop/info.json b/pkgs/by-name/de/devin-desktop/info.json index 592f3a25bdb2..5cbbbd0fde40 100644 --- a/pkgs/by-name/de/devin-desktop/info.json +++ b/pkgs/by-name/de/devin-desktop/info.json @@ -1,14 +1,14 @@ { "aarch64-darwin": { - "version": "3.4.27", + "version": "3.5.17", "vscodeVersion": "1.110.1", - "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/0d4bf12ed4a7597cb8ae9016fe8474468aad98a2/Devin-darwin-arm64-3.4.27.zip", - "sha256": "c42b0671c246ef295807e822809cb82dfe65831d4879d68f25334f754babec8d" + "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/2c489dfc762456657db8662309c0d5e76e886397/Devin-darwin-arm64-3.5.17.zip", + "sha256": "bca8cc6154f99f5153cd5b508899d8db64be795a96856a14f1d052b7d8091edd" }, "x86_64-linux": { - "version": "3.4.27", + "version": "3.5.17", "vscodeVersion": "1.110.1", - "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/0d4bf12ed4a7597cb8ae9016fe8474468aad98a2/Devin-linux-x64-3.4.27.tar.gz", - "sha256": "80850124b31331f63c24a201d1317bdacdfb438fb2bcc9b31c9b7a6391391619" + "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/2c489dfc762456657db8662309c0d5e76e886397/Devin-linux-x64-3.5.17.tar.gz", + "sha256": "e7ce36c4baacc617a4d89b0e2fb4403f83b328fefd897aec1be5e31038be4e91" } } diff --git a/pkgs/by-name/de/devmem2/package.nix b/pkgs/by-name/de/devmem2/package.nix deleted file mode 100644 index bc8a155b1cbb..000000000000 --- a/pkgs/by-name/de/devmem2/package.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - stdenv, - fetchurl, -}: - -stdenv.mkDerivation { - pname = "devmem2"; - version = "unstable-2004-08-05"; - - src = fetchurl { - urls = [ - "http://lartmaker.nl/lartware/port/devmem2.c" - "https://raw.githubusercontent.com/hackndev/tools/7ed212230f8fbb1da3424a15ee88de3279bf96ec/devmem2.c" - ]; - sha256 = "14f1k7v6i1yaxg4xcaaf5i4aqn0yabba857zjnbg9wiymy82qf7c"; - }; - - hardeningDisable = [ "format" ]; # fix compile error - - buildCommand = '' - $CC "$src" -o devmem2 - install -D devmem2 "$out/bin/devmem2" - ''; - - meta = { - description = "Simple program to read/write from/to any location in memory"; - mainProgram = "devmem2"; - homepage = "http://lartmaker.nl/lartware/port/"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ bjornfor ]; - }; -} diff --git a/pkgs/by-name/di/dia/fix-build-with-poppler-26-06.patch b/pkgs/by-name/di/dia/fix-build-with-poppler-26-06.patch new file mode 100644 index 000000000000..66c62a79d747 --- /dev/null +++ b/pkgs/by-name/di/dia/fix-build-with-poppler-26-06.patch @@ -0,0 +1,33 @@ +From 2373861a858fb6ee7d50870ae66a59f05c6cd4bd Mon Sep 17 00:00:00 2001 +From: Nadzeya Hutsko +Date: Wed, 22 Jul 2026 20:46:52 +0200 +Subject: [PATCH] Fix build with Poppler >= 26.06 + +poppler 26.06 changed the Page box accessors to return a const reference +instead of a pointer. Take the address of the result, guarded by a +version check so older poppler still builds +--- + plug-ins/pdf/pdf-import.cpp | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/plug-ins/pdf/pdf-import.cpp b/plug-ins/pdf/pdf-import.cpp +index 3af268646..35fc6d9e3 100644 +--- a/plug-ins/pdf/pdf-import.cpp ++++ b/plug-ins/pdf/pdf-import.cpp +@@ -93,8 +93,13 @@ public : + (Annot *annot, void *user_data) G_GNUC_UNUSED, + void *annotDisplayDecideCbkData G_GNUC_UNUSED) + { ++#if POPPLER_VERSION_MAJOR > 26 || (POPPLER_VERSION_MAJOR == 26 && POPPLER_VERSION_MINOR >= 6) ++ const PDFRectangle *mediaBox = &page->getMediaBox(); ++ const PDFRectangle *clipBox = &page->getCropBox (); ++#else + const PDFRectangle *mediaBox = page->getMediaBox(); + const PDFRectangle *clipBox = page->getCropBox (); ++#endif + + if (page->isOk()) { + real w1 = (clipBox->x2 - clipBox->x1); +-- +GitLab + diff --git a/pkgs/by-name/di/dia/package.nix b/pkgs/by-name/di/dia/package.nix index c71a40831715..5bbd709b105d 100644 --- a/pkgs/by-name/di/dia/package.nix +++ b/pkgs/by-name/di/dia/package.nix @@ -50,16 +50,21 @@ let in stdenv.mkDerivation { pname = "dia"; - version = "unstable-2025-10-26"; + version = "0.97.2-unstable-2026-07-24"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "dia"; - rev = "efdf829e8afdbbeb371820932769e35415ebe886"; - hash = "sha256-VFFU5iJnVJdZ2tkNszZ2ooBD+GiCL6MqanzpEWIJerk="; + rev = "ad68cc378b7a187706bc2648c48b44d16fb80819"; + hash = "sha256-ejjSc9GGXD5GsbeRps1T20xifJuzWA1yq/G7jk797Cw="; }; + patches = [ + # https://gitlab.gnome.org/GNOME/dia/-/merge_requests/146 + ./fix-build-with-poppler-26-06.patch + ]; + postPatch = '' # Fix build with poppler 25.10.0 substituteInPlace plug-ins/pdf/pdf-import.cpp \ diff --git a/pkgs/by-name/di/diffyml/package.nix b/pkgs/by-name/di/diffyml/package.nix index c0b8fb86e053..5d28a1c06dfe 100644 --- a/pkgs/by-name/di/diffyml/package.nix +++ b/pkgs/by-name/di/diffyml/package.nix @@ -8,15 +8,17 @@ buildGoModule (finalAttrs: { pname = "diffyml"; - version = "1.7.0"; + version = "1.7.1"; __structuredAttrs = true; + __darwinAllowLocalNetworking = true; + src = fetchFromGitHub { owner = "szhekpisov"; repo = "diffyml"; tag = "v${finalAttrs.version}"; - hash = "sha256-DIKHvFY/eW3CAF/ojW+D737vFCcZk0peRrSb8I/an9Q="; + hash = "sha256-bfFerbjpwQuTCnGKfqUj3ydf1xBdNoP+qH7UTmtZvTk="; }; vendorHash = "sha256-QE/EwVzMqUO24ZAl0WBibGx6x0kNo1AUTZtfnQvX50k="; diff --git a/pkgs/by-name/dr/dracut/CVE-2026-6893.patch b/pkgs/by-name/dr/dracut/CVE-2026-6893.patch new file mode 100644 index 000000000000..d770c1e9625a --- /dev/null +++ b/pkgs/by-name/dr/dracut/CVE-2026-6893.patch @@ -0,0 +1,126 @@ +diff --git a/modules.d/35network-legacy/dhclient-script.sh b/modules.d/35network-legacy/dhclient-script.sh +index 0cb00ab..ae68952 100755 +--- a/modules.d/35network-legacy/dhclient-script.sh ++++ b/modules.d/35network-legacy/dhclient-script.sh +@@ -20,11 +20,11 @@ setup_interface() { + mask=$new_subnet_mask + bcast=$new_broadcast_address + gw=${new_routers%%,*} +- domain=$new_domain_name ++ domain=$(printf -- "%s" "$new_domain_name" | tr -d '[:cntrl:]') + # get rid of control chars + search=$(printf -- "%s" "$new_domain_search" | tr -d '[:cntrl:]') + namesrv=$new_domain_name_servers +- hostname=$new_host_name ++ hostname=$(printf '%s' "$new_host_name" | tr -d -c 'a-zA-Z0-9.-') + [ -n "$new_dhcp_lease_time" ] && lease_time=$new_dhcp_lease_time + [ -n "$new_max_life" ] && lease_time=$new_max_life + preferred_lft=$lease_time +@@ -56,20 +56,32 @@ setup_interface() { + ${preferred_lft:+preferred_lft ${preferred_lft}} + + if [ -n "$gw" ]; then +- if [ "$mask" = "255.255.255.255" ]; then +- # point-to-point connection => set explicit route to gateway +- echo ip route add "$gw" dev "$netif" > /tmp/net."$netif".gw +- fi ++ gw_check=0 ++ for g in $gw; do ++ case "$g" in ++ *[!0-9.]*) ++ gw_check=1 ++ break ++ ;; ++ esac ++ done + +- echo "$gw" | { +- IFS=' ' read -r main_gw other_gw +- echo ip route replace default via "$main_gw" dev "$netif" >> /tmp/net."$netif".gw +- if [ -n "$other_gw" ]; then +- for g in $other_gw; do +- echo ip route add default via "$g" dev "$netif" >> /tmp/net."$netif".gw +- done +- fi +- } ++ if [ $gw_check -eq 0 ]; then ++ if [ "$mask" = "255.255.255.255" ]; then ++ # point-to-point connection => set explicit route to gateway ++ echo ip route add "$gw" dev "$netif" > /tmp/net."$netif".gw ++ fi ++ ++ echo "$gw" | { ++ IFS=' ' read -r main_gw other_gw ++ echo ip route replace default via "$main_gw" dev "$netif" >> /tmp/net."$netif".gw ++ if [ -n "$other_gw" ]; then ++ for g in $other_gw; do ++ echo ip route add default via "$g" dev "$netif" >> /tmp/net."$netif".gw ++ done ++ fi ++ } ++ fi + fi + + if getargbool 1 rd.peerdns; then +@@ -82,15 +94,15 @@ setup_interface() { + fi + # Note: hostname can be fqdn OR short hostname, so chop off any + # trailing domain name and explicitly add any domain if set. +- [ -n "$hostname" ] && echo "echo ${hostname%."$domain"}${domain:+.$domain} > /proc/sys/kernel/hostname" > /tmp/net."$netif".hostname ++ [ -n "$hostname" ] && echo "echo '${hostname%."$domain"}${domain:+.$domain}' > /proc/sys/kernel/hostname" > /tmp/net."$netif".hostname + } + + setup_interface6() { +- domain=$new_domain_name ++ domain=$(printf -- "%s" "$new_domain_name" | tr -d '[:cntrl:]') + # get rid of control chars + search=$(printf -- "%s" "$new_dhcp6_domain_search" | tr -d '[:cntrl:]') + namesrv=$new_dhcp6_name_servers +- hostname=$new_host_name ++ hostname=$(printf '%s' "$new_host_name" | tr -d -c 'a-zA-Z0-9.-') + [ -n "$new_dhcp_lease_time" ] && lease_time=$new_dhcp_lease_time + [ -n "$new_max_life" ] && lease_time=$new_max_life + preferred_lft=$lease_time +@@ -105,7 +117,7 @@ setup_interface6() { + + # Note: hostname can be fqdn OR short hostname, so chop off any + # trailing domain name and explicitly add any domain if set. +- [ -n "$hostname" ] && echo "echo ${hostname%."$domain"}${domain:+.$domain} > /proc/sys/kernel/hostname" > /tmp/net."$netif".hostname ++ [ -n "$hostname" ] && echo "echo '${hostname%."$domain"}${domain:+.$domain}' > /proc/sys/kernel/hostname" > /tmp/net."$netif".hostname + } + + parse_option_121() { +@@ -113,16 +125,18 @@ parse_option_121() { + # Each route is: + # mask_width determines how many destination octets follow (0-4) + # +- # This version validates arguments before operations to prevent +- # "integer expression expected" and "shift count out of range" errors. ++ # Validate all arguments are numeric upfront to prevent ++ # shell injection via crafted octets in destination/gateway. ++ for _octet in "$@"; do ++ case "$_octet" in ++ '' | *[!0-9]*) return 0 ;; ++ esac ++ done + + while [ $# -ge 5 ]; do + mask="$1" + + # Validate mask is a number between 0-32 +- case "$mask" in +- '' | *[!0-9]*) return 0 ;; +- esac + if [ "$mask" -lt 0 ] 2> /dev/null || [ "$mask" -gt 32 ] 2> /dev/null; then + return 0 + fi +@@ -150,9 +164,6 @@ parse_option_121() { + # Check if destination is multicast (224.0.0.0 - 239.255.255.255) + multicast=0 + if [ $need_dest -ge 1 ]; then +- case "$1" in +- '' | *[!0-9]*) return 0 ;; +- esac + if [ "$1" -ge 224 ] 2> /dev/null && [ "$1" -lt 240 ] 2> /dev/null; then + multicast=1 + fi diff --git a/pkgs/by-name/dr/dracut/package.nix b/pkgs/by-name/dr/dracut/package.nix index 7a6de9a45785..dc479789b0d8 100644 --- a/pkgs/by-name/dr/dracut/package.nix +++ b/pkgs/by-name/dr/dracut/package.nix @@ -38,6 +38,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-2jdS7/LGuLSBBXv1R/o8yjgwdXl2l2wNbZWxq01wSb0"; }; + # Patch from https://github.com/dracut-ng/dracut/commit/11577739221ff38c1fd29abbba51a6c797376ed6 included in main branch. + # Adapted to version 111 (line number and small formatting diff) + patches = [ + ./CVE-2026-6893.patch + ]; + strictDeps = true; __structuredAttrs = true; diff --git a/pkgs/by-name/du/dump1090-fa/package.nix b/pkgs/by-name/du/dump1090-fa/package.nix index 941f75fbf06a..df8cb12bec52 100644 --- a/pkgs/by-name/du/dump1090-fa/package.nix +++ b/pkgs/by-name/du/dump1090-fa/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch2, pkg-config, hackrf, libbladeRF, @@ -15,23 +14,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "dump1090"; - version = "10.2"; + version = "11.1"; src = fetchFromGitHub { owner = "flightaware"; repo = "dump1090"; tag = "v${finalAttrs.version}"; - hash = "sha256-kTJ8FMugBRJaxWas/jEj4E5TmVnNpNdhq4r2YFFwgTU="; + hash = "sha256-A6nkct7jvpPtPZ+iM2UKVckIXgNxxq5sxhyPiw5+EZk="; }; - patches = [ - # Fix compilation with GCC 15: https://github.com/flightaware/dump1090/pull/261 - (fetchpatch2 { - url = "https://github.com/flightaware/dump1090/commit/93be1da123215e8ac15a0deaffedd480e8899f77.patch?full_index=1"; - hash = "sha256-x+U86b1j+mSpqfG4oFnHEz3cd7/O57ezPUf8yBrLzbc="; - }) - ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ @@ -44,8 +35,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional stdenv.hostPlatform.isLinux limesuite; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-implicit-function-declaration -Wno-int-conversion -Wno-unknown-warning-option"; - buildFlags = [ "DUMP1090_VERSION=${finalAttrs.version}" "showconfig" @@ -74,6 +63,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ earldouglas aciceri + ryand56 ]; mainProgram = "dump1090"; }; diff --git a/pkgs/by-name/ea/easyeffects/package.nix b/pkgs/by-name/ea/easyeffects/package.nix index eeace37ecfb3..871930bd2ddf 100644 --- a/pkgs/by-name/ea/easyeffects/package.nix +++ b/pkgs/by-name/ea/easyeffects/package.nix @@ -61,13 +61,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "easyeffects"; - version = "8.2.7"; + version = "8.2.8"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; tag = "v${finalAttrs.version}"; - hash = "sha256-YYwVoqCRVAZVu8vCTN3ZSicy1Fzw3l+hQbooGAE/AEI="; + hash = "sha256-gkUJxEmFfUAKUnr+Gs65y9l0bdNXXd0f8ql0keM2bVs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fa/fasmg/package.nix b/pkgs/by-name/fa/fasmg/package.nix index 1ea5b4b1977b..96b1062241b4 100644 --- a/pkgs/by-name/fa/fasmg/package.nix +++ b/pkgs/by-name/fa/fasmg/package.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "fasmg"; - version = "l7xm"; + version = "l8vn"; src = fetchzip { url = "https://flatassembler.net/fasmg.${finalAttrs.version}.zip"; - sha256 = "sha256-m/mLZLluvoxr0VsNVcBnHvv1LlagafkX6fwZSovtO9s="; + sha256 = "sha256-/Izf7w7yofmPp1J85BgWbMLIGC4SGsCqXzhdecOo7CE="; stripRoot = false; }; diff --git a/pkgs/by-name/fl/flux-build/package.nix b/pkgs/by-name/fl/flux-build/package.nix new file mode 100644 index 000000000000..ec9940a227e2 --- /dev/null +++ b/pkgs/by-name/fl/flux-build/package.nix @@ -0,0 +1,34 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "flux-build"; + version = "3.0.10"; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "DoodleScheduling"; + repo = "flux-build"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ToQVm69XqJgRahunUXjNnIiieqSV8TzgFdtFJktz5/g="; + }; + + vendorHash = "sha256-kVi/VVVPTblDvCjvnsKxfqYELBahHmzTlW74ktdZC7k="; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Build and test kustomize overlays with Flux HelmRelease templating"; + homepage = "https://github.com/DoodleScheduling/flux-build"; + license = lib.licenses.asl20; + changelog = "https://github.com/DoodleScheduling/flux-build/releases/tag/v${finalAttrs.version}"; + mainProgram = "flux-build"; + maintainers = with lib.maintainers; [ MNThomson ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/fo/forecast/package.nix b/pkgs/by-name/fo/forecast/package.nix index 25db7b50a01d..6c9113e4c0f6 100644 --- a/pkgs/by-name/fo/forecast/package.nix +++ b/pkgs/by-name/fo/forecast/package.nix @@ -16,13 +16,13 @@ rustPlatform.buildRustPackage { pname = "forecast"; - version = "0-unstable-2026-07-12"; + version = "0-unstable-2026-07-17"; src = fetchFromGitHub { owner = "cosmic-utils"; repo = "forecast"; - rev = "0de1b7502979eb3704445c98ce8dbb7969e109da"; - hash = "sha256-9IZDDIhZY+YC0SOie5z0Ed5UAvBcf+soZ0RRz8sr71w="; + rev = "22a7de05c4bdaa4a4fa33f51091eb681d021f90e"; + hash = "sha256-z0WYytAEZ1PaO5yyh+iDbJOSPZmnKV503HUZTpQPUXw="; }; cargoHash = "sha256-F5AlYm9bzJJUrDiY712dbwpCR3lzvQNFKXHzIDG+TVQ="; diff --git a/pkgs/by-name/fr/freqle/package.nix b/pkgs/by-name/fr/freqle/package.nix new file mode 100644 index 000000000000..470c08349885 --- /dev/null +++ b/pkgs/by-name/fr/freqle/package.nix @@ -0,0 +1,25 @@ +{ + lib, + rustPlatform, + fetchCrate, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "freqle"; + version = "0.1.0"; + __structuredAttrs = true; + src = fetchCrate { + inherit (finalAttrs) pname version; + hash = "sha256-1LL1C9jYPjboGgz0z7AdWeMZR7DApCDlQ8Cj7I+iADY="; + }; + cargoHash = "sha256-VeI2jyq7EXpjIT4e6nuTXj8z5ANoZyfxd27k/4ZaY7k="; + + meta = { + description = "Simple CLI frecency history"; + homepage = "https://github.com/jonascarpay/freqle"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jonascarpay ]; + mainProgram = "freqle"; + }; + +}) diff --git a/pkgs/by-name/fr/fromager/package.nix b/pkgs/by-name/fr/fromager/package.nix index 91625a3276f2..34912d3be0d5 100644 --- a/pkgs/by-name/fr/fromager/package.nix +++ b/pkgs/by-name/fr/fromager/package.nix @@ -1,53 +1,55 @@ { lib, - stdenv, - python3, fetchFromGitHub, + python3Packages, writableTmpDirAsHomeHook, }: -python3.pkgs.buildPythonApplication (finalAttrs: { +python3Packages.buildPythonApplication (finalAttrs: { pname = "fromager"; - version = "0.71.0"; + version = "0.91.0"; pyproject = true; src = fetchFromGitHub { owner = "python-wheel-build"; repo = "fromager"; tag = finalAttrs.version; - hash = "sha256-3zz37BZx8FcKNl8mSmClIrZxvL+2AS0hJDct6K7BhBE="; + hash = "sha256-N+4DbKNUpQdkJAfr0vwlfXJS8FLLBOXxuzkLoJblJM4="; }; - build-system = with python3.pkgs; [ + build-system = with python3Packages; [ hatchling hatch-vcs ]; - dependencies = with python3.pkgs; [ + dependencies = with python3Packages; [ click elfdeps - html5lib + license-expression packaging - pkginfo + packageurl-python psutil pydantic + pypi-simple pyproject-hooks pyyaml requests - requests-mock resolvelib rich - setuptools + starlette stevedore tomlkit tqdm uv + uvicorn wheel ]; - nativeCheckInputs = with python3.pkgs; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook + pytest-xdist requests-mock + spdx-tools twine uv writableTmpDirAsHomeHook @@ -57,21 +59,10 @@ python3.pkgs.buildPythonApplication (finalAttrs: { "fromager" ]; - disabledTestPaths = [ - # Depends on wheel.cli module that is private since wheel 0.46.0 - "tests/test_wheels.py" - ]; - - disabledTests = [ - # Accessing pypi.org (not allowed in sandbox) - "test_get_build_backend_dependencies" - "test_get_build_sdist_dependencies" - ] - ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [ - # Assumes platform.machine() returns 'arm64' on ARM64, which is not true for Linux. - # Re-enable once https://github.com/python-wheel-build/fromager/pull/849 is merged. - "test_add_constraint_conflict" - ]; + # Upstream runs pytest with `--log-level DEBUG`, which this test suite + # relies on for caplog assertions against INFO records. + # Reported: https://github.com/python-wheel-build/fromager/issues/1274 + pytestFlags = [ "--log-level=DEBUG" ]; meta = { description = "Wheel maker"; diff --git a/pkgs/by-name/fs/fsuae/package.nix b/pkgs/by-name/fs/fsuae/package.nix index 9ff2a17e17f4..7854c414d357 100644 --- a/pkgs/by-name/fs/fsuae/package.nix +++ b/pkgs/by-name/fs/fsuae/package.nix @@ -6,10 +6,11 @@ freetype, gettext, glib, - gtk2, libGL, libGLU, libmpeg2, + libx11, + libxi, lua, openal, pkg-config, @@ -21,7 +22,7 @@ }: stdenv.mkDerivation (finalAttrs: { - pname = "fs-uae"; + pname = "fsuae"; version = "3.2.35"; src = fetchFromGitHub { @@ -31,6 +32,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-e+Q+PC6Kpq3OBKsgoRvmu2p9dQfJeRCdFO1agXIGcU8="; }; + enableParallelBuilding = true; + nativeBuildInputs = [ autoreconfHook pkg-config @@ -43,10 +46,11 @@ stdenv.mkDerivation (finalAttrs: { freetype gettext glib - gtk2 libGL libGLU libmpeg2 + libx11 + libxi lua openal zlib diff --git a/pkgs/by-name/ga/gale/package.nix b/pkgs/by-name/ga/gale/package.nix index e9e42b11d6a8..dc8eca9df22b 100644 --- a/pkgs/by-name/ga/gale/package.nix +++ b/pkgs/by-name/ga/gale/package.nix @@ -38,13 +38,13 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "gale"; - version = "1.13.4"; + version = "1.19.0"; src = fetchFromGitHub { owner = "Kesomannen"; repo = "gale"; tag = finalAttrs.version; - hash = "sha256-ZCHknOp6ll9q6OBW/5/mNcu0d0zZj1rkCjPiumjMVzk="; + hash = "sha256-VufV/Z1XODQKwbEpMrw0xNMdMl8D1t3bPIfdwRhQI9I="; }; pnpmDeps = fetchPnpmDeps { @@ -56,7 +56,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ; pnpm = pnpm_10; fetcherVersion = 3; - hash = "sha256-bCGiYVmoWjpwneTQUwetna7u29BMIv48qWgZ2gd93hQ="; + hash = "sha256-/IR+34cdnCt9WpYdMaT92YIC/2JjEe/mZdeQewdWTek="; }; postPatch = '' @@ -70,7 +70,11 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoRoot = "src-tauri"; buildAndTestSubdir = finalAttrs.cargoRoot; - cargoHash = "sha256-kAPTiGHWO/eBapPcH8xItOFeZYC0URzLYdl2GMQ50Ls="; + cargoHash = "sha256-4WSWvMQIYPzfxjDyuQI37ymxJhMVGxmxYDVSoknIzmg="; + + checkFlags = [ + "--skip=config::bepinex::tests::check_from_string" # Fails a left == right check, even with left and right data being identical + ]; nativeBuildInputs = [ jq diff --git a/pkgs/by-name/ge/gearboy/package.nix b/pkgs/by-name/ge/gearboy/package.nix index e96f9ab020f5..d581ff8301f3 100644 --- a/pkgs/by-name/ge/gearboy/package.nix +++ b/pkgs/by-name/ge/gearboy/package.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gearboy"; - version = "3.8.9"; + version = "3.8.11"; src = fetchFromGitHub { owner = "drhelius"; repo = "Gearboy"; tag = finalAttrs.version; - hash = "sha256-p6gIGWkcv4jJacF4baK8Uej2kwwPnd/ylvgmUHHPXnI="; + hash = "sha256-3Z8J71c7tRng7Nj+05pbjtientfkED+SyZF43tZSGDg="; }; __structuredAttrs = true; diff --git a/pkgs/by-name/gh/ghostunnel/package.nix b/pkgs/by-name/gh/ghostunnel/package.nix index 9af77d72cbd5..a32d9bcb62f1 100644 --- a/pkgs/by-name/gh/ghostunnel/package.nix +++ b/pkgs/by-name/gh/ghostunnel/package.nix @@ -3,17 +3,16 @@ fetchFromGitHub, lib, nixosTests, - ghostunnel, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "ghostunnel"; version = "1.10.0"; src = fetchFromGitHub { owner = "ghostunnel"; repo = "ghostunnel"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-BntQCauAgnaiNn31nrVEsHFvQv7zK6D0z/rInbCVTr0="; }; @@ -41,13 +40,13 @@ buildGoModule rec { imports = [ (lib.modules.importApply ./service.nix { }) ]; - ghostunnel.package = ghostunnel; # FIXME: finalAttrs.finalPackage + ghostunnel.package = finalAttrs.finalPackage; }; meta = { description = "TLS proxy with mutual authentication support for securing non-TLS backend applications"; homepage = "https://github.com/ghostunnel/ghostunnel#readme"; - changelog = "https://github.com/ghostunnel/ghostunnel/releases/tag/v${version}"; + changelog = "https://github.com/ghostunnel/ghostunnel/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ roberth @@ -55,4 +54,4 @@ buildGoModule rec { ]; mainProgram = "ghostunnel"; }; -} +}) diff --git a/pkgs/by-name/gh/ghostunnel/service.nix b/pkgs/by-name/gh/ghostunnel/service.nix index 52a2f4016e79..67e2ba60add4 100644 --- a/pkgs/by-name/gh/ghostunnel/service.nix +++ b/pkgs/by-name/gh/ghostunnel/service.nix @@ -187,6 +187,9 @@ in process = { argv = [ (getExe cfg.package) + # ghostunnel's landlock rules don't like reading the CA certs from /etc + # because they are links to /nix/store, which isn't part of its rules + "--disable-landlock" "server" "--listen" cfg.listen diff --git a/pkgs/by-name/gi/gitkraken/package.nix b/pkgs/by-name/gi/gitkraken/package.nix index ddc70a42368d..870fccd09ac7 100644 --- a/pkgs/by-name/gi/gitkraken/package.nix +++ b/pkgs/by-name/gi/gitkraken/package.nix @@ -56,19 +56,19 @@ let pname = "gitkraken"; - version = "12.2.1"; + version = "12.3.1"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; srcs = { x86_64-linux = fetchzip { url = "https://api.gitkraken.dev/releases/production/linux/x64/${version}/gitkraken-amd64.tar.gz"; - hash = "sha256-CX/NxvLrxia92vSIjWXzIiBdTfhZ8TW7a5g1hEt+Y/k="; + hash = "sha256-VK96/i+7dXn6j/s2/PSzY4yQlawO0SmJ0F67gEcukNc="; }; aarch64-darwin = fetchzip { url = "https://api.gitkraken.dev/releases/production/darwin/arm64/${version}/GitKraken-v${version}.zip"; - hash = "sha256-JEgqJ6smqDG/2KFApRSYTuL1Ch1sIkhGDMjqVsgQUmc="; + hash = "sha256-WlMWIAoSTloqhYAhP/uifj7QpR843IL1oIQmZoXBPDE="; }; }; diff --git a/pkgs/by-name/gl/glaze/package.nix b/pkgs/by-name/gl/glaze/package.nix index 96bf10e34cd2..c432f350cfd0 100644 --- a/pkgs/by-name/gl/glaze/package.nix +++ b/pkgs/by-name/gl/glaze/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "glaze"; - version = "7.9.0"; + version = "7.9.1"; src = fetchFromGitHub { owner = "stephenberry"; repo = "glaze"; tag = "v${finalAttrs.version}"; - hash = "sha256-vNhxBdGaM70YABfwczvJcAFIYdEGIUGE8Sp2sgkTcaQ="; + hash = "sha256-NRRq5MGF2f5PW0teYnq58ELzson+U6KHVPaY6r30KLA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/go/google-lighthouse/package.nix b/pkgs/by-name/go/google-lighthouse/package.nix index 143b2a52ca96..dbfef1e3b86a 100644 --- a/pkgs/by-name/go/google-lighthouse/package.nix +++ b/pkgs/by-name/go/google-lighthouse/package.nix @@ -13,18 +13,18 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "google-lighthouse"; - version = "13.4.0"; + version = "13.4.1"; src = fetchFromGitHub { owner = "GoogleChrome"; repo = "lighthouse"; tag = "v${finalAttrs.version}"; - hash = "sha256-diZT1SOCSpuiQfAS7kjGxea2imVAJyKYxf2WFBsE/H0="; + hash = "sha256-+6UVMZTJbTJGFZaXA9yqIByrvZ8oiLKIK+p/24/41UU="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-Rp+LCYRZ5jVGiR1L8Wyd5juw8GPrwnUH2chrxrrwE6k="; + hash = "sha256-pHXPurgGRoVI1WDSywAFWOSSuAhH0iFGDl2BPy1X0HI="; }; yarnBuildScript = "build-report"; diff --git a/pkgs/by-name/go/gotosocial/package.nix b/pkgs/by-name/go/gotosocial/package.nix index e27130db606e..340c18e2c08e 100644 --- a/pkgs/by-name/go/gotosocial/package.nix +++ b/pkgs/by-name/go/gotosocial/package.nix @@ -1,13 +1,25 @@ { lib, + stdenv, buildGo125Module, fetchFromCodeberg, fetchYarnDeps, nodejs, yarn, yarnConfigHook, + makeBinaryWrapper, + ffmpeg, nixosTests, nix-update-script, + # Wazero (the WASM runtime GoToSocial uses to bundle ffmpeg/ffprobe/sqlite3) + # only has a fast "compiler" backend for amd64 and arm64. On every other + # architecture (riscv64, 32-bit ARM, ppc64le, ...) it falls back to a WASM + # interpreter that is far too slow for real-world media processing. + # Upstream exposes the explicitly unsupported/experimental "nowasm" build + # tag for this situation: it drops the embedded WASM ffmpeg/ffprobe/sqlite3 + # and instead shells out to ffmpeg/ffprobe binaries found on $PATH. + # See: https://docs.gotosocial.org/en/latest/advanced/builds/nowasm/ + withWasm ? stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isAarch64, }: buildGo125Module (finalAttrs: { pname = "gotosocial"; @@ -30,13 +42,15 @@ buildGo125Module (finalAttrs: { tags = [ "kvformat" - ]; + ] + ++ lib.optionals (!withWasm) [ "nowasm" ]; nativeBuildInputs = [ nodejs yarn yarnConfigHook - ]; + ] + ++ lib.optionals (!withWasm) [ makeBinaryWrapper ]; yarnOfflineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/web/source/yarn.lock"; @@ -68,6 +82,12 @@ buildGo125Module (finalAttrs: { mkdir -p $out/share/gotosocial/web mv web/{assets,template} $out/share/gotosocial/web + '' + + lib.optionalString (!withWasm) '' + # nowasm builds need ffmpeg/ffprobe available on $PATH at runtime, + # since the embedded WASM copies have been compiled out. + wrapProgram $out/bin/gotosocial \ + --prefix PATH : ${lib.makeBinPath [ ffmpeg ]} ''; # tests are working only on x86_64-linux diff --git a/pkgs/by-name/gr/graphicsmagick/package.nix b/pkgs/by-name/gr/graphicsmagick/package.nix index 4c9ab79b4938..29e669edc997 100644 --- a/pkgs/by-name/gr/graphicsmagick/package.nix +++ b/pkgs/by-name/gr/graphicsmagick/package.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "graphicsmagick"; - version = "1.3.47"; + version = "1.3.48"; src = fetchurl { url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${finalAttrs.version}.tar.xz"; - hash = "sha256-lftoLasCBqnbFo0GWWP0/99aYLCyo3WsofRJL7GNBic="; + hash = "sha256-khjreBeREPkTcQZqt1yztN0DS5u0ZLKc6bq3oRl5Iys="; }; outputs = [ diff --git a/pkgs/by-name/gr/gridtracker2/package.nix b/pkgs/by-name/gr/gridtracker2/package.nix index bd45ad2b1ed2..12f158f4194b 100644 --- a/pkgs/by-name/gr/gridtracker2/package.nix +++ b/pkgs/by-name/gr/gridtracker2/package.nix @@ -11,13 +11,13 @@ }: buildNpmPackage (finalAttrs: { pname = "gridtracker2"; - version = "2.260714.0"; + version = "2.260723.0"; src = fetchFromGitLab { owner = "gridtracker.org"; repo = "gridtracker2"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZY+p86wgjzVNALBt6+Gn68sZ6tNcsq5wo1QykZccPT0="; + hash = "sha256-BfUJhkw242Gu8gxCeDiIzpTiuToBSlKlI5+Z5Ae1kdE="; }; npmDepsHash = "sha256-5h3bswjVf/8JHhwHRFTUfydN7XXtWbxNHTZ0mLL7RT8="; diff --git a/pkgs/by-name/gs/gsender/package.nix b/pkgs/by-name/gs/gsender/package.nix index c555d3320c5c..2a436d5b9af7 100644 --- a/pkgs/by-name/gs/gsender/package.nix +++ b/pkgs/by-name/gs/gsender/package.nix @@ -5,12 +5,12 @@ }: let - version = "1.6.2"; + version = "1.6.3"; pname = "gsender"; src = fetchurl { url = "https://github.com/Sienci-Labs/gsender/releases/download/v${version}/gSender-${version}-Linux-Intel-64Bit.AppImage"; - hash = "sha256-DZBTnvbxh2n4KVhbbe7JG0/q+wNQVEkHN8w4+5RuQGw="; + hash = "sha256-xWsRSzJm5aA13qCBI2MRzauvPqoOBtxqtGb3gLAa3sI="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/gt/gtkspell2/gettext-0.25.patch b/pkgs/by-name/gt/gtkspell2/gettext-0.25.patch deleted file mode 100644 index abe8c5446508..000000000000 --- a/pkgs/by-name/gt/gtkspell2/gettext-0.25.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index e926833..667a8e6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -12,6 +12,10 @@ AC_CONFIG_SRCDIR(gtkspell/gtkspell.c) - AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) - AC_CONFIG_HEADERS([config.h]) - -+AC_CONFIG_MACRO_DIRS([m4]) -+AM_GNU_GETTEXT_VERSION([0.25]) -+AM_GNU_GETTEXT([external]) -+ - SPELLER_LIB=-lenchant - - AC_SUBST(SPELLER_LIB) diff --git a/pkgs/by-name/gt/gtkspell2/package.nix b/pkgs/by-name/gt/gtkspell2/package.nix deleted file mode 100644 index ceab5f828149..000000000000 --- a/pkgs/by-name/gt/gtkspell2/package.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - stdenv, - lib, - fetchurl, - fetchpatch, - autoreconfHook, - docbook_xsl, - gtk-doc, - intltool, - pkg-config, - aspell, - enchant, - gtk2, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "gtkspell"; - version = "2.0.16"; - - src = fetchurl { - url = "mirror://sourceforge/gtkspell/gtkspell-${finalAttrs.version}.tar.gz"; - sha256 = "00hdv28bp72kg1mq2jdz1sdw2b8mb9iclsp7jdqwpck705bdriwg"; - }; - - patches = [ - # Fix build with gettext 0.25 - ./gettext-0.25.patch - # Build with enchant 2 - # https://github.com/archlinux/svntogit-packages/tree/packages/gtkspell/trunk - (fetchpatch { - url = "https://github.com/archlinux/svntogit-packages/raw/17fb30b5196db378c18e7c115f28e97b962b95ff/trunk/enchant-2.diff"; - sha256 = "0d9409bnapwzwhnfpz3dvl6qalskqa4lzmhrmciazsypbw3ry5rf"; - }) - ]; - - nativeBuildInputs = [ - autoreconfHook - docbook_xsl - gtk2 # GLIB_GNU_GETTEXT - gtk-doc - intltool - pkg-config - ]; - - buildInputs = [ - aspell - enchant - gtk2 - ]; - - meta = { - description = "Word-processor-style highlighting and replacement of misspelled words"; - homepage = "https://gtkspell.sourceforge.net"; - platforms = lib.platforms.unix; - license = lib.licenses.gpl2; - }; -}) diff --git a/pkgs/by-name/i2/i2p/package.nix b/pkgs/by-name/i2/i2p/package.nix index 1f25bf58c883..8660f4207e1f 100644 --- a/pkgs/by-name/i2/i2p/package.nix +++ b/pkgs/by-name/i2/i2p/package.nix @@ -32,7 +32,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "i2p"; - version = "2.12.0"; + version = "2.13.0"; src = fetchzip { urls = [ @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { "https://files.i2p-projekt.de/" "https://download.i2p2.no/releases/" ]); - hash = "sha256-gpxmCNtatF6wVvBBB5/LWzgL5e7i8c145dQ/yzldwwQ="; + hash = "sha256-fCtjCKbvad8Uk+1ir1suJ0MqV8JjAcmOKXJicbUtKls="; }; strictDeps = true; diff --git a/pkgs/by-name/il/iloader/package.nix b/pkgs/by-name/il/iloader/package.nix index 2caf94bfb38e..76a04ae2e930 100644 --- a/pkgs/by-name/il/iloader/package.nix +++ b/pkgs/by-name/il/iloader/package.nix @@ -22,13 +22,13 @@ rustPlatform.buildRustPackage (finalAttrs: { __structuredAttrs = true; pname = "iloader"; - version = "2.2.6"; + version = "2.2.7"; src = fetchFromGitHub { owner = "nab138"; repo = "iloader"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-zSl08bhJ/OrdcvvL1ciybxgnLqrg4IinmcGXrsPQYyQ="; + sha256 = "sha256-DLs9jNnkykAdFSaDZCfLmUl+oYja7kxWlV5Db2TQQE8="; }; nodeModules = stdenv.mkDerivation { @@ -71,7 +71,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoRoot = "src-tauri"; buildAndTestSubdir = "src-tauri"; - cargoHash = "sha256-6nDqIikItl5SuHN2o/iQREiOkY+bYkP7akShOEtY9JY="; + cargoHash = "sha256-92C6xeEVLtjCSqkJBrCOaMjBJj7yIuRM3zRtkurnBT4="; doCheck = false; diff --git a/pkgs/by-name/in/intel-compute-runtime/package.nix b/pkgs/by-name/in/intel-compute-runtime/package.nix index 1e5ffa895573..3404a67d56dd 100644 --- a/pkgs/by-name/in/intel-compute-runtime/package.nix +++ b/pkgs/by-name/in/intel-compute-runtime/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "intel-compute-runtime"; - version = "26.22.38646.4"; + version = "26.27.39122.11"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; tag = finalAttrs.version; - hash = "sha256-YjCRbYsq44U+pwdTnyA5lffJtSHVK2u3R2XRRNb6l9c="; + hash = "sha256-CbOtBgYlvn5r15gB7skmmZ+ZvRwq7FFtouICakku0ls="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/in/intel-llvm/unwrapped.nix b/pkgs/by-name/in/intel-llvm/unwrapped.nix index f01144744b3a..269205435786 100644 --- a/pkgs/by-name/in/intel-llvm/unwrapped.nix +++ b/pkgs/by-name/in/intel-llvm/unwrapped.nix @@ -57,7 +57,11 @@ let cp $out/bin/clang-${llvmMajorVersion} $out/bin/clang cp $out/bin/clang-${llvmMajorVersion} $out/bin/clang++ ''; - passthru.isClang = true; + passthru = { + isClang = true; + langC = true; + langCC = true; + }; } ); @@ -296,6 +300,8 @@ stdenv.mkDerivation (finalAttrs: { passthru = { isClang = true; + langC = true; + langCC = true; inherit unified-runtime; diff --git a/pkgs/by-name/in/invidious/package.nix b/pkgs/by-name/in/invidious/package.nix index 57d6250fee35..589f0e55d209 100644 --- a/pkgs/by-name/in/invidious/package.nix +++ b/pkgs/by-name/in/invidious/package.nix @@ -3,7 +3,6 @@ callPackage, crystal, fetchFromGitHub, - fetchpatch2, librsvg, pkg-config, libxml2, @@ -42,15 +41,6 @@ crystal.buildCrystalPackage rec { inherit (versions.invidious) hash; }; - patches = [ - # Remove with the first release containing this commit. - (fetchpatch2 { - name = "CVE-2026-58447.patch"; - url = "https://github.com/iv-org/invidious/commit/77ad41678b45c4f6815940123f1796fc51259f45.patch?full_index=1"; - hash = "sha256-0pf6eu0ckQ2gYHLr2tEDy+1dvAhVjepG26kuxuHbZl8="; - }) - ]; - postPatch = let # Replacing by the value (templates) of the variables ensures that building diff --git a/pkgs/by-name/in/invidious/versions.json b/pkgs/by-name/in/invidious/versions.json index 74b6e3663d93..bb9e89200c4c 100644 --- a/pkgs/by-name/in/invidious/versions.json +++ b/pkgs/by-name/in/invidious/versions.json @@ -1,9 +1,9 @@ { "invidious": { - "hash": "sha256-xJZjEnSeMnDo37ohtSAI2ucaPPv+nBYdrslHUCL/Pd8=", - "version": "2.20260626.0", - "date": "2026.06.27", - "commit": "ad0bd928" + "hash": "sha256-QV3fN0wwbtds5hoQfPu56rlULe2/xu0Kw9wAS9fszKQ=", + "version": "2.20260723.0", + "date": "2026.07.23", + "commit": "5953859e" }, "videojs": { "hash": "sha256-jED3zsDkPN8i6GhBBJwnsHujbuwlHdsVpVqa1/pzSH4=" diff --git a/pkgs/by-name/jf/jftui/package.nix b/pkgs/by-name/jf/jftui/package.nix index ac0bc0443921..fc6a07f08e43 100644 --- a/pkgs/by-name/jf/jftui/package.nix +++ b/pkgs/by-name/jf/jftui/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/Aanok/jftui"; license = lib.licenses.unlicense; maintainers = [ lib.maintainers.nyanloutre ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "jftui"; }; }) diff --git a/pkgs/by-name/ji/jitsi/jitsi.patch b/pkgs/by-name/ji/jitsi/jitsi.patch deleted file mode 100644 index 07b16b919962..000000000000 --- a/pkgs/by-name/ji/jitsi/jitsi.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- /home/dario/Downloads/jitsi/resources/install/generic/run.sh 2013-11-01 15:37:21.000000000 +0000 -+++ jitsi/resources/install/generic/run.sh 2014-03-04 11:52:30.796397567 +0000 -@@ -1,4 +1,9 @@ --mkdir -p $HOME/.sip-communicator/log -+#! /bin/bash -+# A modified version of the generic run.sh -+ -+#mkdir -p $HOME/.sip-communicator/log -+ -+cd "$(dirname "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")")" - - # Get architecture - ARCH=`uname -m | sed -e s/x86_64/64/ -e s/i.86/32/` -@@ -6,10 +11,12 @@ - # Additionnal JVM arguments - CLIENTARGS="" - -+NATIVELIBS="lib/native/linux-64" - if [ $ARCH = 32 ] - then - CLIENTARGS="-client -Xmx256m" -+ NATIVELIBS="lib/native/linux" - fi - - export PATH=$PATH:native --java $CLIENTARGS -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djava.library.path=native -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator -+LD_LIBRARY_PATH=@EXTRALIBS@ exec @JAVA@ $CLIENTARGS -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djava.library.path=$NATIVELIBS -Dfelix.config.properties=file:lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator diff --git a/pkgs/by-name/ji/jitsi/package.nix b/pkgs/by-name/ji/jitsi/package.nix deleted file mode 100644 index bff74b04f310..000000000000 --- a/pkgs/by-name/ji/jitsi/package.nix +++ /dev/null @@ -1,99 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - makeDesktopItem, - unzip, - ant, - jdk8, - # Optional, Jitsi still runs without, but you may pass null: - alsa-lib, - dbus, - gtk2, - libpulseaudio, - openssl, - libxv, - libxscrnsaver, - libxext, - libx11, -}: - -let - jdk = jdk8; -in -stdenv.mkDerivation (finalAttrs: { - pname = "jitsi"; - version = "2.11.5633"; - - src = fetchFromGitHub { - owner = "jitsi"; - repo = "jitsi"; - tag = lib.versions.patch finalAttrs.version; - hash = "sha256-CN4o0VfHdoUteI2wyJ2hFJ9UsQ2wWUzcvrLMbR/l36M="; - }; - - patches = [ ./jitsi.patch ]; - - jitsiItem = makeDesktopItem { - name = "Jitsi"; - exec = "jitsi"; - comment = "VoIP and Instant Messaging client"; - desktopName = "Jitsi"; - genericName = "Instant Messaging"; - categories = [ "Chat" ]; - }; - - libPath = lib.makeLibraryPath [ - stdenv.cc.cc # For libstdc++. - alsa-lib - dbus - gtk2 - libpulseaudio - openssl - libx11 - libxext - libxscrnsaver - libxv - ]; - - nativeBuildInputs = [ unzip ]; - buildInputs = [ - ant - jdk - ]; - - buildPhase = "ant make"; - - installPhase = '' - mkdir -p $out - cp -a lib $out/ - rm -rf $out/lib/native/solaris - cp -a sc-bundles $out/ - mkdir $out/bin - cp resources/install/generic/run.sh $out/bin/jitsi - chmod +x $out/bin/jitsi - substituteInPlace $out/bin/jitsi \ - --subst-var-by JAVA ${jdk}/bin/java \ - --subst-var-by EXTRALIBS ${gtk2.out}/lib - sed -e 's,^java\ ,${jdk}/bin/java ,' -i $out/bin/jitsi - patchShebangs $out - libPath="$libPath:${jdk.home}/lib/${jdk.architecture}" - find $out/ -type f -name '*.so' | while read file; do - patchelf --set-rpath "$libPath" "$file" && \ - patchelf --shrink-rpath "$file" - done - ''; - - meta = { - homepage = "https://desktop.jitsi.org/"; - description = "Open Source Video Calls and Chat"; - mainProgram = "jitsi"; - sourceProvenance = with lib.sourceTypes; [ - binaryBytecode - binaryNativeCode - ]; - license = lib.licenses.lgpl21Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.jitsi ]; - }; -}) diff --git a/pkgs/by-name/jj/jjui/package.nix b/pkgs/by-name/jj/jjui/package.nix index 9ed459e2d028..c9f17b2eaf62 100644 --- a/pkgs/by-name/jj/jjui/package.nix +++ b/pkgs/by-name/jj/jjui/package.nix @@ -8,16 +8,18 @@ }: buildGo125Module (finalAttrs: { pname = "jjui"; - version = "0.10.8"; + version = "0.10.9"; + __structuredAttrs = true; + strictDeps = true; src = fetchFromGitHub { owner = "idursun"; repo = "jjui"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZbmCPCTsSbphLUy+lrTt4/6DVq70edKGI59U0HDbawE="; + hash = "sha256-D/ZBH9bsiWO26+xxixD8RKgnoA3x74YdYAIoRznsBTQ="; }; - vendorHash = "sha256-thGlfZ0SwHpynYydxu6Sg8OUe5kr7jiPKvl6BXS5BWA="; + vendorHash = "sha256-BldmFVYpRPdnyeswPKGspH4oZ2mjvFS5VbTu3DN5bJg="; ldflags = [ "-X main.Version=${finalAttrs.version}" ]; diff --git a/pkgs/by-name/jm/jmol/package.nix b/pkgs/by-name/jm/jmol/package.nix index 59150799e1ef..3dd0e46e51fa 100644 --- a/pkgs/by-name/jm/jmol/package.nix +++ b/pkgs/by-name/jm/jmol/package.nix @@ -31,7 +31,7 @@ let }; in stdenv.mkDerivation (finalAttrs: { - version = "16.4.11"; + version = "16.4.15"; pname = "jmol"; src = @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${finalAttrs.version}/Jmol-${finalAttrs.version}-binary.tar.gz"; - hash = "sha256-kDt6XF5axy9DhygLZcImV37plkq/xDqi2aL2wKV9wh4="; + hash = "sha256-JdkeJRjlNsjWYbn5WRe2np+vV2W0TumtZy72/ofkpG8="; }; patchPhase = '' diff --git a/pkgs/by-name/jw/jwx/package.nix b/pkgs/by-name/jw/jwx/package.nix index e43423d5ab58..197134e23754 100644 --- a/pkgs/by-name/jw/jwx/package.nix +++ b/pkgs/by-name/jw/jwx/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "jwx"; - version = "4.1.0"; + version = "4.2.0"; src = fetchFromGitHub { owner = "lestrrat-go"; repo = "jwx"; tag = "v${finalAttrs.version}"; - hash = "sha256-+u2PR1L66cua6iGer9qYlnPpfYt1j9cZ0PSrWntpYp0="; + hash = "sha256-sX4z0JhINss0kE42F3rSMyVvBUWH1OVli0UKFiqfZbU="; }; - vendorHash = "sha256-dxC00wr51c48yxdCUWsL44RMmk+pBmqXkUQqjP90GNU="; + vendorHash = "sha256-lX03CF9WhcDGgvYhHlG+XaXIeinEWRTwzO8mmnyBzBM="; sourceRoot = "${finalAttrs.src.name}/cmd/jwx"; diff --git a/pkgs/by-name/ka/kamailio/package.nix b/pkgs/by-name/ka/kamailio/package.nix index 5b6364a8fbf8..53ad92fb524a 100644 --- a/pkgs/by-name/ka/kamailio/package.nix +++ b/pkgs/by-name/ka/kamailio/package.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "kamailio"; - version = "6.0.5"; + version = "6.1.3"; src = fetchurl { url = "https://www.kamailio.org/pub/kamailio/${finalAttrs.version}/src/kamailio-${finalAttrs.version}_src.tar.gz"; - hash = "sha256-LEpl8MTkNULs0EJCO2/IKe4Vqwmlauf0QbdCfWvOGzA="; + hash = "sha256-49s9IWb0TY892Q2wkGP3C1W77M4pWr1/McNNi53XlyE="; }; buildInputs = [ diff --git a/pkgs/by-name/ka/kapow/package.nix b/pkgs/by-name/ka/kapow/package.nix index 9790db08bf28..a42a54ea94e4 100644 --- a/pkgs/by-name/ka/kapow/package.nix +++ b/pkgs/by-name/ka/kapow/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "kapow"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "gottcode"; repo = "kapow"; rev = "v${finalAttrs.version}"; - hash = "sha256-IWkvAXDcWodrV23/wv3GEQXWdNcaIZDsU3LUtxsD+cA="; + hash = "sha256-gBr1CmOpwJOqolY6HA4fv7YCaFSeRmxbJeVkZCau9QE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ka/kawkab-mono-font/package.nix b/pkgs/by-name/ka/kawkab-mono-font/package.nix index c3a0571c1324..1a162a1a5adc 100644 --- a/pkgs/by-name/ka/kawkab-mono-font/package.nix +++ b/pkgs/by-name/ka/kawkab-mono-font/package.nix @@ -3,16 +3,16 @@ stdenvNoCC, fetchzip, }: - -stdenvNoCC.mkDerivation { +let pname = "kawkab-mono"; - version = "20151015"; - + version = "0.501"; src = fetchzip { - url = "https://makkuk.com/kawkab-mono/downloads/kawkab-mono-0.1.zip"; - stripRoot = false; - hash = "sha256-arZTzXj7Ba5G4WF3eZVGNaONhOsYVPih9iBgsN/lg14="; + url = "https://github.com/aiaf/kawkab-mono/releases/download/v${version}/kawkab-mono-${version}.zip"; + hash = "sha256-cDpQGTu3XzLrDtInAZtnCw6BymX7fupbbr7L4bd7kN8="; }; +in +stdenvNoCC.mkDerivation { + inherit pname version src; installPhase = '' runHook preInstall @@ -23,8 +23,11 @@ stdenvNoCC.mkDerivation { ''; meta = { - description = "Arab fixed-width font"; + description = "Monospaced Arabic typeface designed for code and text-editing"; homepage = "https://makkuk.com/kawkab-mono/"; + downloadPage = "https://github.com/aiaf/kawkab-mono"; + changelog = "https://github.com/aiaf/kawkab-mono/releases/tag/v${version}"; license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ talal ]; }; } diff --git a/pkgs/by-name/kc/kchat/package.nix b/pkgs/by-name/kc/kchat/package.nix index 5d6834004b3d..e081c502dfdf 100644 --- a/pkgs/by-name/kc/kchat/package.nix +++ b/pkgs/by-name/kc/kchat/package.nix @@ -6,12 +6,12 @@ appimageTools.wrapType2 rec { pname = "kchat"; - version = "3.3.3"; + version = "3.3.5"; src = fetchurl { url = "https://download.storage5.infomaniak.com/kchat/kchat-desktop-${version}-linux-x86_64.AppImage"; name = "kchat-${version}.AppImage"; - hash = "sha256-5Nk2IMGk7BDDL7fuoOBO3wEcbtJDDDnQvUiqa8Pt8yU="; + hash = "sha256-LwiXX9B4prqSg3ccKXT3h/5D5kawrF7EXt86D5kA0Qc="; }; extraInstallCommands = diff --git a/pkgs/by-name/ke/ketesa/package.nix b/pkgs/by-name/ke/ketesa/package.nix index 9afc27b5184d..67d1a01fdcee 100644 --- a/pkgs/by-name/ke/ketesa/package.nix +++ b/pkgs/by-name/ke/ketesa/package.nix @@ -17,18 +17,18 @@ assert lib.asserts.assertMsg ( stdenv.mkDerivation (finalAttrs: { pname = "ketesa"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "etkecc"; repo = "ketesa"; tag = "v${finalAttrs.version}"; - hash = "sha256-0YNCPOkWIzXMfs6Jptn+PBRHxuees6zVh7RpTXZKywQ="; + hash = "sha256-tW7lOYl/TNQgvsMFMDQKXzqzzfnxNIUQ8Iqld8M5Hjc="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-NJGAchoEVgIOjQyH9mNh7h4BZmq4HV2FjHOBhL88ZWw="; + hash = "sha256-+xWyq/jGJke4HQ6p37y+fJJ73wxNmNMKA3zrP6ANh8E="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ki/kicad/versions.nix b/pkgs/by-name/ki/kicad/versions.nix index faf8d0d696cf..875e27be061d 100644 --- a/pkgs/by-name/ki/kicad/versions.nix +++ b/pkgs/by-name/ki/kicad/versions.nix @@ -25,23 +25,23 @@ }; "kicad-testing" = { kicadVersion = { - version = "10.0-2026-07-09"; + version = "10.0-2026-07-21"; src = { - rev = "d3b8ca6d7d750e499b96306ba56888aefb0d0936"; - sha256 = "07shf3nfn9jz5m4r4kskvgx157sx4q62zl4cqn7vy2x8vxlhgsxh"; + rev = "667fa360548678b187c71689d415ef5afa613b59"; + sha256 = "0fh1nf9xvz53hsg8kwxwmr31pj1khigdxf3k18p6x9hn1w9ai4x9"; }; }; libVersion = { - version = "10.0-2026-07-09"; + version = "10.0-2026-07-21"; libSources = { - symbols.rev = "5a6700bbb3f2a3b05d123a1a1af770cfbb5bc7d3"; - symbols.sha256 = "1ns0lg360h3h55w2xv5lyj0qzy6nc1cr02vll95c0vma34rc1qwa"; - templates.rev = "32bcda122df6ae76b221155c641de3656904e786"; + symbols.rev = "94d8f4635e3ce67695aae0ee16d983d32346feaf"; + symbols.sha256 = "12w7qbqm9wk6b7d8ljdd46afskkqc2aanh8fyf36frwqy1mjfx87"; + templates.rev = "cafa8b3ef4735f830212299da26629e9bcd62c02"; templates.sha256 = "0zs29zn8qjgxv0w1vyr8yxmj02m8752zagn4vcraqgik46dwg2id"; - footprints.rev = "12095f926a3c5c37d9573ebab0c67c9eed71812f"; - footprints.sha256 = "15cz4lh6dzqdl2cc9nqnpa8bd73h5p33vnvmc4l68js5wqlsyba1"; - packages3d.rev = "9484cb1a4e193898c3f86e0cf69146bcc6e8053d"; - packages3d.sha256 = "0mkc9km540n6ri5is4fjw5abv8afidwj9q7fmbs66l6kx1z3lxky"; + footprints.rev = "a2d01395d25f14158f2ca0b17adcc8fcb45fe443"; + footprints.sha256 = "0jr9q1yrlxbb796wrsrnlplb2a05k3z0g1m1dn3c87cf9ffmlaz0"; + packages3d.rev = "67538dca1b8583dec9bd2a45d4eeced6fa287923"; + packages3d.sha256 = "1gqqi91g1yynfgmxl5l34g1rg3gjksl54xd1zsgp4kvyi5w50b3r"; }; }; }; diff --git a/pkgs/by-name/ki/kingfisher/package.nix b/pkgs/by-name/ki/kingfisher/package.nix index 942845ed89b4..589b9cc1acc1 100644 --- a/pkgs/by-name/ki/kingfisher/package.nix +++ b/pkgs/by-name/ki/kingfisher/package.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "kingfisher"; - version = "1.107.0"; + version = "1.109.0"; __structuredAttrs = true; @@ -24,10 +24,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "mongodb"; repo = "kingfisher"; tag = "v${finalAttrs.version}"; - hash = "sha256-PhrniOr2YRaWbCbI35bhdYzztgegnKVTw/rWX/BMwGQ="; + hash = "sha256-IdHL4qAVvHRbvEt+GKjGPX62SXp/WPvwJkvMqtZcqU8="; }; - cargoHash = "sha256-bEPg0exoNFxk/CZgThn6SXXx6ELJcKvmXBqDVeZlKv4="; + cargoHash = "sha256-f+y3KXd8bBxdZtP+kGiFYUoVLzH7CLOtznAsCjAQYL8="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/ki/kitty/package.nix b/pkgs/by-name/ki/kitty/package.nix index 89f1c57fc6b9..a1ab0959ba3e 100644 --- a/pkgs/by-name/ki/kitty/package.nix +++ b/pkgs/by-name/ki/kitty/package.nix @@ -50,14 +50,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.48.0"; + version = "0.48.1"; pyproject = false; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; tag = "v${version}"; - hash = "sha256-+x3saXQw+6BzBYfwwur0DiTaJZVNgOYKJ4UVzeScbtk="; + hash = "sha256-h4dE99FET26iTgEFrmeXcFDw6DLl8dQjGep0NJ7jMzk="; }; goModules = diff --git a/pkgs/by-name/ku/kubernetes/package.nix b/pkgs/by-name/ku/kubernetes/package.nix index 475d6e921049..4e9cd2b56578 100644 --- a/pkgs/by-name/ku/kubernetes/package.nix +++ b/pkgs/by-name/ku/kubernetes/package.nix @@ -23,13 +23,13 @@ buildGoModule (finalAttrs: { pname = "kubernetes"; - version = "1.36.2"; + version = "1.36.3"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; tag = "v${finalAttrs.version}"; - hash = "sha256-vE+2iBoJvkRhJDAHMCrJLIJKD53YWRBN6fBUP4589OU="; + hash = "sha256-yqxE+it+uYQrJJs3TJI2D6IQRJizieUQyPQMLIOPWqA="; }; vendorHash = null; diff --git a/pkgs/by-name/le/legendsviewer-next/deps.json b/pkgs/by-name/le/legendsviewer-next/deps.json new file mode 100644 index 000000000000..6e3e9e7b8218 --- /dev/null +++ b/pkgs/by-name/le/legendsviewer-next/deps.json @@ -0,0 +1,112 @@ +[ + { + "pname": "Castle.Core", + "version": "5.1.1", + "hash": "sha256-oVkQB+ON7S6Q27OhXrTLaxTL0kWB58HZaFFuiw4iTrE=" + }, + { + "pname": "coverlet.collector", + "version": "6.0.0", + "hash": "sha256-IEmweTMapcPhFHpmJsPXfmMhravYOrWupgjeOvMmQ4o=" + }, + { + "pname": "Microsoft.CodeCoverage", + "version": "17.8.0", + "hash": "sha256-cv/wAXfTNS+RWEsHWNKqRDHC7LOQSSdFJ1a9cZuSfJw=" + }, + { + "pname": "Microsoft.Extensions.ApiDescription.Server", + "version": "6.0.5", + "hash": "sha256-RJjBWz+UHxkQE2s7CeGYdTZ218mCufrxl0eBykZdIt4=" + }, + { + "pname": "Microsoft.NET.Test.Sdk", + "version": "17.8.0", + "hash": "sha256-uz7QvW+NsVRsp8FR1wjnGEOkUaPX4JyieywvCN6g2+s=" + }, + { + "pname": "Microsoft.OpenApi", + "version": "1.6.14", + "hash": "sha256-dSJUic2orPGfYVgto9DieRckbtLpPyxHtf+RJ2tmKPM=" + }, + { + "pname": "Microsoft.TestPlatform.ObjectModel", + "version": "17.8.0", + "hash": "sha256-9TwGrjVvbtyetw67Udp3EMK5MX8j0RFRjduxPCs9ESw=" + }, + { + "pname": "Microsoft.TestPlatform.TestHost", + "version": "17.8.0", + "hash": "sha256-+CTYFu631uovLCO47RKe86YaAqfoLA4r73vKORJUsjg=" + }, + { + "pname": "Moq", + "version": "4.20.70", + "hash": "sha256-O+Ed1Hv8fK8MKaRh7qFGbsSPaTAj4O+yaLQ/W/ju7ks=" + }, + { + "pname": "MSTest.TestAdapter", + "version": "3.1.1", + "hash": "sha256-TLysbO9bgiztIap44o875ZPpuVAOC6ueaRTKsiVicXg=" + }, + { + "pname": "MSTest.TestFramework", + "version": "3.1.1", + "hash": "sha256-Vqu+IDuYjiR39QOJW7GHiH7CeF2cBfNIYYTXmVeeb9E=" + }, + { + "pname": "Newtonsoft.Json", + "version": "13.0.1", + "hash": "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo=" + }, + { + "pname": "NuGet.Frameworks", + "version": "6.5.0", + "hash": "sha256-ElqfN4CcKxT3hP2qvxxObb4mnBlYG89IMxO0Sm5oZ2g=" + }, + { + "pname": "SkiaSharp", + "version": "2.88.8", + "hash": "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A=" + }, + { + "pname": "SkiaSharp.NativeAssets.Linux", + "version": "2.88.8", + "hash": "sha256-fOmNbbjuTazIasOvPkd2NPmuQHVCWPnow7AxllRGl7Y=" + }, + { + "pname": "SkiaSharp.NativeAssets.macOS", + "version": "2.88.8", + "hash": "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI=" + }, + { + "pname": "SkiaSharp.NativeAssets.Win32", + "version": "2.88.8", + "hash": "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM=" + }, + { + "pname": "Swashbuckle.AspNetCore", + "version": "6.9.0", + "hash": "sha256-fmJjAfVHzbw/31IFPFUP31g46Y1XXIc1kr6VvYW5pCc=" + }, + { + "pname": "Swashbuckle.AspNetCore.Swagger", + "version": "6.9.0", + "hash": "sha256-8KM21CWckFghGaqWahMa3V64+hUBrifAJnQ6P2VXlEk=" + }, + { + "pname": "Swashbuckle.AspNetCore.SwaggerGen", + "version": "6.9.0", + "hash": "sha256-Ni8Z9CFs+ybTX8IgDuSKA580ISQ55w032EeqWYQXwoc=" + }, + { + "pname": "Swashbuckle.AspNetCore.SwaggerUI", + "version": "6.9.0", + "hash": "sha256-V+3bEEpxSXPi9Sy1hHZEjY9qxuIpRWV5dKzaqYMSu40=" + }, + { + "pname": "System.Diagnostics.EventLog", + "version": "6.0.0", + "hash": "sha256-zUXIQtAFKbiUMKCrXzO4mOTD5EUphZzghBYKXprowSM=" + } +] diff --git a/pkgs/by-name/le/legendsviewer-next/frontend.nix b/pkgs/by-name/le/legendsviewer-next/frontend.nix new file mode 100644 index 000000000000..34aa35831fbd --- /dev/null +++ b/pkgs/by-name/le/legendsviewer-next/frontend.nix @@ -0,0 +1,44 @@ +{ + version, + src, + patches, + + lib, + nodejs_22, + + buildNpmPackage, +}: +buildNpmPackage { + pname = "legends-viewer-frontend"; + + inherit version src patches; + + nodejs = nodejs_22; + npmDepsHash = "sha256-Hlo+G/d0glDutBwQU1Y5rfLD7IcfWtAClJPyrX5QBQg="; + + postPatch = '' + cd "./LegendsViewer.Frontend/legends-viewer-frontend" + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -r ./dist $out + + runHook postInstall + ''; + + meta = { + description = "Recreates Dwarf Fortress' Legends Mode from exported files"; + homepage = "https://github.com/Kromtec/LegendsViewer-Next"; + license = lib.licenses.mit; + platforms = [ + "aarch64-darwin" + "x86_64-darwin" + "aarch64-linux" + "x86_64-linux" + ]; + maintainers = with lib.maintainers; [ donottellmetonottellyou ]; + }; +} diff --git a/pkgs/by-name/le/legendsviewer-next/package.nix b/pkgs/by-name/le/legendsviewer-next/package.nix new file mode 100644 index 000000000000..96e4eeff46a2 --- /dev/null +++ b/pkgs/by-name/le/legendsviewer-next/package.nix @@ -0,0 +1,155 @@ +{ + patches ? [ ], + + lib, + dotnetCorePackages, + curl, + + buildDotnetModule, + callPackage, + copyDesktopItems, + fetchFromGitHub, + makeDesktopItem, + nix-update-script, +}: +let + version = "1.2.5"; + + src = fetchFromGitHub { + owner = "Kromtec"; + repo = "LegendsViewer-Next"; + tag = "v${version}"; + hash = "sha256-R84y+QdLiEoVTo+z3jaql8m2rg2nbX9aXa2m8JiYAzU="; + }; + + patches' = patches ++ [ ./remove-npm-frontend.patch ]; + + frontend = callPackage ./frontend.nix { + inherit version src; + patches = patches'; + }; +in +buildDotnetModule rec { + pname = "legendsviewer-next"; + inherit version src; + patches = patches'; + + strictDeps = true; + __structuredAttrs = true; + + desktopItems = [ + (makeDesktopItem { + name = pname; + desktopName = "Legends Viewer"; + genericName = "DF Legends Export Browser"; + comment = meta.description; + icon = "${frontend}/dist/ceretelina.png"; + tryExec = meta.mainProgram; + exec = meta.mainProgram; + + categories = [ + "Game" + "RolePlaying" + "Simulation" + ]; + keywords = [ + "df" + "dwarf" + "fortress" + "legends" + "viewer" + ]; + }) + ]; + + dotnet-sdk = dotnetCorePackages.sdk_10_0; + dotnet-runtime = dotnetCorePackages.aspnetcore_10_0; + + # File generated with `nix-build -A package.passthru.fetch-deps` + nugetDeps = ./deps.json; + + projectFile = "./LegendsViewer.Backend/LegendsViewer.Backend.csproj"; + testProjectFile = "./LegendsViewer.Backend.Tests/LegendsViewer.Backend.Tests.csproj"; + executables = [ meta.mainProgram ]; + + nativeBuildInputs = [ + copyDesktopItems + ]; + + installPhase = '' + runHook preInstall + + lib=$out/lib/legendsviewer-next + + mkdir -p $lib + + cp ./LegendsViewer.Backend/bin/Release/*/*/* $lib + ln -s ${frontend} $lib/legends-viewer-frontend + + runHook postInstall + ''; + + doInstallCheck = true; + + nativeInstallCheckInputs = [ + curl + ]; + + installCheckPhase = '' + runHook preInstallCheck + + # Do not use coproc (on darwin) + $out/bin/LegendsViewer > /dev/null 2>&1 & + LEGENDSVIEWER_PID=$! + + # Prevent hang on darwin + cleanup() { + kill -KILL "$LEGENDSVIEWER_PID" + } + trap cleanup EXIT + + echo "Wait for server (max ~5 minutes):" + for i in $(seq 1 300); do + sleep 1 + if curl -fsS http://localhost:15421/api/version > /dev/null; then + echo "Server is up!" + break + fi + echo "Retrying $i / 300" + done + + echo "Version matches expected?" + if ! curl -fsS http://localhost:15421/api/version | grep -F "${version}"; then + echo "Version check failed" + exit 1 + fi + + echo "Static html server is up?" + if ! curl -fsS http://localhost:15422 | grep ""; then + echo "Static html check failed" + exit 1 + fi + + # Cleanup, no longer need trap + cleanup + trap - EXIT + + runHook postInstallCheck + ''; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Recreates Dwarf Fortress' Legends Mode from exported files"; + homepage = "https://github.com/Kromtec/LegendsViewer-Next"; + license = lib.licenses.mit; + mainProgram = "LegendsViewer"; + platforms = [ + "aarch64-linux" + "x86_64-linux" + ]; + maintainers = with lib.maintainers; [ donottellmetonottellyou ]; + }; +} diff --git a/pkgs/by-name/le/legendsviewer-next/remove-npm-frontend.patch b/pkgs/by-name/le/legendsviewer-next/remove-npm-frontend.patch new file mode 100644 index 000000000000..025675d52d8a --- /dev/null +++ b/pkgs/by-name/le/legendsviewer-next/remove-npm-frontend.patch @@ -0,0 +1,21 @@ +diff --git a/LegendsViewer.Frontend/LegendsViewer.Frontend.csproj b/LegendsViewer.Frontend/LegendsViewer.Frontend.csproj +index 3275f9c..aac315e 100644 +--- a/LegendsViewer.Frontend/LegendsViewer.Frontend.csproj ++++ b/LegendsViewer.Frontend/LegendsViewer.Frontend.csproj +@@ -21,16 +21,8 @@ + + + +- +- +- +- + + +- +- +- +- + + + diff --git a/pkgs/by-name/le/level-zero/package.nix b/pkgs/by-name/le/level-zero/package.nix index 6eca9754361b..271e1b962766 100644 --- a/pkgs/by-name/le/level-zero/package.nix +++ b/pkgs/by-name/le/level-zero/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "level-zero"; - version = "1.31.0"; + version = "1.32.0"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "level-zero"; tag = "v${finalAttrs.version}"; - hash = "sha256-/3HVvivHKSwvrrFEU7LHP2H/6bHDBDyI1SVr/3A6Ie0="; + hash = "sha256-u8q8VOuJKUCFNJ8aLR/BrVx9lU5vD+hwkHRmy77vFe8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libaribcaption/package.nix b/pkgs/by-name/li/libaribcaption/package.nix index 622242e10daa..fbb51631d1f2 100644 --- a/pkgs/by-name/li/libaribcaption/package.nix +++ b/pkgs/by-name/li/libaribcaption/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libaribcaption"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "xqq"; repo = "libaribcaption"; rev = "v${finalAttrs.version}"; - hash = "sha256-x6l0ZrTktSsqfDLVRXpQtUOruhfc8RF3yT991UVZiKA="; + hash = "sha256-y2POfwIcn3Fs3h7aoEYJo6IjRZNKqwDPbV3LHwPdYT8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/li/libayatana-common/package.nix b/pkgs/by-name/li/libayatana-common/package.nix index e188da82d7b4..a5ba8dfa2ab2 100644 --- a/pkgs/by-name/li/libayatana-common/package.nix +++ b/pkgs/by-name/li/libayatana-common/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libayatana-common"; - version = "0.9.11"; + version = "0.9.13"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "libayatana-common"; tag = finalAttrs.version; - hash = "sha256-o5datBxGaGnvNvz8hvPY14DvjiFJdB7k93MumXuol0I="; + hash = "sha256-fNlyNdxNZo8nMeCPtkq09QyslnVb4bEnfu94+Dn/69s="; }; postPatch = '' diff --git a/pkgs/by-name/li/librewolf-unwrapped/src.json b/pkgs/by-name/li/librewolf-unwrapped/src.json index bcc4927bcbc6..3365f017db84 100644 --- a/pkgs/by-name/li/librewolf-unwrapped/src.json +++ b/pkgs/by-name/li/librewolf-unwrapped/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "152.0.6-1", + "packageVersion": "153.0-3", "source": { - "rev": "152.0.6-1", - "hash": "sha256-O5s1t/ZZVYL/9ik4zyi/kKAQEbSERO6vD1NJzEUmnU4=" + "rev": "153.0-3", + "hash": "sha256-kRa+IOicrS2xWO2k3m52qBmmazGSj3Ybuke6UQwQJgg=" }, "firefox": { - "version": "152.0.6", - "hash": "sha512-xNh3g31wB/thHDjUnZtt07xMXJypALVOci4UDOfs0JJPabXO3H+MH+YC5+/h1xWbAZ3ieZnikjXNYxghuxPmsA==" + "version": "153.0", + "hash": "sha512-oa9YZuHJpzKBgSPy8EG/1Zk9CT6W3XQ7WDMS+xHSs51CnfdQ+ewi3tZLWKIJux7KvHqvcwV9emTHNJ5NoEPWbQ==" } } diff --git a/pkgs/by-name/ls/lstk/package.nix b/pkgs/by-name/ls/lstk/package.nix index ac93856533fa..7a3609d407b2 100644 --- a/pkgs/by-name/ls/lstk/package.nix +++ b/pkgs/by-name/ls/lstk/package.nix @@ -7,7 +7,7 @@ }: buildGoModule (finalAttrs: { pname = "lstk"; - version = "0.17.0"; + version = "0.18.0"; __structuredAttrs = true; @@ -15,10 +15,10 @@ buildGoModule (finalAttrs: { owner = "localstack"; repo = "lstk"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-btwXEUstvJ2z+ixVH5QeOVOhrE7AmLNESKVSTmEmNiU="; + sha256 = "sha256-ukmz27Bq4yrJ0oNIwwG4dyy1nLrFLL8KNEJjnihvTEU="; }; - vendorHash = "sha256-86yg2+SZ+pnCi0wTjfqyO68adVaDjT24SgCbPVgd1Ho="; + vendorHash = "sha256-hia/DjlnvnjuJvTE52Twr61bDFR9Oz/gFpp94FY3pYc="; excludedPackages = "test/integration"; diff --git a/pkgs/by-name/ma/mactop/package.nix b/pkgs/by-name/ma/mactop/package.nix index e54d58aec534..8886e48b5d87 100644 --- a/pkgs/by-name/ma/mactop/package.nix +++ b/pkgs/by-name/ma/mactop/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "mactop"; - version = "2.1.3"; + version = "2.1.5"; src = fetchFromGitHub { owner = "metaspartan"; repo = "mactop"; tag = "v${version}"; - hash = "sha256-rWALbjy7s6X3hegcUxoR0XUXKFZGnWRWV5OeXtN3BjU="; + hash = "sha256-uIHqnHkqdQGZceruvHdXacS5vD2tgN1KPY4v6k7s5Vc="; }; vendorHash = "sha256-TF66wg8nyAb/kZ80XLaD7H39EehZQ896DS6Ce3+P8Lk="; diff --git a/pkgs/by-name/ma/mapnik/package.nix b/pkgs/by-name/ma/mapnik/package.nix index 7f1afcb4fdd7..f4e1d8d90ed0 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.2.2"; + version = "4.3.0"; src = fetchFromGitHub { owner = "mapnik"; repo = "mapnik"; tag = "v${finalAttrs.version}"; - hash = "sha256-Cx6RO22A4JKLlSeKBgXwSCpwh4P4B6i+jKaDa21PJXI="; + hash = "sha256-CrE/Td/JllzhcrRvNHunw0HaWAiKEAyQpAdHpVM7lPM="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ma/markitdown/package.nix b/pkgs/by-name/ma/markitdown/package.nix new file mode 100644 index 000000000000..e1cd39804848 --- /dev/null +++ b/pkgs/by-name/ma/markitdown/package.nix @@ -0,0 +1,5 @@ +{ python3Packages }: + +(python3Packages.toPythonApplication python3Packages.markitdown).overrideAttrs (_: { + __structuredAttrs = true; +}) diff --git a/pkgs/by-name/ma/matrix-authentication-service/package.nix b/pkgs/by-name/ma/matrix-authentication-service/package.nix index 618351a33b61..08d1c5b78743 100644 --- a/pkgs/by-name/ma/matrix-authentication-service/package.nix +++ b/pkgs/by-name/ma/matrix-authentication-service/package.nix @@ -16,6 +16,7 @@ nix-update-script, versionCheckHook, buildPackages, + nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -101,12 +102,15 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - passthru.updateScript = nix-update-script { - extraArgs = [ - # avoid unstable pre‐releases - "--version-regex" - "^v([0-9.]+)$" - ]; + passthru = { + tests = { inherit (nixosTests) matrix-authentication-service; }; + updateScript = nix-update-script { + extraArgs = [ + # avoid unstable pre‐releases + "--version-regex" + "^v([0-9.]+)$" + ]; + }; }; meta = { diff --git a/pkgs/by-name/mi/minikube/package.nix b/pkgs/by-name/mi/minikube/package.nix index 791e29f09485..af3206d413a1 100644 --- a/pkgs/by-name/mi/minikube/package.nix +++ b/pkgs/by-name/mi/minikube/package.nix @@ -9,6 +9,7 @@ libvirt, withQemu ? false, qemu, + socket-vmnet, withVfkit ? false, vfkit, makeWrapper, @@ -77,10 +78,16 @@ buildGoModule (finalAttrs: { --prefix PATH : ${ lib.makeBinPath ( lib.optionals withQemu [ qemu ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ libvirt ] + ++ lib.optionals (withQemu && stdenv.hostPlatform.isDarwin) [ socket-vmnet ] ++ lib.optionals (withVfkit && stdenv.hostPlatform.isDarwin) [ vfkit ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ libvirt ] ) } \ + ${ + lib.optionalString ( + withQemu && stdenv.hostPlatform.isDarwin + ) ''--set MINIKUBE_SOCKET_VMNET_CLIENT_PATH "${lib.getExe' socket-vmnet "socket_vmnet_client"}"'' + } \ ${lib.optionalString stdenv.hostPlatform.isLinux "--prefix LD_LIBRARY_PATH : ${ lib.makeLibraryPath [ libvirt ] }"} diff --git a/pkgs/by-name/mi/miriway/package.nix b/pkgs/by-name/mi/miriway/package.nix index b2e45f5acde5..46a42e22bd32 100644 --- a/pkgs/by-name/mi/miriway/package.nix +++ b/pkgs/by-name/mi/miriway/package.nix @@ -7,23 +7,25 @@ bash, boost, cmake, + dbus, inotify-tools, pkg-config, mir, libxkbcommon, swaybg, + systemd, wayland, }: stdenv.mkDerivation (finalAttrs: { pname = "miriway"; - version = "26.01"; + version = "26.06.3"; src = fetchFromGitHub { owner = "Miriway"; repo = "Miriway"; tag = "v${finalAttrs.version}"; - hash = "sha256-JHLP5M9uBS4CmTGx3xgNq7YN1Tj8FZyKo1C8aGTtG9E="; + hash = "sha256-q1CYySy5lB1bMZYdakHintRH2ZAinThm9rk7WkyY39U="; }; postPatch = '' @@ -41,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ bash boost + dbus mir libxkbcommon wayland # wayland-server.pc, for mirwayland.pc @@ -52,6 +55,9 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace $out/bin/miriway-run \ --replace-fail 'inotifywait -qq' '${lib.getExe' inotify-tools "inotifywait"} -qq' + + substituteInPlace $out/libexec/miriway-session-startup \ + --replace-fail 'dbus-update-activation-environment' '${lib.getExe' dbus "dbus-update-activation-environment"}' ''; passthru = { diff --git a/pkgs/by-name/mm/mmdoc/package.nix b/pkgs/by-name/mm/mmdoc/package.nix index c9e678bdb646..a7d75880cdce 100644 --- a/pkgs/by-name/mm/mmdoc/package.nix +++ b/pkgs/by-name/mm/mmdoc/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mmdoc"; - version = "0.21.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "ryantm"; repo = "mmdoc"; rev = finalAttrs.version; - hash = "sha256-GxGYW10GZvDzeeKy9U9iyGvfN3IM/A/pnQivx8xXhHI="; + hash = "sha256-UYEWntrJPt1CmS3yPb/zP6EznOvc7h9LrSpyGbtTnCc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mo/modsecurity_standalone/package.nix b/pkgs/by-name/mo/modsecurity_standalone/package.nix index f880488b6268..58c5e5c69cfe 100644 --- a/pkgs/by-name/mo/modsecurity_standalone/package.nix +++ b/pkgs/by-name/mo/modsecurity_standalone/package.nix @@ -6,7 +6,7 @@ autoreconfHook, curl, apacheHttpd, - pcre, + pcre2, apr, aprutil, libxml2, @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ curl apacheHttpd - pcre + pcre2 apr aprutil libxml2 @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { "--enable-static" "--with-curl=${curl.dev}" "--with-apxs=${apacheHttpd.dev}/bin/apxs" - "--with-pcre=${pcre.dev}" + "--with-pcre2=${lib.getDev pcre2}/bin/pcre2-config" "--with-apr=${apr.dev}" "--with-apu=${aprutil.dev}/bin/apu-1-config" "--with-libxml=${libxml2.dev}" diff --git a/pkgs/by-name/my/mymake/package.nix b/pkgs/by-name/my/mymake/package.nix index b99f3a9728e6..3505f0bc9f5d 100644 --- a/pkgs/by-name/my/mymake/package.nix +++ b/pkgs/by-name/my/mymake/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mymake"; - version = "2.4.4"; + version = "2.4.5"; src = fetchFromGitHub { owner = "fstromback"; repo = "mymake"; tag = "v${finalAttrs.version}"; - hash = "sha256-H7uoTnFtRf0jaqQ+N2IK4I+edx+cK/5wXDG1Orc2XcY="; + hash = "sha256-R9JWTHmnRwEusl7IT+vZ+nFoJB+7o50S1KgzBx+X1t8="; }; buildPhase = '' diff --git a/pkgs/by-name/ne/nerva/package.nix b/pkgs/by-name/ne/nerva/package.nix index c661088f72a9..49c045376e35 100644 --- a/pkgs/by-name/ne/nerva/package.nix +++ b/pkgs/by-name/ne/nerva/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "nerva"; - version = "1.42.6"; + version = "1.48.1"; src = fetchFromGitHub { owner = "praetorian-inc"; repo = "nerva"; tag = "v${finalAttrs.version}"; - hash = "sha256-TNl+/ikQWsS4hBU5m+zkfVg+KF5YwsZ6Ge3YNarbvmE="; + hash = "sha256-pgelLgRPJVGRq2UqP7EEHpAkSkuhmoPpwsMQKgtNOEk="; }; vendorHash = "sha256-Z0MSD+1/1VzrJ+pz5x0JvxrCxtJe59ckaTqHK/+TVN8="; diff --git a/pkgs/by-name/nf/nfs-ganesha/package.nix b/pkgs/by-name/nf/nfs-ganesha/package.nix index d71cff7a9742..1ce447ee7852 100644 --- a/pkgs/by-name/nf/nfs-ganesha/package.nix +++ b/pkgs/by-name/nf/nfs-ganesha/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "nfs-ganesha"; - version = "11.1"; + version = "12.0"; outputs = [ "out" @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "nfs-ganesha"; repo = "nfs-ganesha"; tag = "V${finalAttrs.version}"; - hash = "sha256-1l1l8wkGp0N0bYXzhF6IqGm8oGVh6523Jfpq8VucHQs="; + hash = "sha256-a0Hv5smtGgVQCGxMZU/lafNlnRM1w0HgkUIQJ/L+0r0="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/no/noctalia/package.nix b/pkgs/by-name/no/noctalia/package.nix index 8e3972a6fdad..70e55719d158 100644 --- a/pkgs/by-name/no/noctalia/package.nix +++ b/pkgs/by-name/no/noctalia/package.nix @@ -61,13 +61,13 @@ stdenv.mkDerivation (finalAttrs: { __structuredAttrs = true; pname = "noctalia"; - version = "5.0.0-beta.4"; + version = "5.0.0-beta.5"; src = fetchFromGitHub { owner = "noctalia-dev"; repo = "noctalia"; tag = "v${finalAttrs.version}"; - hash = "sha256-jXz2vFHgidbyU46ScROLSuBIhsqqtyqNu2M0tmGX/FA="; + hash = "sha256-iq/Eqx62P/JJDpW7CgEsMWWPwOexIWRKXtqKF/drawA="; }; strictDeps = true; @@ -129,9 +129,9 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - description = "A sleek, customizable desktop shell crafted for Wayland."; - homepage = "https://github.com/noctalia-dev/noctalia"; - changelog = "https://github.com/noctalia-dev/noctalia/releases/tag/v${finalAttrs.version}"; + description = "Sleek, customizable desktop shell crafted for Wayland"; + homepage = "https://noctalia.dev"; + changelog = "https://noctalia.dev/changelogs#v${finalAttrs.version}"; license = with lib.licenses; [ mit asl20 # material_color_utilities is Apache 2.0 diff --git a/pkgs/by-name/nu/nushell-plugin-hcl/package.nix b/pkgs/by-name/nu/nushell-plugin-hcl/package.nix index 0abfa618db36..1c234689cb2b 100644 --- a/pkgs/by-name/nu/nushell-plugin-hcl/package.nix +++ b/pkgs/by-name/nu/nushell-plugin-hcl/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nu_plugin_hcl"; - version = "0.114.0"; + version = "0.114.1"; src = fetchFromGitHub { owner = "Yethal"; repo = "nu_plugin_hcl"; tag = finalAttrs.version; - hash = "sha256-3qUsEJIF91679W2mdU9eESTNmcp3TqmMxWoR7G5uUl8="; + hash = "sha256-qhrKEArTI7DeSBJqdzSkZiQmkDtnPAn4KkZ7djH3wmY="; }; - cargoHash = "sha256-xAURId/OvgIGvbh5be4yS2dKmQObIpb4YYlRcjcHMeU="; + cargoHash = "sha256-+Vayvr53jxs2bRGa/8TWmRdcOEzIYsrY8dg1Z0Dgbm0="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; diff --git a/pkgs/by-name/oc/ocelot-desktop/package.nix b/pkgs/by-name/oc/ocelot-desktop/package.nix index 16e9fc6d3c1a..683a8384d9c9 100644 --- a/pkgs/by-name/oc/ocelot-desktop/package.nix +++ b/pkgs/by-name/oc/ocelot-desktop/package.nix @@ -81,9 +81,13 @@ stdenv.mkDerivation (finalAttrs: { install -Dm644 ${finalAttrs.src} $out/share/ocelot-desktop/ocelot-desktop.jar makeBinaryWrapper ${jre}/bin/java $out/bin/ocelot-desktop \ - --set JAVA_HOME ${jre.home} \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeLibs}" \ - --prefix PATH : "${lib.makeBinPath runtimePrograms}" \ + --set JAVA_HOME ${jre.home} ${ + lib.optionalString ( + runtimeLibs != [ ] + ) "--prefix LD_LIBRARY_PATH : \"${lib.makeLibraryPath runtimeLibs}\"" + } ${ + lib.optionalString (runtimePrograms != [ ]) "--prefix PATH : \"${lib.makeBinPath runtimePrograms}\"" + } \ --add-flags "-jar $out/share/ocelot-desktop/ocelot-desktop.jar" # copy icons from zip file diff --git a/pkgs/by-name/oc/octoprint/package.nix b/pkgs/by-name/oc/octoprint/package.nix index cc85ad38a780..3e486480f51b 100644 --- a/pkgs/by-name/oc/octoprint/package.nix +++ b/pkgs/by-name/oc/octoprint/package.nix @@ -4,7 +4,9 @@ callPackage, lib, fetchFromGitHub, - python3, + # OctoPrint requires Python >=3.7, <3.14, so it cannot use the default python3 + # while that points at 3.14. + python313, replaceVars, nix-update-script, nixosTests, @@ -13,38 +15,21 @@ }: let - py = python3.override { + py = python313.override { self = py; packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) [ - ( - - self: super: { - # fix tornado.httputil.HTTPInputError: Multiple host headers not allowed - tornado = super.tornado.overridePythonAttrs (oldAttrs: { - version = "6.4.2"; - format = "setuptools"; - pyproject = null; - src = fetchFromGitHub { - owner = "tornadoweb"; - repo = "tornado"; - tag = "v6.4.2"; - hash = "sha256-qgJh8pnC1ALF8KxhAYkZFAc0DE6jHVB8R/ERJFL4OFc="; - }; - doCheck = false; - }); - }) # Built-in dependency (self: super: { octoprint-filecheck = self.buildPythonPackage rec { pname = "OctoPrint-FileCheck"; - version = "2024.11.12"; + version = "2025.7.23"; format = "setuptools"; src = fetchFromGitHub { owner = "OctoPrint"; repo = "OctoPrint-FileCheck"; rev = version; - sha256 = "sha256-Y7yvImnYahmrf5GC4c8Ki8IsOZ8r9I4uk8mYBhEQZ28="; + hash = "sha256-Y3JVfbe+bZz2t65OqdjvVVqTSa0VUPoCaxvE+zQ+Qts="; }; doCheck = false; }; @@ -54,14 +39,14 @@ let (self: super: { octoprint-firmwarecheck = self.buildPythonPackage rec { pname = "OctoPrint-FirmwareCheck"; - version = "2021.10.11"; + version = "2025.7.23"; format = "setuptools"; src = fetchFromGitHub { owner = "OctoPrint"; repo = "OctoPrint-FirmwareCheck"; rev = version; - hash = "sha256-wqbD82bhJDrDawJ+X9kZkoA6eqGxqJc1Z5dA0EUwgEI="; + hash = "sha256-QPchpyeotB5IKbfES74CJlhw3sz8Q1df/+n5dpbrHSs="; }; doCheck = false; }; @@ -70,14 +55,14 @@ let (self: super: { octoprint-pisupport = self.buildPythonPackage rec { pname = "OctoPrint-PiSupport"; - version = "2023.10.10"; + version = "2025.7.23"; format = "setuptools"; src = fetchFromGitHub { owner = "OctoPrint"; repo = "OctoPrint-PiSupport"; rev = version; - hash = "sha256-VSzDoFq4Yn6KOn+RNi1uVJHzH44973kd/VoMjqzyBRA="; + hash = "sha256-bXjRGxIwi+UnVts2HO9viOJqa2AmZ/CL7wuoyzRbAEw="; }; # requires octoprint itself during tests @@ -92,20 +77,21 @@ let (self: super: { octoprint = self.buildPythonPackage rec { pname = "OctoPrint"; - version = "1.11.7"; + version = "1.11.8"; format = "setuptools"; src = fetchFromGitHub { owner = "OctoPrint"; repo = "OctoPrint"; rev = version; - hash = "sha256-X9+o3EpTtKAFiSmjOumRCDKNwBc9LVjvqyZqun3yDi8="; + hash = "sha256-yTHzBqwVxAP6EokiWqD/SR6P2X4gIGyiyzNH0UzzDB4="; }; propagatedBuildInputs = with self; [ argon2-cffi + babel blinker cachelib click @@ -120,21 +106,23 @@ let flask-limiter frozendict itsdangerous - immutabledict jinja2 + libpass + limits markdown markupsafe netaddr netifaces octoprint-filecheck octoprint-firmwarecheck - passlib + packaging pathvalidate - pkginfo pip + pkginfo psutil pylru pyserial + pytz pyyaml regex requests @@ -148,6 +136,7 @@ let watchdog websocket-client werkzeug + wheel wrapt zeroconf zipstream-ng @@ -179,14 +168,21 @@ let postPatch = let ignoreVersionConstraints = [ + "Babel" "cachelib" + "Click" "colorlog" "emoji" - "immutabledict" + "limits" + "markdown" + "netaddr" + "psutil" "PyYAML" + "requests" "sarge" "sentry-sdk" "watchdog" + "websocket-client" "wrapt" "zeroconf" "Flask-Login" @@ -199,7 +195,7 @@ let '' sed -r -i \ ${lib.concatStringsSep "\n" ( - map (e: ''-e 's@${e}[<>=]+.*@${e}",@g' \'') ignoreVersionConstraints + map (e: ''-e 's@${e}[<>=!]+.*@${e}",@g' \'') ignoreVersionConstraints )} setup.py ''; @@ -214,6 +210,7 @@ let ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_set_external_modification" ]; disabledTestPaths = [ + "tests/http_api" # requires a live OctoPrint server; excluded by upstream pytest.ini "tests/test_octoprint_setuptools.py" # fails due to distutils and python3.12 ]; diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index fd9815394802..decc00c0fd41 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -6,7 +6,6 @@ makeBinaryWrapper, stdenv, addDriverRunpath, - nix-update-script, cmake, gitMinimal, @@ -112,11 +111,12 @@ let # vendored in-tree. Pre-stage the pin (tracks upstream's # `LLAMA_CPP_VERSION` file) so the FetchContent step uses our copy # instead of trying to clone over the network in the sandbox. + llamaCppVersion = "b10091"; llamaCppSrc = fetchFromGitHub { owner = "ggml-org"; repo = "llama.cpp"; - tag = "b9840"; - hash = "sha256-SlcBqlUSeXgGltk7fz1blp4DobypzkT8cw8a7dkVGiU="; + tag = llamaCppVersion; + hash = "sha256-ZHQ9hBnE9GayZRt0jgO4svzaAUfhRUg6cFu5dSe8J1w="; }; wrapperOptions = [ @@ -152,13 +152,13 @@ let in goBuild (finalAttrs: { pname = "ollama"; - version = "0.32.1"; + version = "0.32.3"; src = fetchFromGitHub { owner = "ollama"; repo = "ollama"; tag = "v${finalAttrs.version}"; - hash = "sha256-/bxQrycsBP0iqsvaghQYkGzIEds5jcF8wSoJbkEtO6U="; + hash = "sha256-TGbNdLYRzty6IQJptatQqAUAAp6cfh+OFbO6BdxC6H0="; }; vendorHash = "sha256-HMwoaFBMbpoy8f0I+O+i7kIa9BslLu3FcVWeaIOkpvs="; @@ -366,6 +366,7 @@ goBuild (finalAttrs: { versionCheckKeepEnvironment = "HOME"; passthru = { + inherit llamaCppSrc llamaCppVersion; tests = { inherit ollama; } @@ -377,7 +378,7 @@ goBuild (finalAttrs: { service-vulkan = nixosTests.ollama-vulkan; }; } - // lib.optionalAttrs (!enableRocm && !enableCuda) { updateScript = nix-update-script { }; }; + // lib.optionalAttrs (!enableRocm && !enableCuda && !enableVulkan) { updateScript = ./update.sh; }; meta = { description = diff --git a/pkgs/by-name/ol/ollama/update.sh b/pkgs/by-name/ol/ollama/update.sh new file mode 100755 index 000000000000..1e8dc5b87c0d --- /dev/null +++ b/pkgs/by-name/ol/ollama/update.sh @@ -0,0 +1,21 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p common-updater-scripts nix-update +# shellcheck shell=bash + +set -euo pipefail + +nix-update ollama --src-only + +ollama_src=$(nix-build --no-out-link -A ollama.src) +llama_cpp_version=$(<"$ollama_src/LLAMA_CPP_VERSION") + +if [[ -z "$llama_cpp_version" ]]; then + echo "LLAMA_CPP_VERSION is empty" >&2 + exit 1 +fi + +update-source-version ollama "$llama_cpp_version" \ + --source-key=llamaCppSrc \ + --version-key=llamaCppVersion + +nix-update ollama --version=skip diff --git a/pkgs/by-name/op/openasar/package.nix b/pkgs/by-name/op/openasar/package.nix index 6f99b91daa12..71fab60c5546 100644 --- a/pkgs/by-name/op/openasar/package.nix +++ b/pkgs/by-name/op/openasar/package.nix @@ -14,13 +14,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "openasar"; - version = "0-unstable-2026-07-12"; + version = "0-unstable-2026-07-24"; src = fetchFromGitHub { owner = "GooseMod"; repo = "OpenAsar"; - rev = "5a05f49043d169fe0832e5c5a2e74d08a06f0bd3"; - hash = "sha256-fVOoqdnD2PKmpJKIzjFcGNa5Yg73CvzDH4Y1fu11xVE="; + rev = "5a44615cad9db23ae57573c498b26bae4e6e255b"; + hash = "sha256-aKyhFsecE1nRYYQVSYPUm5MY69dfEv2MnmiyVxfrwhk="; }; postPatch = '' diff --git a/pkgs/by-name/op/openclaw/package.nix b/pkgs/by-name/op/openclaw/package.nix index 304026eaf6fb..5311c50cb236 100644 --- a/pkgs/by-name/op/openclaw/package.nix +++ b/pkgs/by-name/op/openclaw/package.nix @@ -11,7 +11,7 @@ versionCheckHook, rolldown, installShellFiles, - version ? "2026.6.11", + version ? "2026.6.33", }: let pnpm = pnpm_11.override { nodejs-slim = nodejs-slim_22; }; @@ -24,10 +24,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { owner = "openclaw"; repo = "openclaw"; tag = "v${finalAttrs.version}"; - hash = "sha256-Ryj+aJ4Daql/ILs3Z/Gi+ltBGQfOdtXKJoOqr3YNoQ0="; + hash = "sha256-OdH5olBLDGQYCtR2ElbzcQ2+Hgy3cZDixkIwmSPh9Xw="; }; - pnpmDepsHash = "sha256-WvMphvtdimFXIx6kTQ5DMW9dcXS1tcFu2v3W1aiiW+4="; + pnpmDepsHash = "sha256-eVyR8SVp0SyjflFomvgn9dgAqvXIUgjCYc5NICxxIg8="; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; diff --git a/pkgs/by-name/op/openjfx/package.nix b/pkgs/by-name/op/openjfx/package.nix index 3cd764dfda16..5194abbd0eaf 100644 --- a/pkgs/by-name/op/openjfx/package.nix +++ b/pkgs/by-name/op/openjfx/package.nix @@ -13,7 +13,6 @@ python3, ruby, - gtk2, gtk3, libxtst, libxxf86vm, @@ -91,6 +90,14 @@ stdenv.mkDerivation { ]; hash = "sha256-WuJtzPy0IV4xvn+i5xeDqekWO0VR2GIfsYKkEmh8KKU="; }) + # Drop GTK2 support + (fetchpatch2 { + url = "https://github.com/openjdk/jfx/commit/63635ee8160ba6507d625c44320b58e2f9bfb87a.patch?full_index=1"; + includes = [ + "buildSrc/linux.gradle" + ]; + hash = "sha256-p2vRy8jA/JJBGCC5irV3gGbcJqChFNi+ViMeQ1wjtU0="; + }) ] ); @@ -105,7 +112,6 @@ stdenv.mkDerivation { ]; buildInputs = [ - gtk2 gtk3 libxtst libxxf86vm diff --git a/pkgs/by-name/op/openobserve/package.nix b/pkgs/by-name/op/openobserve/package.nix index bde76c4d7db2..7df74346a3ce 100644 --- a/pkgs/by-name/op/openobserve/package.nix +++ b/pkgs/by-name/op/openobserve/package.nix @@ -50,13 +50,13 @@ rustPlatform.buildRustPackage ( in { pname = "openobserve"; - version = "0.91.1"; + version = "0.91.3"; src = fetchFromGitHub { owner = "openobserve"; repo = "openobserve"; tag = "v${finalAttrs.version}"; - hash = "sha256-4Oe1YRblkJg9aNG/aLvP89zrHIysA67GP7GN7oCTdd8="; + hash = "sha256-XPldg4q6PeBDHV0W9tkWg7tdbp7rLDCRP8ux0a1jqec="; }; patches = [ diff --git a/pkgs/by-name/op/openresolv/package.nix b/pkgs/by-name/op/openresolv/package.nix index b487493675ce..35922bde47ca 100644 --- a/pkgs/by-name/op/openresolv/package.nix +++ b/pkgs/by-name/op/openresolv/package.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "NetworkConfiguration"; repo = "openresolv"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-I86BHiSI3G4xlYRJC99elHw8RyUd3eHdkV5kiEGRXNE="; + tag = "v${finalAttrs.version}"; + hash = "sha256-I86BHiSI3G4xlYRJC99elHw8RyUd3eHdkV5kiEGRXNE="; }; nativeBuildInputs = [ makeWrapper ]; @@ -38,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { + changelog = "https://github.com/NetworkConfiguration/openresolv/releases/tag/${finalAttrs.src.tag}"; description = "Program to manage /etc/resolv.conf"; mainProgram = "resolvconf"; homepage = "https://roy.marples.name/projects/openresolv"; diff --git a/pkgs/by-name/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix index c249fbde359a..80d23aee17d7 100644 --- a/pkgs/by-name/op/openscad-unstable/package.nix +++ b/pkgs/by-name/op/openscad-unstable/package.nix @@ -57,13 +57,13 @@ let in clangStdenv.mkDerivation rec { pname = "openscad-unstable"; - unstable_date = "2026-02-25"; + unstable_date = "2026-07-20"; version = "2021.01-unstable-${unstable_date}"; src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "ae3a780de777bcb96d41631818551650bc79650d"; - hash = "sha256-jCiCB3tbM0dyIC2gvQarzwjfYI9mnREkMI+0R3EaGPM="; + rev = "e4fdec49730103274a4e21c2390b9a12882f01aa"; + hash = "sha256-9bPz6iVbUHeFp2uQiVVFYze24IN4skesP45TBBbr8Vk="; fetchSubmodules = true; # Only really need sanitizers-cmake and MCAD and manifold }; @@ -125,7 +125,6 @@ clangStdenv.mkDerivation rec { "-DOPENSCAD_VERSION='${builtins.replaceStrings [ "-" ] [ "." ] unstable_date}-unstable'" "-DCMAKE_UNITY_BUILD=OFF" # broken compile with unity # IPO - "-DCMAKE_EXE_LINKER_FLAGS=-fuse-ld=lld" "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON" # The sources enable this for only apple. We turn it off globally anyway to stay diff --git a/pkgs/by-name/op/opentofu-mcp-server/package.nix b/pkgs/by-name/op/opentofu-mcp-server/package.nix index 3d1b3463daeb..e074cd4361a6 100644 --- a/pkgs/by-name/op/opentofu-mcp-server/package.nix +++ b/pkgs/by-name/op/opentofu-mcp-server/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "opentofu-mcp-server"; - version = "1.0.0-unstable-2026-06-09"; + version = "1.0.0-unstable-2026-07-15"; __structuredAttrs = true; strictDeps = true; @@ -20,15 +20,15 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "opentofu"; repo = "opentofu-mcp-server"; - rev = "59ee379fff12389a25e75dc26768f8602e505a91"; - hash = "sha256-pPeqlJ/M7ylD7bniVbw/HqsFkZywHISmzpqsQG0VhoU="; + rev = "ad9e50780d8ae56ee9a71ddea5f3f8c8f2da1020"; + hash = "sha256-bp1tY4ggHVSVFcU+b/TlWBHhjmrf32Q3a86GWgvkFOk="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; fetcherVersion = 4; pnpm = pnpm_10; - hash = "sha256-N9+sbSsae1wOmHkOQ1+Km97w7T+BLuZKdskWZs8c4kw="; + hash = "sha256-7GEO4Mzxo7k7LXtCaLzF++4iEvc1kFw6uF9LywfPcdo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ov/overseerr/package.nix b/pkgs/by-name/ov/overseerr/package.nix deleted file mode 100644 index e9331a5c7b6e..000000000000 --- a/pkgs/by-name/ov/overseerr/package.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ - fetchFromGitHub, - fetchYarnDeps, - lib, - makeWrapper, - node-gyp, - node-pre-gyp, - nodejs, - python3, - stdenv, - yarnBuildHook, - yarnConfigHook, - yarnInstallHook, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "overseerr"; - version = "1.34.0"; - - src = fetchFromGitHub { - owner = "sct"; - repo = "overseerr"; - tag = "v${finalAttrs.version}"; - hash = "sha256-4332XsupUGjkFo0+4wn2fUyK5/y6EQoPaAuayBH/myk="; - }; - - offlineCache = fetchYarnDeps { - yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-f30P+/DxDz9uBmdgvaYK4YOAUmVce8MUnNHBXr8/yKc="; - }; - - env.CYPRESS_INSTALL_BINARY = 0; - - nativeBuildInputs = [ - makeWrapper - node-gyp - node-pre-gyp - nodejs - python3 - yarnBuildHook - yarnConfigHook - yarnInstallHook - ]; - - postInstall = '' - # Fixes "Error: Cannot find module" (bcrypt) and "SQLite package has not been found installed". - pushd $out/lib/node_modules/overseerr/node_modules - for module in bcrypt sqlite3; do - pushd $module - node-pre-gyp rebuild --build-from-source --nodedir=${nodejs} --prefer-offline - popd - done - - makeWrapper "${lib.getExe nodejs}" "$out/bin/overseerr" \ - --set NODE_ENV production \ - --chdir "$out/lib/node_modules/overseerr" \ - --add-flags "dist/index.js" \ - --add-flags "--" - ''; - - meta = { - badPlatforms = [ - # FileNotFoundError: [Errno 2] No such file or directory: 'xcodebuild' - lib.systems.inspect.patterns.isDarwin - ]; - changelog = "https://github.com/sct/overseerr/releases/tag/v${finalAttrs.version}"; - description = "Request management and media discovery tool for the Plex ecosystem"; - homepage = "https://github.com/sct/overseerr"; - license = lib.licenses.mit; - mainProgram = "overseerr"; - maintainers = with lib.maintainers; [ jf-uu ]; - }; -}) diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix index 63b3c0244611..3b4b18392ed1 100644 --- a/pkgs/by-name/pa/paperless-ngx/package.nix +++ b/pkgs/by-name/pa/paperless-ngx/package.nix @@ -114,6 +114,7 @@ pythonPackages.buildPythonApplication (finalAttrs: { "django-allauth" "django-auditlog" "django-cachalot" + "django-filter" "django-guardian" "drf-spectacular-sidecar" "python-dotenv" diff --git a/pkgs/by-name/pa/parla/package.nix b/pkgs/by-name/pa/parla/package.nix index 460806899a2a..f4de28f46808 100644 --- a/pkgs/by-name/pa/parla/package.nix +++ b/pkgs/by-name/pa/parla/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "parla"; - version = "0.7.0"; + version = "0.7.2"; __structuredAttrs = true; strictDeps = true; @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "trufae"; repo = "parla"; tag = finalAttrs.version; - hash = "sha256-fG8xRqOfcePYTZUidUWMd2ZICWpof/ACfXOXPCAexsM="; + hash = "sha256-XXkNvcqdf7OPb86RYI6cd4RL0hNcFUhf1q8hf+qls/8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pd/pdf2svg/package.nix b/pkgs/by-name/pd/pdf2svg/package.nix index ad1b4e895cca..abd85239cdd9 100644 --- a/pkgs/by-name/pd/pdf2svg/package.nix +++ b/pkgs/by-name/pd/pdf2svg/package.nix @@ -5,7 +5,6 @@ autoreconfHook, pkg-config, cairo, - gtk2, poppler, }: @@ -27,7 +26,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ cairo poppler - gtk2 ]; meta = { diff --git a/pkgs/by-name/pd/pdns-recursor/package.nix b/pkgs/by-name/pd/pdns-recursor/package.nix index ca52e36885b4..a9d9791723c1 100644 --- a/pkgs/by-name/pd/pdns-recursor/package.nix +++ b/pkgs/by-name/pd/pdns-recursor/package.nix @@ -21,17 +21,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "pdns-recursor"; - version = "5.4.3"; + version = "5.4.4"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${finalAttrs.version}.tar.xz"; - hash = "sha256-opICnFQ6xFOMpXYouBQsntypsoOjqAyzk+2UfgWE8A8="; + hash = "sha256-Tut86kxxvTuABQWitPyFSd1vRnW36eFkC/8bNDpJwzo="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; sourceRoot = "pdns-recursor-${finalAttrs.version}/rec-rust-lib/rust"; - hash = "sha256-eAiXdsHWZca0wx5FONGfa7JDcpDHyCABJOUROhwAsZo="; + hash = "sha256-0/HLB9wMVQALga7ZJcPSDczjcBinMwQz2vTPep+x8p8="; }; cargoRoot = "rec-rust-lib/rust"; diff --git a/pkgs/by-name/ph/photoprism/backend.nix b/pkgs/by-name/ph/photoprism/backend.nix index 02632ec2fdb3..7f07b690a879 100644 --- a/pkgs/by-name/ph/photoprism/backend.nix +++ b/pkgs/by-name/ph/photoprism/backend.nix @@ -62,7 +62,6 @@ buildGoModule { description = "Photoprism's backend"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ - benesim ipetkov ]; }; diff --git a/pkgs/by-name/ph/photoprism/frontend.nix b/pkgs/by-name/ph/photoprism/frontend.nix index 14592d00d3d5..3d81ca8f7c5c 100644 --- a/pkgs/by-name/ph/photoprism/frontend.nix +++ b/pkgs/by-name/ph/photoprism/frontend.nix @@ -27,7 +27,6 @@ buildNpmPackage { description = "Photoprism's frontend"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ - benesim ipetkov ]; }; diff --git a/pkgs/by-name/ph/photoprism/package.nix b/pkgs/by-name/ph/photoprism/package.nix index 7b63054de7d6..84a91d43237a 100644 --- a/pkgs/by-name/ph/photoprism/package.nix +++ b/pkgs/by-name/ph/photoprism/package.nix @@ -104,7 +104,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Personal Photo Management powered by Go and Google TensorFlow"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ - benesim ipetkov ]; mainProgram = "photoprism"; diff --git a/pkgs/by-name/pi/pimsync/package.nix b/pkgs/by-name/pi/pimsync/package.nix index d9ba3e201adb..e60bc0e28409 100644 --- a/pkgs/by-name/pi/pimsync/package.nix +++ b/pkgs/by-name/pi/pimsync/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "pimsync"; - version = "0.5.10"; + version = "0.5.11"; src = fetchFromSourcehut { owner = "~whynothugo"; repo = "pimsync"; rev = "v${finalAttrs.version}"; - hash = "sha256-YqLOkv0I+1HOlWNA8HoKB6/3ccYbV8u/0BJ/+4xvde4="; + hash = "sha256-iMdBqSSguViF+54e47IGV8hH3qvTxcNkWkmND1QAAxw="; }; - cargoHash = "sha256-9sEYeKZDMsbEUQc5V8xJzcKIzF6ugGsk3d5bTOCtYnw="; + cargoHash = "sha256-dvkZ047eJnvYvyH1iW1NJo3Uv0L2T7waPYKN12bi+dA="; env.PIMSYNC_VERSION = finalAttrs.version; diff --git a/pkgs/by-name/po/pocketbase/package.nix b/pkgs/by-name/po/pocketbase/package.nix index 5a19aca35b40..d0af359c3d8e 100644 --- a/pkgs/by-name/po/pocketbase/package.nix +++ b/pkgs/by-name/po/pocketbase/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "pocketbase"; - version = "0.39.8"; + version = "0.39.9"; src = fetchFromGitHub { owner = "pocketbase"; repo = "pocketbase"; rev = "v${finalAttrs.version}"; - hash = "sha256-ZStu568NCfNo46NNsuAi0i8Oph0bL5L2v+Zny3WqdIY="; + hash = "sha256-owOE7rEP2junyzLsECv+Qf4z6mq2dJu5R0XR0oCIMo8="; }; - vendorHash = "sha256-88GNxiHZzDJp8Xj0Il3D3gT8NaVAyyd+gcGmFAzfKp8="; + vendorHash = "sha256-jA/MazIBK2iJUI7fd/oRsXyC4HSnfh7iyB5xHLnZRYs="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; diff --git a/pkgs/by-name/po/pods/package.nix b/pkgs/by-name/po/pods/package.nix index efe8edd68f3b..47994603b8ea 100644 --- a/pkgs/by-name/po/pods/package.nix +++ b/pkgs/by-name/po/pods/package.nix @@ -23,18 +23,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "pods"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "marhkb"; repo = "pods"; tag = "v${finalAttrs.version}"; - hash = "sha256-GMFrcWFozRR0G0+7g5JJyMkWzPY79cVF4Go1Wd/4HtA="; + hash = "sha256-tI3ZFR4DYdcIH+MYpRgjRXnbL0HOVcPG3x7mrMWwGOY="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-P0teC048Z61pMrl5cvlvrGaPcccxTki/AIthyzQusGI="; + hash = "sha256-g1xk4Haz8Q04ASOpfoiRC36oaszl3pqkLV0rgiJgGN4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pr/proto/package.nix b/pkgs/by-name/pr/proto/package.nix index b63c860e3a69..baeb421dc6d7 100644 --- a/pkgs/by-name/pr/proto/package.nix +++ b/pkgs/by-name/pr/proto/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "proto"; - version = "0.58.2"; + version = "0.59.0"; src = fetchFromGitHub { owner = "moonrepo"; repo = "proto"; rev = "v${finalAttrs.version}"; - hash = "sha256-fITyBLT4SyQ7q3zMJ2JpunsBjdZtgiGA19g09PKQcL8="; + hash = "sha256-iA/dE4ekd83hkOVewFYk7pe8TVBT4smT8XWavIiMtY8="; }; - cargoHash = "sha256-tK/nb6g8fjhdCciI5mgq+mvUBwXPsak1VNk8pcWlQrk="; + cargoHash = "sha256-ZL8uykBCmzUaGwVj5kTpxqv6oYAsRGRUBmTF51fkwQ0="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv diff --git a/pkgs/by-name/pt/pt2-clone/package.nix b/pkgs/by-name/pt/pt2-clone/package.nix index e6c8f1ef1c42..ee2b6e5a0f8e 100644 --- a/pkgs/by-name/pt/pt2-clone/package.nix +++ b/pkgs/by-name/pt/pt2-clone/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pt2-clone"; - version = "1.91"; + version = "1.92"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-Kti3oWkgpdZu3w0FjW3pjYSSkda56Ht/a/oaC3JDHIM="; + sha256 = "sha256-gEcaE7Tyr6WoP8trxC9FgLbomZWnjferNSBxaZavR5E="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/pu/pulumi-bin/data.nix b/pkgs/by-name/pu/pulumi-bin/data.nix index d501b8b4083b..b0b0c4402649 100644 --- a/pkgs/by-name/pu/pulumi-bin/data.nix +++ b/pkgs/by-name/pu/pulumi-bin/data.nix @@ -1,12 +1,12 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.253.0"; + version = "3.254.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.253.0-linux-x64.tar.gz"; - sha256 = "1b6ini1p2232wq0lh9fzj251377zlpdl8qx4jmrwgrl02991w5ik"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.254.0-linux-x64.tar.gz"; + sha256 = "08jc6q347isbd09hmp76qdva4h77w2yhl1vd8lcckgqf7c4pq5mj"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.58.0-linux-amd64.tar.gz"; @@ -17,48 +17,48 @@ sha256 = "04c46mdgnm51wbdn68sbr1005wa0r7i9k7swd87j541qrws54csk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.104.0-linux-amd64.tar.gz"; - sha256 = "1hkg2h7q5g4swjm07wfjfww7y3ssbm3ffi38vdy0p6xs1aamcn4q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.105.0-linux-amd64.tar.gz"; + sha256 = "1cp0x63hwpsii6kqw1wkyg2qxjry13jmcq0aq844c8m3fvvx024c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.11.4-linux-amd64.tar.gz"; - sha256 = "1h7fk2c83d6qxb2n3mvmdpmxk7b67mwkg6zv1isjmdfmkxiz84ir"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.11.5-linux-amd64.tar.gz"; + sha256 = "0cypa7hgq41vcffix6s7ssc5y6qam9id1bgmnqxjvhb3az4hlyvw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.48.0-linux-amd64.tar.gz"; - sha256 = "0ja9jm9giz231ip8mi0phnfm50hz991kwgnp94yiq25hmk3h5ifl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.49.0-linux-amd64.tar.gz"; + sha256 = "0s0bb32j3kk0klnpdhqnz0ybz1542p6jczndlwzafj03nrv1i946"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.35.0-linux-amd64.tar.gz"; - sha256 = "1bwbdm21a5kr2z6jd36idn78yas9ysgg29d14wqjjwhqb0hw3pkq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.39.0-linux-amd64.tar.gz"; + sha256 = "1kx9arfflwy5683m44bp881mg4423b9460lxgwydfyjq2gwi874c"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.10.0-linux-amd64.tar.gz"; sha256 = "1h1yrkxd2w8vc2kj097mb7jzv21948vp6kv0x7p5bgcbgpyh69qp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.15.0-linux-amd64.tar.gz"; - sha256 = "0hx94wf890a8cz9k66q4p89w9330axb1a3lg2g6j5lbxhrp2bvac"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.16.0-linux-amd64.tar.gz"; + sha256 = "1n9dcga0rsvfyd1m44p5kp2rfay6dn30l80v8idsq9i6r6aigbwn"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.39.0-linux-amd64.tar.gz"; sha256 = "13crj1h932vf9ch4m3yphm701dqc86j8pmi4ymjlg0yzfm6b8xwb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.17.0-linux-amd64.tar.gz"; - sha256 = "1qkx0kmgx50pz06m6rpz58iilx7b94w1dvz17j0mrr4vdmkbldid"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.18.0-linux-amd64.tar.gz"; + sha256 = "0y0l71d638zl4853fd42j6ldxv1xwiwn4v7x6wbcfaz0djx94x4l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.15.0-linux-amd64.tar.gz"; - sha256 = "0xbx66jaknq7n8s77s1zkv3jdacqv4pnxfnlg424vlk04laar6q0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.15.1-linux-amd64.tar.gz"; + sha256 = "1jyq8pwcifq6y86m0wq6dv2l7jbgin6kdp6man29405ss5l2qhx9"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v5.8.0-linux-amd64.tar.gz"; sha256 = "0lv8bsm05rw1xv5m8wscanq1crrphhrdah8nd28vww3akr36af2q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.75.0-linux-amd64.tar.gz"; - sha256 = "0lccw7i98d43v0pipabb7i67588jllil2s882fjlvj3afk7njqza"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.76.0-linux-amd64.tar.gz"; + sha256 = "1jymfc0sv6pqb5a0irxr0vyh7qvz0ki5gyzmnwpyk5pjm670i7q7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v5.1.0-linux-amd64.tar.gz"; @@ -69,28 +69,28 @@ sha256 = "0hnardid0kbzy65dmn7vz8ddy5hq78nf2871zz6srf2hfyiv7qa4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v12.3.1-linux-amd64.tar.gz"; - sha256 = "0qgyrfy24bsny0l0kyb4dwyfrpk0a8bh7cl0c11gjh7idwazrn9p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v12.4.0-linux-amd64.tar.gz"; + sha256 = "0xikj493rqgd38dvzgwzj70pzch0rsss4khgxsaqbxwv9v7ssirg"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.30.0-linux-amd64.tar.gz"; sha256 = "1dq271jcbqi705w691yrfnk09qwj3d5zghz058hsv6b7zmjzp5mf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.14.0-linux-amd64.tar.gz"; - sha256 = "0vsaqqc21kn46pc4pkli2zqh9xmbp4b23rgl5c10100mkjn516bq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.14.1-linux-amd64.tar.gz"; + sha256 = "07gxsrldf77c46cshrawc6v860xplgnnh8dn4r18i24gnksd5xh1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v10.0.0-linux-amd64.tar.gz"; - sha256 = "0x6zj6cxcv0r0sd71bkx9cav2d68yipyk2m3ngaz2180rjml7pqd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v10.1.1-linux-amd64.tar.gz"; + sha256 = "02v3ykw1095a9kgw2gzwvp0s1nk8vlgljx2rxcmbpyj6bxbh5x39"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-linux-amd64.tar.gz"; sha256 = "1zra1ck64gs4nwqf62ksfmpbx24lxw6vsgi47j4v8q051m89fgq3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.39.0-linux-amd64.tar.gz"; - sha256 = "030rn7smyfq1j5lgrx50psqbabdjiqr7qmrq965aydjwb2kfs8lx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.39.1-linux-amd64.tar.gz"; + sha256 = "19ljpp33x4jsy25lg1gj4v18wzk75w8bb96crhm24x448rvibwag"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.33.0-linux-amd64.tar.gz"; @@ -101,24 +101,24 @@ sha256 = "18s9p81kqf89807wm77g8s6dvh99wpaxd5f064k1kdypb6snbp6p"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.8.0-linux-amd64.tar.gz"; - sha256 = "0ql5y5n82lr0850hg33w7jh7v8b5qc0j4lk47vjdkfxg87s8f36k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.9.0-linux-amd64.tar.gz"; + sha256 = "0213b8pbijwnx1zh9qvcacg9djx47biv79ylcyi77sya9vl7pbwn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.3.0-linux-amd64.tar.gz"; - sha256 = "1j6clq6h9j0n8xl9bx1apay138569sgv5x5byl9zvp4cyfxri6gr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.3.1-linux-amd64.tar.gz"; + sha256 = "0ksm9fgx9cp3fpsg5g96lwxs49kjkaylqjpg2dbzcm6czj73xbwh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.5.0-linux-amd64.tar.gz"; - sha256 = "060vr8rd6c1rm92x5cn97ijk5f2mq730mvw25n79smli90yk3d7y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.5.1-linux-amd64.tar.gz"; + sha256 = "1sibbv3zxzffgk44cy7vml3d0ccncqqzid63rsbzgvjl0z0zcr09"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.17.0-linux-amd64.tar.gz"; - sha256 = "0sq70hajgwjcg7nlx82kh7xzx657gwxfqycndbmj0wpwmzpngdzg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.18.0-linux-amd64.tar.gz"; + sha256 = "1nixw8mpg82v4zc8fab1xn4i52fikfjmmqk2g1wgwbqy5a47qarp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.21.0-linux-amd64.tar.gz"; - sha256 = "07lqjsz8d7cn52zfawhxj6k9n6g1a220kcckdfnf6135h26w75h0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.21.1-linux-amd64.tar.gz"; + sha256 = "024726qg7kz76ika61mblf6s45fbzbq5zgz661qpfycib7ps48na"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.18.0-linux-amd64.tar.gz"; @@ -137,16 +137,16 @@ sha256 = "0203qf994hjablrl6nm51f6j69z469q46rm1d15gvxsgi17g23sx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.5.0-linux-amd64.tar.gz"; - sha256 = "1j034cch58whw4zf0vggbhm32is6qw2bjfp8zfjna490rbba6xlf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.5.1-linux-amd64.tar.gz"; + sha256 = "02ww9272mfrfw7f4n2rldfjj9p5qc9rcazli71g6rzrklx2r1f6p"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.10.0-linux-amd64.tar.gz"; - sha256 = "03cgllyqi4sn2m3109d2qcdrg4zi7q7s0ijnglb0pikf54rckj5f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.11.0-linux-amd64.tar.gz"; + sha256 = "0w524zqy7xprgv0al7k0ki36ypbvj80bk6y5dx0xvlgl4h1ha4m3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.13.0-linux-amd64.tar.gz"; - sha256 = "038jpbd3id3lbfqkbp0cxmpj8grf2ym5vaf7khvbjb4ydpglvkg1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.13.1-linux-amd64.tar.gz"; + sha256 = "1grvj9n3zfm6sbjlak0v2p2fphv3j7bnv8vq4ysdr4849yy2jh17"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.17.0-linux-amd64.tar.gz"; @@ -163,8 +163,8 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.253.0-linux-arm64.tar.gz"; - sha256 = "1skpnnrh4inw20p2ldji4a75vm7v2igkdck3q4k944vngbb78w3x"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.254.0-linux-arm64.tar.gz"; + sha256 = "03z3fmvgdx4nkfsykdqlxylij5sp40rd1wjcdbg3zj307ybrn9dz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.58.0-linux-arm64.tar.gz"; @@ -175,48 +175,48 @@ sha256 = "1j6nckrzndcdjyzmmv63z351wcqlflmrp5dr342lbpdc0889yk4y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.104.0-linux-arm64.tar.gz"; - sha256 = "0s6h6l77jkz38bifcb61sfx1bqwdyf4ayi7f0m0idcji5b28anpr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.105.0-linux-arm64.tar.gz"; + sha256 = "007slzw6y0a5s4azb7s2kp0qfkahy2v2ybd9lw2yrigd4cf02110"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.11.4-linux-arm64.tar.gz"; - sha256 = "1dnkx3qhh2ln6gps8z7gwknb6cjzl0v5ximvz91gqz1i8pshvqz4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.11.5-linux-arm64.tar.gz"; + sha256 = "1nmbcaa4kdm39zzds29rgq07bnch3pnnb5275yyhw8lx6gqwkkb4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.48.0-linux-arm64.tar.gz"; - sha256 = "16ckjw8375yrz92wm0dgdp1yamswikr9gbrigad2f3yf6crmlyia"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.49.0-linux-arm64.tar.gz"; + sha256 = "10r6d6mk1j7dv9j6qmhr5873kjdj9vqyapqd1sf6qfv2f7yfgj46"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.35.0-linux-arm64.tar.gz"; - sha256 = "0hmwjbg8l32vgy8ydl5makl1l6x9frz6abg3yah597flwdy8afgd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.39.0-linux-arm64.tar.gz"; + sha256 = "1pna2nh491bdis85jhlafbi8ffa46zcrbmbq9f9ih5x644m2c9vj"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.10.0-linux-arm64.tar.gz"; sha256 = "06bkdfipmgjq1ahfmpjzsfz73kkasxwajciym9y1gmlb62zq75ac"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.15.0-linux-arm64.tar.gz"; - sha256 = "0660ml58rak26im6fc6vr7mj943xpn7fnrysg7h8a6yi2rs31vb1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.16.0-linux-arm64.tar.gz"; + sha256 = "150m8xbjaap20kym39vbsk26jzficc0n13d7i50zgv00n9dj34z5"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.39.0-linux-arm64.tar.gz"; sha256 = "1zwqw37zvv5yqdy95vs7dvq8x6a34glfy5sg336rgz36mnrbs2fb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.17.0-linux-arm64.tar.gz"; - sha256 = "1s53h8nj6y9pd3hxygs30nwa708pi3sqgndw96l8hi2b4xckw1pv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.18.0-linux-arm64.tar.gz"; + sha256 = "01l38jr81yvr8j3vdp5r7qdbj56432y0xmsvc1cnr24snf2hhq0i"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.15.0-linux-arm64.tar.gz"; - sha256 = "0jgqk4sp7rkapxfi3gs5z74rrrs050bqs6kggpfz32v6sp5514z1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.15.1-linux-arm64.tar.gz"; + sha256 = "04qf0ypr4x1ndrcna2fm9hxn323z1dczgf2nc0v16fznr94hfsps"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v5.8.0-linux-arm64.tar.gz"; sha256 = "1gsi703xf1zl508wsrwpcgnj0g6g81fjdqhgc4shd7sk1iykjnd3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.75.0-linux-arm64.tar.gz"; - sha256 = "1n3hkniyzd14sijcbhd9kl7nvq6gfmmg42q4knp4vwjrf26dv86a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.76.0-linux-arm64.tar.gz"; + sha256 = "02xhc5kq0wc5m0w64v118s2h3y46vkr8gzc6k5cvn266mf21ig7i"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v5.1.0-linux-arm64.tar.gz"; @@ -227,28 +227,28 @@ sha256 = "111pia2f5xwkwaqs6p90ri29l5b3ivmahsa1bji4fwyyjyp22h4r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v12.3.1-linux-arm64.tar.gz"; - sha256 = "1viavidp6g7s2pyczic4iq5p7pakg3g7994yfx03nar76sv94rgp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v12.4.0-linux-arm64.tar.gz"; + sha256 = "17wzipyz3nid2bckqiw1959f0xmyns8vglfbr2m1if14fsyabpva"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.30.0-linux-arm64.tar.gz"; sha256 = "09v3mpdscgsjpd3h1g8q2fk7amh5z7iindszf0wf8zml4qcg187v"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.14.0-linux-arm64.tar.gz"; - sha256 = "0r119cbrv54k026jsg8z7hyd10asi6ff6jyd5ckxzni6rawm1yzf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.14.1-linux-arm64.tar.gz"; + sha256 = "1ilhfgy32icxcwdj3xi6zvancf0bx8nc9kpxd10m7pcc449mhwnn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v10.0.0-linux-arm64.tar.gz"; - sha256 = "1yxipxylrmdp9mmwdvx99p8bjp5kn7hswvk38lafapyal5j2qfkv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v10.1.1-linux-arm64.tar.gz"; + sha256 = "0rq23zf8vg3pn1rg4sm0gii2qv3yvp54gb0138cs56yg6s9m06yr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-linux-arm64.tar.gz"; sha256 = "0d8m2krbzxjhfm82dgf8p4vm3kk9gk98l798q4ayjrddqqb4mxq4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.39.0-linux-arm64.tar.gz"; - sha256 = "0w0caqipdipj56qqv2vkcn5srbb6h1xv741d53v5863ax1hgp0w3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.39.1-linux-arm64.tar.gz"; + sha256 = "182yd88v6x5pgbiisjmvmivv0vmr4ympy6ij8j07y1zi2x3bsa5l"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.33.0-linux-arm64.tar.gz"; @@ -259,24 +259,24 @@ sha256 = "16gwcr4j5fwmsxkcvna1wkx1hjxzyiycv4b4fwysd5y7myh4zsnb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.8.0-linux-arm64.tar.gz"; - sha256 = "1m5bw0cj07hmzk84mbfjwl7gyqqjlsyimfzbs3aqmdl7pqw7ibc4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.9.0-linux-arm64.tar.gz"; + sha256 = "1ags036pqs7xgiahpa6i1qgx2xxsicb8dk4dpycrwaj1b299zcxh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.3.0-linux-arm64.tar.gz"; - sha256 = "1zzvlsksm3599zx61rm1yr51rhglj56jd74h012h7ksnfkrg12sx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.3.1-linux-arm64.tar.gz"; + sha256 = "06xnmzjhvrim6wmpnjq6c16sf5ixm8pqj5wc9srvvbayjg1aagi8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.5.0-linux-arm64.tar.gz"; - sha256 = "1py1gip6l3rgkyp0py9bny3kpzakwf3jygmbhywb3krzmjzl1hly"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.5.1-linux-arm64.tar.gz"; + sha256 = "0r9jl1fdz75a78mw188admd81kcbrb9bcc8pn93mb1qwn3iwlww5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.17.0-linux-arm64.tar.gz"; - sha256 = "0gzjkvbwbrvnyx2amdw1p05abg196n96v6vniryi92ql3k40cp10"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.18.0-linux-arm64.tar.gz"; + sha256 = "1b4l1krbn6ndi5x5yfl5r9f6mq6rgv0bglvxgifj5c9n9g554hvb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.21.0-linux-arm64.tar.gz"; - sha256 = "1d6j1hqy0w3w4jssyp3w7xdkg8501vljra8299giiv0cycmhd3w8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.21.1-linux-arm64.tar.gz"; + sha256 = "0x6h3zg44y1amk7a2y3n8a54qbgdzir57akmwqg0zddq5jbrcbpi"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.18.0-linux-arm64.tar.gz"; @@ -295,16 +295,16 @@ sha256 = "0bi1i8ysx2way6gix1bxixdiipk6w0wqp3xh8vvzw8s61ax4awsa"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.5.0-linux-arm64.tar.gz"; - sha256 = "0k5h1xc602r9lhwlh6priq75i8mvsalwn7lgyknc7lg4kgvc4f82"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.5.1-linux-arm64.tar.gz"; + sha256 = "0afxnkk2vmyhy52mbn3mv6bq7fdx3hk1gn6qhsf2h4gd7x7qr6vh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.10.0-linux-arm64.tar.gz"; - sha256 = "0ww2y1gnnx4rbblvrbjlm6zj2as8zwgcifqqimcar2178x755a39"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.11.0-linux-arm64.tar.gz"; + sha256 = "0wigb7qqm2kjx6jgqn26wa6f0jw07nis3phzkp21q4dciqg0fwnr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.13.0-linux-arm64.tar.gz"; - sha256 = "1nfv4cfnpwyk5fbd2znk1x3cz9p45bc5069mvvxv47cc5fn176d5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.13.1-linux-arm64.tar.gz"; + sha256 = "0v7y0jnssmiafbh73xzsganfz16y5dpdais56jzzlxzja0wa84p6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.17.0-linux-arm64.tar.gz"; @@ -321,8 +321,8 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.253.0-darwin-arm64.tar.gz"; - sha256 = "0glfsanndr725r4dr0cjj24yhd529kczp6ksy2dan4b4387d1l8j"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.254.0-darwin-arm64.tar.gz"; + sha256 = "1qs0dqbr1vaalajr68brk1hn83cls011j1qr2ah3vkshxvr5br8z"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.58.0-darwin-arm64.tar.gz"; @@ -333,48 +333,48 @@ sha256 = "16b7i6fyd6b2axgv60ld9a6pj6gy2mh3nqml33sc024adrlssyn2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.104.0-darwin-arm64.tar.gz"; - sha256 = "1mqzky6ilc14jsdxpzjyx9ldhiiid2akmhj3wqw2mjqlcmz4sxvd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.105.0-darwin-arm64.tar.gz"; + sha256 = "1i792m76dlmaqmchzbrnd0m4ls1wq4jc61q63yacm2zj63yk6g5h"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.11.4-darwin-arm64.tar.gz"; - sha256 = "0q5i2mx7isdgiqscqkswnqgrg25xm4wf2nqxcpmr91bvwc5rrjsi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.11.5-darwin-arm64.tar.gz"; + sha256 = "1yank4slw1r2c7dilvzbpjjshx2kynnsizdb0n2qidpfsz5v2pk1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.48.0-darwin-arm64.tar.gz"; - sha256 = "03ymhjv30xyi3nsw40mz7saazaw7xw20l2bnmia37nnn5336qlhd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.49.0-darwin-arm64.tar.gz"; + sha256 = "1w22miq3594mz4dqnv2i5sicb76ii380ybr5afmmirvi3xy38z76"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.35.0-darwin-arm64.tar.gz"; - sha256 = "0m5xbg919vvmhv6v644wivfgaq4mzsfbf7bdq001z4065v6im2sg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.39.0-darwin-arm64.tar.gz"; + sha256 = "0sp53if3d38zx11mdmp4n207p2dc41ra4539naamxp414ssigp25"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.10.0-darwin-arm64.tar.gz"; sha256 = "17rfxhnfkdwkpnv1kfzl427s6ysaggdy6z37d4h5cxpl6d6kf8nr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.15.0-darwin-arm64.tar.gz"; - sha256 = "0rzjlcwq1gpp7v9a4xcfwcc09g9ry6c8d7s00jiy8ix5cfzmwv10"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.16.0-darwin-arm64.tar.gz"; + sha256 = "0pyxkwzx9j5sfh996wpdx5nw5mrl76a3s7030hpdqn1fizn0kqhv"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.39.0-darwin-arm64.tar.gz"; sha256 = "01cfgmb13ylbi2dk7ng8mda6lsrjgaccyrffjp6jhfp245fj97pb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.17.0-darwin-arm64.tar.gz"; - sha256 = "0la2l0c5chif0j681k4dgnav8qd0bdfbc01x7w0wpa1cvp5a7g49"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.18.0-darwin-arm64.tar.gz"; + sha256 = "0lyhpx5hdj2qnhssin9ghhx5vrz7pa9sikaylgkbmfbv4s14lmx6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.15.0-darwin-arm64.tar.gz"; - sha256 = "1ly07rsqrrxqcbgwf0a0dhjgv16bbsanc56k04yhvsq1i4cis8v3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.15.1-darwin-arm64.tar.gz"; + sha256 = "0phyk41226nvm3dkfi9z3r10b99p8pln4gsli49ls4r6wgg3jaxx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v5.8.0-darwin-arm64.tar.gz"; sha256 = "0833vlgcy3jcnnlhb94wr1fn1j1r4sjqlwhxsqldkd53w1x0rxqs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.75.0-darwin-arm64.tar.gz"; - sha256 = "16nv45p1gfbyjxcvmw9w28yzk9vygd5w1l2ifhax27g63zwzb7yk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.76.0-darwin-arm64.tar.gz"; + sha256 = "1qkfag4zs0fhjh2vr9qca5cyvr2gybd36hgqy7k6nyr3hfrrn7f4"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v5.1.0-darwin-arm64.tar.gz"; @@ -385,28 +385,28 @@ sha256 = "12bzicm43l7yvh02v5fx3z8v46l9i7a9f677735xi5rjbmd2an4c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v12.3.1-darwin-arm64.tar.gz"; - sha256 = "1dsr4d1i1rrq6801x1mmqgqg5rw2fibvqid5gbv9gyb73vkaafkn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v12.4.0-darwin-arm64.tar.gz"; + sha256 = "0vkp0kchr3zl58ddxl4573ll9zdxjrm2cb5y4d728va7dzjsmpl4"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.30.0-darwin-arm64.tar.gz"; sha256 = "1vzaypv5wqa9vdggcv5m7kkxcmbwim100j85jsbylkhnf8lg5sq3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.14.0-darwin-arm64.tar.gz"; - sha256 = "05kzpbg75j47ls6y7a9pqgn4yqis7yp2fsd9ix2laywmkd9rqhv5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.14.1-darwin-arm64.tar.gz"; + sha256 = "0bkx2qf8p815k50fg8rzhxz0bzcqf32hniv7abbwfqpykyxjvgqf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v10.0.0-darwin-arm64.tar.gz"; - sha256 = "0rmw56k5ray15aciq3y5km40dlyq7zp10jpbf6s0z4nfg9479ni1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v10.1.1-darwin-arm64.tar.gz"; + sha256 = "026rvz64mpf9vr1r76lsj28rzbi3jbpm6w28brbny1d0rpdfsb41"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-arm64.tar.gz"; sha256 = "0caz4kgnnrmdr7n571xc7yqscac9jnjwwpjzbnvx4ib6a91wvsdn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.39.0-darwin-arm64.tar.gz"; - sha256 = "1mfv6qlzm6l94j12pfy1dni5w9laix3s5fak7csmpwywnyf82dgx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.39.1-darwin-arm64.tar.gz"; + sha256 = "16rnj91ws7v61pmpyc7yi8lvwrc4y6pg6gk0ykwydrlgw8vrf9bv"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.33.0-darwin-arm64.tar.gz"; @@ -417,24 +417,24 @@ sha256 = "1xf9k1aqqrpq6apjgmqs4l276w5qzg2337ixcp3f12z8l476yv40"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.8.0-darwin-arm64.tar.gz"; - sha256 = "1idhx267y78hl33vc7w196fyq4bjqjgicrgd8bbls6vh0z0k9zhk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.9.0-darwin-arm64.tar.gz"; + sha256 = "1dnx16pj5q8pnz2k7cgvppbwps171jqrcd1l3dsh05jrhvhh6z0r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.3.0-darwin-arm64.tar.gz"; - sha256 = "1x81na0bj8x2mxy789n944ibf21wlzpqmv1h5i4h9nfm07jqz8d9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.3.1-darwin-arm64.tar.gz"; + sha256 = "0vnhz4zq8y2rz58bji3yl96bsl3gzav4ck6f80j096s1dp48zqch"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.5.0-darwin-arm64.tar.gz"; - sha256 = "1y33bybcdmjc39xhnggf06zrffamcdxnjvqiqg8110ps5wxqjzmc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.5.1-darwin-arm64.tar.gz"; + sha256 = "1if9k9wz9k5k0a37p08fkfqr6yimxbh8z69bfczl0b2rj5ibkbs5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.17.0-darwin-arm64.tar.gz"; - sha256 = "0yzvqn2i55y1q5wl1hykdvwv0zj957ascm731d4a6fs54gbnv174"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.18.0-darwin-arm64.tar.gz"; + sha256 = "1hp5rkbi32342z97ly68hr0rq2gqdk26qi9cfwg5x49c7x8wa26d"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.21.0-darwin-arm64.tar.gz"; - sha256 = "1ccyxmkzmj5qah2z912vks548bbrhiifa65h0dm5bkihyjk1bi95"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.21.1-darwin-arm64.tar.gz"; + sha256 = "1dn4ci1ghy6kfv7jgrmnacyajia41glrw9kd46i3x5861apam3xl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.18.0-darwin-arm64.tar.gz"; @@ -453,16 +453,16 @@ sha256 = "0bjp4076cbkvdcjj3jcvy4r50zdv74vwbzq706i31rz1c121dm3x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.5.0-darwin-arm64.tar.gz"; - sha256 = "1hajg5iaxhl4dk4v67clk5957sd2pznxaj8h3475vmq7vpzxfpwi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.5.1-darwin-arm64.tar.gz"; + sha256 = "17a9hjb4yslw6367q7ixcmazrcnzzs2887pkc001kk7h8h1qgx1w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.10.0-darwin-arm64.tar.gz"; - sha256 = "1h8izm6mbvvjj3ybxdskaanh4f3pws3wrl46y4biwkb2b9g71wqp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.11.0-darwin-arm64.tar.gz"; + sha256 = "10447krdfm4fqn04n2sd6m4fscy3vgbkgzbfaymmxqqvdxc04lm8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.13.0-darwin-arm64.tar.gz"; - sha256 = "09aza2hkn6ckr3anzif82ka370g7mqcj4s796lcak15pp93c0q9b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.13.1-darwin-arm64.tar.gz"; + sha256 = "1dyfwqf28hj3a77lsbll86wd0fgmlashiqp6rm9r2sg74hmkggyk"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.17.0-darwin-arm64.tar.gz"; diff --git a/pkgs/by-name/pu/pulumi/extra/mk-pulumi-package.nix b/pkgs/by-name/pu/pulumi/extra/mk-pulumi-package.nix index 0b6f1e3a573d..0060539afa92 100644 --- a/pkgs/by-name/pu/pulumi/extra/mk-pulumi-package.nix +++ b/pkgs/by-name/pu/pulumi/extra/mk-pulumi-package.nix @@ -80,6 +80,19 @@ let -e 's/^PLUGIN_VERSION = .*/PLUGIN_VERSION = "${version}"/g' \ setup.py fi + + # Pulumi Python SDKs use `pkg_resources` to find their current version at + # runtime. However, `pkg_resources` has been deprecated from `setuptools` + # since v82.0.0 (https://setuptools.pypa.io/en/stable/history.html#v82-0-0). + # + # Bypass this problem by: + # - removing the `pkg_resources` import and, + # - patching the plugin `version` string as a literal instead of requesting + # it via `pkg_resources`. + find . -name "_utilities.py" -exec sed -i \ + -e 's/import pkg_resources//g' \ + -e 's/pkg_resources.require(root_package)\[0\].version/"${version}"/g' \ + {} + ''; # Auto-generated; upstream does not have any tests. diff --git a/pkgs/by-name/pu/pulumi/package.nix b/pkgs/by-name/pu/pulumi/package.nix index 4cafbee7d929..bf0dd8db26b7 100644 --- a/pkgs/by-name/pu/pulumi/package.nix +++ b/pkgs/by-name/pu/pulumi/package.nix @@ -17,18 +17,18 @@ }: buildGoModule (finalAttrs: { pname = "pulumi"; - version = "3.192.0"; + version = "3.253.0"; src = fetchFromGitHub { owner = "pulumi"; repo = "pulumi"; tag = "v${finalAttrs.version}"; - hash = "sha256-rcDXC+xlUa67afuXvmEv8UNsYWBvQQ0P4httdtdcrh4="; + hash = "sha256-ZwK9IXuKD583MJ+6VG9CsrEIwh4aJGBlCXys/TYfrmg="; # Some tests rely on checkout directory name name = "pulumi"; }; - vendorHash = "sha256-BaFw8EnPd2GPA/p9wm8XpVy/iE8gqbteRnMQC8Z4NHQ="; + vendorHash = "sha256-5HYYesdKfZqCqDNrD2LZc25hxrczxRV/jsMXWeFT6fc="; sourceRoot = "${finalAttrs.src.name}/pkg"; @@ -60,22 +60,16 @@ buildGoModule (finalAttrs: { # Skip tests that fail in Nix sandbox. "-skip=^${ lib.concatStringsSep "$|^" [ - # Concurrent map modification in test case. - # TODO: remove after the fix is merged and released. - # https://github.com/pulumi/pulumi/pull/19200 - "TestGetDocLinkForPulumiType" - # Seems to require TTY. "TestProgressEvents" - - # Flaky; upstream “fixed” it by increasing timeout. - # https://github.com/pulumi/pulumi/pull/20116 - "TestAnalyzerCancellation" + "TestInfoXTerm" + "TestInfoVT102" # Tries to clone repo: https://github.com/pulumi/test-repo.git "TestValidateRelativeDirectory" "TestRepoLookup" "TestDSConfigureGit" + "TestResolvePackage" # Tries to clone repo: github.com/pulumi/templates.git "TestGenerateOnlyProjectCheck" @@ -89,6 +83,9 @@ buildGoModule (finalAttrs: { "TestPulumiNewWithRegistryTemplates" "TestRunNewYesNoTemplate" "TestRunNewYesWithTemplate" + "TestNewCmdYesWritesMinimalPulumiYAMLWithExplicitName" + "TestNewCmdYesSanitizesDefaultDirectoryName" + "TestNewCmdYesUsesCurrentDirectoryNameByDefault" # Connects to https://api.pulumi.com/… "TestGetLatestPluginIncludedVersion" @@ -108,6 +105,10 @@ buildGoModule (finalAttrs: { # Downloads pulumi-resource-random from Pulumi plugin registry. "TestPluginInstallCancellation" + # Fails to create/run test-plugin. + "TestPluginRunCommand" + "TestPluginRunCommandError" + # Requires language-specific tooling and/or Internet access. "TestGenerateProgram" "TestGenerateProgramVersionSelection" @@ -117,6 +118,44 @@ buildGoModule (finalAttrs: { "TestGeneratePackageTwo" "TestParseAndRenderDocs" "TestImportResourceRef" + "TestImportPathPattern" + "TestL2ResourceAssetArchive" + + # Require reading from a local credential file. + "TestAuthRequiredMessageChecksClaimWhenTokenLocallyValidButRejected" + "TestAuthRequiredMessageFallsBackToLocalClaimWhenValidationFails" + "TestAuthRequiredMessageOmitsClaimURLWhenClaimIsNotClaimable" + "TestAuthRequiredMessagePrintsClaimInstructionWhenTokenExpiredButClaimValid" + "TestAuthRequiredMessageSkipsValidationWhenClaimMarkedUnavailable" + "TestCurrentEnvTokenFailsWithInaccessibleExplicitPath" + "TestCurrentEnvTokenStoresInDefaultPathWhenWritable" + "TestCurrentInvalidAgentCredentialsWithActiveClaimDoesNotSignup" + "TestCurrentRejectedAgentCredentialsWithUnexpiredTokenDoesNotSignup" + "TestCurrentSignupAgentAccountStoresClaimTokenURL" + "TestCurrentSignupAgentAccountStoresRefreshToken" + "TestCurrentSignupAgentAccountWithoutRefreshTokenLeavesAccountEmpty" + "TestCurrentValidAgentCredentialsWithExpiredClaimDoesNotSignup" + "TestGetBackendAccountDoesNotFallbackToAgentCredentialsWithExplicitPath" + "TestGetCurrentCloudURLFallsBackToAgentCredentials" + "TestLoginUsesAgentSignupInNonInteractiveAgentMode" + "TestMaybePrintClaimWarningPrintsForUsedAgentCredentials" + "TestMaybePrintClaimWarningRequiresAgentCredentialsUsed" + "TestProcessCmdErrorsDoesNotPrintAgentAuthRequiredInstructionForAPINonUnauthorized" + "TestProcessCmdErrorsDoesNotPrintClaimURLForUnauthorizedClaimedAccount" + "TestProcessCmdErrorsPrintsAgentAuthRequiredInstruction" + "TestProcessCmdErrorsPrintsAgentAuthRequiredInstructionForAPIUnauthorized" + "TestProcessCmdErrorsPrintsAgentClaimWarningForNonLoginError" + "TestRetrievePrivatePulumiCloudTemplateFallsBackToAgentCredentials" + + # Probably flaky. + "TestTokenSourceWithClient" + + # Requires invoking pulumi binary. + "TestDecryptEncryptedLog" + "TestDecryptGzipLog" + + # Requires unavailable access token. + "TestRunNewYesWithAILanguage" ] }$" ]; @@ -143,6 +182,10 @@ buildGoModule (finalAttrs: { withPackages = callPackage ./with-packages.nix { }; updateScript = _experimental-update-script-combinators.sequence [ (nix-update-script { }) + (nix-update-script { + attrPath = "pulumiPackages.pulumi-bun"; + extraArgs = [ "--version=skip" ]; + }) (nix-update-script { attrPath = "pulumiPackages.pulumi-go"; extraArgs = [ "--version=skip" ]; @@ -164,7 +207,12 @@ buildGoModule (finalAttrs: { }; # Test building packages that reuse our version and src. - inherit (pulumiPackages) pulumi-go pulumi-nodejs pulumi-python; + inherit (pulumiPackages) + pulumi-bun + pulumi-go + pulumi-nodejs + pulumi-python + ; pythonPackage = python3Packages.pulumi; pythonPackageProtobuf5 = (python3Packages.overrideScope ( @@ -187,8 +235,10 @@ buildGoModule (finalAttrs: { license = lib.licenses.asl20; mainProgram = "pulumi"; maintainers = with lib.maintainers; [ - veehaitch + nicoo tie + untio11 + veehaitch ]; }; }) diff --git a/pkgs/by-name/pu/pulumi/plugins/pulumi-bun/package.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-bun/package.nix new file mode 100644 index 000000000000..413b478a78cb --- /dev/null +++ b/pkgs/by-name/pu/pulumi/plugins/pulumi-bun/package.nix @@ -0,0 +1,46 @@ +{ + lib, + buildGoModule, + symlinkJoin, + pulumi, + pulumi-nodejs, +}: +let + unwrapped = buildGoModule (finalAttrs: { + pname = "pulumi-bun-unwrapped"; + inherit (pulumi) version src; + + sourceRoot = "${finalAttrs.src.name}/sdk/nodejs/cmd/pulumi-language-bun"; + + vendorHash = null; + + ldflags = [ + "-s" + "-w" + "-X=github.com/pulumi/pulumi/sdk/v3/go/common/version.Version=${finalAttrs.version}" + ]; + }); +in +symlinkJoin (finalAttrs: { + pname = "pulumi-bun"; + inherit (pulumi) version; + + paths = [ + unwrapped + pulumi-nodejs + ]; + + passthru = { + inherit unwrapped; + }; + + meta = { + homepage = "https://www.pulumi.com/docs/iac/languages-sdks/javascript/"; + description = "Language host for Pulumi programs written in TypeScript & JavaScript (Bun)"; + license = lib.licenses.asl20; + mainProgram = "pulumi-language-bun"; + maintainers = with lib.maintainers; [ + niklasravnsborg + ]; + }; +}) diff --git a/pkgs/by-name/pu/pulumi/plugins/pulumi-go/package.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-go/package.nix index f47385a5cb86..41e29c144084 100644 --- a/pkgs/by-name/pu/pulumi/plugins/pulumi-go/package.nix +++ b/pkgs/by-name/pu/pulumi/plugins/pulumi-go/package.nix @@ -9,7 +9,7 @@ buildGoModule (finalAttrs: { sourceRoot = "${finalAttrs.src.name}/sdk/go/pulumi-language-go"; - vendorHash = "sha256-jwsdMSLDn2PNJFIIVhqwBLH7acFTOFLPgVNMKbI5DZE="; + vendorHash = "sha256-NTIOTy6pLJgnxI6AP87Nfljr551fvih/b9c59VYg3PA="; ldflags = [ "-s" @@ -20,7 +20,9 @@ buildGoModule (finalAttrs: { checkFlags = [ "-skip=^${ lib.concatStringsSep "$|^" [ - "TestLanguage" + "TestLanguagePublished" + "TestLanguageLocal" + "TestLanguageExtraTypes" "TestPluginsAndDependencies_vendored" "TestPluginsAndDependencies_subdir" "TestPluginsAndDependencies_moduleMode" @@ -35,6 +37,7 @@ buildGoModule (finalAttrs: { mainProgram = "pulumi-language-go"; maintainers = with lib.maintainers; [ tie + untio11 ]; }; }) diff --git a/pkgs/by-name/pu/pulumi/plugins/pulumi-nodejs/package.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-nodejs/package.nix index 8c72d7d0540d..a164d2c7f096 100644 --- a/pkgs/by-name/pu/pulumi/plugins/pulumi-nodejs/package.nix +++ b/pkgs/by-name/pu/pulumi/plugins/pulumi-nodejs/package.nix @@ -12,7 +12,7 @@ buildGoModule (finalAttrs: { sourceRoot = "${finalAttrs.src.name}/sdk/nodejs/cmd/pulumi-language-nodejs"; - vendorHash = "sha256-Q5Pk2f3EAiM4oit1vhc+PMEuMxdbrKAue3e0pnrZw2c="; + vendorHash = "sha256-q+7Qm3HL2avVtx29Cz066BOD7tgyukEwj1FinzmEdw8="; ldflags = [ "-s" @@ -23,8 +23,10 @@ buildGoModule (finalAttrs: { checkFlags = [ "-skip=^${ lib.concatStringsSep "$|^" [ - "TestLanguage" "TestGetProgramDependencies" + "TestLanguageTSC" + "TestLanguageTSNode" + "TestLanguageBun" ] }$" ]; @@ -41,8 +43,7 @@ buildGoModule (finalAttrs: { postInstall = '' cp -t "$out/bin" \ - ../../dist/pulumi-resource-pulumi-nodejs \ - ../../dist/pulumi-analyzer-policy + ../../dist/pulumi-resource-pulumi-nodejs ''; meta = { @@ -52,6 +53,7 @@ buildGoModule (finalAttrs: { mainProgram = "pulumi-language-nodejs"; maintainers = with lib.maintainers; [ tie + untio11 ]; }; }) diff --git a/pkgs/by-name/pu/pulumi/plugins/pulumi-python/package.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-python/package.nix index 405b110e23b2..fb2483779a2d 100644 --- a/pkgs/by-name/pu/pulumi/plugins/pulumi-python/package.nix +++ b/pkgs/by-name/pu/pulumi/plugins/pulumi-python/package.nix @@ -12,7 +12,7 @@ buildGoModule (finalAttrs: { sourceRoot = "${finalAttrs.src.name}/sdk/python/cmd/pulumi-language-python"; - vendorHash = "sha256-BfkjDesPdPDV2uILYaMJFIvaEBKT15ukwaReAL3yziw="; + vendorHash = "sha256-JlfRmBrowYYcKG+lkG6DCxWIibb0V1NVbpgPT86iRFU="; ldflags = [ "-s" @@ -23,8 +23,10 @@ buildGoModule (finalAttrs: { checkFlags = [ "-skip=^${ lib.concatStringsSep "$|^" [ - "TestLanguage" - "TestDeterminePulumiPackages" + "TestLanguageDefault" + "TestLanguageTOML" + "TestLanguageClasses" + "TestListPulumiPackageInfos" ] }$" ]; @@ -42,8 +44,7 @@ buildGoModule (finalAttrs: { postInstall = '' cp -t "$out/bin" \ ../pulumi-language-python-exec \ - ../../dist/pulumi-resource-pulumi-python \ - ../../dist/pulumi-analyzer-policy-python + ../../dist/pulumi-resource-pulumi-python ''; passthru.tests.smokeTest = callPackage ./smoke-test/default.nix { }; @@ -54,7 +55,9 @@ buildGoModule (finalAttrs: { license = lib.licenses.asl20; mainProgram = "pulumi-language-python"; maintainers = with lib.maintainers; [ + nicoo tie + untio11 ]; }; }) diff --git a/pkgs/by-name/pu/pure-maps/package.nix b/pkgs/by-name/pu/pure-maps/package.nix index a9730664d973..1fd2fd50a5bf 100644 --- a/pkgs/by-name/pu/pure-maps/package.nix +++ b/pkgs/by-name/pu/pure-maps/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "pure-maps"; - version = "3.4.2"; + version = "3.5.1"; src = fetchFromGitHub { owner = "rinigus"; repo = "pure-maps"; rev = version; - hash = "sha256-UkPZ5Wy/05srZv1r5GLoT5hFQVLfYF6Q2rQDFoILlQ0="; + hash = "sha256-kPkkGoS/jikAQe6DYeWoEDmLU8iENXNDJwkY0f4UvO0="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/py/pymol/package.nix b/pkgs/by-name/py/pymol/package.nix index 596482a0ea8e..7f190f3019eb 100644 --- a/pkgs/by-name/py/pymol/package.nix +++ b/pkgs/by-name/py/pymol/package.nix @@ -3,6 +3,7 @@ lib, fetchFromGitHub, fetchpatch, + fetchpatch2, makeDesktopItem, cmake, python3Packages, @@ -75,6 +76,11 @@ python3Packages.buildPythonApplication rec { url = "https://github.com/schrodinger/pymol-open-source/commit/17c6cbd96d52e9692fd298daec6c9bda273a8aad.patch"; hash = "sha256-dcYRzUhiaGlR3CjQ0BktA5L+8lFyVdw0+hIz3Li7gDQ="; }) + # Fixes `set` command with int/float arguments, i.e. `set transparency, 0.5` + (fetchpatch2 { + url = "https://github.com/schrodinger/pymol-open-source/commit/71246845f77ecfa2e14f01887abd180c18ebfb55.patch"; + hash = "sha256-ES7v38daaDXgbHqtxJ6Pt6Xa3ggKwXcx1txWJWkkLgI="; + }) ]; postPatch = '' diff --git a/pkgs/by-name/pz/pzip/package.nix b/pkgs/by-name/pz/pzip/package.nix deleted file mode 100644 index 7d87526404a5..000000000000 --- a/pkgs/by-name/pz/pzip/package.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, - unzip, -}: - -buildGoModule (finalAttrs: { - pname = "pzip"; - version = "0.2.0"; - - src = fetchFromGitHub { - owner = "ybirader"; - repo = "pzip"; - rev = "v${finalAttrs.version}"; - hash = "sha256-bb2TSSyA7TwgoV53M/7WkNcTq8F0EjCA7ObHfnGL9l0="; - }; - - vendorHash = "sha256-MRZlv4eN1Qbu+QXr//YexTDYSK4pCXAPO7VvGqZhjho="; - - nativeBuildInputs = [ - unzip - ]; - - ldflags = [ - "-s" - "-w" - ]; - - meta = { - description = "Fast concurrent zip archiver and extractor"; - homepage = "https://github.com/ybirader/pzip"; - changelog = "https://github.com/ybirader/pzip/releases/tag/${finalAttrs.src.rev}"; - license = lib.licenses.asl20; - maintainers = [ ]; - mainProgram = "pzip"; - }; -}) diff --git a/pkgs/by-name/qd/qdl/package.nix b/pkgs/by-name/qd/qdl/package.nix index bde84a5f85f2..bea86693c187 100644 --- a/pkgs/by-name/qd/qdl/package.nix +++ b/pkgs/by-name/qd/qdl/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qdl"; - version = "2.7"; + version = "2.7.1"; src = fetchFromGitHub { owner = "linux-msm"; repo = "qdl"; tag = "v${finalAttrs.version}"; - hash = "sha256-oZ/1Pe81VOAmZiywSC2jC1OcDtaH84GAuo8AqiE77d4="; + hash = "sha256-r7DVfuTjuhkhLCXJdgzLuh34nIsoEroGzIaFQJ3oHAA="; }; patches = [ diff --git a/pkgs/by-name/qt/qtalarm/package.nix b/pkgs/by-name/qt/qtalarm/package.nix index edd300015566..856d4ec00cc9 100644 --- a/pkgs/by-name/qt/qtalarm/package.nix +++ b/pkgs/by-name/qt/qtalarm/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qtalarm"; - version = "3.0.2"; + version = "3.1.0"; src = fetchFromGitHub { owner = "CountMurphy"; repo = "QTalarm"; tag = finalAttrs.version; - hash = "sha256-rf1Vd5npCu6HVPunRfV2yFIWiSJ686iU3gXcT8g4VUQ="; + hash = "sha256-9g6WzOn9yCOnu14nLwsR15E6rmLBOEtDZKnZzz6HS6Y="; }; buildInputs = [ diff --git a/pkgs/by-name/qu/quarkdown/deps.json b/pkgs/by-name/qu/quarkdown/deps.json new file mode 100644 index 000000000000..132480f19b9a --- /dev/null +++ b/pkgs/by-name/qu/quarkdown/deps.json @@ -0,0 +1,1786 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://plugins.gradle.org/m2": { + "com/fasterxml#oss-parent/38": { + "pom": "sha256-yD+PRd/cqNC2s2YcYLP4R4D2cbEuBvka1dHBodH5Zug=" + }, + "com/fasterxml#oss-parent/41": { + "pom": "sha256-r2UPpN1AC8V2kyC87wjtk4E/NJyr6CE9RprK+72UXYo=" + }, + "com/fasterxml#oss-parent/50": { + "pom": "sha256-9dpV3XuI+xcMRoAdF3dKZS+y9FgftbHQpfyGqhgrhXc=" + }, + "com/fasterxml#oss-parent/58": { + "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA=" + }, + "com/fasterxml/jackson#jackson-base/2.12.7": { + "pom": "sha256-F55U/ibI1N/pJf7jHUqH0cwl+LfgCUik5laxIp4rdq4=" + }, + "com/fasterxml/jackson#jackson-bom/2.12.7": { + "pom": "sha256-GVVDL22K8ygG2C2CGP7f5L47s+I9WadNgUSf/HS/e9E=" + }, + "com/fasterxml/jackson#jackson-bom/2.17.2": { + "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI=" + }, + "com/fasterxml/jackson#jackson-parent/2.12": { + "pom": "sha256-YqocFnmt4J8XPb8bbDLTXFXnWAAjj9XkjxOqQzfAh1s=" + }, + "com/fasterxml/jackson#jackson-parent/2.17": { + "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.12.7": { + "jar": "sha256-PKzvcUqJ89aLafoRJjr6VaaqL97x//k97SLKoWtUaHw=", + "module": "sha256-udQUijW0OBPvz4AbJj7+jpyvHXWfbT6c/xIXrUs0uRQ=", + "pom": "sha256-u7b3aEXxQjrbJwnPw2M4OlKR/Blf407OEoYn/j9Z/dA=" + }, + "com/fasterxml/jackson/core#jackson-core/2.12.7": { + "jar": "sha256-OYemozUEbiJuVrgdaWaPtakbFV6n/ZawhRrbt9SsHKY=", + "module": "sha256-B0jdOm9PbdgkSwkZ8RQPWw9oQm8LCkq2n7z1au+XnKw=", + "pom": "sha256-hmQUWI/gqPtzQbqph/b+4FZxuYWeKMMstjvFKfQqY6k=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.12.7.1": { + "jar": "sha256-P1BMrEBc4GbVZl/2lUFITVMi81rHp+xhBM+GoBAI4C0=", + "module": "sha256-00wrIwGY2LLTmirRRxDWySJxwHhIxDKkDh1HFZSiKaY=", + "pom": "sha256-BXeRSYclRKUn7oo4VYqRcJeVMvSAb0/jz4k6EHaKj7I=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-xml/2.12.7": { + "jar": "sha256-udi0WaP98IcES8TzYWOxhaCtsISpOQ3422J7EVCH76A=", + "module": "sha256-bxysptOpUrBBDJgcx7yLkG2d/V9EazYUQLkq1yVfg88=", + "pom": "sha256-G45KhlzmFyf9DuDR7sJWvoXfklfqNj83/N4/DlZEol8=" + }, + "com/fasterxml/jackson/module#jackson-module-jaxb-annotations/2.12.7": { + "jar": "sha256-hGhu9Umr8FPuNjKSWwJL4/MwvG809+Fm8FN3mef5Db0=", + "module": "sha256-wDgW20RCyzvDuEg3XZte4z0cjjmZnT6e/eVHzq8U20A=", + "pom": "sha256-9sHbW2XrT34FtcQu6/fXwzBtwn8gRkGreobv9+UCsWs=" + }, + "com/fasterxml/jackson/module#jackson-module-kotlin/2.12.7": { + "jar": "sha256-f0WUsO31GzPYnBpUV3vOqz46hbg3PORiLySxJKsyC7Y=", + "module": "sha256-KFgSNtUkPvn4QIbqYSnl+onOmomANlBHJ+tP0gthWN8=", + "pom": "sha256-n3uQJAkenbt/rP6uXhDF1a2TvRMste4UFlRfn6+Rf24=" + }, + "com/fasterxml/jackson/module#jackson-modules-base/2.12.7": { + "pom": "sha256-EhnfADQxBTWu+hl6YsSgr7gjqIIu1Ch9F3kDElMmoVw=" + }, + "com/fasterxml/woodstox#woodstox-core/6.2.4": { + "pom": "sha256-EOfKWazmMwqKqW4zMs+Sn8BmcWnei0EvvPxfOgFMVNE=" + }, + "com/fasterxml/woodstox#woodstox-core/6.5.1": { + "jar": "sha256-ySjWBmXGQV+xw5d1z5XPxE9/RYDPWrAbHDgOv/12iH8=", + "pom": "sha256-SDllThaxcU509Rq8s3jYNWgUq49NUnPR3S8c6KOQrdw=" + }, + "com/github/ben-manes#gradle-versions-plugin/0.52.0": { + "jar": "sha256-zuihUdLgvp86hcouXYeg2lyRpIHt8bx/e1e1Ywj9PA0=", + "module": "sha256-r6cL5O0h646QJ2hPFfpeKXXz0uRtIpN76jmhDkj3nd0=", + "pom": "sha256-WESi8/+pqARY0m7ex3EjeuYxXN3yBp1Qp+hUFj5A8Q0=" + }, + "com/github/ben-manes/versions#com.github.ben-manes.versions.gradle.plugin/0.52.0": { + "pom": "sha256-sLbWCz+UCuWgFAfwNJ6d86Ayph+FXkoXt9vakSprU3Y=" + }, + "com/google/code/gson#gson-parent/2.10.1": { + "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM=" + }, + "com/google/code/gson#gson-parent/2.11.0": { + "pom": "sha256-issfO3Km8CaRasBzW62aqwKT1Sftt7NlMn3vE6k2e3o=" + }, + "com/google/code/gson#gson/2.10.1": { + "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=", + "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc=" + }, + "com/google/code/gson#gson/2.11.0": { + "jar": "sha256-V5KNblpu3rKr03cKj5W6RNzkXzsjt6ncKzCcWBVSp4s=", + "pom": "sha256-wOVHvqmYiI5uJcWIapDnYicryItSdTQ90sBd7Wyi42A=" + }, + "com/google/errorprone#error_prone_annotations/2.27.0": { + "jar": "sha256-JMkjNyxY410LnxagKJKbua7cd1IYZ8J08r0HNd9bofU=", + "pom": "sha256-TKWjXWEjXhZUmsNG0eNFUc3w/ifoSqV+A8vrJV6k5do=" + }, + "com/google/errorprone#error_prone_parent/2.27.0": { + "pom": "sha256-+oGCnQSVWd9pJ/nJpv1rvQn4tQ5tRzaucsgwC2w9dlQ=" + }, + "com/gradleup/shadow#com.gradleup.shadow.gradle.plugin/8.3.6": { + "pom": "sha256-vI+Lii1Izey8uwCD39qhI2EVvzDYzJ3foE1W6T7J3e4=" + }, + "com/gradleup/shadow#shadow-gradle-plugin/8.3.6": { + "jar": "sha256-fOIOvwHuKe7FJFY70UK6wpHXUTXtedDZUamP0skmXDs=", + "module": "sha256-+8pm1Bwrz9HiUE9uzIIf4BqbAIx27qnJQM+Ay1aaI/8=", + "pom": "sha256-lRJfSJrSuJ5gJXMmnK9h9tSF26gvHcuNCYDODfK2stA=" + }, + "com/squareup/moshi#moshi-kotlin/1.12.0": { + "jar": "sha256-HENsB8FZzRrwMrt5NRpIqY5/eBrIB8/4tXEamZtWZt8=", + "module": "sha256-KnvKZtbM8WhVy1oKp8lRWPaIklomPv5MIEsjclSGH6E=", + "pom": "sha256-gwdSmAK8nLCHd24CabvdaSBG+kpz8ZDVgUpaj5JmJ24=" + }, + "com/squareup/moshi#moshi/1.12.0": { + "jar": "sha256-7pCR4dGlkm+ptN8mQsH7e7lq7Ahjm2IZwZ4LhyTUJHU=", + "module": "sha256-uGqTFURxITGVpEL4XKBG55oAHG1EbEHU0WiTbahW6+I=", + "pom": "sha256-YbyUJDqTc9mUini25xAAl161EPtvf0aoHq/N3TgeR3k=" + }, + "com/squareup/okhttp3#okhttp/4.12.0": { + "jar": "sha256-sQUAgbFLt6On5VpNPvAbXc+rxFO0VzpPwBl2cZHV9OA=", + "module": "sha256-YH4iD/ghW5Kdgpu/VPMyiU8UWbTXlZea6vy8wc6lTPM=", + "pom": "sha256-fHNwQKlBlSLnxQzAJ0FqcP58dinlKyGZNa3mtBGcfTg=" + }, + "com/squareup/okio#okio-jvm/3.6.0": { + "jar": "sha256-Z1Q/Bzb8QirpJ+0OUEuYvF4mn9oNNQBXkzfLcT2ihBI=", + "module": "sha256-scIZnhwMyWnvYcu+SvLsr5sGQRvd4By69vyRNN/gToo=", + "pom": "sha256-YbTXxRWgiU/62SX9cFJiDBQlqGQz/TURO1+rDeiQpX8=" + }, + "com/squareup/okio#okio/3.6.0": { + "module": "sha256-akesUDZOZZhFlAH7hvm2z832N7mzowRbHMM8v0xAghg=", + "pom": "sha256-rrO3CiTBA+0MVFQfNfXFEdJ85gyuN2pZbX1lNpf4zJU=" + }, + "com/sun/activation#all/1.2.1": { + "pom": "sha256-NgiDv2RIbs7xYbjygvZQNTbdGmcNU6Coccj7IBcOZ5U=" + }, + "commons-io#commons-io/2.17.0": { + "jar": "sha256-SqTKSPPf0wt4Igt4gdjLk+rECT7JQ2G2vvqUh5mKVQs=", + "pom": "sha256-SEqTn/9TELjLXGuQKcLc8VXT+TuLjWKF8/VrsroJ/Ek=" + }, + "de/undercouch#gradle-download-task/5.6.0": { + "jar": "sha256-zkN6arnKcZzIVrVbp0kuQsTODumC5tIvtDLNVYh2gb4=", + "module": "sha256-P+YJN66Dzs2qpOD2EykVaQKD7d+IQ54m8efjgEV4NSI=", + "pom": "sha256-RqMBkMaLY9AegKQEQJfCULu8MgmkXw3FpNDioe1bgKc=" + }, + "io/miret/etienne/gradle#sass-gradle-plugin/1.5.2": { + "jar": "sha256-185qlGwdMZzjM60+uUiJyyQFvwIVKHEpNOmOq/pKXbw=", + "module": "sha256-YcmeC/Q2ozabf5rlXNXv1FfFPIp7m0PTlnsIEtyrEyE=", + "pom": "sha256-wrgI2EZrET2d0WuHxjbAJqnttrXxbl56P6HU3Id0r6Q=" + }, + "io/miret/etienne/sass#io.miret.etienne.sass.gradle.plugin/1.5.2": { + "pom": "sha256-md+2epJ8wadqvspcxsg8Zas7XQA8nE8UArVIlDkln4o=" + }, + "jakarta/activation#jakarta.activation-api/1.2.1": { + "jar": "sha256-iwoPUvqLBcVDGSGgY+2GbvqkHa3y46fuPhlh8rDZZFs=", + "pom": "sha256-QlhcsH3afyOqBOteCUAGGUSiRqZ609FpQvvlaf8DzTE=" + }, + "jakarta/platform#jakarta.jakartaee-bom/9.1.0": { + "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ=" + }, + "jakarta/platform#jakartaee-api-parent/9.1.0": { + "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api-parent/2.3.2": { + "pom": "sha256-FaVbfVN8n5lwrq0o0q+XwFn2X/YQL3a70p8SR92Kbfs=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api/2.3.2": { + "jar": "sha256-aRVjBAeb3u2fwK47OTifGbPMS6REO8gFCJlTlOrXQuo=", + "pom": "sha256-tTeziNurTMBpC50vsMdBJNZyUxc0VnrPblMTDqsTGtY=" + }, + "net/swiftzer/semver#semver/1.1.1": { + "jar": "sha256-8ChUbXAya5MxSk9EjP0he1C4AewgMTzUYCipRgT0bWY=", + "pom": "sha256-MgwRUMLF3ECTdCP56IjhDZ6LLU4TRsNJhkgWuir+Of8=" + }, + "org/apache#apache/31": { + "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" + }, + "org/apache#apache/33": { + "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU=" + }, + "org/apache/ant#ant-launcher/1.10.15": { + "jar": "sha256-XIVRmQMHoDIzbZjdrtVJo5ponwfU1Ma5UGAb8is9ahs=", + "pom": "sha256-ea+EKil53F/gAivAc8SYgQ7q2DvGKD7t803E3+MNrJU=" + }, + "org/apache/ant#ant-parent/1.10.15": { + "pom": "sha256-SYhPGHPFEHzCN/QoXER3R5uwgEvwc3OUgBsI114rvrA=" + }, + "org/apache/ant#ant/1.10.15": { + "jar": "sha256-djrNpKaViMnqiBepUoUf8ML8S/+h0IHCVl3EB/KdV5Q=", + "pom": "sha256-R4DmHoeBbu4fIdGE7Jl7Zfk9tfS5BCwXitsp4j50JdY=" + }, + "org/apache/commons#commons-parent/74": { + "pom": "sha256-gOthsMh/3YJqBpMTsotnLaPxiFgy2kR7Uebophl+fss=" + }, + "org/apache/groovy#groovy-bom/4.0.22": { + "module": "sha256-Ul0/SGvArfFvN+YAL9RlqygCpb2l9MZWf778copo5mY=", + "pom": "sha256-Hh9rQiKue/1jMgA+33AgGDWZDb1GEGsWzduopT4832U=" + }, + "org/apache/logging#logging-parent/11.3.0": { + "pom": "sha256-pcmFtW/hxYQzOTtQkabznlufeFGN2PySE0aQWZtk19A=" + }, + "org/apache/logging/log4j#log4j-api/2.24.1": { + "jar": "sha256-bne7Ip/I3K8JA4vutekDCyLp4BtRtFiwGDzmaevMku8=", + "pom": "sha256-IzAaISnUEAiZJfSvQa7LUlhKPcxFJoI+EyNOyst+c+M=" + }, + "org/apache/logging/log4j#log4j-bom/2.24.1": { + "pom": "sha256-vGPPsrS5bbS9cwyWLoJPtpKMuEkCwUFuR3q1y3KwsNM=" + }, + "org/apache/logging/log4j#log4j-core/2.24.1": { + "jar": "sha256-ALzziEcsqApocBQYF2O2bXdxd/Isu/F5/WDhsaybybA=", + "pom": "sha256-JyQstBek3xl47t/GlYtFyJgg+WzH9NFtH0gr/CN24M0=" + }, + "org/apache/logging/log4j#log4j/2.24.1": { + "pom": "sha256-+NcAm1Rl2KhT0QuEG8Bve3JnXwza71OoDprNFDMkfto=" + }, + "org/apache/maven#maven-api-meta/4.0.0-alpha-9": { + "jar": "sha256-MsT1yturaAw0lS+ctXBFehODzOxMmlewOSYH1xkcaUk=", + "pom": "sha256-2ePDXW/aysuNGLn2QoYJDH/65yjWbLJq9aJmgZUNvnk=" + }, + "org/apache/maven#maven-api-xml/4.0.0-alpha-9": { + "jar": "sha256-KbJijQ8CgRlxWRaEnBnu1FsyzcZ+sTVReYxzr6SqI9Y=", + "pom": "sha256-N2bjAzOTTJIvUlj6M0uHXyi7ABJ/8D3vANl/KlOnrps=" + }, + "org/apache/maven#maven-api/4.0.0-alpha-9": { + "pom": "sha256-ZYvglXcymzX5TemWdb8O/HI26ZYbXHhfMyqkfyKUcfA=" + }, + "org/apache/maven#maven-bom/4.0.0-alpha-9": { + "pom": "sha256-4EfSnTUI/yd6Wsk1u5J/NUkQLMbTec5a4p4pYzeE0Rw=" + }, + "org/apache/maven#maven-parent/41": { + "pom": "sha256-di/N1M6GIcX6Ciz2SVrSaXKoCT60Mqo+QCvC1OJQDFM=" + }, + "org/apache/maven#maven-xml-impl/4.0.0-alpha-9": { + "jar": "sha256-JucCuIHVeuTuiNAsAJQLpkBjcF7mkgWuiVi/g5qLBrE=", + "pom": "sha256-us0USYVzbUMmuuRChHM78eMTKX3NolNGTkYpsddoGPc=" + }, + "org/apache/maven#maven/4.0.0-alpha-9": { + "pom": "sha256-5QzZ/zefQ3H3/ywsrFF5YfPS9n7fgJCHU8e9UGuRPX4=" + }, + "org/codehaus/plexus#plexus-utils/4.0.2": { + "jar": "sha256-iVcnTnX+LCeLFCjdFqDa7uHdOBUstu/4Fhd6wo/Mtpc=", + "pom": "sha256-UVHBO918w6VWlYOn9CZzkvAT/9MRXquNtfht5CCjZq8=" + }, + "org/codehaus/plexus#plexus-xml/4.0.4": { + "jar": "sha256-Bp54tTcQjcYSSmcHP8mYJkeR9rZJnpVaOOcrs+T+Gt8=", + "pom": "sha256-Ohb3yn7CRzFFtGHgpylREI1H4SThjIRMCFsaY3jGEVE=" + }, + "org/codehaus/plexus#plexus/18": { + "pom": "sha256-tD7onIiQueW8SNB5/LTETwgrUTklM1bcRVgGozw92P0=" + }, + "org/codehaus/woodstox#stax2-api/4.2.1": { + "jar": "sha256-Z4Vn5ItRpCxlxpnyZlOa09Z21LGlsK19iezoudV3JXk=", + "pom": "sha256-edpBDIwPRqP46K2zDWwkzNYGW272v96HvZfpiB6gouc=" + }, + "org/eclipse/ee4j#project/1.0.2": { + "pom": "sha256-dJWgenl+iOQ8O8GodCG9ix/FXjIpH6GOTjLYAx3chz8=" + }, + "org/eclipse/ee4j#project/1.0.5": { + "pom": "sha256-kWtHlNjYIgpZo/32pk2+eUrrIzleiIuBrjaptaLFkaY=" + }, + "org/eclipse/ee4j#project/1.0.7": { + "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" + }, + "org/gradle/toolchains#foojay-resolver/0.8.0": { + "jar": "sha256-+Q5pNRY46QueyYSOdZ0hhjWQfAklQRkRUAN7CyLlFAw=", + "module": "sha256-jDzPVNoHLGSkDgaIKqplIzbLKe7C6iMPBtaEOrs4TVE=", + "pom": "sha256-pxZyrK0MCu4576V1P1yU+aSjWh2sBl4ii8rDQt6nxUg=" + }, + "org/gradle/toolchains/foojay-resolver-convention#org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/0.8.0": { + "pom": "sha256-O2ciN72cwejoyobvWnkgpnj2nQTS9L+9DFouedRcXLU=" + }, + "org/jdom#jdom2/2.0.6.1": { + "jar": "sha256-CyD0XjoP2PDRLNxTFrBndukCsTZdsAEYh2+RdcYPMCw=", + "pom": "sha256-VXleEBi4rmR7k3lnz4EKmbCFgsI3TnhzwShzTIyRS/M=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains/dokka#dokka-core/2.0.0": { + "jar": "sha256-OwIhZrfP49201Tjnb5e8jEE0Z379ZjEDTmP9ci4SU+4=", + "module": "sha256-iA7+arXz1MMGrsNVkBQ+5Bhujyuzw6yVKaxTZAVmetY=", + "pom": "sha256-SWN/vvKBVW4wjx0Gz8EV00p2q5OvfpXkiSYnNHwov5E=" + }, + "org/jetbrains/dokka#dokka-gradle-plugin/2.0.0": { + "jar": "sha256-9pSXM7wDyGFfTd0QpTddHaq3b/4gCziRrrVSqw5ueOQ=", + "module": "sha256-AukU6HnChqCQGPsrif7JV0M3zDOTbk5lZQLxcao/2/k=", + "pom": "sha256-h963mcSbDJo92nmwCLjyM56iBKWbaY4dsCFhboxAqlQ=" + }, + "org/jetbrains/dokka#org.jetbrains.dokka.gradle.plugin/2.0.0": { + "pom": "sha256-4fxoagGDfn6GKRGFkBUH/+r3lLip7JR7XQQ2j6cOAMo=" + }, + "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.1.20": { + "module": "sha256-6NVkojvCA3s++xxbAP+3SuRPmXJFd+L8jYf/u8nLn7U=", + "pom": "sha256-oRA6cKb4/8EITdwIGyS6smpWRJcvnM0UG4mU2fUFRHg=" + }, + "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.1.20/gradle85": { + "jar": "sha256-ZnTyl1XTJq3cdWov3Kvyu2AvAABKDtLbZp2j306EgAY=" + }, + "org/jetbrains/kotlin#kotlin-bom/2.0.21": { + "pom": "sha256-1Ufg3iVCLZY+IsepRPO13pQ8akmClbUtv/49KJXNm+g=" + }, + "org/jetbrains/kotlin#kotlin-build-statistics/2.1.20": { + "jar": "sha256-TSjxg6dsMKjKwg56P6hwVMLdHbiGSzyc04nhjdmX0x4=", + "pom": "sha256-OR9tc0uDTJG3qAHiI638c2tYDb3ODxOafkvUdknATKM=" + }, + "org/jetbrains/kotlin#kotlin-build-tools-api/2.1.20": { + "jar": "sha256-Uzw2yzYubtLRX1hzLn9MbSvtXJ1RebiXvEsJ0W1gU3c=", + "pom": "sha256-kn9h95cmHFnktTEDFNaf1KOrjvT3A596UyYHXEKkFzo=" + }, + "org/jetbrains/kotlin#kotlin-compiler-runner/2.1.20": { + "jar": "sha256-3jtUI9j7+G6ivRM01AG8SqhOKOxIlFlS0RwAsQsUArY=", + "pom": "sha256-xgNdI3KARTSALDfOVU6MjLqq6EUUp7rWzAlkJNjySUU=" + }, + "org/jetbrains/kotlin#kotlin-daemon-client/2.1.20": { + "jar": "sha256-NjCjAYLGNXDrUZrmWqqUGSF9utCBT+3kLI3ecERlpMY=", + "pom": "sha256-+qpgvkJw6RSbWUOSZjlhkr60f/XjpAmF3u3FTlkXItI=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.1.20": { + "jar": "sha256-sk9SbQ3++wKWrg9Ks2L51soCV3JcwnMIOprjN+ooJn0=", + "pom": "sha256-wKs06ffQCv3LIv0D5S6PhZpGR9lY4Lh7fQzSY0QWOlo=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.1.20": { + "jar": "sha256-fjYZlm/jid9IV59DsY8sCwc2llWZFTd8lELrqM+7+/Y=", + "module": "sha256-AsJsJlASRw1yrc3buCTSOOayieEAzUu/moJ1Cj1Jv8A=", + "pom": "sha256-t02/6klcg6xWRwS6qDmk56W3kRiMj3llbJwZ3XfeLxg=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.1.20/gradle85": { + "jar": "sha256-fjYZlm/jid9IV59DsY8sCwc2llWZFTd8lELrqM+7+/Y=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.1.20": { + "jar": "sha256-6vELILujkjoH+PsYL7jNVlaZ4Vfuc9Elma8fXKuiUEA=", + "pom": "sha256-PdYeaTbcUQBs5MN+/+Q+/hQAuEHgnsSx7kqU9rkZOCo=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.1.20": { + "jar": "sha256-APb4Q6vJMNDGGrtOPjAsjRd2EpH5srwlhv4SsMuXXq0=", + "module": "sha256-td7wBfIpohsq1pJt9wjPhLqe+8TsGcY16/5baTcx2wg=", + "pom": "sha256-CjCxRdSY1H2yVdDUzWp3hMXx+QyL+YgsupWCKjvzMHA=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-model/2.1.20": { + "jar": "sha256-1jf7pHCzv3E7CmXmcXrV3QOocl/MlFMCiUc6smtC6Cs=", + "module": "sha256-WJm5fnqbFx5sBeVJziqbo8ddJZMVnUsrAVZkFLVoUWo=", + "pom": "sha256-18CRV8ehutuNrk6Jv54N9FRbBM0DqqQJZqJm87hG0sM=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.1.20": { + "module": "sha256-6Ue1RPTNCcFQr9h5G70yoxN92uMEWn1TlL6lCaq5bFc=", + "pom": "sha256-H2OowlwTZmlled2VLz639CoKSns/avaRpIIjEwb82sk=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.1.20/gradle85": { + "jar": "sha256-+wFuZDtY4Koq7IkRDq8U54s3aMFX8lQ0V5X9aqEEk+s=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.1.20": { + "module": "sha256-IF4RacYovsBfHVnkTTIJFSiun9U6fjPsVDvO/bEojeY=", + "pom": "sha256-Y5ymx2U+Gp2pXfKjuuJsy3AcA6/VjHl6tr9vJV9kwwE=" + }, + "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.1.20": { + "jar": "sha256-EyGYEVmGCVkEsMsB76rh2BJJZB75FJ4Fs0T4ZKrpdfQ=", + "pom": "sha256-LZayVvD8kesSvOtuR2HhPXAf8TU/BZL8VymI2uai0Zs=" + }, + "org/jetbrains/kotlin#kotlin-native-utils/2.1.20": { + "jar": "sha256-pyVic6u53yI1kk2A/dNtZ4tFhGfDB2xmhRxCQ3vdPGY=", + "pom": "sha256-1Gec6AsERY5fzL1pteMUvxwMFnmH4EOVRv3+z7U+M0Y=" + }, + "org/jetbrains/kotlin#kotlin-reflect/2.0.21": { + "jar": "sha256-OtL8rQwJ3cCSLeurRETWEhRLe0Zbdai7dYfiDd+v15k=", + "pom": "sha256-Aqt66rA8aPQBAwJuXpwnc2DLw2CBilsuNrmjqdjosEk=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/2.0.21": { + "module": "sha256-b134r2M2AKa5z7D8x2SvPVEZ83Zndne5G2rugWsdMKs=", + "pom": "sha256-X0As+413MZW5ZwUBJMnom1+EsXJGThiUkpeJv1xMLyk=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/2.0.21": { + "jar": "sha256-cS9IB2Dt7uSKhDaea+ifarUjdUCLsso74U72Y/cr7jE=", + "pom": "sha256-TXE+dTi5Kh15cX6nHPHQI1eoThFFDEbLkuMgee40224=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/2.0.21": { + "jar": "sha256-FcjArLMRSDwGjRaXUBllR0tw39gKx5WA7KOgPPUeSh0=", + "pom": "sha256-MQ1tXGVBPjEQuUAr2AdfyuP0vlGdH9kHMTahj+cnvFc=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.0.21": { + "jar": "sha256-8xzFPxBafkjAk2g7vVQ3Vh0SM5IFE3dLRwgFZBvtvAk=", + "module": "sha256-gf1tGBASSH7jJG7/TiustktYxG5bWqcpcaTd8b0VQe0=", + "pom": "sha256-/LraTNLp85ZYKTVw72E3UjMdtp/R2tHKuqYFSEA+F9o=" + }, + "org/jetbrains/kotlin#kotlin-tooling-core/2.1.20": { + "jar": "sha256-tPu1I+hmLUqEUbmjap5/1D9jfLDNapueNoFxlmXavY0=", + "pom": "sha256-PO8cS3yC7KjMAcMMrt0VSQWeZfL51BYsjJ13+6JBMXY=" + }, + "org/jetbrains/kotlin#kotlin-util-io/2.1.20": { + "jar": "sha256-gqOymmEdR85jSuLmxQnN4qhvlLI7hr4whk6z1Lj+jn4=", + "pom": "sha256-eSQnftICC4UQ1F8N0QgREmVoEDAH2D+ZcfwYRmC9hKM=" + }, + "org/jetbrains/kotlin#kotlin-util-klib-metadata/2.1.20": { + "jar": "sha256-8tXmhHFbkgtghJaObDPIuwWwtrl5GYAOLyIdlBgkDH0=", + "pom": "sha256-hCdVuVwx20vbks9tQshUGhcB+ivc8lIahwa8sDKgoZc=" + }, + "org/jetbrains/kotlin#kotlin-util-klib/2.1.20": { + "jar": "sha256-/3nFsObkLZIOuxx2uhDMLdvyJOgFZFqO6sreSRbiqs4=", + "pom": "sha256-ps3TjXdd/QfQe9FZ00LPegqWg4qH50guIgxjrtluEoA=" + }, + "org/jetbrains/kotlin/jvm#org.jetbrains.kotlin.jvm.gradle.plugin/2.1.20": { + "pom": "sha256-q8TDh14/l1U6F2qQ9ReI7A9ero4dJkI+qOvb+KpqF4Y=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.7.3": { + "pom": "sha256-Tl0ZAOY3nvP1lw0EqPMFKa3IL4WejMEHwhzoFJ72ZsQ=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.8.0": { + "pom": "sha256-Ejnp2+E5fNWXE0KVayURvDrOe2QYQuQ3KgiNz6i5rVU=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.8.0": { + "jar": "sha256-mGCQahk3SQv187BtLw4Q70UeZblbJp8i2vaKPR9QZcU=", + "module": "sha256-/2oi2kAECTh1HbCuIRd+dlF9vxJqdnlvVCZye/dsEig=", + "pom": "sha256-pWM6vVNGfOuRYi2B8umCCAh3FF4LduG3V4hxVDSIXQs=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.7.3": { + "module": "sha256-f7FiOWWU7CjhtqRBG0V5SadnD14SAZF2d04f1rlHG78=", + "pom": "sha256-7W6wOYcXA14p8cHWCk4927iYWPPbnge1etdZ03Ta6Ck=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.8.0": { + "module": "sha256-FE7s1TZd4+MNe0YibAWAUeOZVbXBieMfpMfP+5nWILo=", + "pom": "sha256-yglaS/iLR0+trOgzLBCXC3nLgBu/XfBHo5Ov4Ql28yE=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-bom/1.6.0": { + "pom": "sha256-bKZIdTuB5O4L9/N2wGNreMr6o7BxbBykXM0AzZSXdHc=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-core-jvm/1.6.0": { + "jar": "sha256-7DUSjE+5BE6Zu88H8F7yVDv6bUIDDXqtq66s/7FucsU=", + "module": "sha256-uVDCZfLD4WO/1kdETbSsGqrAXX56jSrbBoRHs0wxxsg=", + "pom": "sha256-0VZ6zJLhdIK8ATwZA1EbtbG/36GUKWLXAia+3FK3xII=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-core/1.6.0": { + "module": "sha256-0lw7Wm4k3nKasF1JmDxg7CmY290q5O/iS2JV2MqC+nc=", + "pom": "sha256-O0Ni9LSZwS3/XUzOriTCaLBFe1Scha56Dyetslzgs3M=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-json-jvm/1.6.0": { + "jar": "sha256-H3K8q5I1ZCWR+1qrqG4UMXAe8A7/pfQFTTWEPceVEXY=", + "module": "sha256-OG9a4BhhX0cAIEcQ0c8Jh4MncnzrATBDjg9WTwit1MI=", + "pom": "sha256-CKbxhALfOeKfAj/f1VrfaHHpXLJkcpv3ikkciSUavDw=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-json/1.6.0": { + "module": "sha256-IagQNSE8nNiADHbXYFfPRaqJxp2jsSkqn4zQf+DaLQc=", + "pom": "sha256-6hSUk17ZJHsWf8DXD/i/xJurjzLNLMahWnpXPNTXBgU=" + }, + "org/jlleitschuh/gradle#ktlint-gradle/12.2.0": { + "jar": "sha256-7Ie8XQiag2FJMFM+hwVx8hYJB9zXbqUE/KlA7Wsji0w=", + "module": "sha256-xb5GVdm87pTDHwc3tDc8IYimk09sRtoqEP1Io3GK7Lg=", + "pom": "sha256-odmoVmUQz9ox8ex94Mb7ATYKjeYUkUhY2PINBBp2qYU=" + }, + "org/jlleitschuh/gradle/ktlint#org.jlleitschuh.gradle.ktlint.gradle.plugin/12.2.0": { + "pom": "sha256-IzH3uRJILlhKTNZJ36dKV4vsSu3BXy2AuoCM6v2lNl0=" + }, + "org/junit#junit-bom/5.10.1": { + "module": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c=", + "pom": "sha256-IcSwKG9LIAaVd/9LIJeKhcEArIpGtvHIZy+6qzN7w/I=" + }, + "org/junit#junit-bom/5.10.2": { + "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", + "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" + }, + "org/junit#junit-bom/5.10.3": { + "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=", + "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw=" + }, + "org/junit#junit-bom/5.11.0": { + "module": "sha256-9+2+Z/IgQnCMQQq8VHQI5cR29An1ViNqEXkiEnSi7S0=", + "pom": "sha256-5nRZ1IgkJKxjdPQNscj0ouiJRrNAugcsgL6TKivkZE0=" + }, + "org/mockito#mockito-bom/4.11.0": { + "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" + }, + "org/mockito#mockito-bom/5.7.0": { + "pom": "sha256-dlcAW89JAw1nzF1S3rxm3xj0jVTbs+1GZ/1yWwZ5+6A=" + }, + "org/ow2#ow2/1.5.1": { + "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" + }, + "org/ow2/asm#asm-commons/9.7.1": { + "jar": "sha256-mlebVNKSrZvhcdQxP9RznGNVksK1rDpFm70QSc3exqA=", + "pom": "sha256-C/HTHaDJ+djtwvJ9u/279z8acVtyzS+ijz8ZWZTXStE=" + }, + "org/ow2/asm#asm-tree/9.7.1": { + "jar": "sha256-mSmIH1nra4QOhtVFcMd7Wc5yHRBObf16QJeJkcLTtB8=", + "pom": "sha256-E7kF9l5/1DynZ09Azao3Z5ukhYxsnZ+48Xp6/ZuqvJ4=" + }, + "org/ow2/asm#asm/9.7.1": { + "jar": "sha256-jK3UOsXrbQneBfrsyji5F6BAu5E5x+3rTMgcdAtxMoE=", + "pom": "sha256-cimwOzCnPukQCActnkVppR2FR/roxQ9SeEGu9MGwuqg=" + }, + "org/springframework#spring-framework-bom/5.3.39": { + "module": "sha256-+ItA4qUDM7QLQvGB7uJyt17HXdhmbLFFvZCxW5fhg+M=", + "pom": "sha256-9tSBCT51dny6Gsfh2zj49pLL4+OHRGkzcada6yHGFIs=" + }, + "org/vafer#jdependency/2.12": { + "jar": "sha256-xuxNA/nwT7ZEjTavQ6HMBpoh7LXocBM90Y/tT02x3mg=", + "pom": "sha256-LY6Zq9RS9eZCxtK74xACuSh5naw6CeA+PknyE3ozt+s=" + } + }, + "https://repo.maven.apache.org/maven2": { + "ch/qos/logback#logback-classic/1.3.14": { + "jar": "sha256-+bB6bbpN84mTgd9+WX30UBNOGHmx86dXRWs80cjZTi8=", + "pom": "sha256-Iyrhwx8F6Qrk5LuhhGSSMY3hUZ1g0rhztDoY9sJho6I=" + }, + "ch/qos/logback#logback-classic/1.3.5": { + "jar": "sha256-nWi52vL7uYoJsEReDGSsMJ2dDhVraFELY3kTl8l+MuQ=", + "pom": "sha256-7HWshxo9E2HbsPjbbSUDW6uJpeqXPxhKse+pHO7oRsU=" + }, + "ch/qos/logback#logback-core/1.3.14": { + "jar": "sha256-n1MVmvGKnUOLw5jJcNs7t+F92wewS7s7Ad/jRU3RiGI=", + "pom": "sha256-9fDjBkddC5tqBV4TCxoMT7nSIgNMk/DR3TVGHjvC4do=" + }, + "ch/qos/logback#logback-core/1.3.5": { + "jar": "sha256-sfDsOT8vW7rx3sthYk3hg4ZjTDGX6e7WnRwSNN3XVvM=", + "pom": "sha256-HgdGJT8D995vW70VQzaqTXWGlCEPac//bo61+O/DVSg=" + }, + "ch/qos/logback#logback-parent/1.3.14": { + "pom": "sha256-eW3MTL/UKut/ckMkRfU2RhlniSgkK58+R0nUxODdncQ=" + }, + "ch/qos/logback#logback-parent/1.3.5": { + "pom": "sha256-EYAKLQpLzUQpZNpWHBGhHxbkS4n+prEKiRoQkigHn1s=" + }, + "com/fasterxml#oss-parent/38": { + "pom": "sha256-yD+PRd/cqNC2s2YcYLP4R4D2cbEuBvka1dHBodH5Zug=" + }, + "com/fasterxml#oss-parent/41": { + "pom": "sha256-r2UPpN1AC8V2kyC87wjtk4E/NJyr6CE9RprK+72UXYo=" + }, + "com/fasterxml#oss-parent/58": { + "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA=" + }, + "com/fasterxml/jackson#jackson-base/2.12.7": { + "pom": "sha256-F55U/ibI1N/pJf7jHUqH0cwl+LfgCUik5laxIp4rdq4=" + }, + "com/fasterxml/jackson#jackson-bom/2.12.7": { + "pom": "sha256-GVVDL22K8ygG2C2CGP7f5L47s+I9WadNgUSf/HS/e9E=" + }, + "com/fasterxml/jackson#jackson-bom/2.17.2": { + "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI=" + }, + "com/fasterxml/jackson#jackson-parent/2.12": { + "pom": "sha256-YqocFnmt4J8XPb8bbDLTXFXnWAAjj9XkjxOqQzfAh1s=" + }, + "com/fasterxml/jackson#jackson-parent/2.17": { + "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.12.7": { + "jar": "sha256-PKzvcUqJ89aLafoRJjr6VaaqL97x//k97SLKoWtUaHw=", + "module": "sha256-udQUijW0OBPvz4AbJj7+jpyvHXWfbT6c/xIXrUs0uRQ=", + "pom": "sha256-u7b3aEXxQjrbJwnPw2M4OlKR/Blf407OEoYn/j9Z/dA=" + }, + "com/fasterxml/jackson/core#jackson-core/2.12.7": { + "jar": "sha256-OYemozUEbiJuVrgdaWaPtakbFV6n/ZawhRrbt9SsHKY=", + "module": "sha256-B0jdOm9PbdgkSwkZ8RQPWw9oQm8LCkq2n7z1au+XnKw=", + "pom": "sha256-hmQUWI/gqPtzQbqph/b+4FZxuYWeKMMstjvFKfQqY6k=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.12.7.1": { + "jar": "sha256-P1BMrEBc4GbVZl/2lUFITVMi81rHp+xhBM+GoBAI4C0=", + "module": "sha256-00wrIwGY2LLTmirRRxDWySJxwHhIxDKkDh1HFZSiKaY=", + "pom": "sha256-BXeRSYclRKUn7oo4VYqRcJeVMvSAb0/jz4k6EHaKj7I=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-xml/2.12.7": { + "jar": "sha256-udi0WaP98IcES8TzYWOxhaCtsISpOQ3422J7EVCH76A=", + "module": "sha256-bxysptOpUrBBDJgcx7yLkG2d/V9EazYUQLkq1yVfg88=", + "pom": "sha256-G45KhlzmFyf9DuDR7sJWvoXfklfqNj83/N4/DlZEol8=" + }, + "com/fasterxml/jackson/module#jackson-module-jaxb-annotations/2.12.7": { + "jar": "sha256-hGhu9Umr8FPuNjKSWwJL4/MwvG809+Fm8FN3mef5Db0=", + "module": "sha256-wDgW20RCyzvDuEg3XZte4z0cjjmZnT6e/eVHzq8U20A=", + "pom": "sha256-9sHbW2XrT34FtcQu6/fXwzBtwn8gRkGreobv9+UCsWs=" + }, + "com/fasterxml/jackson/module#jackson-module-kotlin/2.12.7": { + "jar": "sha256-f0WUsO31GzPYnBpUV3vOqz46hbg3PORiLySxJKsyC7Y=", + "module": "sha256-KFgSNtUkPvn4QIbqYSnl+onOmomANlBHJ+tP0gthWN8=", + "pom": "sha256-n3uQJAkenbt/rP6uXhDF1a2TvRMste4UFlRfn6+Rf24=" + }, + "com/fasterxml/jackson/module#jackson-modules-base/2.12.7": { + "pom": "sha256-EhnfADQxBTWu+hl6YsSgr7gjqIIu1Ch9F3kDElMmoVw=" + }, + "com/fasterxml/woodstox#woodstox-core/6.2.4": { + "jar": "sha256-X6c01QUPCXQFqAECLQk3e7yB6BHvmhfNAnntMnn0laU=", + "pom": "sha256-EOfKWazmMwqKqW4zMs+Sn8BmcWnei0EvvPxfOgFMVNE=" + }, + "com/github/ajalt/clikt#clikt-core-jvm/5.0.3": { + "jar": "sha256-acupSiKR90t4yII5zYtn6vPwjg2tKXdJq+ZHez6bgbE=", + "module": "sha256-dFtZmw9KoAz3AVYz429KVvJdGLy292htyrOxoRQZ3PE=", + "pom": "sha256-CPpCgzMVYwi9KLYyNih6MXIVLcu/ccgx4LOshiPl4XE=" + }, + "com/github/ajalt/clikt#clikt-core/5.0.3": { + "jar": "sha256-KeBaQXAKBp8NEHSOp9Xwyb8OFjbUsQNXPj98X3q7fDo=", + "module": "sha256-CmMddfhkwX5dYQBfYDwSaUtGcy3s1cOckU0pLQXo6zM=", + "pom": "sha256-wrBLaB6IqaGSgLZW2mBKIfLj4lUih2i4maaLoejuYBU=" + }, + "com/github/ajalt/clikt#clikt-jvm/5.0.2": { + "module": "sha256-XP3wXVDagWYbEEu5g+0WzYyQ+gviod/k+4tBNtGkf/4=", + "pom": "sha256-SrqetHfL9KvuQpA72reTzo6YWKVpFdMn3wKzsxwkjFc=" + }, + "com/github/ajalt/clikt#clikt-jvm/5.0.2/sources": { + "jar": "sha256-xtQg99TRBkRE0ykNrUNeuhoRZPP4fPayCpn8DUjg7U0=" + }, + "com/github/ajalt/clikt#clikt-jvm/5.0.3": { + "jar": "sha256-nNGeBHgvRh3/6xg9F+V2mE/rt5NJMstAZkasQeQohjs=", + "module": "sha256-nSm2J+l1mRLhJ+r7136GAYceul6qUthMgXUKiYIC8Xc=", + "pom": "sha256-CcAbsS0foX/hKcoSgvHpmpCAEbGDA5ptT8z2tclaTos=" + }, + "com/github/ajalt/clikt#clikt/5.0.2": { + "module": "sha256-RxznYZxjEC99/MAzbKQ+19pZFkYLcdAGDK3e+QtQU84=", + "pom": "sha256-oft1NUdQSp/XUh+nMN1PZwl1cWZ8rf91OCmGw4kXW2Y=" + }, + "com/github/ajalt/clikt#clikt/5.0.3": { + "jar": "sha256-qLzj6fI3DFVs1FG2AY5Yfu1LCfO3jr72SP2D874LgPw=", + "module": "sha256-vNNPHTxGfvq1FuoiqeeazD8SRJxIl/DF6sGCEnMizsY=", + "pom": "sha256-GwUigSeaOs6FY7svHtP1Khs9Rq15w9T2wzMjI+VzX9g=" + }, + "com/github/ajalt/colormath#colormath-jvm/3.6.0": { + "jar": "sha256-WfdBrf5iBTBmeC2LGkWv0GaFpLxkszJ35Uh2uZPtiFw=", + "module": "sha256-P6dnMPmJ4ChN8YL87IViDZtIrjIhOYhBrGyviEYvYvg=", + "pom": "sha256-8Dw11QURDQZzNF9HQOVbzZdqmp+lobE8qirTmPO8Hl0=" + }, + "com/github/ajalt/colormath#colormath-jvm/3.6.1": { + "jar": "sha256-oYU+5KX+xjbbu4xElVt6MBXwLOj5z6HCNQeRwsLTY5w=", + "module": "sha256-fHKvGnzj4EFMhBqBgWvDwVpy6X9lKMwHqp+lSFCHpYc=", + "pom": "sha256-PeaemJMjZ5OF480HME/v08BfRFa7MsoyJ8s7y/RNHAo=" + }, + "com/github/ajalt/colormath#colormath/3.6.0": { + "jar": "sha256-49ox0EqJXlNfXQh2TM9fODQcQr99aNqW6h8ACfclmdY=", + "module": "sha256-aQeqSXrbmvY4EsdTZjic7T5ruL7oDnsjmttMU2c/iIQ=", + "pom": "sha256-zh3tjA259LxNNjS64Vn9jVu2qWDyzTuWoAyPDnnOZAs=" + }, + "com/github/ajalt/colormath#colormath/3.6.1": { + "jar": "sha256-vPPH5lLCbSLhEkcZR4Kf7kzJniocnihPgmaTv0Y3mHs=", + "module": "sha256-xA0F1dTNksc2qxDVkR6HjjsIqBRa76mjy20/VUPM8Bc=", + "pom": "sha256-uBYdwuDrGNPXm8koHtFxA3IcwcEvFYo1QydbqSlw/jg=" + }, + "com/github/ajalt/mordant#mordant-core-jvm/3.0.1": { + "jar": "sha256-nPm0bR9J8tbPJjVGKyncWeDCmx+y8IWzMSiIu+nHzTE=", + "module": "sha256-5HRMRxB05ezUFh9wcLRZTfAO8XivBEJlkF5e0c61rJI=", + "pom": "sha256-1Ylt5eNKnVarJ4Y5iyYHJLGB85zAUIy7Kh9+iGzSXYc=" + }, + "com/github/ajalt/mordant#mordant-core/3.0.1": { + "jar": "sha256-c/UXnY6U+FEUR18Zlo0WWURZTmszjbcciwv9sJUe6z4=", + "module": "sha256-BWl6xcBV8Uh2cJ/U6f1ejD0VphrHesVy+RZEmTKgjC8=", + "pom": "sha256-Ah3YAdKdWJlqDJv/ux8VHWkHytU20syNGnoHuck4UNo=" + }, + "com/github/ajalt/mordant#mordant-jvm-ffm-jvm/3.0.1": { + "jar": "sha256-IEHC9fe4cJWxFcsZFV7pJXRRhU0I5bhnEWW0O8fhFM8=", + "module": "sha256-iE1x/LfBAQrm11qoka5UqYmGEVSwfxIVzVRfDkg34V0=", + "pom": "sha256-azbnZhrYKN4DoomS2K6WJWzq3z/aEo+OxImo1lu7rFM=" + }, + "com/github/ajalt/mordant#mordant-jvm-ffm/3.0.1": { + "module": "sha256-2Frg+0n7bXFHibQ/MbVnUoybit+G0Ou5hpSkGpHgmmc=", + "pom": "sha256-/MzpL8GhnxYzgGhDyuVTLIx/2YSnkxRbb7y3iUpk/s0=" + }, + "com/github/ajalt/mordant#mordant-jvm-graal-ffi-jvm/3.0.1": { + "jar": "sha256-bdS+vBZK6s3azI+Y6Phx4A/SHOe8LrDRgjDqg73fyGo=", + "module": "sha256-DYGba/u8pO6XszB4ZoEpaQdmr/lI/ByDF4j04DSFOsM=", + "pom": "sha256-Cm95LxyTYJX4dGmR1k2os/+ECazeOUir5d4v1WiIeDo=" + }, + "com/github/ajalt/mordant#mordant-jvm-graal-ffi/3.0.1": { + "module": "sha256-qu/aIGckg7OwsmDdHvE0LOazTs6IutbfOa4bJgUMjAo=", + "pom": "sha256-VAicrH9XCzo84x3cCD+ORgs7ED62oXM8kUE1GgaLR/M=" + }, + "com/github/ajalt/mordant#mordant-jvm-jna-jvm/3.0.1": { + "jar": "sha256-QQY0QsiJGyd0U2qbh6UGKn/SDm8ZSZdMbacvSUctb00=", + "module": "sha256-eBcNkl07qnWGYvl2M2FjkN6Q1CoslON2PqpZBXY3jh4=", + "pom": "sha256-/hWoxktH4H8vmdiDKG5O+xR0YkVlh0ayVQ9vlohkX4A=" + }, + "com/github/ajalt/mordant#mordant-jvm-jna/3.0.1": { + "module": "sha256-cn+1FiNOi6/JJ5Xi7L0No4VNcjoWxphCrGGSC/WIebk=", + "pom": "sha256-xbxkikqeKmz3+dGAJMi/ZrIYCVDpPxYIODTHv/OqeGE=" + }, + "com/github/ajalt/mordant#mordant-jvm/3.0.1": { + "jar": "sha256-ntO5dvzMx42nRtSYZvqOu48QUwqTxUTqBCAlmmB92V4=", + "module": "sha256-peTyMSt69CDG2DLDA4kcGg2GN8z6WpTYnxFGxIZpgLo=", + "pom": "sha256-sAnaTDfbjhc2uEgrRPIJ2Cdx/xyNO9+UbraE07nOmWU=" + }, + "com/github/ajalt/mordant#mordant/3.0.1": { + "jar": "sha256-CQmE0gJpL/70R+iN/ixjaTpd4pZw2ggxuGO8KE2hR+I=", + "module": "sha256-lJLcf2NgJt8ulCkim52Ae1d00uZBUQ2Qv4Kb0qyzthU=", + "pom": "sha256-BlK5t9Y0kro8J8ZIkANIZRxbKFdEAph7j+KqBUlqkaQ=" + }, + "com/github/doyaaaaaken#kotlin-csv-jvm/1.10.0": { + "jar": "sha256-4GdlSbDT3kAauBdPxzgTEGR9+Db2eyX+ehAfmydqsWg=", + "module": "sha256-4Mna9GqdH4AN+EbNdeg+Bn1nV6jMSKFEyAOrLeg+eus=", + "pom": "sha256-CmCLI/H5cdcCjoADsRbrrsHtai2kAo6aEd3OtCvHoBA=" + }, + "com/github/fracpete#romannumerals4j/0.0.1": { + "jar": "sha256-t4YmH9I5ZcPalw1831pYR6oZOZfYNTKg1S2+4+vMfRg=", + "pom": "sha256-nj2vO+jVtbW/8s/WlDWto2JAfab59EgElrz1Qg9gOPM=" + }, + "com/github/h0tk3y/betterParse#better-parse-jvm/0.4.4": { + "jar": "sha256-5AkwFfV4UkbKpe5py2qj7ycGIIaarGpLYRHTjVLTZss=", + "module": "sha256-yixiuHTLAt5c7sFuG+3ssLn1NJ6fLlx+bVbb2LApizs=", + "pom": "sha256-9WgsA/m42BCWgMyN5iO2DLM0OEAbHrdt7t36wuVmr4c=" + }, + "com/github/h0tk3y/betterParse#better-parse/0.4.4": { + "module": "sha256-+IYiAXGfTGmpe3vvIumlmbz71cts45P291LrU4q7+aM=", + "pom": "sha256-fmVyJlZbvB/UC0i4iaeie2+hLSe/MRxddSgMCkm8YpA=" + }, + "com/github/h0tk3y/betterParse#better-parse/0.4.4/all": { + "jar": "sha256-avYnrYAd6pqO+9JutMgDnW8IYxB4w1nf7s+U4gCXLFQ=" + }, + "com/pinterest/ktlint#ktlint-cli-reporter-baseline/1.0.1": { + "jar": "sha256-Ln8MWBVAp2dLBdNnNb/KvoSxS0feEPE/fzc4zEdvC9Q=", + "module": "sha256-WjV/CoePa6ytfgCapEauU89y77t5WUQAlELSM791trI=", + "pom": "sha256-VrRmFiJtguCn/YHzgyNjPUd/+OtdBN6ZhKxjTBHCLnE=" + }, + "com/pinterest/ktlint#ktlint-cli-reporter-baseline/1.5.0": { + "jar": "sha256-4cuIQn1Sy7OYtVWukIVNSlZYHa8Umr34HjGLFlRIquE=", + "module": "sha256-x4gK7YALYBYJN0b84Xeipq2orTPirIPmUKv6x8OSqI4=", + "pom": "sha256-nnjiNHdlcZsTsUdLEoaiz3VeHJ88/sfEt+hNq2ckZLE=" + }, + "com/pinterest/ktlint#ktlint-cli-reporter-checkstyle/1.0.1": { + "jar": "sha256-+0G4sfRph8zqrAOxrlJuEy0oT9JMJXMWc2mvfzpnJ3U=", + "module": "sha256-Oa6xgZA+j6/WUch+JoOo2IXAs4xEi02rhtS2rs6L6rg=", + "pom": "sha256-P+sNYgaPwqU+fRScNJtlQrHlmftPYkjQhEbYO1DD/8E=" + }, + "com/pinterest/ktlint#ktlint-cli-reporter-checkstyle/1.5.0": { + "jar": "sha256-vjNZMArLjBK+qOlxOI0owsnQjMLU+XK/ZTLeG/Sh8CQ=", + "module": "sha256-3ExXhmgwCWuycccw38nVBt20VTLi2qGFz7+aXyv4osM=", + "pom": "sha256-kxgrJyP5GdUk3DkO9F7GKEFlt4X1igzSTuwsPfggZyM=" + }, + "com/pinterest/ktlint#ktlint-cli-reporter-core/1.0.1": { + "jar": "sha256-TnMZ0yvR2ZD+Da4jRYKQjQjoUUrvhOHa2Dy5paFZreM=", + "module": "sha256-5GbqEH3+Nnttp7voaw6oVnkb8bVXTkw2GxJqVtcd6LM=", + "pom": "sha256-eyl9q0MW6E1h4gj1wKgR6XfMomOJFb3cllI8wMVU2kk=" + }, + "com/pinterest/ktlint#ktlint-cli-reporter-core/1.5.0": { + "jar": "sha256-zD9H5zYFHzatZSWTHAV5caFYvUw5ttNPwDzTKK4MV0Y=", + "module": "sha256-N3rMOhsnZe9wdrlsGfR/FIB9lRFCnyk6+d2SYIWAEMg=", + "pom": "sha256-TXwIGgkQsSSTGOJUW0Oom8h/TuPrNiXB0oD05fKhjI4=" + }, + "com/pinterest/ktlint#ktlint-cli-reporter-format/1.0.1": { + "jar": "sha256-vS4jUzwvnWJbeyUZQ5OFgC2A/AdkYgyL3EKknpM3C2Q=", + "module": "sha256-/mbk4WCirbzgIAF8jjIB4vzA+ShvVkL05K8iIwR2bYk=", + "pom": "sha256-pCLArPUSOAYiLTp3IOdJj5DGLMlxFk4AEuUMLNXEV90=" + }, + "com/pinterest/ktlint#ktlint-cli-reporter-format/1.5.0": { + "jar": "sha256-DOUghId1gB26JBPliQPKXv4AhGmCKOTlfG36c1AJNUM=", + "module": "sha256-ehcfe7qLfTaIaIqqlR4I/SAZHCZYynJhP691U/X3BDE=", + "pom": "sha256-qwTP4KqBUUKhTllYr5VOraSpFRG4KvQ8UflMZuDha74=" + }, + "com/pinterest/ktlint#ktlint-cli-reporter-html/1.0.1": { + "jar": "sha256-ckMCKvSfktTvSVruFhrfZfbEY5mXlSmArPI3mIdU6WQ=", + "module": "sha256-1Z0BMx1yPMROcLHKXtcidb89J4eJVZuP57udbgW2y3o=", + "pom": "sha256-XIedJFQgXOxt44iQ6K3MKYhPeHlzL0vlguxMhv7P2T0=" + }, + "com/pinterest/ktlint#ktlint-cli-reporter-html/1.5.0": { + "jar": "sha256-W2Zq9yso6aOtBDBJ+yFYyDo54iJPBnRJG4mbDq0XQzE=", + "module": "sha256-xIVmBHI01WGHST+g3EqVS5XEwyyI+6GCMyWi9/21iLU=", + "pom": "sha256-nnuDk4UeQD8/G64QqfES9AaYq5UImEbUCpQoQnueTBc=" + }, + "com/pinterest/ktlint#ktlint-cli-reporter-json/1.0.1": { + "jar": "sha256-TsmXW2jdlQtB0V2zQ2Av/0SMhYusLjZD+FzfXeJSW+4=", + "module": "sha256-gl/n7GdM/ww6eya+0Zi5hllUZ7qLXl2ukM/EPCybRr0=", + "pom": "sha256-X7OhuKBVpl3mNYmALUpAHzzR26bvNAfBGeWajkOz9js=" + }, + "com/pinterest/ktlint#ktlint-cli-reporter-json/1.5.0": { + "jar": "sha256-3LipEJtFLwk0zwTVaw6YAxWVvmytBi/2HtTAxscDxRk=", + "module": "sha256-/6/wpG35vZZ92SDg2VWq6wS/tY51Lkq05QhNhjIVTqw=", + "pom": "sha256-p4hZKVXvyI7sqLYJSmTF8ndGeFqqu7duslRNl3sWuWk=" + }, + "com/pinterest/ktlint#ktlint-cli-reporter-plain-summary/1.0.1": { + "jar": "sha256-QE9uoMK2/W8Z64pIikS3/AtPjhFtzLouqSHFBvxGBL4=", + "module": "sha256-WA/NHUBIkozZIw9vLVJHbF7XlJl1iex3H+Ww00qP5A0=", + "pom": "sha256-NSrXnzGAztkFZGWCT8D9uZ6oiIYo9SN9MXyeQOv3Jns=" + }, + "com/pinterest/ktlint#ktlint-cli-reporter-plain-summary/1.5.0": { + "jar": "sha256-ojdapQBSCTxAoPzo0JTyfjahHQRSYWMDWuxJ0UmnM9M=", + "module": "sha256-UO61m0WGVQH9WCNc4hxqE+o7bma2rvYgzJ1lS2tgiAs=", + "pom": "sha256-E9vNrzHhKIu2fslscL8bOU6/eOe440smV5Km7hiBpMw=" + }, + "com/pinterest/ktlint#ktlint-cli-reporter-plain/1.0.1": { + "jar": "sha256-qyEbs7kHb4z0U2/KOedXp1GP0oZBUUB8sCXwVkvFmJI=", + "module": "sha256-aFbBNnm4M7la/dd6dvaKTDUzHt1TMyMD2vpEZf8hn+U=", + "pom": "sha256-xf48ZqJGbHtG/VRq9Fa/qTugH036jgaCuYHK+jMh9FQ=" + }, + "com/pinterest/ktlint#ktlint-cli-reporter-plain/1.5.0": { + "jar": "sha256-vWZNQpR+EAb/QCNkulOiDSIhuDzWZsdNp5adCYWK8mU=", + "module": "sha256-QfL0VPzbtEMaCDYTa8RPjoBEuYTrm7w3wq8IqOAR/JE=", + "pom": "sha256-n2Ma0Yjca7yxVDJcnrpip7dz80MDT/bqt+HLXNKB4bI=" + }, + "com/pinterest/ktlint#ktlint-cli-reporter-sarif/1.0.1": { + "jar": "sha256-MeFwuM4oHIrBkvQvvR78UhuSUME+1npYmLcsVNOQx7A=", + "module": "sha256-ewJ1W11MEDwOKfeHopEFWLqUOjcUUSZbobBhvVZCONQ=", + "pom": "sha256-nNo19HMwxbKRDMjC2s9MoYsYTw9loSuSyegT8jhpqHU=" + }, + "com/pinterest/ktlint#ktlint-cli-reporter-sarif/1.5.0": { + "jar": "sha256-puJyHSAjY6jEtgklWELmFYRL/kLUX+u6mk1buYAzF0I=", + "module": "sha256-tkYiytsKp+/NL12zZySTZ4tnKTmKMBEUOaEPtKnaHKM=", + "pom": "sha256-8vTWwlUiacj3YaHbRvQqcXBENSVaLsvB8hD4rhL2uyI=" + }, + "com/pinterest/ktlint#ktlint-cli-ruleset-core/1.0.1": { + "jar": "sha256-IYxgKWCZSQOmctehkd0Btv0BWoa2cUWkcLtX3us4j1o=", + "module": "sha256-JchL+ektJZtQd8J4Ub3ZKtS43WEicFTFNfFsIO3CD1Q=", + "pom": "sha256-JvJGVFx+Se8Q7vUqWKq4bihD9TzlWmveAHP2c+ZzNF4=" + }, + "com/pinterest/ktlint#ktlint-cli-ruleset-core/1.5.0": { + "jar": "sha256-ZNOQdb3tp0eC/FwbqVKEwRbzNuVgb00cZFAS0AMiThs=", + "module": "sha256-l4VDX7Knr9ZXpdORiikfAzpxa6LHKJ1wXOc8dynPOBM=", + "pom": "sha256-vC1KaQl6iv6LcJy9/1nf3gHxhsrqHYkE6EW/C1K25jM=" + }, + "com/pinterest/ktlint#ktlint-cli/1.0.1": { + "jar": "sha256-gYianKtdoEKupIhpsXApn+x9b2Z3OqfVJFuLjMuNDIk=", + "module": "sha256-EBPOxG6wTbofOqSsRHuY0hSGZnexvvZyMovwd/8Nd1U=", + "pom": "sha256-p6lIh9Tj5sTNK5DOs5QD/w3qwHpMkk6B7lHaSxw2r70=" + }, + "com/pinterest/ktlint#ktlint-cli/1.5.0": { + "jar": "sha256-35hMJO7OvCwLxfIMRnbbuzQXldzPDhggBSFXAi2g5t8=", + "module": "sha256-r6oZWD73nykS18p6dTpMhg83O+i3i2IUu3Ls/BDRRKk=", + "pom": "sha256-IEhI30lx6dj6xi4A+EQFQ4OD96y+Pwg2rmQavSXZxt0=" + }, + "com/pinterest/ktlint#ktlint-logger/1.0.1": { + "jar": "sha256-TRHIIgT1WUC2NUomyacbw1hvJ1KLyylGYbh5ZJQ8Um8=", + "module": "sha256-cEHOlZ+/s4jaY3U80YM7L8uTtt3FwDomjlqoB6bmw38=", + "pom": "sha256-jSUEnoH0YO56zaU81iyDgwWbuDxvj44U/5GPZ8TjTdY=" + }, + "com/pinterest/ktlint#ktlint-logger/1.5.0": { + "jar": "sha256-wGfJmbqkGmgEG6BPnL+kxTulMg6q3cjdPSniQBRjwgI=", + "module": "sha256-aQTd7ojhPby8MvqkVhc5luinOw9VjDMSmtjACeonMuk=", + "pom": "sha256-Xo8fk9x3GTsLk4zX1sNR0VRMwRqbSJQjZ+24F8Ziew0=" + }, + "com/pinterest/ktlint#ktlint-rule-engine-core/1.0.1": { + "jar": "sha256-7kQX2an+HULHALkKy2jwr7O9Wrikxs+l03M4h2MdZU4=", + "module": "sha256-2uGlssHvsEIwXlsph5ukGB4sFNjFyypwSgIdeo9q1P4=", + "pom": "sha256-eNaqhV0MPc3PHL41XUIk5VRoznPyYuMFeb1L/AR3LuY=" + }, + "com/pinterest/ktlint#ktlint-rule-engine-core/1.5.0": { + "jar": "sha256-dQz0FweSf1kpDQcZHaytQY4QH0aNv7OwqfKcrir3WQM=", + "module": "sha256-MHztv/etYCfo4dq9A6+zmSzVO6SXCoctEKvZtJJ/Qds=", + "pom": "sha256-yhdZIWDDkPhwo9ok2iDrFGFnX49XU9E0kH+qa3JfHSI=" + }, + "com/pinterest/ktlint#ktlint-rule-engine/1.0.1": { + "jar": "sha256-OOogVTlppVT/IpOyxjiGnPDf7xde3u1prej/dJuKCdw=", + "module": "sha256-kWi6gfjZ64VeCQU8MTPhklMj52hTFzUqfwPAZ38S49o=", + "pom": "sha256-nrtsAkvm2X0zGscmKUiUHst0IFa3JnN9gYMtC1hnrPQ=" + }, + "com/pinterest/ktlint#ktlint-rule-engine/1.5.0": { + "jar": "sha256-fNruUpD4wk7/Aqp+gx2Y2ctYQXaFQ3a8osaXerD0Zr4=", + "module": "sha256-hImoOxJYzfbJpxTEjNn3RgxcGEYbAyKs0CHxwuyh+uo=", + "pom": "sha256-+48BhUGSvzjcQQciM6jLaBbGk8CydO3Ns5rpLSwsS8Q=" + }, + "com/pinterest/ktlint#ktlint-ruleset-standard/1.0.1": { + "jar": "sha256-oZ2Ut9yWfXQz/55IYDf523z8a6dzn2L5BJ+G86L7AnM=", + "module": "sha256-/W/IabGg3wpF05H9DnaLB3Gn6NN22o4dyAGv4CqsKBU=", + "pom": "sha256-Y94YcmnQpcZGm3xHuEn5COUlx83H0G27Gy+kbG2Uqac=" + }, + "com/pinterest/ktlint#ktlint-ruleset-standard/1.5.0": { + "jar": "sha256-7K4MM1ZhIkSo4NkB/kMcSiWh7fXXxnR4O5R1EevRZ6g=", + "module": "sha256-T2JFSezEy8b1jd4NQKQeYurlqiFCQ+b37vVcBTew7iU=", + "pom": "sha256-+HubmyBkcfkvoPvu7YO5ifx5E/97m7QJED/HVgKsnZo=" + }, + "com/sun/activation#all/1.2.1": { + "pom": "sha256-NgiDv2RIbs7xYbjygvZQNTbdGmcNU6Coccj7IBcOZ5U=" + }, + "com/typesafe#config/1.4.3": { + "jar": "sha256-itpMGFznJBZxLWPgta/cXwCcDN9AXl8m7+zfFWql37Y=", + "pom": "sha256-tn6vqd0iD/h9ANumiACDpSlqXgxsAxA/XUuOHaEDD/M=" + }, + "commons-logging#commons-logging/1.3.4": { + "jar": "sha256-vC3+MvHvBlCeagZRRMGt97Qg6r8RqH8wvRJ/j6ozIBY=", + "pom": "sha256-1L2jSJKqzL9PrTP8MjqKqQfvnXmYRlnaJJRMCoa/CGU=" + }, + "dev/drewhamilton/poko#poko-annotations-jvm/0.15.0": { + "jar": "sha256-O8uWdwrFIHXEMSAeKf1eZ5JENVVd8i9eWrJgK3t3NjU=", + "module": "sha256-t5wvb4mPqOG/FBWoWhT5j9mfdw4As+kem6bPHZFbu/8=", + "pom": "sha256-HLIRA91A2KH5DeSXnHvJxQDHKQtZ1u8QL/A8HOKlMPs=" + }, + "dev/drewhamilton/poko#poko-annotations-jvm/0.15.0/sources": { + "jar": "sha256-enNd3oW60lSztIoeJy3pFkDIDPhV+vvu5Wm6Zu3s7W0=" + }, + "dev/drewhamilton/poko#poko-annotations-jvm/0.18.0": { + "jar": "sha256-rgFjfbjjivDRhIWVqmTIzad+mAzatzfkXTg44hjFQKY=", + "module": "sha256-h3CPpoQhtvTKODmQAs7fP7v/r5gCYovBekb22UaMQSg=", + "pom": "sha256-QQo/D+YBczUlIexi7kFnrwERWtzQXs209ENJZDZpVjw=" + }, + "dev/drewhamilton/poko#poko-annotations-jvm/0.18.0/sources": { + "jar": "sha256-iJtiN59LfrpRuWgngo6W3F78j1pPxYfnWJaeD3fddq0=" + }, + "dev/drewhamilton/poko#poko-annotations/0.15.0": { + "module": "sha256-ZtciTXPNHDULdSPi1wwR42b76lHZz2H/EJkUneNdf7A=", + "pom": "sha256-tWhy9s9I36x4xexi9zoR3wfqEKGa1B6CGgqB24noTzM=" + }, + "dev/drewhamilton/poko#poko-annotations/0.18.0": { + "module": "sha256-O35bb9Nn9VwohqakBwnE61tn1xYH6Jv/mPksdWEoT+c=", + "pom": "sha256-VZomm1IfIdnGkUkW8H5mPb9oZFBELoW8Jti8NFjE9g4=" + }, + "info/picocli#picocli/4.7.5": { + "jar": "sha256-6DqQb7mbVwkdHWisEffD0lGL16ganHGyWeLADRVkyOg=", + "pom": "sha256-fk6LD0t8pgdSCyDS8eWN9Pk0ymNsseuoKJz/LylWv9g=" + }, + "io/github/detekt/sarif4k#sarif4k-jvm/0.5.0": { + "jar": "sha256-6tBBk4Mjs0M2E4z0Phh12K/5C15+lBHb7ePSAaMn8ac=", + "module": "sha256-lIo7rVzkNYKq1GA2YJbKULSR9oqGtYYYnes/qDUOdrE=", + "pom": "sha256-uFnbSlHJkag3uMMPQsjkK96Xh2sVTH2LW4MFk+3F4RQ=" + }, + "io/github/detekt/sarif4k#sarif4k-jvm/0.5.0/sources": { + "jar": "sha256-6MS5UVL7xf/N4kva9Vtp2tlTlM2itHy61r0RyN/f5ck=" + }, + "io/github/detekt/sarif4k#sarif4k-jvm/0.6.0": { + "jar": "sha256-s6yW3ZesuoMY2+JvakMtbG25HEbHgIBeiSi4ED5XY9w=", + "module": "sha256-Lf6fe4j3KOGtSFq5cXrwalWeAl7NXwGb6LUy6TUrmHU=", + "pom": "sha256-i5D8N0XwCPUQiGznB1Ofa7cbvdG3yduP0dsK5WahwK8=" + }, + "io/github/detekt/sarif4k#sarif4k-jvm/0.6.0/sources": { + "jar": "sha256-bmEvu+jHWW534SDV2K183pPUkji08gcHdK0Wl+y6gCI=" + }, + "io/github/detekt/sarif4k#sarif4k/0.5.0": { + "module": "sha256-5ypi8HtWnROl1muoN+dKwzxoz+8BwT863eGD565kzok=", + "pom": "sha256-MMgukyguwUte58jfdJRXGs0VlRapPpRoLgfDdDDteVk=" + }, + "io/github/detekt/sarif4k#sarif4k/0.6.0": { + "module": "sha256-aK4T0fQBTLjEZUdLo/GgJGAWo0VcJV5u3udUjxUPqMU=", + "pom": "sha256-QFP71kaAT/u2ebMSGQGyI+3B+OQbNcp8KR4qjc2pwsE=" + }, + "io/github/oshai#kotlin-logging-jvm/5.1.0": { + "jar": "sha256-DpGOyyKmG5nx65rOvWif2qmnbcn+lyw2D9NimakqqJI=", + "module": "sha256-I5kb4I6v5ce5fA8hHQv38Mv9QnbYYw6HTMYfaTA3XcY=", + "pom": "sha256-xwR0qu+5LPNc7jqALap5LiBSOMg4AiyAUZ1VO2RP/74=" + }, + "io/github/oshai#kotlin-logging-jvm/5.1.0/sources": { + "jar": "sha256-iEBNtKtZttI0w4KPVgXDzEfd2DS4uF684BbtoyoEMUI=" + }, + "io/github/oshai#kotlin-logging-jvm/7.0.3": { + "jar": "sha256-JB2qIWZd0MpVV2pLxNjprOiJGuPGmMx38Tu0vaw3LpQ=", + "module": "sha256-sL9KJyNR4eK00USgIiOb9coyLdpTVygK7wTeI4zcvL4=", + "pom": "sha256-7NyZgBiOEtX5lLMiK7nmYp3e7j72xsfcS24v+mnGdMk=" + }, + "io/github/oshai#kotlin-logging-jvm/7.0.3/sources": { + "jar": "sha256-nkR7Tndl161VhCKXa5tNVLD2BRhe3nchTfa7mOi9gvg=" + }, + "io/github/oshai#kotlin-logging/5.1.0": { + "module": "sha256-3Tq3fg7DUIygiYC1Qm7aZiPOilt9Qi84PaFge4UT44Q=", + "pom": "sha256-KYbXa8EmweHXrpdutMBv7eMp18GL7/Kb1t+EjQ41UjQ=" + }, + "io/ktor#ktor-client-cio-jvm/3.1.2": { + "jar": "sha256-szWkKJCwyD0Tc4X6KDhwbKIaRCVlhFONKIcSGKcINQs=", + "module": "sha256-4HRopZKCW31pXGcuwBthBEcuI8/C8o/oPq/QMlDCx1s=", + "pom": "sha256-PaU0//8L1C46urZMlayvrYPtn4oLdqfpu2rZscbPmuc=" + }, + "io/ktor#ktor-client-cio/3.1.2": { + "jar": "sha256-64zDd1PgQKDhC1ZkrqzHic0hPDZJBG9wYrjbmKOxaQI=", + "module": "sha256-w2CRMFxmU5NoqUrbluIE6oTXVZEEPFypikndcjkXBv8=", + "pom": "sha256-KuEq8O1yILUSIbuFlBBpRUF6p4D4XFYWkeMIo8F5TrQ=" + }, + "io/ktor#ktor-client-core-jvm/3.1.2": { + "jar": "sha256-6+fGebo+G16Ma6Wxwt2JWcZ/Jv3etgnnee/xd9boxQg=", + "module": "sha256-FnKDMXflgXZQrVbQrtK+oMSvOpgbAZthw2OLsLzJeG0=", + "pom": "sha256-fHMA6SdRZcGDb9ylkOISDgARY+va5ha7K8WjQUNblp4=" + }, + "io/ktor#ktor-client-core/3.1.2": { + "jar": "sha256-DLhTKGPp8Xqdesr9Ecim7x6ahK9i57xYxFfHjiGzqA8=", + "module": "sha256-Yq0wnFdFJQmUpZpzzDfA0KPbtTplF1ul0VHOHcwP4XY=", + "pom": "sha256-qiDsWjyuvdkVZRxeOUb5l5aRVkD2NmylJHqKxjZbEFM=" + }, + "io/ktor#ktor-events-jvm/3.1.2": { + "jar": "sha256-ZvgMmj04rjEwGCwe2iBhfEUZNlfWPWqvBUU0Tr+1kRE=", + "module": "sha256-2VXhTrl7C8klpYpUUPFuKP06SxOw4pGpozacSFcq1O0=", + "pom": "sha256-DD0TK9i8DWi8mhsYDhEyGiogX2YAO+/y5tWIUWWltgE=" + }, + "io/ktor#ktor-events/3.1.2": { + "jar": "sha256-EOdojQWik+k9467ZuxEfmpV00K0IQ9QIzfE0DHncx1c=", + "module": "sha256-zCNnPeUfpwNdbTGjbqPmBSW8eXgxWH62Qbdg7QzhgGY=", + "pom": "sha256-2KZiJ7h5hEIIHJo7a4wCpHyfmYFlfM347TrR23Msd4w=" + }, + "io/ktor#ktor-http-cio-jvm/3.1.2": { + "jar": "sha256-T/GcEQ/Vd4xcGqNmZHgdH5/SkK8Zk6tWMoO5YRVpvFM=", + "module": "sha256-uwPweWBUeas6d3R7IKqu1ospB3VlEd3HpBlm07jS2t4=", + "pom": "sha256-NTLCYHe7jeNppkFFcUqP7BwY0uk8ffZ/Y81lQ+Gthb0=" + }, + "io/ktor#ktor-http-cio/3.1.2": { + "jar": "sha256-IzLwt1DKuYqOi/YqikkohFAp8Ai79EzF2wgk7qOU3uo=", + "module": "sha256-GoQI1DE0XFRZwXQzp4dXO98q0MSKhF3x23EZscUXpeg=", + "pom": "sha256-ur0cAJKzJKB5IwQ1y4/iLloga2iUSJO8kGE2MO9xtaw=" + }, + "io/ktor#ktor-http-jvm/3.1.2": { + "jar": "sha256-ykYSGB96b0dZ6G0oGoHqucOsrNp4ijGhY1si8dBWwWo=", + "module": "sha256-oDFMPrgt1dLkKl4vpIdf0HQiL7csS6V5+PSeIAh/cbQ=", + "pom": "sha256-ZwKozhE2AxhCCljnjlVpx6O7guGFjxAPLOcMXPemmlE=" + }, + "io/ktor#ktor-http/3.1.2": { + "jar": "sha256-cMCBsesMktL754uIosWc8HzaXWDTwuHjHZJ9EeL2S6E=", + "module": "sha256-vsKmzcm1BARxfP/X9MAUhiCC+37DH+ovZp5hfO2sKiI=", + "pom": "sha256-wtnv/1erfTa9JsAJxLZbgjw0Zuavym2xJJGEoMZV4IY=" + }, + "io/ktor#ktor-io-jvm/3.1.2": { + "jar": "sha256-szoNOusNuTYxkJyHNoBBNkW31AQeadG1yZuuzoB1J/Y=", + "module": "sha256-eqmaoqiUwvMw7VaKWSmkd13mlhbFIRdla6HRitnMDEo=", + "pom": "sha256-3FWhpZqyA9Zx0SRPWimqgAX3RweUxFfqXp3IVxpMI6c=" + }, + "io/ktor#ktor-io/3.1.2": { + "jar": "sha256-UcQbuJG56bljRISd4FkrMFCflRNaryTh4+PoU8ltmFA=", + "module": "sha256-WuOYj9Nnpsgp4EEg8uz46efG6zW/4vo3p5x2FGHo/8E=", + "pom": "sha256-QLweS6FxQJvUNyR5qIlCQzFT3x5CL0pKgtJt96OOdAY=" + }, + "io/ktor#ktor-network-jvm/3.1.2": { + "jar": "sha256-rEQzHpc22qmy+zk9iFqOI7Xfk0xOgjXBbBvD9eg33NM=", + "module": "sha256-768dVKqyVkgci1Rg6SDaePaZcXb856rAfs5//mkWlg4=", + "pom": "sha256-QDnfI6RnjDOWKbua57It1q9dLMqjYflnu5SN0ubzD9M=" + }, + "io/ktor#ktor-network-tls-jvm/3.1.2": { + "jar": "sha256-4Oenh22yX6gZETzdz1+fFAcRl/saof8CB0W3q1OAYbc=", + "module": "sha256-9OqgetQxLU4fn1+RvQnNx6rQIxa6WmfmAEy4y5H8XHg=", + "pom": "sha256-X25PZ6/b6NqgCLq+7/pjFnT4buK8YM00Z2169ShMhUM=" + }, + "io/ktor#ktor-network-tls/3.1.2": { + "jar": "sha256-vLgy2Hr+70QUDBlg9ey228QQ9wTzrbL9oi2deO/N3LA=", + "module": "sha256-emXubYVqSyWToBK7wC04WSMt1vMXoGs07SeApYNlQug=", + "pom": "sha256-lYzkHibGmQaIpX8JLarHHN7WnG1nOEd1ksmgYIWdBF4=" + }, + "io/ktor#ktor-network/3.1.2": { + "jar": "sha256-PQ818dwIBciI9TcznNyGsfsswhQ9+2+vrylv+R0thcY=", + "module": "sha256-kPTc8badNU4osJR+0ObEu4TbaW1W7T7eQCdbDt+nG0I=", + "pom": "sha256-CLpyZm62hR5IgaVTJQGub456HLcRxli0QULOPbECOyY=" + }, + "io/ktor#ktor-serialization-jvm/3.1.2": { + "jar": "sha256-JOEoQIvzHiORBjGvDJdDK3EARLDA4W+6Qc8UW9wJv2g=", + "module": "sha256-UG5PTj6iQ8PTm6LwA3C29Hk6FNkDKznvnmP2Zk3YFSw=", + "pom": "sha256-97F+QLGEwuPaeJ3J06HDuZjuLRZDK1GaggpUR/qg+4Q=" + }, + "io/ktor#ktor-serialization/3.1.2": { + "jar": "sha256-1usUAlHKWspctpxK1+8Yk1OiutpxL4Nog4RXCrJCzRA=", + "module": "sha256-RtMIqVsr24f70PzKTbsKGfLQMbJvLDkem3IWu9mPjiI=", + "pom": "sha256-C125cC6iCfWIJrkiODy+md8O0ZAZwQiMWlh5dMhIDwA=" + }, + "io/ktor#ktor-server-core-jvm/3.1.2": { + "jar": "sha256-iBEDVZq7aObB0c780MUwkwJl18ougjB24XYXX4rGxOY=", + "module": "sha256-m4p2pwPqhT+7XKnQYyN+svD4THb6zX/jQgYQgL/axeI=", + "pom": "sha256-dEmOLZuVzvt7DO3MIIrhcai3n74KOTzDg1b1WZeAMlA=" + }, + "io/ktor#ktor-server-core/3.1.2": { + "jar": "sha256-VUyioR71br61HUOne0sUU2B3f9hx7p1AzNk36G2HgSI=", + "module": "sha256-4lSGk0IJguc3mKY0YpXVhtf4T3g3d8a6/DqUa+4E5qQ=", + "pom": "sha256-Acdzm7TWm55iHHkA89pprWb9nPmf2MpHESoBO8vdRps=" + }, + "io/ktor#ktor-server-netty-jvm/3.1.2": { + "jar": "sha256-eSoO5N7cy9wT7cdYvYXV4+iNH8vIZ+WLkeTfkscITa0=", + "module": "sha256-6xNWWPqhkxLNP803/AdR+tsfZzfWzOFCaa5XGmgZfGE=", + "pom": "sha256-Xe/4K5nC5OVvK9TAgIeqdOKNefzXzTlGuj6ADW0udEs=" + }, + "io/ktor#ktor-server-netty/3.1.2": { + "jar": "sha256-CJ4kQXv59sNO7Fcg7rssvMguooVezvkBM+sX4QedWGg=", + "module": "sha256-1d8Fjp6COlzMLubskn6ZpIPJ5J1QPickupq3pMTHucc=", + "pom": "sha256-pixCY3DKI1sf+EQTvaOUS16cUCFc2/XN42AM+z+3cCY=" + }, + "io/ktor#ktor-server-websockets-jvm/3.1.2": { + "jar": "sha256-flHQUEcEfa+RvVNCKM4t3rqJ8j5ifp3EoyPWzEFVo78=", + "module": "sha256-BCpTNre8EdKiW7NhuMk1QXNFLlVV0oRUBURp/9gPYx8=", + "pom": "sha256-jqEebGyiK0b86/1yxm2+dR28lfgyl332y8bnxQ+drA8=" + }, + "io/ktor#ktor-server-websockets/3.1.2": { + "jar": "sha256-pxZ70igebuTFKsBWJ1fgkTeFgt9QAhiPcJrfbZQmgas=", + "module": "sha256-Vo6RMlk+wS2/D31qpgFXVZ/E4+JXO6mLIMFDNdaTqHE=", + "pom": "sha256-mKPiS1G5PuSXJIhb7fY/Hf6JmFRvYzXQX90RPoLquoI=" + }, + "io/ktor#ktor-sse-jvm/3.1.2": { + "jar": "sha256-VSqeqy0QpMmzCC5YnpT//zu7+S4Tq47LhyGVlAp+kMQ=", + "module": "sha256-a+Dj4yneNokQAUFDO9ZICzuWibtiVpWi+XryqP2Q53A=", + "pom": "sha256-NFgOcSUEJOrJXk9FsmQaRjPWJDlmdt1YysiutYjU+kE=" + }, + "io/ktor#ktor-sse/3.1.2": { + "jar": "sha256-CZgN7Mg5zmR1e5ziCOTFcdyH/Iqx1JBq0bVWBfp5s8Q=", + "module": "sha256-10Vyu1yjrb9bPYbsuN416ZG+EC7P36gvfmxhW+wMvH0=", + "pom": "sha256-ySrv+ZpYpjyjtcGsKurq1570eQONm2QjLAEYhCZ+k9Y=" + }, + "io/ktor#ktor-utils-jvm/3.1.2": { + "jar": "sha256-/0m9ennrHA4wzCRPjOsreZQNLAZl8EiHX0qUUfTsHEw=", + "module": "sha256-qZnf4JCbFcqHPzZNOQc+zB74ST0P0TGkLHuDQ2NYkhM=", + "pom": "sha256-mN/IgBAFUWNmFWPCfmQS1yWmMtC1yJxw37atxbh7ATs=" + }, + "io/ktor#ktor-utils/3.1.2": { + "jar": "sha256-8x9wURdB2HuriPQcJIu/q8Kokg/CsWr7iWvSkSQDyhk=", + "module": "sha256-K/6VIuFZfCVpCrrJdXLyXoP16Z6sU7aK9no7KbTujWg=", + "pom": "sha256-UbDVCglWz5/na3ZN7zaDNIRTdU2oQ9Vm0v3zAWbkdi8=" + }, + "io/ktor#ktor-websocket-serialization-jvm/3.1.2": { + "jar": "sha256-D2MHbFz3aA9DkWzuT2XUQeuRKT/vW9Xw0WVhEC21PfA=", + "module": "sha256-ZcdTmCf721le0cNiDnlgwNesP0hGBBr3kF1ph9/M6qc=", + "pom": "sha256-OxpuXkGJ7HNzKtYQceBJXIsSasZs4tvdNgK1JuZy4nY=" + }, + "io/ktor#ktor-websocket-serialization/3.1.2": { + "jar": "sha256-H4Kdk+9uqBnvMbwuO81vRj8f2/Zgrg6MngFGGSs1khE=", + "module": "sha256-7rXJKLPxQ9ut0Hmzno0UZ/WZ2Pd3/1GR+j23wHdTkAM=", + "pom": "sha256-PhfeNeQIf3wRDiExmB2p0lj9oK1ofW/SrYylydvKSok=" + }, + "io/ktor#ktor-websockets-jvm/3.1.2": { + "jar": "sha256-U0I/bUueO3L6K9vh5DvdTQx2hV1V78o4ogsQNezj6Tc=", + "module": "sha256-bOp2XLFt1lC7jtiLQhQ9/9dh6SnBEFEjCyf8W45ju1Y=", + "pom": "sha256-JUj5WAi39GGG1FLKC/UnvxPsepcDwRxiTTGXebqgNlY=" + }, + "io/ktor#ktor-websockets/3.1.2": { + "jar": "sha256-+haBQSo9iI+FM+XkJwLzOOTgUmpr3dKhxOxk0WdTlMk=", + "module": "sha256-GgOOGCIN7tGhOKdN9fbz02YT6XYnzZCZUFGmgqVzJYY=", + "pom": "sha256-6WI1wK5Wl9B1yZHxKxEU1g+ByYRBuBEVkpM7LQxsiR0=" + }, + "io/methvin#directory-watcher/0.19.0": { + "jar": "sha256-r0BTPl9wUuFoUykaG6NAvYq6LRcYbjQAOa0uuikBcIU=", + "pom": "sha256-wfy5wF4oAb1N/vbLLb2eoA1KMaxnCc7kAl3FgqTcUd4=" + }, + "io/netty#netty-buffer/4.1.118.Final": { + "jar": "sha256-DupOhmapY2oociZh2LpfqFZEd+df7G3S/z4yTjYfizw=", + "pom": "sha256-lcvm4+NB7km8/9MlfPePpXheRlt3pzS8/C+TUJ1D/mQ=" + }, + "io/netty#netty-codec-http/4.1.118.Final": { + "jar": "sha256-CYIteF6aeUg4Ax3dU0bPQZswwDapgcLid6BivqiEF0s=", + "pom": "sha256-76CmX6G8y9mN0U3vmf2mba6Zn278S2QYgDu1DGcTxxY=" + }, + "io/netty#netty-codec-http2/4.1.118.Final": { + "jar": "sha256-aNoLGjTc6wCm+fb3iPsva3ueStuoxwZYrCvX64mLl64=", + "pom": "sha256-QiRGD2n29nmCxiSg1QPHhqJFARGzGrFcB14LKMlOEf4=" + }, + "io/netty#netty-codec/4.1.118.Final": { + "jar": "sha256-Sr0hX9HtfOhlCdFpzJy+3lBCF2wmWnmztwYCsBcibD8=", + "pom": "sha256-Dx2BOQ3KRYjYfT/hXYxS8muy6m2AyQq5OpfmTf16HN0=" + }, + "io/netty#netty-common/4.1.118.Final": { + "jar": "sha256-ZczpAezw+dZZHMd1B3JhSrQBqEQV3JrsnaTQRvD5p3w=", + "pom": "sha256-NCkEFeP3lhsZb3Y3yCphfRA4ESKRsxy7xHIA0doyboI=" + }, + "io/netty#netty-handler/4.1.118.Final": { + "jar": "sha256-JuP4pehZ/WLPPBPcbXXk4Yh58ACl0K1/WPhnlnXSPa4=", + "pom": "sha256-ZLS1kaxN9OloOj+hf3Pe+3Ya8HLFbcLeQDPhgMVrEEk=" + }, + "io/netty#netty-parent/4.1.118.Final": { + "pom": "sha256-2Wba6618ch37+P7NlPB7Em9vyy0fhbnIeZn9mZ68aMg=" + }, + "io/netty#netty-resolver/4.1.118.Final": { + "jar": "sha256-MXDCJZcsGLaFDSit1g2xW7KNg8Tj1baGyiIOC9cnPIo=", + "pom": "sha256-hy3L2IIpwukYCjyqdVhMQs7YilFsSaaN2JY3IWSyqU8=" + }, + "io/netty#netty-transport-classes-epoll/4.1.118.Final": { + "jar": "sha256-vYbm1B4fYFP5V3kxZVI2JZd4qwRWRuHmqwQVDwcIZPM=", + "pom": "sha256-+WK0V5pL4M1LuiPqia47hODJuNFkhuTB0xE0brb8cx8=" + }, + "io/netty#netty-transport-classes-kqueue/4.1.118.Final": { + "jar": "sha256-msaNJu+3jXSiTu7IMJ1gvIAmVlW2DESSDcrAgo206OI=", + "pom": "sha256-KMceQ5Y0PyVDjWGdKVPwZtDPD1lxrqlX+rHjGKATUpA=" + }, + "io/netty#netty-transport-native-epoll/4.1.118.Final": { + "jar": "sha256-iSyF0Gfs9JWAi3CQ2LYq+gJIQEtOB83ogofqEW36b7o=", + "pom": "sha256-yre/tsBtH4gZncEPhoHZLe8IDRFrdmn8WWp1Cjf0DlA=" + }, + "io/netty#netty-transport-native-kqueue/4.1.118.Final": { + "jar": "sha256-12hJMUA7COIKeSbBceKU3sytzr3FAKkOaNBPl4zdrkE=", + "pom": "sha256-nZuw9Sh5xTkHsKYImPbnHnmXFpy/qEMHFUtQPBIgkUY=" + }, + "io/netty#netty-transport-native-unix-common/4.1.118.Final": { + "jar": "sha256-abFnk9e0HqdqdivSvRRPxPfDnBVqelnr9puutWD7ELc=", + "pom": "sha256-w336RI/aV2410qeIo0appFGBmKzFN1mSJYSruG0h39s=" + }, + "io/netty#netty-transport/4.1.118.Final": { + "jar": "sha256-qzdR5xfa75yNkeTXRyikhzC9hTC3LiRmsiKy6j+wfbk=", + "pom": "sha256-Yh9MVnIgSntDcjl7C/jX5EbNn2YK/8DQM5wFnFAKcDI=" + }, + "jakarta/activation#jakarta.activation-api/1.2.1": { + "jar": "sha256-iwoPUvqLBcVDGSGgY+2GbvqkHa3y46fuPhlh8rDZZFs=", + "pom": "sha256-QlhcsH3afyOqBOteCUAGGUSiRqZ609FpQvvlaf8DzTE=" + }, + "jakarta/platform#jakarta.jakartaee-bom/9.1.0": { + "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ=" + }, + "jakarta/platform#jakartaee-api-parent/9.1.0": { + "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api-parent/2.3.2": { + "pom": "sha256-FaVbfVN8n5lwrq0o0q+XwFn2X/YQL3a70p8SR92Kbfs=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api/2.3.2": { + "jar": "sha256-aRVjBAeb3u2fwK47OTifGbPMS6REO8gFCJlTlOrXQuo=", + "pom": "sha256-tTeziNurTMBpC50vsMdBJNZyUxc0VnrPblMTDqsTGtY=" + }, + "junit#junit/4.13.2": { + "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", + "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" + }, + "net/bytebuddy#byte-buddy-parent/1.15.11": { + "pom": "sha256-jcUZ16PnkhEqfNhB6vvsTwDbxjPQha3SDEXwq0dspJY=" + }, + "net/bytebuddy#byte-buddy/1.15.11": { + "jar": "sha256-+giZiq4ee9roO94HEsUOhETXHA4MGWuyJHrejUrQ65A=", + "pom": "sha256-IFuLJUGWcX6B2tZyu4aacZr8lt8pf5fYEe/+H0NlPa4=" + }, + "net/java/dev/jna#jna/5.16.0": { + "jar": "sha256-P1IzWJp5nrZtwpaa+jQz+1aFnT14fFi5vH3Z6G8KJQw=", + "pom": "sha256-9h/SxEqlg/Kiy8X8Z7DxmpIDyofV8OGNPVAwy+OQgIM=" + }, + "org/apache#apache/17": { + "pom": "sha256-OYBEt0tacZMmviGK4IEk5eLzMYq114/hmdUE78Lg1D8=" + }, + "org/apache#apache/32": { + "pom": "sha256-z9hywOwn9Trmj0PbwP7N7YrddzB5pTr705DkB7Qs5y8=" + }, + "org/apache#apache/33": { + "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU=" + }, + "org/apache/commons#commons-lang3/3.17.0": { + "jar": "sha256-bucx31yOWil2ocoCO2uzIOqNNTn75kyKHVy3ZRJ8M7Q=", + "pom": "sha256-NRxuSUDpObHzMN9H9g8Tujg9uB7gCBga9UHzoqbSpWw=" + }, + "org/apache/commons#commons-parent/72": { + "pom": "sha256-Q0Xev8dnsa6saKvdcvxn0YtSHUs5A3KhG2P/DFhrIyA=" + }, + "org/apache/commons#commons-parent/73": { + "pom": "sha256-TtRFYLB/hEhHnf0eg6Qiuk6D5gs25RsocaxQKm1cG+o=" + }, + "org/apache/commons#commons-parent/78": { + "pom": "sha256-Ai0gLmVe3QTyoQ7L5FPZKXeSTTg4Ckyow1nxgXqAMg4=" + }, + "org/apache/commons#commons-text/1.13.0": { + "jar": "sha256-HjI6UBEn33jtCYfzRdadZdDqf6PU+1s/hKrro6iyDzg=", + "pom": "sha256-1GYUvcptEZXDM7qfcwzQhYXE8zKkPqe5C2A1rYBIcdg=" + }, + "org/apache/groovy#groovy-bom/4.0.22": { + "module": "sha256-Ul0/SGvArfFvN+YAL9RlqygCpb2l9MZWf778copo5mY=", + "pom": "sha256-Hh9rQiKue/1jMgA+33AgGDWZDb1GEGsWzduopT4832U=" + }, + "org/apache/logging#logging-parent/11.3.0": { + "pom": "sha256-pcmFtW/hxYQzOTtQkabznlufeFGN2PySE0aQWZtk19A=" + }, + "org/apache/logging/log4j#log4j-api/2.24.3": { + "jar": "sha256-W0oKDNDnUd7UMcFiRCvb3VMyjR+Lsrrl/Bu+7g9m2A8=", + "pom": "sha256-vAXeM1M6Elmtusv8yCbNZjdqLZxO5T+4NgCfRKRbgjk=" + }, + "org/apache/logging/log4j#log4j-bom/2.24.3": { + "pom": "sha256-sXq38yj0WGt+cfjJT8NaXaK86AcFpdYwBAIsGSiDNVg=" + }, + "org/apache/logging/log4j#log4j-core/2.24.3": { + "jar": "sha256-frQIRZauJb08YWmOSOjQq2WpJgdYiE7Vy7nG5VxEpWo=", + "pom": "sha256-v9XAxKrGECQsy2H/ABCK1zeA2iCi9ym+Bjg2qXZXf1c=" + }, + "org/apache/logging/log4j#log4j/2.24.3": { + "pom": "sha256-wUG0hj/AzqtYOJShPh+eUsAfwtdYcn1nR/a5nVBA87E=" + }, + "org/apache/pdfbox#fontbox/3.0.4": { + "jar": "sha256-Le7GIy9dbTsxJ2WS0xaArpcir1fSTLD3bacOK6DpnhI=", + "pom": "sha256-8MzDMOmyDYlXigqHArR6OZvNYojCOG10/6uPjjAoROg=" + }, + "org/apache/pdfbox#pdfbox-io/3.0.4": { + "jar": "sha256-ep1HRvLhOh4i9O/kf7r5mXY8rqQXSFNa+ToB7txQ9VQ=", + "pom": "sha256-YLURdX737TBIv4LH2ClvcdC8RwAgEYQzqzs+OEC/jqU=" + }, + "org/apache/pdfbox#pdfbox-parent/3.0.4": { + "pom": "sha256-w5j++zUez/mTEYCNftU0bnHzVrETS9c6JQTLgXB9tFE=" + }, + "org/apache/pdfbox#pdfbox/3.0.4": { + "jar": "sha256-CaD/J9b4Sh3EAGDLCgHezyrU75HDa8kbmDbCVL6KrkU=", + "pom": "sha256-098DLfK90jT+NwMO+sNXa6Yj/Jf1ERNUxMUq13dfkOQ=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/assertj#assertj-core/3.27.3": { + "jar": "sha256-W4omIF9tXqYK2c5lzkpAoq/kxIq+7GG9B0CgiMJOifU=", + "pom": "sha256-jrN+QWt4B+e/833QN8QMBrlWk6dgWcX7m+uFSaTO19w=" + }, + "org/codehaus/woodstox#stax2-api/4.2.1": { + "jar": "sha256-Z4Vn5ItRpCxlxpnyZlOa09Z21LGlsK19iezoudV3JXk=", + "pom": "sha256-edpBDIwPRqP46K2zDWwkzNYGW272v96HvZfpiB6gouc=" + }, + "org/ec4j/core#ec4j-core-parent/0.3.0": { + "pom": "sha256-kKMRBDNTwIfbP/LzSAKWc1ii5IgkXYh7OcIbZvc+3mU=" + }, + "org/ec4j/core#ec4j-core-parent/1.1.0": { + "pom": "sha256-34AoYmnNxcPlUpdqIVN3QP5oKRdhHxBwewLG3xbC36E=" + }, + "org/ec4j/core#ec4j-core/0.3.0": { + "jar": "sha256-yt7wIHB3B0sRoSvkQviats+T+8L4SHAtk3GpYRQU1Vg=", + "pom": "sha256-/RtdTKFRGzy8nJGvde82Eii0+fsQAZLTyGVHGETdxuk=" + }, + "org/ec4j/core#ec4j-core/1.1.0": { + "jar": "sha256-NCSpwmMqhDPACrC3zBBInrcyZ1yX/jM6/1tScsXoYfY=", + "pom": "sha256-QMd1ZnphclrgaTTj+MENFtH20P6S7Ft0Hjmy/AlITiA=" + }, + "org/eclipse/ee4j#project/1.0.2": { + "pom": "sha256-dJWgenl+iOQ8O8GodCG9ix/FXjIpH6GOTjLYAx3chz8=" + }, + "org/eclipse/ee4j#project/1.0.5": { + "pom": "sha256-kWtHlNjYIgpZo/32pk2+eUrrIzleiIuBrjaptaLFkaY=" + }, + "org/eclipse/ee4j#project/1.0.7": { + "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" + }, + "org/eclipse/jetty#jetty-parent/21": { + "pom": "sha256-eXLp7G84UqjuHuXU0Q3Mnc1gd7El+TWqlrNnpsgjN/U=" + }, + "org/eclipse/jetty/alpn#alpn-api/1.1.3.v20160715": { + "jar": "sha256-B76ZdYtpnhlPcPuXhNlCAtxsmCEod4KePXKwIPJmBXY=", + "pom": "sha256-FrRveqUg7VDUR4oM9ndjje3AFDtCNMJ48WDLS9JUgq8=" + }, + "org/freemarker#freemarker/2.3.32": { + "jar": "sha256-BNZewb3mzqIONJXV5475ard02ZNkNIYdMlS9iOfpT5I=", + "pom": "sha256-B6B+Lq8JdgIrVAVnx99iJxK5oDk6bF9tIOb/FXkiKgE=" + }, + "org/fusesource#fusesource-pom/1.12": { + "pom": "sha256-xA2WDarc73sBwbHGZXr7rE//teUxaPj8sLKLhOb9zKE=" + }, + "org/fusesource/jansi#jansi/2.4.1": { + "jar": "sha256-Ll53Wp3Fj/prvWqm8JnWL4ti3N60w8O7vlzyMBvC3ME=", + "pom": "sha256-P5jZeaTTVZ+HefuwBLNK51Fq+t9RDhHffMPNBz6xuzs=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/jbibtex#jbibtex/1.0.20": { + "jar": "sha256-sOqDZn2darH89q2EieF6pRsA18CGRUrsNQFuL7Ucm7U=", + "pom": "sha256-ZMsdu8KSZgmcYTnVsq8NXKfUxgVV/gABoBePhGjfnCo=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains#annotations/23.0.0": { + "jar": "sha256-ew8ZckCCy/y8ZuWr6iubySzwih6hHhkZM+1DgB6zzQU=", + "pom": "sha256-yUkPZVEyMo3yz7z990P1P8ORbWwdEENxdabKbjpndxw=" + }, + "org/jetbrains#markdown-jvm/0.7.3": { + "jar": "sha256-iTq7MfFbYhb3TccEwMa/HlZ9zytizKKc9C5PUxU2N6w=", + "module": "sha256-cCm2PHSWTltDNDCO5ynpW1ONpe1qwSsuR31HhXLQIlI=", + "pom": "sha256-rLnRV//Hpk7mK+jt2WANJrXbAycKdOi+U815/gsm880=" + }, + "org/jetbrains#markdown/0.7.3": { + "module": "sha256-2/rnqoU+teoe66MYllOKhANkb1XFmpkZHWh/wDe9rDk=", + "pom": "sha256-EeUuCmQOVKSzsjDRSFyVukuneyx7H8KENzkPngEicUc=" + }, + "org/jetbrains/dokka#all-modules-page-plugin/2.0.0": { + "jar": "sha256-01ibU23XRoB5BnKVgZyihXNjEnXMGOzOLy7/DgFtMnI=", + "module": "sha256-H2omPRdAFRJHcCQJoQGyGyBEsv5oHtlfPwDIPKL49/w=", + "pom": "sha256-k1+S+aXwCPT8akdE00bUIWf6TXQdCYDLh7m3iQTg+pw=" + }, + "org/jetbrains/dokka#analysis-kotlin-api/1.9.20": { + "jar": "sha256-1JE4PRijEtz7b2Dw0S373/V5uIHi4RQXZ3aKxkeDqjU=", + "module": "sha256-R7z5azydD2d3mw7m7DxMvSzrMP86m/xnS4qn4U6RDLA=", + "pom": "sha256-thZsupB4eKq+SwyEczLBcClf9UMYSdOjdZqMaPB+8jw=" + }, + "org/jetbrains/dokka#analysis-kotlin-descriptors/1.9.20": { + "jar": "sha256-Nq+ECbvk2mov81ZFwntqdoeIQEQ4mLVgWh2avXVclow=", + "pom": "sha256-WO9jQY0yViRqjpkfKV8q/N7WefqS/LgpdOJt7Vy2Vkc=" + }, + "org/jetbrains/dokka#analysis-kotlin-descriptors/2.0.0": { + "jar": "sha256-gpeIxAiRoqPEuUNcueyA1kVWDZJun7vQjMwp6OTx63w=", + "pom": "sha256-EkmpCHEX6hwM/7XNoM+hFJBS+Q13v34Ob9mzoYNdB18=" + }, + "org/jetbrains/dokka#analysis-markdown/2.0.0": { + "jar": "sha256-2juwVNWQyNO3ms62FTrN5PKKcsWPbvtvopFtqGi5+DQ=", + "module": "sha256-Y9Svlf2/ITUM/nfCm44n7fxphC1GIPA3sooAivE2LBc=", + "pom": "sha256-hNqWan785ktm0YjoyRsgv+NBf6cstEEeD46dxgdkoXg=" + }, + "org/jetbrains/dokka#dokka-base-test-utils/1.9.20": { + "jar": "sha256-6yDtZvIYV2p+Op2pPnaU3AWcn/UAHLfJ7aQ6RkPI3Ik=", + "module": "sha256-HfzUMTH1CZJaGhco1AQXeahHvtRtaZ/S1jkNNO0UUuw=", + "pom": "sha256-LjkLEFR4gt+mol3mLH9wIC/ox5xBaHfj4O+2OJoHQQk=" + }, + "org/jetbrains/dokka#dokka-base/2.0.0": { + "jar": "sha256-BBHRw4odEAy9NGxjQMPEtfFUpIqcEZ7RGJPW+ulMkao=", + "module": "sha256-JTBdz25Cw739iyyqX74qjc6i6Vw1kALZaB9FCd5XSak=", + "pom": "sha256-HG+nzVExr6XbUft5BGqF5GaGaOm2h2t/kJC9D0PW5Dg=" + }, + "org/jetbrains/dokka#dokka-core/1.9.20": { + "jar": "sha256-EhizoInIX41byc7lNGp4f2QUPW/HtPBLBRtqW3Sv3IY=", + "module": "sha256-w+z7y6JqmLbouDusckOZKz6d/jilB9d6UnvL5E75ua0=", + "pom": "sha256-N9LsB2+hsvlR92bUjxHVHXOrjlNwkGy/XXnMPkbRjxI=" + }, + "org/jetbrains/dokka#dokka-core/2.0.0": { + "jar": "sha256-OwIhZrfP49201Tjnb5e8jEE0Z379ZjEDTmP9ci4SU+4=", + "module": "sha256-iA7+arXz1MMGrsNVkBQ+5Bhujyuzw6yVKaxTZAVmetY=", + "pom": "sha256-SWN/vvKBVW4wjx0Gz8EV00p2q5OvfpXkiSYnNHwov5E=" + }, + "org/jetbrains/dokka#dokka-test-api/1.9.20": { + "jar": "sha256-qXMoUtyOaMayJqHqnI2S6wZzn/TXJTAbwcaVYiyuJ6w=", + "module": "sha256-lPDPN+ip7EZOsJBdhqHPtb1c8yrwMeTyKhwH/v53I58=", + "pom": "sha256-oQnQuSohBVOiQ2aCZE+ikgT0JyUWk9zLpfxOpGTKduE=" + }, + "org/jetbrains/dokka#templating-plugin/2.0.0": { + "jar": "sha256-gmXG5qAozQ45wRaMG3bw/wY5ngvmi57/Snj8LdSugYM=", + "module": "sha256-YIna696ws1DZHuCxqxarB5j63II7Eo3UNDmWOxdkmsQ=", + "pom": "sha256-rqDS7WCgzoRhO3nxh8It7eTbBPIfV/mRPhapC/0ONdk=" + }, + "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { + "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", + "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" + }, + "org/jetbrains/kotlin#kotlin-build-tools-api/2.1.20": { + "jar": "sha256-Uzw2yzYubtLRX1hzLn9MbSvtXJ1RebiXvEsJ0W1gU3c=", + "pom": "sha256-kn9h95cmHFnktTEDFNaf1KOrjvT3A596UyYHXEKkFzo=" + }, + "org/jetbrains/kotlin#kotlin-build-tools-impl/2.1.20": { + "jar": "sha256-bpSJbjIWA+O/6J/vAkeORNHWSj0l1J0GlIkv/AHGCs8=", + "pom": "sha256-EPseNeDocGdH6Og+ro+LQ0BrpmTkIB7J38ua99prQro=" + }, + "org/jetbrains/kotlin#kotlin-compiler-embeddable/1.9.10": { + "jar": "sha256-ttOWX9s/wqX42WVoHCFcN1UrKK5a0Z/K28FWjJtl2rQ=", + "pom": "sha256-xUVrHIKj7yFTuZOfcdGQIV9uU6gZLSbo127sIzJVVr0=" + }, + "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.1.0": { + "jar": "sha256-wbE5pvJRw7mekr76Mmy3XZOgAddMOsYBFVqM2w0lN4M=", + "pom": "sha256-AET6RQRvunyoCNmPmJXyWxZRDttTweKCEH2wBtEm1n8=" + }, + "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.1.20": { + "jar": "sha256-xUoAcYyMDj7oWL9Cdxx/QBxePBc4hh4Y6VNjcQQvobM=", + "pom": "sha256-InQE6sbYCbwNlN74kzbf332afVOHkqI01Svbr8Kuha8=" + }, + "org/jetbrains/kotlin#kotlin-compiler-runner/2.1.20": { + "jar": "sha256-3jtUI9j7+G6ivRM01AG8SqhOKOxIlFlS0RwAsQsUArY=", + "pom": "sha256-xgNdI3KARTSALDfOVU6MjLqq6EUUp7rWzAlkJNjySUU=" + }, + "org/jetbrains/kotlin#kotlin-daemon-client/2.1.20": { + "jar": "sha256-NjCjAYLGNXDrUZrmWqqUGSF9utCBT+3kLI3ecERlpMY=", + "pom": "sha256-+qpgvkJw6RSbWUOSZjlhkr60f/XjpAmF3u3FTlkXItI=" + }, + "org/jetbrains/kotlin#kotlin-daemon-embeddable/1.9.10": { + "jar": "sha256-eb1L84jaRDCwqb6G0vcqEREQlBll7dR46Z864IMVYRY=", + "pom": "sha256-xzNJPeX3vx4ILOwO30dLNNkLB0dAw7PQ04PPgbdSLyk=" + }, + "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.1.0": { + "jar": "sha256-aqWBvVPDUA44Dku2skB/bSM5EAEvQlNJwu1ajdvinqw=", + "pom": "sha256-yFt67Djwo+U80iEmXQgjPZqx8GAJArfT10dU3vhKvxg=" + }, + "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.1.20": { + "jar": "sha256-2eg98dhHogG6PAFqeGztCRvpUDmX0J9qnPF5buSJ83Q=", + "pom": "sha256-sdOMCv1uHRXEjBxdFWzmBXj0MxNr7FI/TrGZ968/gik=" + }, + "org/jetbrains/kotlin#kotlin-klib-commonizer-embeddable/2.1.20": { + "jar": "sha256-TRP+4Fu7RxlCw7Xt4PKKui4BGWDmQSZ0uCh7rYZuLfo=", + "pom": "sha256-xAVqvU8vDg7JUBdZ2H1aRLlQ5/IquAc+dG7OPrc2HII=" + }, + "org/jetbrains/kotlin#kotlin-reflect/1.6.10": { + "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=", + "pom": "sha256-V5BVJCdKAK4CiqzMJyg/a8WSWpNKBGwcxdBsjuTW1ak=" + }, + "org/jetbrains/kotlin#kotlin-reflect/2.0.20": { + "jar": "sha256-GPRR5rS3vR0fnWCEnDy/Fg4RUwL5eiAIwZDVBcQ5xnA=", + "pom": "sha256-Y+Y4sFbdRJ5vUtcenCxdxdsNFkRDI5cOFtf8DWWDk9s=" + }, + "org/jetbrains/kotlin#kotlin-reflect/2.1.20": { + "jar": "sha256-QZd48reoJrrW7iyh5L3r5jmrMG0pBPo+8qMI7PqrOBE=", + "pom": "sha256-XgIIh67A2JqcFo79ka7WKGVVOHf5MD8UXby50jumDcc=" + }, + "org/jetbrains/kotlin#kotlin-script-runtime/1.9.10": { + "jar": "sha256-KmCHN1vpvfqq20ukvpgzu6DejtqxJVyRZkKsqr/SCTI=", + "pom": "sha256-V0i+WJXtfcMBVOiS+OFbAjZZnonlAMLaC7ZUnjOF0sc=" + }, + "org/jetbrains/kotlin#kotlin-script-runtime/2.1.0": { + "jar": "sha256-FaK4IRnp8UXqAoApvTEWZYRkikGRV8IJSMEk+jPUDlA=", + "pom": "sha256-8zMvwPXpYvau/gosCNPE16s1sToF2shMS8aRTibtJ80=" + }, + "org/jetbrains/kotlin#kotlin-script-runtime/2.1.20": { + "jar": "sha256-rkOX+7OqKhraCSkOdTu6maQRRUiXfDEVUmuZWPTLGgQ=", + "pom": "sha256-D4O1qQFWxhpv8QlVey2YjicQ7j++n0pCV6bqDYdIw9Y=" + }, + "org/jetbrains/kotlin#kotlin-scripting-common/2.1.20": { + "jar": "sha256-X9v2rnIjfOM11gPrEsSbCbycGjPAwB8dYud/8zZjzvs=", + "pom": "sha256-H3dwkEXdkF63UFqUKA037HV/CHCc/p86dKunO7+Z95s=" + }, + "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.1.20": { + "jar": "sha256-PU93KyOEFGUAF+l0YiVrfE1e36EBPL9Ud1c+sawuKIQ=", + "pom": "sha256-D/9/8dO/qczj77tNs4mJwmilHrZ/ge/QMRuKZGGLhak=" + }, + "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.1.20": { + "jar": "sha256-9mXXCxoIN/86Dve+xPxdn+1n6nXkaX3hWOtR8epQHD8=", + "pom": "sha256-tjmuINh6gV4wTd0goOTEk34Ttfx6Qme14VwOWQIphmU=" + }, + "org/jetbrains/kotlin#kotlin-scripting-jvm/2.1.20": { + "jar": "sha256-afRXrKuYNkwOtXjEl+DDypMLjPuCvndASdoEzeOAh/c=", + "pom": "sha256-PERTORE37EVcdL5Jb3HZpJhpbSVJvmT1mmBkfO7iVT0=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.8.20": { + "pom": "sha256-YFWRuJs3ISfmspxpMl+i9qjEb0aMRdCUEOeOtZ/IChc=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.10": { + "jar": "sha256-zeM0G6GKK6JisLfPbFWyDJDo1DTkLJoT5qP3cNuWWog=", + "pom": "sha256-fUtwVHkQZ2s738iSWojztr+yRYLJeEVCgFVEzu9JCpI=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/2.0.20": { + "module": "sha256-tZe3Be/U4tgnFCCQw2BUJlVI7VG09SN38r+JxFlNU28=", + "pom": "sha256-o11/wINw+TE6S5U7zu7d2F4OHnLTEGLTe/jHeBs/b18=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/2.1.0": { + "module": "sha256-K5pa54X4UTqT+M7D9uXgf4sXZvhJezpIfzRBolHWdWM=", + "pom": "sha256-Sp2nqeUpW9VC1YY8rgNfevnKEB8iXEoIkcPS343CqA0=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/2.1.20": { + "module": "sha256-lNCtKyMZuFxANRz57nB32hLdOFA5LmzxCj/oFZ+8c/c=", + "pom": "sha256-1iLjAAVmBil0Qmj6iRKPt97U1C4XTOsIH2f3BWrJqLs=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.6.21": { + "jar": "sha256-8bBjTbuUFyA4RjAguy3UXKJoSfjOKdYlrLDxVp0R2+4=", + "pom": "sha256-ARzSjruf3oFrA1nVrhCjZ07A/yxTEMBBLCDv6Oo9oG4=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.0": { + "jar": "sha256-TIidHZgD9fLrbBWSprfmI2msdmDJ7uFauhb+wFkWNmY=", + "pom": "sha256-36lkSmrluJjuR1ux9X6DC6H3cK7mycFfgRKqOBGAGEo=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.20": { + "jar": "sha256-rx7EDDuVGv3MDCoBc8e4F2PFKBwtW6+/CoVEokxdzAw=", + "pom": "sha256-NiLRBleM3cwKnsIPjOgV9/Sf9UL2QCKNIUH8r4BhawY=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.10": { + "jar": "sha256-rGNhv5rR7TgsIQPZcSxHzewWYjK0kD7VluiHawaBybc=", + "pom": "sha256-x/pnx5YTILidhaPKWaLhjCxlhQhFWV3K5LRq9pRe3NU=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.6.21": { + "jar": "sha256-2rRUibR3NtWfzkS4BnbxlHqba8qxD9YOh4qDvYKmlUw=", + "pom": "sha256-g2oReaCNJJFGl9JhLgO4SKCHyAy0sMoj+c+rJH86dcQ=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.0": { + "jar": "sha256-BbYoBEQbDJoZILa31c9zKaTiS2JYR44ysfBGygGQCUY=", + "pom": "sha256-K7bHVRuXx7oCn5hmWC56oZ1jq/1M1T2j/AxGLzq1/CY=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.20": { + "jar": "sha256-45i2eXdiJxi/GP+ZtznH2doGDzP7RYouJSAyIcFq8BA=", + "pom": "sha256-OkYiFKM26ZVod2lTGx43sMgdjhDJlJzV6nrh14A6AjI=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.10": { + "jar": "sha256-pMdNlNZM4avlN2D+A4ndlB9vxVjQ2rNeR8CFoR7IDyg=", + "pom": "sha256-X0uU3TBlp3ZMN/oV3irW2B9A1Z+Msz8X0YHGOE+3py4=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.9.10": { + "jar": "sha256-VemJxRK4CQd5n4VDCfO8d4LFs9E5MkQtA3nVxHJxFQQ=", + "pom": "sha256-fin79z/fceBnnT3ufmgP1XNGT6AWRKT1irgZ0sCI09I=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.0.20": { + "jar": "sha256-+xaVlmWaUYNXxLLBb0PcdascSYBWXtS0oxegUOXjkAY=", + "module": "sha256-3AUdwExqGW8tBtDTya8zufErybT+E5rhKQFAUII2tns=", + "pom": "sha256-Cu6WIJHn3QKIzDykz0qSjFYgcUYCEb+PQXkAkwbmGf4=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.0.20/all": { + "jar": "sha256-UP+t6yC00kVqUmWVpPep6FiJaCcVBz5s26Gx2A461Fg=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.1.0": { + "jar": "sha256-1vkbew8wbMopn+x0+3w05IdNb17FuSWgtN4hkB4RnD8=", + "module": "sha256-3PvI6L8yzWen763ZHTEVK86YcJEdbsUIePT9tuA+cOI=", + "pom": "sha256-E05IwXeWwcECfsvmyfHHXHkvU1mHq4nh4d2kP4w2b14=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.1.20": { + "jar": "sha256-G8x06M6E4sJeqv3hDxJINJzOMGK242l4y+7GENsekwo=", + "module": "sha256-VdKW5FRF9siGmbCJZwbqlVCvh62Uhz3BO2W+u9VmCm8=", + "pom": "sha256-Z1DheZ7lAgd9rlw9WZeW9mdgb2DTXpXLeQRI3HkStAs=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.1.20/all": { + "jar": "sha256-geB9406Esp4U8/3vkC9LxM8dXalZuGffaD++HMVM4eE=" + }, + "org/jetbrains/kotlin#kotlin-test-junit/2.1.20": { + "jar": "sha256-/JyFRHUR3oPiEPfenSA67HLvRT9yXETXvP/H6Qed+tw=", + "module": "sha256-NnictkXfB/pR3tuXVy871W//MsXrk8oI1dgx1upBqBo=", + "pom": "sha256-WYfnDG7E65vAb8Ao8saDKTteNgH5YjtwfuX2YbqrsGw=" + }, + "org/jetbrains/kotlin#kotlin-test-junit5/2.1.20": { + "jar": "sha256-naYXcsjCtS8CK5V2pTobD4ev8aY3IDnOhsLpOz7rGcs=", + "module": "sha256-gXscq8CfbdghYEi3BvzeaiCjny3JQcKp6429ZGXznRI=", + "pom": "sha256-704insBu17h98Cq82n34NsJSoxjfV0x3oQL7X0SkdXE=" + }, + "org/jetbrains/kotlin#kotlin-test/2.1.20": { + "jar": "sha256-ACi1x0GRGEUZ9g5yfFqk5dfjrAT8C+1Vn0nTcWXeyWE=", + "module": "sha256-3M5BCYnVErxDug/4sgYkU0DJ86An36Fl9y6BQy3ssVY=", + "pom": "sha256-2SCpd6AcRqNwv3Npji1BcJE8afDeRoXURWTtUW9BtMo=" + }, + "org/jetbrains/kotlin#kotlin-test/2.1.20/all": { + "jar": "sha256-07fPliK3To6kwNNvS9X/nR0xsy/jUORuCCBHxb48alc=" + }, + "org/jetbrains/kotlinx#atomicfu/0.23.1": { + "jar": "sha256-fbhmDr5LkbtHjts2FsTjpQulnAfcpRfR4ShMA/6GrFc=", + "module": "sha256-Pokf5ja1UQgZIQD884saObzRwlM+I8Ri/AdkTur8sg8=", + "pom": "sha256-aIt5ABn0F87APmldZWexc7o7skGJVBZi8U/2ZEG1Pas=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.10.1": { + "pom": "sha256-nL0EumPnOZhWdFcT4xLS8hYaHUTtpQbe1HyNVtr4Rh8=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": { + "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.7.3": { + "pom": "sha256-Tl0ZAOY3nvP1lw0EqPMFKa3IL4WejMEHwhzoFJ72ZsQ=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.8.0": { + "pom": "sha256-Ejnp2+E5fNWXE0KVayURvDrOe2QYQuQ3KgiNz6i5rVU=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.10.1": { + "jar": "sha256-BpxZiGMyMOB07A05Mh7DzapFR8SekLqTbGPY/JHIwA0=", + "module": "sha256-GN1lRl7IDQ5uXXGBi/EZLvSBfPXSASgrW5sbcTrHlpo=", + "pom": "sha256-f5AURlw6uheoNXqJZcqcnKjJ4aBEfHrqEXxkB4CKUtY=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.5.2": { + "jar": "sha256-IxTEiqGjnAXBHzs4XN88VrF0XwZDFOT+q+zrwVcrOsE=", + "module": "sha256-4in4HmvAmAZ5NqS4Jk6kj75yj/xQ+vSnjgACeTps2P8=", + "pom": "sha256-oaUrwxiqy+0a9MJLW5ylXjSOgKAvR6agXuLfnSRrq/U=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.6.4": { + "jar": "sha256-wkyLsnuzIMSpOHFQGn5eDGFgdjiQexl672dVE9TIIL4=", + "module": "sha256-DZTIpBSD58Jwfr1pPhsTV6hBUpmM6FVQ67xUykMho6c=", + "pom": "sha256-Cdlg+FkikDwuUuEmsX6fpQILQlxGnsYZRLPAGDVUciQ=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.7.3": { + "jar": "sha256-GrOsw48+c1XE+dHsYhB6RvpzyJnzBw0FXl1Dc9/mfhI=", + "module": "sha256-NNbumbdqwGK1FVW0pwvhg0n+VWbaeaGQYU8XHIC2U44=", + "pom": "sha256-dThYdT3su7I5c0PiuHHwYvaXgS6UIuQcnuRqZrk+7jA=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.8.0": { + "jar": "sha256-mGCQahk3SQv187BtLw4Q70UeZblbJp8i2vaKPR9QZcU=", + "module": "sha256-/2oi2kAECTh1HbCuIRd+dlF9vxJqdnlvVCZye/dsEig=", + "pom": "sha256-pWM6vVNGfOuRYi2B8umCCAh3FF4LduG3V4hxVDSIXQs=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.10.1": { + "jar": "sha256-+uR3HdmHz62rrhKd1/Ylr0DZ5PFKu3/8cuQtzLl7cBA=", + "module": "sha256-y/1tFz4KXCmGr5U/ixzPKYAqrQnqympOkRQQj4rKyLE=", + "pom": "sha256-Ip7SIxgcPK8nt6wwHIFp3KLYYxkbcQ5hNVGlh5XANlU=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.5.2": { + "module": "sha256-e59pYMZonRp52CyjsAuDR71X0V/kBwo9006CbnYTY5I=", + "pom": "sha256-9wPjHqf4URl1mWZF94WbNR6gNokDCMRWL0dI6Y8Mx+I=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.7.3": { + "module": "sha256-f7FiOWWU7CjhtqRBG0V5SadnD14SAZF2d04f1rlHG78=", + "pom": "sha256-7W6wOYcXA14p8cHWCk4927iYWPPbnge1etdZ03Ta6Ck=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-slf4j/1.10.1": { + "jar": "sha256-5fpnTj2mpw/hGI/A1l+GcFN5rto0xZy9ML0VwORlts8=", + "module": "sha256-Z53VZCkanbzH7lbmZCzzqdB7BXGWj9lN5BachzJ/i8U=", + "pom": "sha256-UqJfb2ZMxFkJQmTVEDOeVYOqyQJ/DqqqPXA1XHVQkkY=" + }, + "org/jetbrains/kotlinx#kotlinx-html-jvm/0.9.1": { + "jar": "sha256-to85zZrXtG3goOd+f1kI1OdmHz0MhdLZFxVD/NWxVvs=", + "module": "sha256-yic/19Bs3g8yr4MjBwCr2bD1c7mErohHzpDj3F0NE1M=", + "pom": "sha256-CwfOpOggKjkGxUbxfi5akjR2rKhZ01TnnocfKehL0pc=" + }, + "org/jetbrains/kotlinx#kotlinx-io-bytestring-jvm/0.6.0": { + "jar": "sha256-uqd6eD1wpmr4jWiYodSXHkqoTmKyZBgFc3m98J+1uto=", + "module": "sha256-Tw2oHhXO+zujubirjmHoaoLtZd2N3S46cF2Euybr/Oo=", + "pom": "sha256-dQpt9xYR1MMAN+mCfSOVSSkKRuDBQBBoi4FM2ZZyG8c=" + }, + "org/jetbrains/kotlinx#kotlinx-io-bytestring/0.6.0": { + "jar": "sha256-jMGXmjmiO2RLGRCjv22efNg4aGSKDb3auRs44DxfTBk=", + "module": "sha256-aO+bxmrpVPRzxZ9R679Ywdewb9b/9zNd0/s9JPipOQA=", + "pom": "sha256-I1NofPyzbJCaW8T08LUj0wv2WuXI34CsxW6enFJb528=" + }, + "org/jetbrains/kotlinx#kotlinx-io-core-jvm/0.6.0": { + "jar": "sha256-QlI8gII9Me9Z+uQsklLvHTsRicqdPMOt/UAqKdBj5v8=", + "module": "sha256-tZuXjCxEJJpnRkGmlONaKs7LqBLah9NlpRZzQqjKU0c=", + "pom": "sha256-3DNkYsj1BEkGHNRdXLHI9oC+VEGqgQ6UQR/4GQmdT2s=" + }, + "org/jetbrains/kotlinx#kotlinx-io-core/0.6.0": { + "jar": "sha256-otY5Q+xpNpUevkpM1Mld5Q1wNPqTrJUHeFk80AJAfTo=", + "module": "sha256-FIX7aljyQWnRr3PEFDAiUKx4u0axpD4Csa4hILKhJPA=", + "pom": "sha256-QIZ+EY9KW7uz291WZ3DY8Yu07w02MtyE+WyZ+2vD6oE=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-bom/1.8.0": { + "pom": "sha256-xD5IdSnM/RIJ66hlOrjolZggNGSq+/5fBEje2ZKHFQk=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-core-jvm/1.4.1": { + "jar": "sha256-66fxyFQpbkzhQY+wE2D48QxWg+fEWqNHIBhBegZ2NvM=", + "module": "sha256-c7yUvdX8hmIVCaZxXD/jRJBO59tYBqDGF5LOI1YInuk=", + "pom": "sha256-blIuCoY+rZXX8nMuAPb0W/MC6jLgm+iMZNBgwHZV+DI=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-core-jvm/1.8.0": { + "jar": "sha256-08lOnYKbum4MTNOuR4pAhG3UnVR11nB4d76FOXav5BY=", + "module": "sha256-NzH80jhWGpCpdSs0hfHWNeAbRF5Kd4F9ewd/S50vQi0=", + "pom": "sha256-QVKRtvWbeTemcau136BLJyl811jLUQLNzHWUFJj5wDw=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-core/1.4.1": { + "module": "sha256-YOWBw5fduUYewfHe5bu0oju37H0JspYCQZYiACKqcJA=", + "pom": "sha256-BKWsA/zZmdCmsP5RUG9ln6k/q0Cb0wkFDjMQg5NjdL8=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-core/1.8.0": { + "jar": "sha256-hThiUkHBX0SBQAQyDq6l32fpRK3FKwDduDGY1mTpIlE=", + "module": "sha256-mE2aqabpvMONfoNuqNAAsThyCH/GZY0NjWIldjPzlfE=", + "pom": "sha256-nVbnQWLOQn4MSetsuXUSR0Mq3PwukTw4KWY+27qr7hM=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-json-jvm/1.4.1": { + "jar": "sha256-r2BMRnNxIdQiX9tg7w4Xdmo8lLfBye92tOOlx3M9VX4=", + "module": "sha256-yPv95LXuHkGmkXUWXoOZkdFQFmWnWQ4jFiMmUBrGEiw=", + "pom": "sha256-Mtk0fHEBNfvnCnAZKFe8c7BpWZYu3s//MZJgOb4kuGE=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-json/1.4.1": { + "module": "sha256-6ZIjAK/2Y+VezvfT/KMFy2ChR1Wx+YDZQDnjwcq2Rcw=", + "pom": "sha256-dkrPeeNju9YeyL+dUcOw2XzryNCLSTjDBiPA+vbRNaA=" + }, + "org/jsoup#jsoup/1.16.1": { + "jar": "sha256-HxFXJlQN33GVjBS8UX6/xJz0gekc2Rew+s6E8BJy6QE=", + "pom": "sha256-bMUH9jBTbyBb3iwbOMPFkHUR3i17GkRL6dY41GFPJDw=" + }, + "org/jsoup#jsoup/1.20.1": { + "jar": "sha256-ybt7LA9JVfx4WlXAVKPWpbFzuQ6krIhm17GmFuOEkc0=", + "pom": "sha256-oeGYRMAjusOTjPx5zGLPovp1SonWyooyxL+anx1IhIU=" + }, + "org/junit#junit-bom/5.10.1": { + "module": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c=", + "pom": "sha256-IcSwKG9LIAaVd/9LIJeKhcEArIpGtvHIZy+6qzN7w/I=" + }, + "org/junit#junit-bom/5.10.3": { + "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=", + "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw=" + }, + "org/junit#junit-bom/5.11.0": { + "module": "sha256-9+2+Z/IgQnCMQQq8VHQI5cR29An1ViNqEXkiEnSi7S0=", + "pom": "sha256-5nRZ1IgkJKxjdPQNscj0ouiJRrNAugcsgL6TKivkZE0=" + }, + "org/junit#junit-bom/5.11.0-M2": { + "module": "sha256-hkd6vPSQ1soFmqmXPLEI0ipQb0nRpVabsyzGy/Q8LM4=", + "pom": "sha256-Sj/8Sk7c/sLLXWGZInBqlAcWF5hXGTn4VN/ac+ThfMg=" + }, + "org/junit#junit-bom/5.11.2": { + "module": "sha256-iDoFuJLxGFnzg23nm3IH4kfhQSVYPMuKO+9Ni8D1jyw=", + "pom": "sha256-9I6IU4qsFF6zrgNFqevQVbKPMpo13OjR6SgTJcqbDqI=" + }, + "org/junit/jupiter#junit-jupiter-api/5.10.1": { + "jar": "sha256-YNXDmMMtxwObmSglFK1gZAYdhBfPlZofa9IDjMkHyRM=", + "module": "sha256-+H9zEVSfSf4k5igqEWXpB+AXqR6XnK2r/fm/VMP3EG8=", + "pom": "sha256-PK9ZSxPa5xB1EN2Zj02en6J3MFzcohMh/dWRmdyHzz0=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.10.1": { + "jar": "sha256-ApMN/klfk/5wsmVQrOOij34bkAyEQmwuRibOAgxygtY=", + "module": "sha256-VBIeWCzLLUYl7J+lRnlDbJA/oFPHQJe75F/fud22f7g=", + "pom": "sha256-MHCG3F5wjLdZAQhoXAQOCOCK3g7UlUkwsvM8BttT6l4=" + }, + "org/junit/platform#junit-platform-commons/1.10.1": { + "jar": "sha256-fZhV7j8/cfAV6xR5VZv5I3gyQ8JPv72LKb7Y6AmbVnI=", + "module": "sha256-VtNwYvzicEHwtaNfOTxoyK0jr+NLLTDvjgewT8EZ1N0=", + "pom": "sha256-Su81pl6VGRWhPZ920fr/CaeMND5SJC+vNSBDtwx/bzA=" + }, + "org/junit/platform#junit-platform-engine/1.10.1": { + "jar": "sha256-uqSORw1t7nNpoKiCDFHaicFGMnntpuE6ME0R9Fkix2A=", + "module": "sha256-KXiTcRuSz0lfdH41o6rLSDELHRNBpFzYTSP5QxxS4p0=", + "pom": "sha256-3X1k/Zr2eJywPFDCWGyRW7hrHizIwH+5dPHbDvhhZA0=" + }, + "org/junit/platform#junit-platform-launcher/1.10.1": { + "jar": "sha256-3tQUxQTojQInAzEHGWkIThsv2bz4RD811E2ixuMwG8I=", + "module": "sha256-3ZcDx0TqC54Vv4yeP+vM/B40cBalXXHvf/qbC8TEBRI=", + "pom": "sha256-unroFwQMcqPCbTY6R/wTZIoc0MZOmjgYDd6YGKG1DjM=" + }, + "org/mockito#mockito-bom/4.11.0": { + "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" + }, + "org/opentest4j#opentest4j/1.3.0": { + "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=", + "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=", + "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U=" + }, + "org/slf4j#slf4j-api/1.7.36": { + "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=", + "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ=" + }, + "org/slf4j#slf4j-api/2.0.17": { + "jar": "sha256-e3UdlSBhlU1av+1xgcH2RdM2CRtnmJFZHWMynGIuuDI=", + "pom": "sha256-FQxAKH987NwhuTgMqsmOkoxPM8Aj22s0jfHFrJdwJr8=" + }, + "org/slf4j#slf4j-api/2.0.4": { + "jar": "sha256-V/qHRZms6SWShrmSU9eod6/dLbSwemgnrGyEfKXWAaI=", + "pom": "sha256-hbGvBTVmXOjyOiufH1gcweeHe7EokwQUCCdzEhbHj/0=" + }, + "org/slf4j#slf4j-api/2.0.7": { + "jar": "sha256-XWKYuToZBcMs2mR4gIrBTC1KR+kVNeU8Qff+64XZRvQ=", + "pom": "sha256-LUA8zw4KAtXBqGZ7DiozyN/GA4qyh7lnHdaBwgUmeYE=" + }, + "org/slf4j#slf4j-bom/2.0.17": { + "pom": "sha256-940ntkK0uIbrg5/BArXNn+fzDzdZn/5oGFvk4WCQMek=" + }, + "org/slf4j#slf4j-parent/1.7.36": { + "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI=" + }, + "org/slf4j#slf4j-parent/2.0.17": { + "pom": "sha256-lc1x6FLf2ykSbli3uTnVfsKy5gJDkYUuC1Rd7ggrvzs=" + }, + "org/slf4j#slf4j-parent/2.0.4": { + "pom": "sha256-3J3If1Oor3Ie5J27UhvQbNoGE0IU/a2UANhyp1Qmz/0=" + }, + "org/slf4j#slf4j-parent/2.0.7": { + "pom": "sha256-wYK7Ns068ck8FgPN/v54iRV9swuotYT0pEU1/NIuRec=" + }, + "org/slf4j#slf4j-simple/2.0.17": { + "jar": "sha256-3f6lmsB0xtPiSsLDhiLS2WOJXhf3CzjtS9rk14C+aWQ=", + "pom": "sha256-+zDo4vauotKYQnmGd+1FQbmyJVcVwVg1DKLF9ce4ZLA=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "org/springframework#spring-framework-bom/5.3.39": { + "module": "sha256-+ItA4qUDM7QLQvGB7uJyt17HXdhmbLFFvZCxW5fhg+M=", + "pom": "sha256-9tSBCT51dny6Gsfh2zj49pLL4+OHRGkzcada6yHGFIs=" + } + } +} diff --git a/pkgs/by-name/qu/quarkdown/package.nix b/pkgs/by-name/qu/quarkdown/package.nix new file mode 100644 index 000000000000..ff2f9310b93a --- /dev/null +++ b/pkgs/by-name/qu/quarkdown/package.nix @@ -0,0 +1,117 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + gradle_8, + jre, + dart-sass, + libarchive, + makeWrapper, +}: + +let + gradle = gradle_8; +in +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "quarkdown"; + version = "1.6.1"; + + src = fetchFromGitHub { + owner = "iamgio"; + repo = "quarkdown"; + tag = "v${finalAttrs.version}"; + hash = "sha256-rCHpsCjPJRAh4a6GSwLqTIhAShTMLdED2LeE+Jxd/1Y="; + }; + + postPatch = '' + # Skip downloadSass from and "download" it ourselves + # due to https://github.com/EtienneMiret/sass-gradle-plugin + SASS_INSTALL_DIR=".gradle/sass/quarkdown-html/${dart-sass.version}/dart-sass" + mkdir -p "$SASS_INSTALL_DIR" + ln -s ${lib.getExe dart-sass} "$SASS_INSTALL_DIR/sass" + + cat <> quarkdown-html/build.gradle.kts + + sass { + version = "${dart-sass.version}" + } + + afterEvaluate { + tasks.findByName("downloadSass")?.onlyIf { false } + tasks.findByName("installSass")?.onlyIf { false } + } + EOF + + # Enable missing dependencies + cat <> build.gradle.kts + + dependencies { + dokkaPlugin("org.jetbrains.dokka:all-modules-page-plugin:2.0.0") + } + EOF + + # Skip failing ktlintKotlinScriptCheck + cat <> build.gradle.kts + + afterEvaluate { + tasks.findByName("ktlintKotlinScriptCheck")?.onlyIf { false } + } + EOF + ''; + + __structuredAttrs = true; + strictDeps = true; + nativeBuildInputs = [ + gradle + dart-sass + libarchive + makeWrapper + ]; + buildInputs = [ jre ]; + + mitmCache = gradle.fetchDeps { + pkg = finalAttrs.finalPackage; + data = ./deps.json; + }; + __darwinAllowLocalNetworking = true; + gradleFlags = [ + # According to the nixpkgs gradle docs + "-Dfile.encoding=utf-8" + # Display useful messages for troubleshooting + "--stacktrace" + "--info" + ]; + + # TODO(@Pandapip1): Too many tests depend on networking and no clear way to disable those specific tests + doCheck = false; + + installPhase = '' + runHook preInstall + + mkdir -p $out + bsdtar -xf build/distributions/quarkdown.zip --strip-components 1 -C "$out" + + # Remove windows scripts + rm $out/bin/*.bat + + for script in $out/bin/*; do + wrapProgram $script --set-default JAVA_HOME "${jre.home}" + done + + runHook postInstall + ''; + + meta = { + description = "Modern Markdown-based typesetting system"; + homepage = "https://github.com/iamgio/quarkdown"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ pandapip1 ]; + # Build broken on Darwin (seems to try to do non-local networking) + # I'm assuming this means the BSDs are also broken + platforms = lib.platforms.linux; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryBytecode # gradle mitmCache + ]; + }; +}) diff --git a/pkgs/by-name/ra/rapidyaml/package.nix b/pkgs/by-name/ra/rapidyaml/package.nix index b3546a9f79a4..d2942b5862f9 100644 --- a/pkgs/by-name/ra/rapidyaml/package.nix +++ b/pkgs/by-name/ra/rapidyaml/package.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "rapidyaml"; - version = "0.11.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "biojppm"; repo = "rapidyaml"; fetchSubmodules = true; tag = "v${finalAttrs.version}"; - hash = "sha256-NjpEpjBFB2Ydfo81VzOYoMPqMdJbIYcQWBRcxCbJlY4="; + hash = "sha256-GTEgdCxqPs/Xos9pLDa0Zn/3heLBi17bhiNHfChTxQk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ra/raspi-utils/package.nix b/pkgs/by-name/ra/raspi-utils/package.nix new file mode 100644 index 000000000000..f24a1c0186ab --- /dev/null +++ b/pkgs/by-name/ra/raspi-utils/package.nix @@ -0,0 +1,135 @@ +{ + lib, + stdenv, + fetchFromGitHub, + unstableGitUpdater, + cmake, + makeBinaryWrapper, + pkg-config, + bashNonInteractive, + coreutils, + dtc, + gawk, + gitMinimal, + gnugrep, + gnutls, + gnutar, + kmod, + ncurses, + perl, + python3, + targetPackages, + util-linux, + which, + zstd, + cc ? targetPackages.stdenv.cc, +}: + +let + runtimePath = lib.makeBinPath [ + coreutils + dtc + gawk + gitMinimal + gnugrep + gnutar + kmod + cc + util-linux + which + zstd + ]; +in +stdenv.mkDerivation (finalAttrs: { + pname = "raspi-utils"; + version = "0-unstable-2026-07-08"; + + src = fetchFromGitHub { + owner = "raspberrypi"; + repo = "utils"; + rev = "5edd399260b5081f9c1c96fc7f369b920d6732d1"; + hash = "sha256-qxwASdmEH47oCjuPtboWuUkcNsw5j6eCSsWrNejpIMU="; + }; + + __structuredAttrs = true; + strictDeps = true; + + outputs = [ + "out" + "dev" + ]; + + nativeBuildInputs = [ + cmake + makeBinaryWrapper + pkg-config + ]; + + buildInputs = [ + bashNonInteractive + dtc + gnutls + ncurses + perl + python3 + ]; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_SHARED_LIBS" true) + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "add_subdirectory(raspinfo)" "" + + substituteInPlace dtapply/dtapply \ + --replace-fail \ + "parser = argparse.ArgumentParser(" \ + 'parser = argparse.ArgumentParser(prog="dtapply",' + substituteInPlace eeptools/eepflash.sh \ + --replace-fail 'me=$(basename "$0")' 'me=eepflash.sh' + substituteInPlace otamaker/otamaker \ + --replace-fail \ + "parser = argparse.ArgumentParser()" \ + "parser = argparse.ArgumentParser(prog='otamaker')" + substituteInPlace otpset/otpset \ + --replace-fail \ + "parser = argparse.ArgumentParser(description=" \ + "parser = argparse.ArgumentParser(prog='otpset', description=" + substituteInPlace overlaycheck/overlaycheck \ + --replace-fail \ + 'my $exclusions_file = $0 . "_exclusions.txt";' \ + 'my $exclusions_file = "${placeholder "out"}/bin/overlaycheck_exclusions.txt";' + ''; + + postFixup = '' + for program in \ + dtapply \ + dtoverlay \ + eepflash.sh \ + kdtc \ + otamaker \ + otpset \ + overlaycheck \ + ovmerge + do + wrapProgram "$out/bin/$program" \ + --prefix PATH : "$out/bin:${runtimePath}" + done + ''; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "Scripts and applications for interfacing with Raspberry Pi hardware"; + homepage = "https://github.com/raspberrypi/utils"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ jamiemagee ]; + platforms = [ + "armv6l-linux" + "armv7l-linux" + "aarch64-linux" + "x86_64-linux" + ]; + }; +}) diff --git a/pkgs/by-name/re/reticulum-group-chat/package.nix b/pkgs/by-name/re/reticulum-group-chat/package.nix index 862703889ab1..7a1bd40a5a64 100644 --- a/pkgs/by-name/re/reticulum-group-chat/package.nix +++ b/pkgs/by-name/re/reticulum-group-chat/package.nix @@ -8,7 +8,7 @@ buildGoModule (finalAttrs: { pname = "reticulum-group-chat"; - version = "1.11.0"; + version = "1.12.0"; __structuredAttrs = true; __darwinAllowLocalNetworking = true; @@ -16,7 +16,7 @@ buildGoModule (finalAttrs: { owner = "thatSFguy"; repo = "reticulum-group-chat"; tag = "v${finalAttrs.version}"; - hash = "sha256-LWHYIKnkEPrlDIEruP2ctuMQGnrL1uofOWAsZ4E5guw="; + hash = "sha256-9v9dUVkoq9lcgM9NCxfRx+4rExiqtCavxx2Pq13os4k="; }; vendorHash = "sha256-qMmEi7OYv2xzYOoeBWQ0omeIrcTyhxylw2qvv9kd9dk="; diff --git a/pkgs/by-name/rs/rsrpc/package.nix b/pkgs/by-name/rs/rsrpc/package.nix index 736b3f51cbf0..15005be83129 100644 --- a/pkgs/by-name/rs/rsrpc/package.nix +++ b/pkgs/by-name/rs/rsrpc/package.nix @@ -8,16 +8,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "rsrpc"; - version = "0.27.1"; + version = "0.28.0"; src = fetchFromGitHub { owner = "SpikeHD"; repo = "rsRPC"; tag = "v${finalAttrs.version}"; - hash = "sha256-QzPFhdnZXiJZ4g+J9kB2v8duM2PgShptNRHliTYW3AU="; + hash = "sha256-L07x93mgTbo+v0Wg91XjCNbRYAltHns8WyrsIrr7pZE="; }; - cargoHash = "sha256-6Krtsj9hm8NqkFQMQ0MAPrFAjnzcTt4q5C1Fs5mx2SM="; + cargoHash = "sha256-YTkOneMUTVLv3SWgeRdYpxGB9PIr+C9NHR1SCHOvDUY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/rt/rtk/package.nix b/pkgs/by-name/rt/rtk/package.nix index 2286c9a334d8..187af33367f7 100644 --- a/pkgs/by-name/rt/rtk/package.nix +++ b/pkgs/by-name/rt/rtk/package.nix @@ -24,6 +24,12 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-XKUKdhxfnwUCOx9slqx4oUFa09HcosPLVh5Xkh87oSk="; + # Rust 1.97's dead_code_pub_in_binary analysis exposes dead code in test builds. + # Fixed upstream on develop after 0.43.0: + # https://github.com/rtk-ai/rtk/commit/73b8cb3069297374a3de58552b9fe4aa2cda3a41 + # TODO: Remove RUSTFLAGS when updating rtk to the next release. + env.RUSTFLAGS = "--cap-lints warn"; + nativeBuildInputs = [ makeWrapper pkg-config diff --git a/pkgs/by-name/ru/rustfs/package.nix b/pkgs/by-name/ru/rustfs/package.nix index af8a4991e755..4dd7a96ffd58 100644 --- a/pkgs/by-name/ru/rustfs/package.nix +++ b/pkgs/by-name/ru/rustfs/package.nix @@ -15,7 +15,7 @@ let console = stdenv.mkDerivation (finalAttrs: { pname = "rustfs-console"; - version = "0.1.16"; + version = "0.1.17"; __structuredAttrs = true; __darwinAllowLocalNetworking = true; @@ -23,7 +23,7 @@ let owner = "rustfs"; repo = "console"; tag = "v${finalAttrs.version}"; - hash = "sha256-WZ1vROBZJltcaXdwIuTsRmOY2iZxIoi7yW8lapZcaHo="; + hash = "sha256-t1NYCSdhCYSRjQ/qp+lFP43/N9UXapGiLN7a0gcUaYU="; }; pnpmDeps = fetchPnpmDeps { @@ -51,14 +51,14 @@ let in rustPlatform.buildRustPackage rec { pname = "rustfs"; - version = "1.0.0-beta.10"; + version = "1.0.0-beta.11"; __structuredAttrs = true; src = fetchFromGitHub { owner = "rustfs"; repo = "rustfs"; tag = version; - hash = "sha256-lBkfaTH36MhWHk39Ie2uQqcU+yf76uImPdV91C8kWV8="; + hash = "sha256-arwTgRwUr7/mgobtxnkhxD1mu4LrrEqKnrewacpc6ro="; }; postPatch = '' @@ -66,7 +66,7 @@ rustPlatform.buildRustPackage rec { cp -rL ${console} ./rustfs/static ''; - cargoHash = "sha256-PMgC4+/n/UOpBa5oiZ1F17oht5YmN1RzoFIA0qE+h6M="; + cargoHash = "sha256-cMOPQ70hGFJEdYkrizgrwJOfga9UvqJRPdQbX/Whhuk="; nativeBuildInputs = [ protobuf @@ -83,14 +83,9 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = "-p rustfs"; cargoTestFlags = "-p rustfs"; - checkFlags = [ - # require real disks - "--skip=app::capacity_dirty_scope_test" - "--skip=app::delete_objects_stat_gating_test" - "--skip=app::put_prelookup_gating_test" - # non-deterministically panics - "--skip=two_embedded_servers_isolate_auth_and_data_planes" - ]; + # tests share global state and fail depending on execution order, + # upstream uses nexttest to run tests in separate processes + useNextest = true; passthru.tests = { inherit (nixosTests) rustfs; diff --git a/pkgs/by-name/ru/rustnet/package.nix b/pkgs/by-name/ru/rustnet/package.nix index 70081d80608e..be90fd230c8a 100644 --- a/pkgs/by-name/ru/rustnet/package.nix +++ b/pkgs/by-name/ru/rustnet/package.nix @@ -13,7 +13,7 @@ }: let pname = "rustnet"; - version = "1.3.0"; + version = "1.5.0"; in rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } { inherit pname version; @@ -23,10 +23,10 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } { owner = "domcyrus"; repo = "rustnet"; tag = "v${version}"; - hash = "sha256-E2ItYSnT3WRSgPb5B+HDAlAPPmSLdt8qnE+2TiXHPk8="; + hash = "sha256-eLL6BabW54J6we41swc0yXU1SAKSqhwtcFT0DqQJH3E="; }; - cargoHash = "sha256-B1IdFOKYNaLiq6t64mdR3zUUcvojevcV6/nqYGbsbAY="; + cargoHash = "sha256-X+WyN8qE3gpAOrVLzS+EWIyhjFptRuwZ2OtgCgHxISM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/s-/s-search/package.nix b/pkgs/by-name/s-/s-search/package.nix index 6955e3c39729..3c3b4601abbb 100644 --- a/pkgs/by-name/s-/s-search/package.nix +++ b/pkgs/by-name/s-/s-search/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "s-search"; - version = "0.7.5"; + version = "0.8.0"; src = fetchFromGitHub { owner = "zquestz"; repo = "s"; tag = "v${finalAttrs.version}"; - hash = "sha256-aK1M9ypEX1Hl7+poK4czZan/Bqe5+giDiTtlPVjErHY="; + hash = "sha256-dqmn0DgeurJpEArhvmEq5Yl5+LMNJOUDd+Jl9KwAiUU="; }; - vendorHash = "sha256-GEpBdCByMrCR7doDvp/eVKQzH8Z2kCqetwFivkkUDVU="; + vendorHash = "sha256-ITK4xFT4m0AGcj2bB7mvIQ3+6qyFVZACXPjhVx5aLx4="; ldflags = [ "-s" diff --git a/pkgs/by-name/sa/sabnzbd/package.nix b/pkgs/by-name/sa/sabnzbd/package.nix index 0ffa4d855104..2d5cc67fdfca 100644 --- a/pkgs/by-name/sa/sabnzbd/package.nix +++ b/pkgs/by-name/sa/sabnzbd/package.nix @@ -24,11 +24,11 @@ let babelfish cffi chardet - cheetah3 cheroot cherrypy configobj cryptography + ct3 feedparser guessit jaraco-classes diff --git a/pkgs/by-name/sa/sage/sagelib.nix b/pkgs/by-name/sa/sage/sagelib.nix index 46d4972f94a1..5777a379e421 100644 --- a/pkgs/by-name/sa/sage/sagelib.nix +++ b/pkgs/by-name/sa/sage/sagelib.nix @@ -92,7 +92,9 @@ assert (!blas.isILP64) && (!lapack.isILP64); buildPythonPackage rec { version = src.version; - pname = "sagelib"; + # Sage publishes Python metadata as "sagemath" even though this nixpkgs + # attribute is exposed as `sagelib`. + pname = "sagemath"; src = sage-src; pyproject = true; diff --git a/pkgs/by-name/sa/saunafs/package.nix b/pkgs/by-name/sa/saunafs/package.nix index b9622e6ea0ca..fa46b8ef970f 100644 --- a/pkgs/by-name/sa/saunafs/package.nix +++ b/pkgs/by-name/sa/saunafs/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "saunafs"; - version = "5.10.1"; + version = "5.11.0"; src = fetchFromGitHub { owner = "leil-io"; repo = "saunafs"; rev = "v${finalAttrs.version}"; - hash = "sha256-b7sf6dMstxEoI7n4nqw4AKEcFvAPX+nLOgXf5jQTmqE="; + hash = "sha256-73d8FG/qOTF0nYKETFl0YTXkyd5NuTRh9pr9uNR3i9o="; }; patches = [ diff --git a/pkgs/by-name/sb/sbsigntool/package.nix b/pkgs/by-name/sb/sbsigntool/package.nix index 4721ada70681..f0031367fea8 100644 --- a/pkgs/by-name/sb/sbsigntool/package.nix +++ b/pkgs/by-name/sb/sbsigntool/package.nix @@ -61,6 +61,10 @@ stdenv.mkDerivation (finalAttrs: { automake --add-missing -Wno-portability ''; + # GCC 16's unused variable analysis is more advanced, leading to a build + # failure since sbsigntool builds with -Wno-error. + configureFlags = [ "CFLAGS=-Wno-error=unused-but-set-variable" ]; + makeFlags = [ "AR=${stdenv.cc.targetPrefix}ar" ]; diff --git a/pkgs/by-name/sc/scaleway-cli/package.nix b/pkgs/by-name/sc/scaleway-cli/package.nix index e0c4d86230e0..c702702ca221 100644 --- a/pkgs/by-name/sc/scaleway-cli/package.nix +++ b/pkgs/by-name/sc/scaleway-cli/package.nix @@ -10,16 +10,16 @@ buildGo126Module (finalAttrs: { pname = "scaleway-cli"; - version = "2.58.3"; + version = "2.59.0"; src = fetchFromGitHub { owner = "scaleway"; repo = "scaleway-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-CKsEPVzAYYQE+g3PTqiWKh+I7c2LOU9logpPIabUp2E="; + hash = "sha256-7gZ8rjwbvbmCP2E7uHOsCT6D9SCAczz2XZ8TfQGmdEk="; }; - vendorHash = "sha256-tQcl40u8otGohEguPJCTk6JuuWlLB4hrdSsNPQ1ygIw="; + vendorHash = "sha256-A+w5tayU/Bri1R47/39+UREOGiAGxtKfZc1npvubHcY="; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/sd/SDL_mixer/package.nix b/pkgs/by-name/sd/SDL_mixer/package.nix index 5e7d17b2a31a..6292c0a2f563 100644 --- a/pkgs/by-name/sd/SDL_mixer/package.nix +++ b/pkgs/by-name/sd/SDL_mixer/package.nix @@ -1,81 +1,45 @@ { lib, SDL, - fetchpatch, - fetchurl, + fetchFromGitHub, fluidsynth, libopenmpt-modplug, libogg, libvorbis, pkg-config, - smpeg, + libmpg123, + flac, + autoreconfHook, stdenv, + unstableGitUpdater, # passthru.tests onscripter, + testers, # Boolean flags - enableNativeMidi ? false, enableSdltest ? (!stdenv.hostPlatform.isDarwin), - enableSmpegtest ? (!stdenv.hostPlatform.isDarwin), }: stdenv.mkDerivation (finalAttrs: { pname = "SDL_mixer"; - version = "1.2.12"; + version = "1.2.12-unstable-2026-05-11"; # word of caution: while there is a somewhat maintained SDL-1.2 branch on # https://github.com/libsdl-org/SDL_mixer, it switches from smpeg to mpg123 which - # breaks autoconf in a bunch of packages, it's better to cherry-pick patches as needed - src = fetchurl { - url = "http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${finalAttrs.version}.tar.gz"; - hash = "sha256-FkQwgnmpdXmQSeSCavLPx4fK0quxGqFFYuQCUh+GmSo="; + # breaks autoconf in a bunch of packages. + # smpeg is increasingly showing its age, which is why we no longer wish to depend on it. + src = fetchFromGitHub { + owner = "libsdl-org"; + repo = "SDL_mixer"; + rev = "50517740a3916e5ffd719c053c6e7b65f933e23a"; + hash = "sha256-VQywKO2aaZKTAzseWsb0nywLfpS9NHxCCanNTmUsUcs="; }; - patches = [ - # Fixes implicit declaration of `Mix_QuitFluidSynth`, which causes build failures with clang. - # https://github.com/libsdl-org/SDL_mixer/issues/287 - (fetchpatch { - name = "fluidsynth-fix-implicit-declaration.patch"; - url = "https://github.com/libsdl-org/SDL_mixer/commit/05b12a3c22c0746c29dc5478f5b7fbd8a51a1303.patch"; - hash = "sha256-MDuViLD1w1tAVLoX2yFeJ865v21S2roi0x7Yi7GYRVU="; - }) - # Backport of 2.0 fixes for incompatible function pointer conversions, fixing builds with clang. - (fetchpatch { - name = "fluidsynth-fix-function-pointer-conversions.patch"; - url = "https://github.com/libsdl-org/SDL_mixer/commit/0c504159d212b710a47cb25c669b21730fc78edd.patch"; - hash = "sha256-FSj7JLE2MbGVYCspoq3trXP5Ho+lAtnro2IUOHkto/U"; - }) - # Backport of MikMod fixes, which includes incompatible function pointer conversions. - (fetchpatch { - name = "mikmod-fixes.patch"; - url = "https://github.com/libsdl-org/SDL_mixer/commit/a3e5ff8142cf3530cddcb27b58f871f387796ab6.patch"; - hash = "sha256-dqD8hxx6U2HaelUx0WsGPiWuso++LjwasaAeTTGqdbk="; - }) - # More incompatible function pointer conversion fixes (this time in Vorbis-decoding code). - (fetchpatch { - name = "vorbis-fix-function-pointer-conversion.patch"; - url = "https://github.com/libsdl-org/SDL_mixer/commit/9e6d7b67a00656a68ea0c2eace75c587871549b9.patch"; - hash = "sha256-rZI3bFb/KxnduTkA/9CISccKHUgrX22KXg69sl/uXvU="; - }) - (fetchpatch { - name = "vorbis-fix-function-pointer-conversion-header-part.patch"; - url = "https://github.com/libsdl-org/SDL_mixer/commit/03bd4ca6aa38c1a382c892cef86296cd621ecc1d.patch"; - hash = "sha256-7HrSHYFYVgpamP7Q9znrFZMZ72jvz5wYpJEPqWev/I4="; - }) - (fetchpatch { - name = "vorbis-fix-function-pointer-signature.patch"; - url = "https://github.com/libsdl-org/SDL_mixer/commit/d28cbc34d63dd20b256103c3fe506ecf3d34d379.patch"; - hash = "sha256-sGbtF+Tcjf+6a28nJgawefeeKXnhcwu7G55e94oS9AU="; - }) - ]; - - # Fix location of modplug header - postPatch = '' - substituteInPlace music_modplug.h \ - --replace-fail '#include "modplug.h"' '#include ' - ''; - nativeBuildInputs = [ pkg-config + # upstream configure is pre-built expecting FHS compliance: + # ./configure: line 5346: /usr/bin/file: No such file or directory + autoreconfHook + SDL # for sdl.m4 ]; buildInputs = [ @@ -84,20 +48,15 @@ stdenv.mkDerivation (finalAttrs: { libopenmpt-modplug libogg libvorbis - smpeg + libmpg123 + flac ]; - # pass in correct *-config for cross builds - env.SDL_CONFIG = lib.getExe' (lib.getDev SDL) "sdl-config"; - env.SMPEG_CONFIG = lib.getExe' smpeg.dev "smpeg-config"; - configureFlags = [ (lib.enableFeature false "music-ogg-shared") (lib.enableFeature false "music-mod-shared") (lib.enableFeature true "music-mod-modplug") - (lib.enableFeature enableNativeMidi "music-native-midi-gpl") (lib.enableFeature enableSdltest "sdltest") - (lib.enableFeature enableSmpegtest "smpegtest") ]; outputs = [ @@ -106,14 +65,23 @@ stdenv.mkDerivation (finalAttrs: { ]; strictDeps = true; + __structuredAttrs = true; passthru.tests = { inherit onscripter; + pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; + }; + + passthru.updateScript = unstableGitUpdater { + tagFormat = "release-1.*"; + tagPrefix = "release-"; + branch = "SDL-1.2"; }; meta = { description = "SDL multi-channel audio mixer library"; homepage = "http://www.libsdl.org/projects/SDL_mixer/"; + pkgConfigModules = [ "SDL_mixer" ]; teams = [ lib.teams.sdl ]; license = lib.licenses.zlib; inherit (SDL.meta) platforms; diff --git a/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix b/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix index 4a7ec7a46f7c..cb4953993819 100644 --- a/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix +++ b/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sdl_gamecontrollerdb"; - version = "0-unstable-2026-06-26"; + version = "0-unstable-2026-07-23"; src = fetchFromGitHub { owner = "mdqinc"; repo = "SDL_GameControllerDB"; - rev = "513c72e34569e0f471dde7aa26eecb23946c3ef7"; - hash = "sha256-IZ6BYtxFRu8Kt+Ege3xf+E9dlMBHXFWvdvYdKEFAIM8="; + rev = "fa9c1fb9df83bdabb9f699eadac66adc9759b14d"; + hash = "sha256-t8fTiPT0g08QbPJGnlppJEe64ZHGNyV8fv0Za471DD8="; }; dontBuild = true; diff --git a/pkgs/by-name/si/sickgear/package.nix b/pkgs/by-name/si/sickgear/package.nix index 267dd09a3982..cf24f24b0d3b 100644 --- a/pkgs/by-name/si/sickgear/package.nix +++ b/pkgs/by-name/si/sickgear/package.nix @@ -10,7 +10,7 @@ let pythonEnv = python3.withPackages ( ps: with ps; [ - cheetah3 + ct3 lxml ] ); diff --git a/pkgs/by-name/si/simplenote/package.nix b/pkgs/by-name/si/simplenote/package.nix index 3818dfb1e247..e5d00d23171b 100644 --- a/pkgs/by-name/si/simplenote/package.nix +++ b/pkgs/by-name/si/simplenote/package.nix @@ -20,9 +20,6 @@ in appimageTools.wrapType2 { inherit pname version src; - __structuredAttrs = true; - strictDeps = true; - extraInstallCommands = '' install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications substituteInPlace $out/share/applications/${pname}.desktop \ diff --git a/pkgs/by-name/sk/skaffold/package.nix b/pkgs/by-name/sk/skaffold/package.nix index 485ce51bbb1e..f4e50ca01cbf 100644 --- a/pkgs/by-name/sk/skaffold/package.nix +++ b/pkgs/by-name/sk/skaffold/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "skaffold"; - version = "2.23.0"; + version = "2.24.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${finalAttrs.version}"; - hash = "sha256-mFJOveUkOJC7bIzxrjQgDKhCf0WvOTgSDqBSIVgZZzw="; + hash = "sha256-d8KZmx43OhaBq4S1WexlUm//RwOlId3yGNIJBM9ASxY="; }; vendorHash = null; diff --git a/pkgs/by-name/sk/skeema/package.nix b/pkgs/by-name/sk/skeema/package.nix index 54582ef38b63..6f71d6c6b452 100644 --- a/pkgs/by-name/sk/skeema/package.nix +++ b/pkgs/by-name/sk/skeema/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "skeema"; - version = "1.14.0"; + version = "1.14.1"; src = fetchFromGitHub { owner = "skeema"; repo = "skeema"; tag = "v${finalAttrs.version}"; - hash = "sha256-xcGHzsVV3rn8l7oYu+RD4njyI1KW/fU9iGdwZW7W5PA="; + hash = "sha256-enp51IdhRNcbUBf/+RAJktrltPz7aGISFssMcqbu6Gc="; }; vendorHash = null; diff --git a/pkgs/by-name/so/socket-vmnet/package.nix b/pkgs/by-name/so/socket-vmnet/package.nix new file mode 100644 index 000000000000..678569b83e1f --- /dev/null +++ b/pkgs/by-name/so/socket-vmnet/package.nix @@ -0,0 +1,67 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "socket-vmnet"; + version = "1.2.2"; + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + owner = "lima-vm"; + repo = "socket_vmnet"; + tag = "v${finalAttrs.version}"; + hash = "sha256-D5Z4aml82h397ho48HFeXwR6y2XkopFIKjO09jUgFdo="; + }; + + postPatch = '' + # NOTA BENE: + # Since socket_vmnet is macOS only the upstream Makefile assumes + # standard system utilities such as date from /bin/ and logger + # from /usr/bin are available through $PATH. + # This is not the case for the nixpkgs build environment. + # To maintain compatability with nixpkgs build env nixpkgs dependency + # purity and the following replacements are made: + substituteInPlace Makefile \ + --replace-fail "logger" "echo" \ + --replace-fail "-r $(SOURCE_DATE_EPOCH)" "-d @$(SOURCE_DATE_EPOCH)" + substituteInPlace launchd/io.github.lima-vm.socket_vmnet{,.bridged.en0}.plist \ + --replace-fail "/opt/socket_vmnet/bin/socket_vmnet" "${placeholder "out"}/bin/socket_vmnet" + ''; + + dontConfigure = true; + + makeFlags = [ + "VERSION=${finalAttrs.version}" + "SOURCE_DATE_EPOCH=0" + ]; + + makeTargets = [ + "socket_vmnet" + "socket_vmnet_client" + ]; + + installPhase = '' + runHook preInstall + + make PREFIX=$out $makeFlags install.{bin,doc} + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Vmnet.framework support for unmodified rootless QEMU"; + homepage = "https://github.com/lima-vm/socket_vmnet"; + changelog = "https://github.com/lima-vm/socket_vmnet/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ afh ]; + mainProgram = "socket_vmnet"; + platforms = lib.platforms.darwin; + }; +}) diff --git a/pkgs/by-name/so/soundsource/package.nix b/pkgs/by-name/so/soundsource/package.nix index ec45e94c851c..441eb5592e2e 100644 --- a/pkgs/by-name/so/soundsource/package.nix +++ b/pkgs/by-name/so/soundsource/package.nix @@ -1,31 +1,30 @@ { lib, stdenvNoCC, - fetchurl, - unzip, + fetchzip, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "soundsource"; - version = "6.0.2"; + version = "6.1.0"; - src = fetchurl { - url = "https://web.archive.org/web/20251220113913/https://cdn.rogueamoeba.com/soundsource/download/SoundSource.zip"; - hash = "sha256-tzgGUYaY6mIZXs3xxGC3b3AoJ/DcaESYr49zcDS7+Fo="; + src = fetchzip { + url = "https://web.archive.org/web/20260724150017/https://cdn.rogueamoeba.com/soundsource/download/SoundSource.zip"; + hash = "sha256-C7VvtREU7NA27N9VRQ+ktU6iTQL5wWGEND+3oG6jyII="; }; dontUnpack = true; - nativeBuildInputs = [ unzip ]; - installPhase = '' runHook preInstall - mkdir -p "$out/Applications" - unzip -d "$out/Applications" $src + mkdir -p "$out/Applications/SoundSource.app" + cp -R $src/. "$out/Applications/SoundSource.app/" runHook postInstall ''; + passthru.updateScript = ./update.sh; + meta = { changelog = "https://rogueamoeba.com/support/releasenotes/?product=SoundSource"; description = "Sound controller for macOS"; @@ -34,6 +33,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ emilytrau _4evy + dfjay ]; platforms = lib.platforms.darwin; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/so/soundsource/update.sh b/pkgs/by-name/so/soundsource/update.sh new file mode 100755 index 000000000000..0be80d6720a5 --- /dev/null +++ b/pkgs/by-name/so/soundsource/update.sh @@ -0,0 +1,63 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash curl nixVersions.latest common-updater-scripts + +set -euo pipefail + +attr="soundsource" +here=$(cd "$(dirname "$0")" && pwd) +nixFile="$here/package.nix" + +cdnUrl="https://cdn.rogueamoeba.com/soundsource/download/SoundSource.zip" +releaseNotesUrl="https://rogueamoeba.com/support/releasenotes/?product=SoundSource" + +oldVersion=$(grep -oE 'version = "[0-9.]+"' "$nixFile" | grep -oE '[0-9]+(\.[0-9]+)+' | head -n1) + +latest=$(curl -sSf --max-time 60 "$releaseNotesUrl" \ + | grep -oE '>[0-9]+\.[0-9]+\.[0-9]+<' \ + | tr -d '><' \ + | head -n1) + +if [[ -z "$latest" ]]; then + echo "$attr: could not parse latest version from $releaseNotesUrl" >&2 + exit 1 +fi + +echo "$attr: current=$oldVersion latest=$latest" +if [[ "$latest" == "$oldVersion" ]]; then + echo "$attr: already up to date" + exit 0 +fi + +# No versioned upstream URL exists, so we pin an immutable Wayback Machine +# snapshot of the rolling "latest" build +echo "$attr: archiving $cdnUrl into the Wayback Machine ..." +snapshotUrl=$(curl -sSL --max-time 600 -o /dev/null -w '%{url_effective}' \ + "https://web.archive.org/save/$cdnUrl") +case "$snapshotUrl" in + https://web.archive.org/web/*) : ;; + *) + echo "$attr: unexpected Wayback Machine response: '$snapshotUrl'" >&2 + exit 1 + ;; +esac +echo "$attr: snapshot = $snapshotUrl" + +prefetch=$(nix-prefetch-url --unpack --print-path "$snapshotUrl") +rawHash=$(echo "$prefetch" | head -n1) +storePath=$(echo "$prefetch" | tail -n1) +hash=$(nix --extra-experimental-features nix-command hash convert \ + --hash-algo sha256 --to sri "$rawHash") + +# Verify the archived build is really $latest +zipVersion=$(grep -A1 CFBundleShortVersionString "$storePath/Contents/Info.plist" \ + | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' \ + | head -n1) + +if [[ "$zipVersion" != "$latest" ]]; then + echo "$attr: version mismatch - release notes say $latest but the archived build is $zipVersion" >&2 + echo "$attr: refusing to pin; re-run once upstream is consistent" >&2 + exit 1 +fi + +export NIXPKGS_ALLOW_UNFREE=1 +update-source-version "$attr" "$latest" "$hash" "$snapshotUrl" --file="$nixFile" --ignore-same-version diff --git a/pkgs/by-name/st/stoat-desktop/package.nix b/pkgs/by-name/st/stoat-desktop/package.nix index f2cb193acdbf..a82ec74c6766 100644 --- a/pkgs/by-name/st/stoat-desktop/package.nix +++ b/pkgs/by-name/st/stoat-desktop/package.nix @@ -21,14 +21,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "stoat-desktop"; - version = "1.4.0"; + version = "1.4.2"; src = fetchFromGitHub { owner = "stoatchat"; repo = "for-desktop"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-l4kxlPwohaxserVyNAb3Dp4f5XhnPUKeuRJwrOl9EWc="; + hash = "sha256-Qfny57ZwSk19R4fnz+IQoEhbVG76yJhx06QPDpLM7fM="; }; patches = [ diff --git a/pkgs/by-name/st/strawberry/package.nix b/pkgs/by-name/st/strawberry/package.nix index d315a82498fd..0df5c8d8d9ba 100644 --- a/pkgs/by-name/st/strawberry/package.nix +++ b/pkgs/by-name/st/strawberry/package.nix @@ -30,7 +30,6 @@ taglib, util-linux, sparsehash, - rapidjson, # tests gtest, @@ -38,15 +37,21 @@ stdenv.mkDerivation (finalAttrs: { pname = "strawberry"; - version = "1.2.18"; + version = "1.2.21"; src = fetchFromGitHub { owner = "jonaski"; repo = "strawberry"; rev = finalAttrs.finalPackage.version; - hash = "sha256-5h1psYJDKnFFgIGZY3ecCttgkR+zuUwa3b/A4keLk9o="; + hash = "sha256-FI+lyVx9x82o2HZ9YysIlPsSAl94YUD8nrHP0HsmO2E="; }; + patches = [ + # Link tests against missing gstreamer app + # https://github.com/strawberrymusicplayer/strawberry/pull/2252 + ./strawberry-tests-link-gst-app.patch + ]; + # the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead postPatch = '' substituteInPlace src/context/contextalbum.cpp \ @@ -71,7 +76,6 @@ stdenv.mkDerivation (finalAttrs: { sqlite taglib sparsehash - rapidjson ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio @@ -108,6 +112,12 @@ stdenv.mkDerivation (finalAttrs: { preCheck = '' # defaults to "xcb" otherwise, which requires a display export QT_QPA_PLATFORM=offscreen + + # The waveformloader test calls QStandardPaths::setTestModeEnabled(true) which + # expects a writable $HOME + # https://doc.qt.io/qt-6/qstandardpaths.html#setTestModeEnabled + # https://github.com/strawberrymusicplayer/strawberry/blob/dc831c03bd5863f133dd9f57eba75dafb27e5cf8/tests/src/waveformloader_test.cpp#L67 + export HOME=$(mktemp -d) ''; doCheck = true; diff --git a/pkgs/by-name/st/strawberry/strawberry-tests-link-gst-app.patch b/pkgs/by-name/st/strawberry/strawberry-tests-link-gst-app.patch new file mode 100644 index 000000000000..59ec2860f493 --- /dev/null +++ b/pkgs/by-name/st/strawberry/strawberry-tests-link-gst-app.patch @@ -0,0 +1,12 @@ +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 09cc4660..109396a7 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -77,6 +77,7 @@ macro(add_test_file test_source gui_required) + PkgConfig::GLIB + PkgConfig::GOBJECT + PkgConfig::GSTREAMER_BASE ++ PkgConfig::GSTREAMER_APP + Qt${QT_VERSION_MAJOR}::Core + Qt${QT_VERSION_MAJOR}::Concurrent + Qt${QT_VERSION_MAJOR}::Network diff --git a/pkgs/by-name/st/stremio-service/package.nix b/pkgs/by-name/st/stremio-service/package.nix new file mode 100644 index 000000000000..ee57496be02d --- /dev/null +++ b/pkgs/by-name/st/stremio-service/package.nix @@ -0,0 +1,181 @@ +{ + lib, + stdenv, + fetchurl, + fetchFromGitHub, + rustPlatform, + + pkg-config, + makeBinaryWrapper, + desktop-file-utils, + librsvg, + + openssl, + glib, + gtk3, + + libayatana-appindicator, + jellyfin-ffmpeg, # stremio docs: "We use a specific version of ffmpeg-jellyfin" + nodejs, + procps, +}: +let + # if updating this package, make sure this matches + # the version specified in Cargo.toml's package.metadata.server + server = fetchurl rec { + pname = "stremio-server"; + version = "4.20.17"; + url = "https://dl.strem.io/server/v${version}/desktop/server.js"; + hash = "sha256-Vno5e7EbeIVxvxdQ/QXdeJJ/l77Ayd3qptnMHszuOSI="; + meta.license = lib.licenses.unfree; + }; + os = if stdenv.hostPlatform.isDarwin then "macos" else stdenv.hostPlatform.parsed.kernel.name; +in +rustPlatform.buildRustPackage (finalAttrs: { + pname = "stremio-service"; + version = "0.1.21"; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "Stremio"; + repo = "stremio-service"; + tag = "v${finalAttrs.version}"; + hash = "sha256-aHkPtfkwe9/ulRb9ZjRd/7/r4xQSTZXF4I4Yb2rLeLY="; + }; + + nativeBuildInputs = [ + pkg-config + makeBinaryWrapper + librsvg + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + desktop-file-utils + ]; + + buildInputs = [ + openssl + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + gtk3.dev + glib + ]; + + cargoHash = "sha256-5y7CQmIyNBe8DzyDPAiI4I7SznL/zJG0nT7s8X02ZJ0="; + buildFeatures = [ + "offline-build" + "bundled" + ]; + + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' + # fix desktop file path + substituteInPlace ./src/constants.rs \ + --replace-fail "/usr/share/applications" "${placeholder "out"}/share/applications"; + ''; + + preBuild = '' + # run pre-build checks + # check for server.js version mismatch + server_version=$(sed -n '/package.metadata.server/,$p' Cargo.toml | grep -m 1 'version =' | awk -F'"' '{print $2}'); + if [ "$server_version" != "v${finalAttrs.passthru.server.version}" ]; then + echo "Server version mismatch: expected $server_version, got v${finalAttrs.passthru.server.version}" + exit 1 + fi + + # replace binary nodejs/ffmpeg with symlinks to the system versions + rm -rf ./resources/bin/${os}/{ffmpeg,ffprobe,stremio-runtime} + ln -s ${jellyfin-ffmpeg}/bin/ffmpeg ./resources/bin/${os}/ffmpeg + ln -s ${jellyfin-ffmpeg}/bin/ffprobe ./resources/bin/${os}/ffprobe + ln -s ${nodejs}/bin/node ./resources/bin/${os}/stremio-runtime + + # create server.js symlink and server_version.txt + ln -s ${finalAttrs.passthru.server} ./resources/bin/${os}/server.js + echo "v${finalAttrs.passthru.server.version}" > ./resources/bin/${os}/server_version.txt + ''; + + dontCargoInstall = true; + installPhase = '' + runHook preInstall + + ${lib.optionalString stdenv.hostPlatform.isLinux '' + # install desktop/icon files + mkdir -p $out/share/{applications,metainfo} + install -Dm 644 \ + ./resources/com.stremio.service.desktop \ + $out/share/applications/com.stremio.service.desktop; + install -Dm 644 \ + ./resources/com.stremio.service.metainfo.xml \ + $out/share/metainfo/com.stremio.service.metainfo.xml; + install -Dm 644 \ + ./resources/com.stremio.service.svg \ + $out/share/icons/hicolor/scalable/apps/com.stremio.service.svg; + + # render non-scalable icons + for size in 16 32 64 128 256; do + mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps + rsvg-convert \ + -w $size -h $size \ + ./resources/com.stremio.service.svg \ + -o $out/share/icons/hicolor/"$size"x"$size"/apps/com.stremio.service.png + done + + # patch desktop file + desktop-file-edit \ + --set-key="Exec" --set-value="stremio-service" \ + --set-key="TryExec" --set-value="stremio-service" \ + $out/share/applications/com.stremio.service.desktop + ''} + + # install data directory (/share/stremio-service) + mkdir -p $out/{bin,share/stremio-service} + cp -r ./resources/bin/${os}/* $out/share/stremio-service + + # locate compiled binary dynamically across architectures/cross-compilation + compiled_binary=$(find target -name "stremio-service" -type f -path "*/release/*" | head -n 1) + install -Dm 755 "$compiled_binary" $out/share/stremio-service/stremio-service; + install -Dm 644 ./LICENSE.md $out/share/stremio-service/LICENSE.md; + + # create /bin wrapper + makeBinaryWrapper \ + $out/share/stremio-service/stremio-service \ + $out/bin/stremio-service \ + --add-flags "--skip-updater" \ + --set NODE_ENV production \ + --prefix PATH : "${lib.makeBinPath [ procps ]}" \ + ${lib.optionalString stdenv.hostPlatform.isLinux '' + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libayatana-appindicator ]}" + ''} + + runHook postInstall + ''; + + checkFlags = [ + # Skip test that fails in hermetic build sandbox due to missing git repository history + "--skip=copyright" + ]; + + passthru = { + inherit server; + }; + + meta = { + mainProgram = "stremio-service"; + description = "Modern media center that gives you the freedom to watch everything you want (Service only)"; + homepage = "https://www.stremio.com/"; + license = + with lib.licenses; + AND [ + gpl2Only + unfree # server.js is unfree + ]; + maintainers = with lib.maintainers; [ + griffi-gh + rachalaraj + ]; + platforms = [ + "aarch64-darwin" + "aarch64-linux" + "x86_64-linux" + ]; + }; +}) diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs b/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs index d74fce7b6d19..6961a7c0967b 100644 --- a/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs +++ b/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs @@ -211,17 +211,22 @@ fn die() -> ! { std::process::exit(code); } +/// Parses the key-value pairs of `/etc/os-release`. +/// Absence or emptiness of the file become the empty map. +/// Failure to read returns an error Result. fn parse_os_release() -> Result> { - Ok(std::fs::read_to_string("/etc/os-release") - .context("Failed to read /etc/os-release")? - .lines() - .fold(HashMap::new(), |mut acc, line| { - if let Some((k, v)) = line.split_once('=') { - acc.insert(k.to_string(), v.to_string()); - } + let contents = match std::fs::read_to_string("/etc/os-release") { + Ok(contents) => contents, + Err(err) if err.kind() == std::io::ErrorKind::NotFound => String::new(), + Err(err) => return Err(err).context("Failed to read /etc/os-release"), + }; + Ok(contents.lines().fold(HashMap::new(), |mut acc, line| { + if let Some((k, v)) = line.split_once('=') { + acc.insert(k.to_string(), v.to_string()); + } - acc - })) + acc + })) } fn do_pre_switch_check(command: &str, toplevel: &Path, action: &Action) -> Result<()> { diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix index e41231408fe3..502f4e641716 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.98.8"; + version = "1.98.9"; outputs = [ "out" @@ -35,7 +35,7 @@ buildGoModule (finalAttrs: { owner = "tailscale"; repo = "tailscale"; tag = "v${finalAttrs.version}"; - hash = "sha256-3Ikti52jcncQTq9//rBa3Q9N2C2MkGONJ6+4cn4eUFc="; + hash = "sha256-K8eQU/f5s6azGoOwN/0efmkP184t25aHBm5uZZNjIFg="; }; vendorHash = "sha256-Sd2iLJ7eDfDYdIRuW4xuiKgzhQWJWGAnz97FJWrVRlE="; diff --git a/pkgs/by-name/te/tenv/package.nix b/pkgs/by-name/te/tenv/package.nix index b876a117511c..65c11ae1c35f 100644 --- a/pkgs/by-name/te/tenv/package.nix +++ b/pkgs/by-name/te/tenv/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "tenv"; - version = "4.14.8"; + version = "4.15.1"; src = fetchFromGitHub { owner = "tofuutils"; repo = "tenv"; tag = "v${finalAttrs.version}"; - hash = "sha256-NZANEJJPGcR4ndBnkySLKZmhdXXZCYDw2zE9OSiL6wE="; + hash = "sha256-E4wfG9KeW+v+KcizS9ut0S5gHzvPiChaP6uGRsXfkE4="; }; - vendorHash = "sha256-7XWJXP9zGl+lan6lKnyYUFllAdGYYxpDWS6XEqmofBw="; + vendorHash = "sha256-rZBHSlP1cRB2xzVbFLyd32q9vYPytv9nCpcjQqkei+w="; excludedPackages = [ "tools" ]; diff --git a/pkgs/by-name/te/terraform-mcp-server/package.nix b/pkgs/by-name/te/terraform-mcp-server/package.nix index b4ce22f32362..d34147aac755 100644 --- a/pkgs/by-name/te/terraform-mcp-server/package.nix +++ b/pkgs/by-name/te/terraform-mcp-server/package.nix @@ -6,16 +6,16 @@ }: buildGoModule (finalAttrs: { pname = "terraform-mcp-server"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "terraform-mcp-server"; tag = "v${finalAttrs.version}"; - hash = "sha256-0+TjwCDiuNAM6MkGTxw7cigwp1EaDmSFkyMYS+XwC1E="; + hash = "sha256-SFCvVPohsFbodUbsjWhvmpp3DuzrR+f7M298QX4tOVc="; }; - vendorHash = "sha256-6azUKwzkVg68SvuVlse5ljB2H49tRUWgDasLjEl8KKw="; + vendorHash = "sha256-zHcu4zntwPDs+bBTFNZxCDwn/mfBgrACEsElTTGPssA="; ldflags = [ "-X main.version=${finalAttrs.version}" diff --git a/pkgs/by-name/ti/tideways-daemon/package.nix b/pkgs/by-name/ti/tideways-daemon/package.nix index d3016a2632eb..876e32c8da87 100644 --- a/pkgs/by-name/ti/tideways-daemon/package.nix +++ b/pkgs/by-name/ti/tideways-daemon/package.nix @@ -10,7 +10,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "tideways-daemon"; - version = "1.18.0"; + version = "1.18.2"; src = finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system} @@ -28,15 +28,15 @@ stdenvNoCC.mkDerivation (finalAttrs: { sources = { "x86_64-linux" = fetchurl { url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_amd64-${finalAttrs.version}.tar.gz"; - hash = "sha256-sm5xITxGSbcWiI4hhxkHKFleTQBeZZBTH823KQz3M5U="; + hash = "sha256-34SvkbUTm8ngMqqzeDd7waHg1w6eJlNpTqHGEnWsc/s="; }; "aarch64-linux" = fetchurl { url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_aarch64-${finalAttrs.version}.tar.gz"; - hash = "sha256-WxaJx/vkg139zm0xOzT+9FZRAk4v/YJcVHTXwDVcALE="; + hash = "sha256-tz+VtJ3G5X63mp2gy8zGSvxzY9aN07goGyToyIZkUXk="; }; "aarch64-darwin" = fetchurl { url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_macos_arm64-${finalAttrs.version}.tar.gz"; - hash = "sha256-RcNG7jPt+bYiP4hzV6vaxVgSstDM2oWjOmo9TmpKcWM="; + hash = "sha256-MYHDrZtHuKGi3QGsxW8ZWZDZaUEuqcfRVBZV4jjGk44="; }; }; updateScript = "${ diff --git a/pkgs/by-name/ti/tilem/gcc14-fix.patch b/pkgs/by-name/ti/tilem/gcc14-fix.patch deleted file mode 100644 index f1ef81e57cd6..000000000000 --- a/pkgs/by-name/ti/tilem/gcc14-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/gui/macro.c b/gui/macro.c -index ae8db8b..226d48f 100644 ---- a/gui/macro.c -+++ b/gui/macro.c -@@ -86,7 +86,7 @@ void tilem_macro_add_action(TilemMacro* macro, int type, char * value) { - macro->actions = tilem_macro_actions_new(macro, n + 1); - - /* Then we need to save the action */ -- macro->actions[n] = g_new(char, strlen(value)); /* FIXME : gcc says : "assignment from incompatible pointer type" ??? */ -+ macro->actions[n] = g_new(TilemMacroAtom, 1); /* FIXME : gcc says : "assignment from incompatible pointer type" ??? */ - macro->actions[n]->value = g_strdup(value); - macro->actions[n]->type = type; - macro->n++; diff --git a/pkgs/by-name/ti/tilem/gcc15-fix.patch b/pkgs/by-name/ti/tilem/gcc15-fix.patch deleted file mode 100644 index 6a76170739cf..000000000000 --- a/pkgs/by-name/ti/tilem/gcc15-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -Fix call to zero-argument tilem_macro_new(), which GCC 15 rejects because the declaration takes no parameters. ---- a/gui/macro.c -+++ b/gui/macro.c -@@ -70,7 +70,7 @@ - tilem_macro_finalize(emu->macro); - - /* Then allocate a new one */ -- emu->macro = tilem_macro_new(emu); -+ emu->macro = tilem_macro_new(); - } - - /* Add an action to the macro. The action could be : diff --git a/pkgs/by-name/ti/tilem/package.nix b/pkgs/by-name/ti/tilem/package.nix index 5bc6a6468d19..9ec7a6460904 100644 --- a/pkgs/by-name/ti/tilem/package.nix +++ b/pkgs/by-name/ti/tilem/package.nix @@ -1,43 +1,59 @@ { stdenv, - fetchurl, + fetchFromGitHub, + gnused, lib, + nix-update, pkg-config, + writeShellScript, glib, - gtk2, + gtk3, + wrapGAppsHook3, libticonv, libtifiles2, libticables2, libticalcs2, }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation { pname = "tilem"; - version = "2.0"; - src = fetchurl { - url = "mirror://sourceforge/tilem/tilem-${finalAttrs.version}.tar.bz2"; - sha256 = "1ba38xzhp3yf21ip3cgql6jzy49jc34sfnjsl4syxyrd81d269zw"; + version = "2.1-unstable-2025-11-06"; + + src = fetchFromGitHub { + owner = "kuba160"; + repo = "tilem-gtk3"; + rev = "64b9a38a4460abf52bf09ab28dffdc3784f002a3"; + hash = "sha256-FYJMS2GIUbW89VrYbZM1+DLUGu86HxtScSWN0CLtNDo="; }; - nativeBuildInputs = [ pkg-config ]; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook3 + ]; buildInputs = [ glib - gtk2 + gtk3 libticonv libtifiles2 libticables2 libticalcs2 ]; - patches = [ - ./gcc14-fix.patch - ./gcc15-fix.patch - ]; + env.NIX_CFLAGS_COMPILE = toString [ "-lm" ]; + + passthru.updateScript = writeShellScript "update-tilem" '' + ${lib.getExe nix-update} "$UPDATE_NIX_ATTR_PATH" --version=branch + ${lib.getExe gnused} -i -E \ + 's/version = "0-unstable-([0-9-]+)";/version = "2.1-unstable-\1";/' \ + pkgs/by-name/ti/tilem/package.nix + ''; + meta = { - homepage = "http://lpg.ticalc.org/prj_tilem/"; + homepage = "https://github.com/kuba160/tilem-gtk3"; description = "Emulator and debugger for Texas Instruments Z80-based graphing calculators"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ siraben ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "tilem2"; }; -}) +} diff --git a/pkgs/by-name/tr/traefik/package.nix b/pkgs/by-name/tr/traefik/package.nix index bf296048c478..11fed9b343ef 100644 --- a/pkgs/by-name/tr/traefik/package.nix +++ b/pkgs/by-name/tr/traefik/package.nix @@ -1,23 +1,23 @@ { lib, fetchzip, - buildGo125Module, + buildGo126Module, nixosTests, nix-update-script, }: -buildGo125Module (finalAttrs: { +buildGo126Module (finalAttrs: { pname = "traefik"; - version = "3.7.6"; + version = "3.7.8"; # Archive with static assets for webui src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${finalAttrs.version}/traefik-v${finalAttrs.version}.src.tar.gz"; - hash = "sha256-7osOcFQIqsMQ0ZiGQMy6Joet/Tlou9BYlzmtyytaMh8="; + hash = "sha256-nFc3Mcy0kbeEvyrKfrF9AR60RZOEIMMwsUmefUAi84Y="; stripRoot = false; }; - vendorHash = "sha256-lMGuyp3GdcMUdzxu/e3c3ZV1/XWnsqVho2uj230GXzw="; + vendorHash = "sha256-z+Ku6GOecoiZ8eJVHUiD/GxV2blSIfLOs+Yr4B8coI8="; proxyVendor = true; diff --git a/pkgs/by-name/tr/tremotesf/package.nix b/pkgs/by-name/tr/tremotesf/package.nix index 187eba14263b..f795830beb0a 100644 --- a/pkgs/by-name/tr/tremotesf/package.nix +++ b/pkgs/by-name/tr/tremotesf/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tremotesf"; - version = "2.9.1"; + version = "2.10.0"; src = fetchFromGitHub { owner = "equeim"; repo = "tremotesf2"; tag = finalAttrs.version; - hash = "sha256-bDeyVmcKw6pMrsN123OnZio7YHs1Y/bfg+EnFTHY8gE="; + hash = "sha256-1BDCwXlTTB+MkpQacCuHHQaEafEWujAIuYzbxi9XjWc="; # We need this for src/libtremotesf fetchSubmodules = true; }; diff --git a/pkgs/by-name/tr/troubadix/package.nix b/pkgs/by-name/tr/troubadix/package.nix index 3eaac270204c..88e05abf7caa 100644 --- a/pkgs/by-name/tr/troubadix/package.nix +++ b/pkgs/by-name/tr/troubadix/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "troubadix"; - version = "26.7.1"; + version = "26.7.2"; pyproject = true; src = fetchFromGitHub { owner = "greenbone"; repo = "troubadix"; tag = "v${finalAttrs.version}"; - hash = "sha256-qGByIyO9JmCDNs1BMpO5gjt27Av502NB92vaOcUpuaA="; + hash = "sha256-A3I6b518GOdRHLcfV+7wVKGIDOT14T1ZEZ0JZOH6QzY="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/tr/trufflehog/package.nix b/pkgs/by-name/tr/trufflehog/package.nix index 5bb3877fb41c..16bda98cc5b5 100644 --- a/pkgs/by-name/tr/trufflehog/package.nix +++ b/pkgs/by-name/tr/trufflehog/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "trufflehog"; - version = "3.95.9"; + version = "3.96.0"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; tag = "v${finalAttrs.version}"; - hash = "sha256-CeKZA7d11Kdecjv2aInrK4NQ+C7c/ae8qQmircemTb4="; + hash = "sha256-4KsgBDQj2S6J+RT913bthuKIYLX8X+Jz4B0wYJB96Zg="; }; - vendorHash = "sha256-KVocEbpKYN/PE1Dnx4KO4V8AGEfYoNMKWZsAtXhLXv4="; + vendorHash = "sha256-QHs0ilr/dq6WvtTi7JUIZPZsdUj8BPxR2n4htbYQYS8="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/tu/turborepo-remote-cache/package.nix b/pkgs/by-name/tu/turborepo-remote-cache/package.nix index db7280570825..dfc6fc6ea7d6 100644 --- a/pkgs/by-name/tu/turborepo-remote-cache/package.nix +++ b/pkgs/by-name/tu/turborepo-remote-cache/package.nix @@ -13,20 +13,20 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "turborepo-remote-cache"; - version = "2.11.2"; + version = "2.11.5"; src = fetchFromGitHub { owner = "ducktors"; repo = "turborepo-remote-cache"; tag = "v${finalAttrs.version}"; - hash = "sha256-V56EEG5iO8lKXRfk5UUo5so58xCEZavYfT1Bj6QYfA8="; + hash = "sha256-ead756AFzGbPPEcq1pX7k5lYSGGwv+knjtBsoCu8epk="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_10; fetcherVersion = 3; - hash = "sha256-dMil3ZlCVDOp7q0IxmDQgyBqqsvwidizy3z9b3Bq0hE="; + hash = "sha256-9TysHztWvSXiCOGofDKfSeZNrXVCTHDyiWsMtKI6l8k="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ug/ugs/package.nix b/pkgs/by-name/ug/ugs/package.nix index e6eb894a1720..8c2fe4755888 100644 --- a/pkgs/by-name/ug/ugs/package.nix +++ b/pkgs/by-name/ug/ugs/package.nix @@ -19,11 +19,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ugs"; - version = "2.1.18"; + version = "2.1.24"; src = fetchzip { url = "https://github.com/winder/Universal-G-Code-Sender/releases/download/v${finalAttrs.version}/UniversalGcodeSender.zip"; - hash = "sha256-GRoQ9Wg+OyjhBjjRiNVZlMQ6pukvj9i3p9UA+7B/Tww="; + hash = "sha256-YDoH2romuozMWDBhZu5vW+XHHzqLJi3qYedQX2gzsGM="; }; dontUnpack = true; diff --git a/pkgs/by-name/um/umple-lsp/package-lock.json b/pkgs/by-name/um/umple-lsp/package-lock.json new file mode 100644 index 000000000000..594fcb479f16 --- /dev/null +++ b/pkgs/by-name/um/umple-lsp/package-lock.json @@ -0,0 +1,176 @@ +{ + "name": "umple-lsp-monorepo", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "umple-lsp-monorepo", + "workspaces": [ + "packages/tree-sitter-umple", + "packages/server" + ] + }, + "node_modules/@types/node": { + "version": "22.20.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.20.0.tgz", + "integrity": "sha512-QWlFW2wf3nTjC13/DqRnBpR4ZO36VJH/JVBkA/vcnmbTBNQIlnObqyqZE1tUR7+Ni23Lda8R1BxMfbXRpCUx5g==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.21.0" + } + }, + "node_modules/node-addon-api": { + "version": "8.9.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.9.0.tgz", + "integrity": "sha512-ekZMeaaIzSQTSpr7X2X3iJM7lTzgnx8ahAG9pJfT/7+14mlEM8ZYQ9cgCDvSSRbReFK0oHli3WrZdCiRsgAT9Q==", + "license": "MIT", + "engines": { + "node": "^18 || ^20 || >= 21" + } + }, + "node_modules/node-gyp-build": { + "version": "4.8.4", + "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.4.tgz", + "integrity": "sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==", + "license": "MIT", + "bin": { + "node-gyp-build": "bin.js", + "node-gyp-build-optional": "optional.js", + "node-gyp-build-test": "build-test.js" + } + }, + "node_modules/tree-sitter": { + "version": "0.21.1", + "resolved": "https://registry.npmjs.org/tree-sitter/-/tree-sitter-0.21.1.tgz", + "integrity": "sha512-7dxoA6kYvtgWw80265MyqJlkRl4yawIjO7S5MigytjELkX43fV2WsAXzsNfO7sBpPPCF5Gp0+XzHk0DwLCq3xQ==", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "node-addon-api": "^8.0.0", + "node-gyp-build": "^4.8.0" + } + }, + "node_modules/tree-sitter-cli": { + "version": "0.26.10", + "resolved": "https://registry.npmjs.org/tree-sitter-cli/-/tree-sitter-cli-0.26.10.tgz", + "integrity": "sha512-RTse32x5YWOrEtH7wos8ODt3yyB7SKgmGN70jC7R+WcnDA64vrpYU98+LnwrwdXMlxgr0LGQdezZz85DN8Wv0w==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "bin": { + "tree-sitter": "cli.js" + }, + "engines": { + "node": ">=12.0.0" + } + }, + "node_modules/tree-sitter-umple": { + "resolved": "packages/tree-sitter-umple", + "link": true + }, + "node_modules/typescript": { + "version": "5.9.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz", + "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", + "dev": true, + "license": "Apache-2.0", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, + "node_modules/umple-lsp-server": { + "resolved": "packages/server", + "link": true + }, + "node_modules/undici-types": { + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", + "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/vscode-jsonrpc": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz", + "integrity": "sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==", + "license": "MIT", + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/vscode-languageserver": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-9.0.1.tgz", + "integrity": "sha512-woByF3PDpkHFUreUa7Hos7+pUWdeWMXRd26+ZX2A8cFx6v/JPTtd4/uN0/jB6XQHYaOlHbio03NTHCqrgG5n7g==", + "license": "MIT", + "dependencies": { + "vscode-languageserver-protocol": "3.17.5" + }, + "bin": { + "installServerIntoExtension": "bin/installServerIntoExtension" + } + }, + "node_modules/vscode-languageserver-protocol": { + "version": "3.17.5", + "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.5.tgz", + "integrity": "sha512-mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==", + "license": "MIT", + "dependencies": { + "vscode-jsonrpc": "8.2.0", + "vscode-languageserver-types": "3.17.5" + } + }, + "node_modules/vscode-languageserver-textdocument": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz", + "integrity": "sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==", + "license": "MIT" + }, + "node_modules/vscode-languageserver-types": { + "version": "3.17.5", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz", + "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==", + "license": "MIT" + }, + "node_modules/web-tree-sitter": { + "version": "0.26.3", + "resolved": "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.26.3.tgz", + "integrity": "sha512-JIVgIKFS1w6lejxSntCtsS/QsE/ecTS00en809cMxMPxaor6MvUnQ+ovG8uTTTvQCFosSh4MeDdI5bSGw5SoBw==", + "license": "MIT" + }, + "packages/server": { + "name": "umple-lsp-server", + "version": "1.0.2", + "license": "MIT", + "dependencies": { + "vscode-languageserver": "^9.0.1", + "vscode-languageserver-textdocument": "^1.0.11", + "web-tree-sitter": "0.26.3" + }, + "bin": { + "umple-lsp-server": "bin/umple-lsp-server" + }, + "devDependencies": { + "@types/node": "^22.10.2", + "typescript": "^5.7.2" + } + }, + "packages/tree-sitter-umple": { + "version": "0.1.0", + "license": "MIT", + "dependencies": { + "node-addon-api": "^8.5.0", + "node-gyp-build": "^4.8.4", + "tree-sitter": "^0.21.1" + }, + "devDependencies": { + "tree-sitter-cli": "^0.26.3" + } + } + } +} diff --git a/pkgs/by-name/um/umple-lsp/package.nix b/pkgs/by-name/um/umple-lsp/package.nix new file mode 100644 index 000000000000..e564a15c6aaf --- /dev/null +++ b/pkgs/by-name/um/umple-lsp/package.nix @@ -0,0 +1,95 @@ +{ + lib, + pkgsCross, + buildNpmPackage, + fetchFromGitHub, + linkFarm, + versionCheckHook, + jre_headless, + nodejs, + tree-sitter, + umple, + withUmple ? true, +}: +let + # tree-sitter needs a wasi32 clang available at `bin/clang` + wasi32cc = lib.getExe pkgsCross.wasi32.stdenv.cc; + wasi-sdk = linkFarm "wasi-sdk" { "bin/clang" = wasi32cc; }; +in +buildNpmPackage (finalAttrs: { + pname = "umple-lsp"; + version = "1.0.2"; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "umple"; + repo = "umple-lsp"; + # Upstream repo has no tags, so rev is derived from npm version info + # See ./update.sh + rev = "1771d55d7e00a720b97c0f2422971efa26e110f6"; + hash = "sha256-44JLteH4q2toLBWQ1YmbFlDHqgF4JufCf8DJCczGayE="; + }; + + postPatch = '' + cp ${./package-lock.json} package-lock.json + ''; + + npmDepsHash = "sha256-0RUExwYu/N80cw3LGX4ieOCwSf1LkCICteKIllARhBc="; + npmFlags = [ "--ignore-scripts" ]; + npmWorkspace = "packages/server"; + + nativeBuildInputs = [ + nodejs + pkgsCross.wasi32.stdenv.cc.bintools + tree-sitter + ]; + + # Stop tree-sitter from trying to fetch its own wasi-sdk + env.TREE_SITTER_WASI_SDK_PATH = wasi-sdk; + + dontNpmBuild = true; + + # Same process as the `build-grammar` script from package.json + buildPhase = '' + runHook preBuild + + cd packages/tree-sitter-umple + tree-sitter generate + tree-sitter build --wasm + cd - + + npm run copy-wasm + node_modules/.bin/tsc -b + + runHook postBuild + ''; + + makeWrapperArgs = [ + "--prefix" + "PATH" + ":" + (lib.makeBinPath [ jre_headless ]) + ] + ++ lib.optionals withUmple [ + "--set-default" + "UMPLESYNC_JAR_PATH" + "${umple}/share/java/umplesync.jar" + ]; + + # Dangling symlinks are left from the npm workspace and aren't used + dontCheckForBrokenSymlinks = true; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = ./update.sh; + + meta = { + description = "Umple language server"; + mainProgram = "umple-lsp-server"; + homepage = "https://github.com/umple/umple-lsp"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ MysteryBlokHed ]; + }; +}) diff --git a/pkgs/by-name/um/umple-lsp/update.sh b/pkgs/by-name/um/umple-lsp/update.sh new file mode 100755 index 000000000000..1da1dbd324c3 --- /dev/null +++ b/pkgs/by-name/um/umple-lsp/update.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p common-updater-scripts curl git jq nix-update nodejs +set -euo pipefail + +meta="$(curl -fsSL https://registry.npmjs.org/umple-lsp-server/latest)" +latestVersion="$(echo "$meta" | jq -r .version)" +revision="$(echo "$meta" | jq -r .gitHead)" + +if [[ -z "$latestVersion" || "$latestVersion" == "null" ]]; then + echo "No version from registry" >&2 + exit 1 +fi + +if [[ -z "$revision" || "$revision" == "null" ]]; then + echo "No gitHead from registry" >&2 + exit 1 +fi + +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; umple-lsp.version or (lib.getVersion umple-lsp)" | tr -d '"') + +echo "Current version: $currentVersion" +echo "Latest version: $latestVersion" + +if [[ "$currentVersion" = "$latestVersion" ]]; then + echo "Up-to-date." + exit +fi + +echo "Updating to $latestVersion" + +# Update source version and use nix-update to handle the rest +update-source-version umple-lsp "$latestVersion" --rev="$revision" +nix-update umple-lsp --version=skip --generate-lockfile diff --git a/pkgs/by-name/uu/uutils-procps/package.nix b/pkgs/by-name/uu/uutils-procps/package.nix index f01fc6f23252..a9b1d0ba7ae3 100644 --- a/pkgs/by-name/uu/uutils-procps/package.nix +++ b/pkgs/by-name/uu/uutils-procps/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uutils-procps"; - version = "0.0.1-unstable-2026-07-10"; + version = "0.0.1-unstable-2026-07-22"; src = fetchFromGitHub { owner = "uutils"; repo = "procps"; - rev = "43414458b44617824ef44a0c5791839c3ab98f28"; - hash = "sha256-Eh8fzCsBIaOmz7Apm0HrBCx446s0ZHjCDQ9FlM2b/gQ="; + rev = "610131519ff76cd2ebddd17441c2daf1e3653ffa"; + hash = "sha256-D1aPex36SJ307SGKQV+zOnjfihTvSsRuNQKdM6lEzAQ="; }; - cargoHash = "sha256-yffq2oZ53eNiey/u6kUbXeir0UJZ9LqCm/ysO86qwe0="; + cargoHash = "sha256-uR43hwO+cIxLO4PFrF13MUUxLF+ISCy94ZmHwbVrS7Q="; cargoBuildFlags = [ "--workspace" ]; diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 3649b9c72eee..35bf63f1679d 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -18,17 +18,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uv"; - version = "0.11.28"; + version = "0.11.32"; __structuredAttrs = true; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = finalAttrs.version; - hash = "sha256-/mTH2hojC+l0yxn+LEAIj8FTA/nWKIPZ7uLMVJxebw4="; + hash = "sha256-Vkh4GWcKpaAVrok7K/620jfaFayKZRCO32icfZ6+mSU="; }; - cargoHash = "sha256-FvLl32JfIq5a1NnLtnFJyy5T+vkcOD+qfQLDy6NYhHg="; + cargoHash = "sha256-w8O655Ad9bz79KeWF00hniNX+fssY9ZE+LUKaWBQM7c="; buildInputs = [ rust-jemalloc-sys diff --git a/pkgs/by-name/va/vaultwarden/package.nix b/pkgs/by-name/va/vaultwarden/package.nix index 7d46003d9eed..4e61c3a0a813 100644 --- a/pkgs/by-name/va/vaultwarden/package.nix +++ b/pkgs/by-name/va/vaultwarden/package.nix @@ -20,16 +20,16 @@ in rustPlatform.buildRustPackage (finalAttrs: { pname = "vaultwarden"; - version = "1.36.0"; + version = "1.37.0"; src = fetchFromGitHub { owner = "dani-garcia"; repo = "vaultwarden"; tag = finalAttrs.version; - hash = "sha256-jc2f7Ia2c+U1cQBXmyzfQAgFMFoAPexLejs6/FKaN9I="; + hash = "sha256-7l9tIBCfk8DeQDtIoENnjGUzVWJM3aZxw6eA+YaktlM="; }; - cargoHash = "sha256-sjWBM9SsI/7AQ8SuFiTR19l8kqp3rhy64Uh/1TatH6A="; + cargoHash = "sha256-sza4ZQz2+QJJJ03Upt6sGXAv+1VPImN2qZHXaTSALFQ="; # used for "Server Installed" version in admin panel env.VW_VERSION = finalAttrs.version; diff --git a/pkgs/by-name/va/vaultwarden/webvault.nix b/pkgs/by-name/va/vaultwarden/webvault.nix index 61bb7542da8e..55a2c15e16ab 100644 --- a/pkgs/by-name/va/vaultwarden/webvault.nix +++ b/pkgs/by-name/va/vaultwarden/webvault.nix @@ -10,25 +10,17 @@ buildNpmPackage rec { pname = "vaultwarden-webvault"; - version = "2026.4.1+0"; + version = "2026.6.4+0"; src = fetchFromGitHub { owner = "vaultwarden"; repo = "vw_web_builds"; tag = "v${version}"; - hash = "sha256-CIKhdCQwx1zS8rkOtZoG9WDxtweSmrCNL6HfZXi+mM8="; + hash = "sha256-Uz0wPdhTVy2yOlKWAy5phr+30NmFaIPQQh5bsiWCDLA="; }; - # Upstream lockfile is out of sync for @napi-rs/cli (spec 3.5.1, resolved - # 3.2.0), which makes offline `npm ci` hit the registry. The desktop - # workspace is unused here. https://github.com/bitwarden/clients/pull/20480 - postPatch = '' - substituteInPlace package-lock.json \ - --replace-fail '"@napi-rs/cli": "3.5.1"' '"@napi-rs/cli": "3.2.0"' - ''; - - npmDepsFetcherVersion = 2; - npmDepsHash = "sha256-NBhII5HySIkv0bCeWjH6MknX5NMp11Gwno7RnfCKgjc="; + npmDepsFetcherVersion = 3; + npmDepsHash = "sha256-PaDxqVsq00QIKDmhDhsEbKdM4QXfXn28PgpOyZjB60k="; nativeBuildInputs = [ python3 diff --git a/pkgs/by-name/vi/vicinae/package.nix b/pkgs/by-name/vi/vicinae/package.nix index c183555b6bff..90dcfe198c37 100644 --- a/pkgs/by-name/vi/vicinae/package.nix +++ b/pkgs/by-name/vi/vicinae/package.nix @@ -21,18 +21,18 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vicinae"; - version = "0.23.1"; + version = "0.23.2"; src = fetchFromGitHub { owner = "vicinaehq"; repo = "vicinae"; tag = "v${finalAttrs.version}"; - hash = "sha256-qFDb6I9w9F/KfRVHmwezykv7y/Tb8BjJQD2v5AxlEfU="; + hash = "sha256-/5fGvMWlLlyd5ibK7y1dqIK1MTpLABj3v1M0r/VArww="; }; apiDeps = fetchNpmDeps { src = "${finalAttrs.src}/src/typescript/api"; - hash = "sha256-Im8fSG9sbaSynrN5gLsWVaPgH5g4Zp+x+FUPIBXrKjg="; + hash = "sha256-4FEaBDJK9abcgz+vptuL4wQ8zhp+wpLbbR4Y79BVhEg="; }; extensionManagerDeps = fetchNpmDeps { diff --git a/pkgs/by-name/vp/vpl-gpu-rt/package.nix b/pkgs/by-name/vp/vpl-gpu-rt/package.nix index 262f788b358e..e33c3e94193a 100644 --- a/pkgs/by-name/vp/vpl-gpu-rt/package.nix +++ b/pkgs/by-name/vp/vpl-gpu-rt/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "vpl-gpu-rt"; - version = "26.1.6"; + version = "26.3.0"; outputs = [ "out" @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "intel"; repo = "vpl-gpu-rt"; rev = "intel-onevpl-${finalAttrs.version}"; - hash = "sha256-E8CQC2jHSo2ZHp8drXXTgcOOHru3kDJtoLNKwm++YG8="; + hash = "sha256-7hHeQ5oo6e+rCOSH05TGCUPWR6eO/RUidiTQTF9Ga6Q="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/wa/wayle/package.nix b/pkgs/by-name/wa/wayle/package.nix index fd8d608c04ba..ea294aeccc77 100644 --- a/pkgs/by-name/wa/wayle/package.nix +++ b/pkgs/by-name/wa/wayle/package.nix @@ -21,7 +21,7 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "wayle"; - version = "0.6.0"; + version = "0.7.0"; __structuredAttrs = true; strictDeps = true; @@ -30,10 +30,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "wayle-rs"; repo = "wayle"; tag = "v${finalAttrs.version}"; - hash = "sha256-AOHehdowgxEV1b+CwrAhJsUqxQnARIGZPWMRcdH0h+U="; + hash = "sha256-3JtLRuXXhOTf8mAcNZipYgBi9h+mncyKoz7MqdfnT2U="; }; - cargoHash = "sha256-4PUXJwUP5h/ggZQbY78BdqMh5oZes1XCeWuT2/S94Z4="; + cargoHash = "sha256-RuRoLOGdbbsExsQSnpFS82f7UP0fryORkBmRZfrJ6vk="; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix index 235d16de3e2a..c3c99fe9fb1f 100644 --- a/pkgs/by-name/we/werf/package.nix +++ b/pkgs/by-name/we/werf/package.nix @@ -10,17 +10,17 @@ }: buildGoModule (finalAttrs: { pname = "werf"; - version = "2.73.1"; + version = "2.73.2"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; tag = "v${finalAttrs.version}"; - hash = "sha256-LqFZA8QCQxoEh49f+EHxYdPhFUbqUYnGeDVd/X+hODU="; + hash = "sha256-OadbfQ0onCAFtPuDkgxxdNoqAElHbMHoNTqSAXEEAcQ="; }; proxyVendor = true; - vendorHash = "sha256-Ot2P417uqtdpxBd46NelxThF4Ca7krIInVfJ4OxnTRI="; + vendorHash = "sha256-twmFBZ+uDk/43N5Fy7hq3OWjG1eKaSswgqj11pLhY5Y="; nativeBuildInputs = [ installShellFiles ]; buildInputs = diff --git a/pkgs/by-name/wi/wiki-go/package.nix b/pkgs/by-name/wi/wiki-go/package.nix index 2822a523759b..350e773d6381 100644 --- a/pkgs/by-name/wi/wiki-go/package.nix +++ b/pkgs/by-name/wi/wiki-go/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "wiki-go"; - version = "1.8.11"; + version = "1.8.12"; src = fetchFromGitHub { owner = "leomoon-studios"; repo = "wiki-go"; tag = "v${version}"; - hash = "sha256-vyRggzizv78Cb5XpZ5M7eI0pvb/6ytRBZe00/NBe7KA="; + hash = "sha256-j4a3jUmT9YTrdCCGBMmnzXbPD+81/CzXfhrQA2uN+Zk="; }; vendorHash = null; diff --git a/pkgs/by-name/wi/wildergarden-maim/package.nix b/pkgs/by-name/wi/wildergarden-maim/package.nix new file mode 100644 index 000000000000..2b79b70629aa --- /dev/null +++ b/pkgs/by-name/wi/wildergarden-maim/package.nix @@ -0,0 +1,130 @@ +{ + stdenv, + lib, + fetchFromGitHub, + nix-update-script, + cmake, + ninja, + pkg-config, + libx11, + libxrandr, + libxinerama, + libxext, + libxcursor, + freetype, + fontconfig, + alsa-lib, + + buildStandalone ? true, + buildVST3 ? true, +}: + +let + pluginFormats = [ + (lib.optionalString buildStandalone "Standalone") + (lib.optionalString buildVST3 "VST3") + ]; +in + +stdenv.mkDerivation (finalAttrs: { + name = "wildergarden-maim"; + version = "1.1.1-unstable-2025-12-17"; + + strictDeps = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "ArdenButterfield"; + repo = "Maim"; + rev = "181fe240ff99b446858f054074f8241401304e84"; + hash = "sha256-Ht8Mj8nViXyQm/uHabSxYG1RuJj60MEsCJmISSrn6x0="; + fetchSubmodules = true; + }; + + preConfigure = '' + pushd lib/lame + ./configure --disable-frontend --enable-expopt=full --disable-shared --enable-static + make -j$NIX_BUILD_CORES + popd + ''; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "set(FORMATS Standalone AU VST3 AUv3)" "set(FORMATS ${lib.concatStringsSep " " pluginFormats})" + + substituteInPlace CMakeLists.txt \ + --replace-fail "COPY_PLUGIN_AFTER_BUILD TRUE" "COPY_PLUGIN_AFTER_BUILD FALSE" + + substituteInPlace CMakeLists.txt \ + --replace-fail "include(Tests)" "# No tests" \ + --replace-fail "include(Benchmarks)" "# No benchmarks" + ''; + + nativeBuildInputs = [ + cmake + ninja + pkg-config + ]; + + buildInputs = [ + fontconfig + freetype + libx11 + libxcursor + libxext + libxinerama + libxrandr + alsa-lib + ]; + + # Needed for standalone + NIX_LDFLAGS = "-lX11"; + + cmakeFlags = [ + (lib.cmakeFeature "LAME_LIB" "lib/lame/libmp3lame/.libs/libmp3lame.a") + ]; + + 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" + ]; + + installPhase = '' + runHook preInstall + + pushd Maim_artefacts/Release + ${lib.optionalString buildStandalone '' + mkdir -p $out/bin + install -Dm755 -t $out/bin Standalone/Maim + ''} + + ${lib.optionalString buildVST3 '' + mkdir -p $out/lib/vst3 + cp -r VST3/Maim.vst3 $out/lib/vst3/ + ''} + popd + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + + meta = { + description = "Audio plugin for custom MP3 distortion and digital glitches"; + homepage = "https://github.com/ArdenButterfield/Maim"; + platforms = lib.platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.mrtnvgr ]; + } + // lib.optionalAttrs buildStandalone { + mainProgram = "Maim"; + }; +}) diff --git a/pkgs/by-name/xc/xclock/package.nix b/pkgs/by-name/xc/xclock/package.nix index 965ed0f2d398..b93599032871 100644 --- a/pkgs/by-name/xc/xclock/package.nix +++ b/pkgs/by-name/xc/xclock/package.nix @@ -19,7 +19,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "xclock"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "app"; repo = "xclock"; tag = "xclock-${finalAttrs.version}"; - hash = "sha256-sytAl9vXBdxjTM0NnAgRNK34yqn/6zJeCQ/9bH3xaOc="; + hash = "sha256-e8P1tMLwFMThc0WIJTm5E0jAjJnCF8cdrHtp7tKN8IQ="; }; strictDeps = true; diff --git a/pkgs/by-name/xk/xkbprint/package.nix b/pkgs/by-name/xk/xkbprint/package.nix index 831e8e04306b..d405e56d5cee 100644 --- a/pkgs/by-name/xk/xkbprint/package.nix +++ b/pkgs/by-name/xk/xkbprint/package.nix @@ -12,7 +12,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "xkbprint"; - version = "1.0.7"; + version = "1.0.8"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "app"; repo = "xkbprint"; tag = "xkbprint-${finalAttrs.version}"; - hash = "sha256-JcVXwhEV6tTdgBNki7MuUPjjZOjVE83uBP/yc+ShycE="; + hash = "sha256-ul/gMblKljyUYA2EK1X3FRRKbJ6I0x9Y31Bmi4QdDoo="; }; strictDeps = true; diff --git a/pkgs/by-name/xp/xpipe/package.nix b/pkgs/by-name/xp/xpipe/package.nix index 7d8b9374ccfe..4641259958f8 100644 --- a/pkgs/by-name/xp/xpipe/package.nix +++ b/pkgs/by-name/xp/xpipe/package.nix @@ -39,7 +39,7 @@ let hash = { - x86_64-linux = "sha256-gsZgP8wFl1eWFCYT9F6EBHynY24qFFaFVKIQiRzuWto="; + x86_64-linux = "sha256-VIr66Lbp8Zur5/Lo097QLyDyEjKT3Vj+hmWY42NXfAc="; } .${system} or throwSystem; @@ -48,7 +48,7 @@ let in stdenvNoCC.mkDerivation rec { pname = "xpipe"; - version = "23.7"; + version = "23.8"; src = fetchzip { url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz"; diff --git a/pkgs/by-name/ya/yaookctl/package.nix b/pkgs/by-name/ya/yaookctl/package.nix index 7c84e8d6ed80..47f5bf8e6a8d 100644 --- a/pkgs/by-name/ya/yaookctl/package.nix +++ b/pkgs/by-name/ya/yaookctl/package.nix @@ -6,13 +6,13 @@ }: python3.pkgs.buildPythonApplication { pname = "yaookctl"; - version = "0-unstable-2026-07-02"; + version = "0-unstable-2026-07-16"; src = fetchFromGitLab { owner = "yaook"; repo = "yaookctl"; - rev = "d444a887e0350a62b8b23d761a849ec7db46ad65"; - hash = "sha256-EWKKwPnR15qkRuhuGRyj5otwUVX+sOmRei4WfN3aRpQ="; + rev = "2082bdb4da0f927372e2c7fdb3c27bc9970e0747"; + hash = "sha256-/SXBwHO3Tf3YaefgFrvH0oc6+mYHjE9RySt7vLQuoiQ="; }; pyproject = true; diff --git a/pkgs/by-name/ze/zellij/package.nix b/pkgs/by-name/ze/zellij/package.nix index 38ba70d37b1e..feb18262db1b 100644 --- a/pkgs/by-name/ze/zellij/package.nix +++ b/pkgs/by-name/ze/zellij/package.nix @@ -3,24 +3,36 @@ zellij-unwrapped, makeBinaryWrapper, stdenvNoCC, + symlinkJoin, extraPackages ? [ ], }: -stdenvNoCC.mkDerivation { - inherit (zellij-unwrapped) version meta; - pname = "zellij"; +if extraPackages == [ ] then + symlinkJoin { + inherit (zellij-unwrapped) version meta; + pname = "zellij"; - __structuredAttrs = true; - strictDeps = true; + __structuredAttrs = true; + strictDeps = true; - src = zellij-unwrapped; - dontUnpack = true; + paths = [ zellij-unwrapped ]; + } +else + stdenvNoCC.mkDerivation { + inherit (zellij-unwrapped) version meta; + pname = "zellij"; - nativeBuildInputs = [ makeBinaryWrapper ]; - buildPhase = '' - cp -rs --no-preserve=mode "$src" "$out" + __structuredAttrs = true; + strictDeps = true; - wrapProgram "$out/bin/zellij" \ - --prefix PATH : '${lib.makeBinPath extraPackages}' - ''; -} + src = zellij-unwrapped; + dontUnpack = true; + + nativeBuildInputs = [ makeBinaryWrapper ]; + buildPhase = '' + cp -rs --no-preserve=mode "$src" "$out" + + wrapProgram "$out/bin/zellij" \ + --prefix PATH : '${lib.makeBinPath extraPackages}' + ''; + } diff --git a/pkgs/by-name/zl/zluda/package.nix b/pkgs/by-name/zl/zluda/package.nix index 09097a6f828f..1036e687465d 100644 --- a/pkgs/by-name/zl/zluda/package.nix +++ b/pkgs/by-name/zl/zluda/package.nix @@ -16,13 +16,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "zluda"; - version = "6-preview.63"; + version = "6"; src = fetchFromGitHub { owner = "vosen"; repo = "ZLUDA"; rev = "v${finalAttrs.version}"; - hash = "sha256-AZGSO6aV1T3elsVDJxFylhzYjkhkIy1QFtTdH4u4Lrw="; + hash = "sha256-5+ip6YGIgGH892UzcP/3vHoxRD0YpUNTkryNDg9gojs="; fetchSubmodules = true; fetchLFS = true; }; @@ -51,18 +51,13 @@ rustPlatform.buildRustPackage (finalAttrs: { clang ]; - cargoHash = "sha256-2YAlc8HW+aqfRzLSXw/I++DM4/JneE7UNmV6BVZb4VM="; + cargoHash = "sha256-q5DagH0USWZNni0UrwHzeHe4LpaOCHU0ffOek7PUz50="; # Tests require a GPU and segfault in the sandbox doCheck = false; # xtask doesn't support passing --target, but nix hooks expect the folder structure from when it's set env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.cargoShortTarget; - # Future packagers: - # This is a fix for https://github.com/NixOS/nixpkgs/issues/390469. Ideally - # ZLUDA should configure this automatically. Therefore, on every new update, - # please try removing this line and see if ZLUDA builds. - env.CMAKE_BUILD_TYPE = "Release"; preConfigure = '' # disable test written for windows only: https://github.com/vosen/ZLUDA/blob/774f4bcb37c39f876caf80ae0d39420fa4bc1c8b/zluda_inject/tests/inject.rs#L55 diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index bb3c87bf42ef..ba1a366d4e83 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2534,12 +2534,12 @@ with haskellLib; doJailbreak # 2022-12-02: Hackage release lags behind actual releases: https://github.com/PostgREST/postgrest/issues/2275 (overrideSrc rec { - version = "14.14"; + version = "14.15"; src = pkgs.fetchFromGitHub { owner = "PostgREST"; repo = "postgrest"; rev = "v${version}"; - hash = "sha256-iAyGu0yKXpSg0uFgGvD1UGc35yDMLYQ/fHoRERiKJMU="; + hash = "sha256-6V2qZv7dAkhsddIF9gw/zFwk4x2VprLxmQyNEmGxLIs="; }; }) ]; diff --git a/pkgs/development/interpreters/tcl/9.0.nix b/pkgs/development/interpreters/tcl/9.0.nix index dd134db49c11..f9733ad83162 100644 --- a/pkgs/development/interpreters/tcl/9.0.nix +++ b/pkgs/development/interpreters/tcl/9.0.nix @@ -4,13 +4,13 @@ callPackage ./generic.nix ( args // rec { release = "9.0"; - version = "${release}.3"; + version = "${release}.4"; # Note: when updating, the hash in pkgs/development/libraries/tk/9.0.nix must also be updated! src = fetchzip { url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz"; - hash = "sha256-qKh2QYRy+dcX3tk6DS23YfrKfiN9V8RMU1es999KBE0="; + hash = "sha256-2yfj4ddGX/QT601NKG5y30LToMBu3jomFGnNUdzRaNw="; }; } ) diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix index 83116044fae9..13ab408ab607 100644 --- a/pkgs/development/interpreters/tcl/generic.nix +++ b/pkgs/development/interpreters/tcl/generic.nix @@ -90,6 +90,9 @@ let ] ++ lib.optional stdenv.hostPlatform.is64bit "--enable-64bit"; + # https://core.tcl-lang.org/thread/tktview/30e201c7111a438e2fe6aadc9d733b954874cbb9 + env = lib.optionalAttrs (lib.versionAtLeast version "9.0") { ZIPFS_BUILD = 0; }; + buildFlags = lib.optionals stdenv.hostPlatform.isStatic [ # Don't use the default Make target for static, # since it builds shared libraries for bundled packages. diff --git a/pkgs/development/libraries/mapbox-gl-qml/default.nix b/pkgs/development/libraries/mapbox-gl-qml/default.nix index 142cbd8d2a34..00032a240c99 100644 --- a/pkgs/development/libraries/mapbox-gl-qml/default.nix +++ b/pkgs/development/libraries/mapbox-gl-qml/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mapbox-gl-qml"; - version = "3.0.0"; + version = "3.2.2"; src = fetchFromGitHub { owner = "rinigus"; repo = "mapbox-gl-qml"; tag = finalAttrs.version; - hash = "sha256-csk3Uo+AdP1R/T/9gWyWmYFIKuen2jy8wYN3GJznyRE="; + hash = "sha256-HE36UJgdXZalPpEXShus+C3jSFQr/WmmKZdK65CH1zY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 85163117298f..1c4a1b08f1fd 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -54,8 +54,6 @@ enableIpp ? false, enablePython ? false, pythonPackages, - enableGtk2 ? false, - gtk2, enableGtk3 ? false, gtk3, enableVtk ? false, @@ -360,9 +358,6 @@ effectiveStdenv.mkDerivation { ++ optionals (effectiveStdenv.buildPlatform == effectiveStdenv.hostPlatform) [ hdf5 ] - ++ optionals enableGtk2 [ - gtk2 - ] ++ optionals enableGtk3 [ gtk3 ] @@ -649,7 +644,6 @@ effectiveStdenv.mkDerivation { opencv4-tests = callPackage ./tests.nix { inherit enableGStreamer - enableGtk2 enableGtk3 runAccuracyTests runPerformanceTests diff --git a/pkgs/development/libraries/opencv/tests.nix b/pkgs/development/libraries/opencv/tests.nix index 09e2d08f97c5..fe9f73c42e83 100644 --- a/pkgs/development/libraries/opencv/tests.nix +++ b/pkgs/development/libraries/opencv/tests.nix @@ -1,6 +1,5 @@ { enableGStreamer, - enableGtk2, enableGtk3, gst_all_1, lib, @@ -76,7 +75,7 @@ runCommand "opencv4-tests" #"dnn" #- some caffe tests failed, probably because github workflow also downloads additional models ] ++ optionals (!isAarch64 && enableGStreamer) [ "gapi" ] - ++ optionals (enableGtk2 || enableGtk3) [ "highgui" ]; + ++ optionals enableGtk3 [ "highgui" ]; inherit runPerformanceTests; diff --git a/pkgs/development/libraries/tk/9.0.nix b/pkgs/development/libraries/tk/9.0.nix index 370e53059a6c..c2163cd226b4 100644 --- a/pkgs/development/libraries/tk/9.0.nix +++ b/pkgs/development/libraries/tk/9.0.nix @@ -11,7 +11,7 @@ callPackage ./generic.nix ( src = fetchzip { url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz"; - hash = "sha256-ssgvJdgXCtBPfnPvX9AR9uo4zGbzRGsCjOowxe5cfjM="; + hash = "sha256-G0V6SWe2PF/EEg2qI41c0AAVMYLcCdJtnKlkRxbs5HQ="; }; patches = [ diff --git a/pkgs/development/python-modules/azure-eventhub/default.nix b/pkgs/development/python-modules/azure-eventhub/default.nix index 0d3b8456d40b..47256c6bdf7e 100644 --- a/pkgs/development/python-modules/azure-eventhub/default.nix +++ b/pkgs/development/python-modules/azure-eventhub/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-eventhub"; - version = "5.15.0"; + version = "5.15.1"; pyproject = true; src = fetchFromGitHub { owner = "Azure"; repo = "azure-sdk-for-python"; tag = "azure-eventhub_${version}"; - hash = "sha256-zpj1DUeFCXgVw44LcBCYtuFcQtA9BnrDKAxKSYzu4ts="; + hash = "sha256-+Qx7sPdm1jwB0RYsN2dwB+GJJjqPMQsl8TI2GFCRWKA="; }; sourceRoot = "${src.name}/sdk/eventhub/azure-eventhub"; diff --git a/pkgs/development/python-modules/clickhouse-driver/default.nix b/pkgs/development/python-modules/clickhouse-driver/default.nix index d5678f897d31..f0b154bd3494 100644 --- a/pkgs/development/python-modules/clickhouse-driver/default.nix +++ b/pkgs/development/python-modules/clickhouse-driver/default.nix @@ -17,7 +17,7 @@ buildPythonPackage (finalAttrs: { pname = "clickhouse-driver"; - version = "0.2.10"; + version = "0.2.11"; pyproject = true; __structuredAttrs = true; @@ -27,7 +27,7 @@ buildPythonPackage (finalAttrs: { owner = "mymarilyn"; repo = "clickhouse-driver"; tag = finalAttrs.version; - hash = "sha256-veFkmXAp8b6/Npt7f1EhMfM9OKlLugKtlXS+zMHWAro="; + hash = "sha256-wXWKTmkzK2UDbNPPzO4yQdAGDILtddE/bQGxznqPANI="; }; build-system = [ diff --git a/pkgs/development/python-modules/croniter/default.nix b/pkgs/development/python-modules/croniter/default.nix index 8e1234a323ef..f6c96015ca32 100644 --- a/pkgs/development/python-modules/croniter/default.nix +++ b/pkgs/development/python-modules/croniter/default.nix @@ -1,43 +1,68 @@ { lib, buildPythonPackage, - fetchPypi, - setuptools, + fetchFromGitHub, + hatchling, + packaging, pytestCheckHook, + python, python-dateutil, pytz, + trove-classifiers, tzlocal, + versionCheckHook, + which, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "croniter"; - version = "6.0.0"; + version = "6.2.4"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-N8UEsxOVYRSpg+ziwrB3kLHxCU/p2BzJRzkhR0glVXc="; + src = fetchFromGitHub { + owner = "pallets-eco"; + repo = "croniter"; + tag = "${finalAttrs.version}"; + hash = "sha256-Ff6fHFBOBQmrf8OLPNuhHjRqyPuS1sStd5hWh4oI0cI="; }; - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ - python-dateutil - pytz + build-system = [ + hatchling + packaging + trove-classifiers ]; + dependencies = [ python-dateutil ]; + nativeCheckInputs = [ pytestCheckHook + pytz tzlocal ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "hatchling==1.30.1" "hatchling>=1.30.1" + ''; + pythonImportsCheck = [ "croniter" ]; + nativeInstallCheckInputs = [ + versionCheckHook + which + ]; + + versionCheckProgramArg = "${placeholder "out"}/${python.sitePackages}"; + + preInstallCheck = '' + versionCheckProgram="$(which ls)" + ''; + meta = { description = "Library to iterate over datetime object with cron like format"; homepage = "https://github.com/kiorky/croniter"; - changelog = "https://github.com/kiorky/croniter/blob/${version}/CHANGELOG.rst"; + changelog = "https://github.com/kiorky/croniter/blob/${finalAttrs.version}/CHANGELOG.rst"; license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/cheetah3/default.nix b/pkgs/development/python-modules/ct3/default.nix similarity index 97% rename from pkgs/development/python-modules/cheetah3/default.nix rename to pkgs/development/python-modules/ct3/default.nix index 2b7f46b2e646..74c48f1e5c85 100644 --- a/pkgs/development/python-modules/cheetah3/default.nix +++ b/pkgs/development/python-modules/ct3/default.nix @@ -6,7 +6,7 @@ }: buildPythonPackage (finalAttrs: { - pname = "cheetah3"; + pname = "ct3"; version = "3.4.0.post5"; pyproject = true; diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix index 0c2042d634d9..893621856afb 100644 --- a/pkgs/development/python-modules/daphne/default.nix +++ b/pkgs/development/python-modules/daphne/default.nix @@ -15,14 +15,14 @@ buildPythonPackage (finalAttrs: { pname = "daphne"; - version = "4.2.2"; + version = "4.2.3"; pyproject = true; src = fetchFromGitHub { owner = "django"; repo = "daphne"; tag = finalAttrs.version; - hash = "sha256-i0BwZCpMZW6WXK94FSvlEheXHUzXviCBEew6AbkLkpk="; + hash = "sha256-xdHvJZ+JfVYBpSvZ83mCgLSYgiIxZUS0Yx6Kg706aN4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/django-filter/default.nix b/pkgs/development/python-modules/django-filter/default.nix index e32f81e50407..f64d8b5b2080 100644 --- a/pkgs/development/python-modules/django-filter/default.nix +++ b/pkgs/development/python-modules/django-filter/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "django-filter"; - version = "25.2"; + version = "26.1"; pyproject = true; src = fetchFromGitHub { owner = "carltongibson"; repo = "django-filter"; tag = version; - hash = "sha256-hufqurodhd+cKs8UHvxbn62nfcZRg2Hcv2v/inkUoVg="; + hash = "sha256-Sls/imzl2dzUfVcJTUqpCQTDRH9H09uxx27TnU0R0WI="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/flashinfer/default.nix b/pkgs/development/python-modules/flashinfer/default.nix index c5a98af591e3..795db6d46c0b 100644 --- a/pkgs/development/python-modules/flashinfer/default.nix +++ b/pkgs/development/python-modules/flashinfer/default.nix @@ -24,6 +24,7 @@ einops, numpy, nvidia-ml-py, + requests, tabulate, torch, tqdm, @@ -92,6 +93,7 @@ buildPythonPackage (finalAttrs: { einops numpy nvidia-ml-py + requests tabulate torch tqdm diff --git a/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix b/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix index 295937b46dda..d20057069112 100644 --- a/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix +++ b/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix @@ -38,9 +38,6 @@ buildPythonPackage rec { maintainers = with lib.maintainers; [ matthiasbeyer ]; homepage = "https://github.com/antarctica/flask-reverse-proxy-fix"; - license = { - fullName = "Open Government Licence"; - url = "http://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/"; - }; + license = lib.licenses.ogluk30; }; } diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index dedf77c6eeb5..ad078a5b754c 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchPypi, google-api-core, - libcst, + google-auth, mock, proto-plus, protobuf, @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.64.0"; + version = "2.65.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_container"; inherit version; - hash = "sha256-tBWT4YnyXUxaW195ZmnB5DhLoKJfaymPZLVWkVseN00="; + hash = "sha256-Z2BdOWoYjr0CzXOkJVA2Z+ovW8VrF1cammeLfVW3NNw="; }; build-system = [ setuptools ]; @@ -31,7 +31,7 @@ buildPythonPackage rec { dependencies = [ google-api-core - libcst + google-auth proto-plus protobuf ] diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 1ce8e8f571db..31e0e06718fb 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchPypi, google-api-core, + google-auth, google-cloud-testutils, grpc-google-iam-v1, grpcio-status, @@ -32,10 +33,10 @@ buildPythonPackage rec { dependencies = [ google-api-core + google-auth grpc-google-iam-v1 grpcio grpcio-status - libcst opentelemetry-api opentelemetry-sdk proto-plus @@ -69,8 +70,8 @@ buildPythonPackage rec { meta = { description = "Google Cloud Pub/Sub API client library"; - homepage = "https://github.com/googleapis/python-pubsub"; - changelog = "https://github.com/googleapis/python-pubsub/blob/v${version}/CHANGELOG.md"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-pubsub"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/v${version}/packages/google-cloud-pubsub/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = [ ]; mainProgram = "fixup_pubsub_v1_keywords.py"; diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index 5e5971dd0171..6487921c2aec 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.202607231"; + version = "0.1.202607241"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-zrn/q2Q83nsxXKbH8HlcXRhZbAAEwWEfV3Kq2nf5KxM="; + hash = "sha256-RM86dBzksKDdj2ka2HSspc/ZxVhtsMTJY8C2TYG1Q3M="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/imgw-pib/default.nix b/pkgs/development/python-modules/imgw-pib/default.nix index 4346488707c2..8754970e098a 100644 --- a/pkgs/development/python-modules/imgw-pib/default.nix +++ b/pkgs/development/python-modules/imgw-pib/default.nix @@ -17,14 +17,14 @@ buildPythonPackage (finalAttrs: { pname = "imgw-pib"; - version = "2.4.3"; + version = "2.5.0"; pyproject = true; src = fetchFromGitHub { owner = "bieniu"; repo = "imgw-pib"; tag = finalAttrs.version; - hash = "sha256-aGsvgAdj5PlVvLgE+PsgDUzmgDeXhsBJBNnxLn/K8XU="; + hash = "sha256-fbW350Foj9X3JgtcN+M3LpHcmnh/eWvULW2w7cc7lig="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/langfuse/default.nix b/pkgs/development/python-modules/langfuse/default.nix index 4a431ccbfcdb..fe7828b2a256 100644 --- a/pkgs/development/python-modules/langfuse/default.nix +++ b/pkgs/development/python-modules/langfuse/default.nix @@ -27,6 +27,10 @@ buildPythonPackage (finalAttrs: { build-system = [ poetry-core ]; + pythonRelaxDeps = [ + "wrapt" + ]; + dependencies = [ backoff httpx diff --git a/pkgs/development/python-modules/lark-oapi/default.nix b/pkgs/development/python-modules/lark-oapi/default.nix index 51a9e2979184..27411e768c20 100644 --- a/pkgs/development/python-modules/lark-oapi/default.nix +++ b/pkgs/development/python-modules/lark-oapi/default.nix @@ -14,14 +14,14 @@ buildPythonPackage (finalAttrs: { pname = "lark-oapi"; - version = "1.6.9"; + version = "1.7.1"; pyproject = true; src = fetchFromGitHub { owner = "larksuite"; repo = "oapi-sdk-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-W4eFhB9+XdqA/fX26XwULjvSlflL0ar/FDXWFqXsP8g="; + hash = "sha256-6EYLE+RiDd9ZNjwQ4gWW6jsipFjJCE7CZsSsxIenE6w="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/lhpapi/default.nix b/pkgs/development/python-modules/lhpapi/default.nix index 04cde62792f9..c3c15ed85f5d 100644 --- a/pkgs/development/python-modules/lhpapi/default.nix +++ b/pkgs/development/python-modules/lhpapi/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "lhpapi"; - version = "1.0.10"; + version = "1.0.11"; pyproject = true; src = fetchFromGitHub { owner = "stephan192"; repo = "lhpapi"; tag = "v${version}"; - hash = "sha256-Q9X1STaWWbWWy8wmCQ3Cx+z19+X3EcGl0u/Mmc49rAM="; + hash = "sha256-tz1/+NTg8wI0mWcPfM1zk7EheUwShv8eCoYA7wAb/lM="; }; dependencies = [ diff --git a/pkgs/development/python-modules/losant-rest/default.nix b/pkgs/development/python-modules/losant-rest/default.nix index 9af676517888..041048b2081a 100644 --- a/pkgs/development/python-modules/losant-rest/default.nix +++ b/pkgs/development/python-modules/losant-rest/default.nix @@ -10,14 +10,14 @@ buildPythonPackage (finalAttrs: { pname = "losant-rest"; - version = "2.2.0"; + version = "2.2.1"; pyproject = true; src = fetchFromGitHub { owner = "Losant"; repo = "losant-rest-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-nAc+zTqgIdLw/NVWoprP+Kqkbu17N1DMgzo2iu7w8aM="; + hash = "sha256-KNi3caxuD1jiW3fHT5dcuM/4SfLVgi770MfDfCmkiFk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/mailbits/default.nix b/pkgs/development/python-modules/mailbits/default.nix new file mode 100644 index 000000000000..6e9e8f783aed --- /dev/null +++ b/pkgs/development/python-modules/mailbits/default.nix @@ -0,0 +1,37 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + hatchling, + attrs, +}: + +buildPythonPackage (finalAttrs: { + pname = "mailbits"; + version = "0.2.3"; + pyproject = true; + + src = fetchPypi { + inherit (finalAttrs) pname version; + hash = "sha256-ExQL6Ugl1ECYbe4KbmU9gdO030sAWfvbbXi6jMsMTsA="; + }; + + build-system = [ + hatchling + ]; + + dependencies = [ + attrs + ]; + + pythonImportsCheck = [ + "mailbits" + ]; + + meta = { + description = "Assorted e-mail utility functions"; + homepage = "https://pypi.org/project/mailbits"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ booxter ]; + }; +}) diff --git a/pkgs/development/python-modules/mhcgnomes/default.nix b/pkgs/development/python-modules/mhcgnomes/default.nix index 9ff62ac44743..3883678f3c9a 100644 --- a/pkgs/development/python-modules/mhcgnomes/default.nix +++ b/pkgs/development/python-modules/mhcgnomes/default.nix @@ -17,14 +17,14 @@ buildPythonPackage (finalAttrs: { pname = "mhcgnomes"; - version = "3.32.1"; + version = "3.33.4"; pyproject = true; src = fetchFromGitHub { owner = "pirl-unc"; repo = "mhcgnomes"; tag = "v${finalAttrs.version}"; - hash = "sha256-6YYmIXuZXCaozkrVhqlxSQ9TG7vthHcMhVl0QpWChZE="; + hash = "sha256-RkGXBB/gsX/33xdOg97TzQgk0cXv3Ap4IyinKLrJBOo="; }; build-system = [ diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index 3f5407613d6e..26a965bb66c3 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -50,20 +50,8 @@ buildPythonPackage rec { hash = "sha256-YgM8GjWmWKxOZcahR3+9XO2Xyfu9v8rNgxKn/2oL35Y="; }; - pythonRelaxDeps = [ - # requested by maintainer - "brotli" - # just keep those - "typing-extensions" - - "asgiref" - "cryptography" - "pyparsing" - "ruamel.yaml" - "tornado" - "urwid" - "wsproto" - ]; + # pins many dependencies way to strict + pythonRelaxDeps = true; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/mitsubishi-comfort/default.nix b/pkgs/development/python-modules/mitsubishi-comfort/default.nix index d5a718b1fc4c..197bf32ba444 100644 --- a/pkgs/development/python-modules/mitsubishi-comfort/default.nix +++ b/pkgs/development/python-modules/mitsubishi-comfort/default.nix @@ -11,14 +11,14 @@ buildPythonPackage (finalAttrs: { pname = "mitsubishi-comfort"; - version = "0.4.0"; + version = "0.5.1"; pyproject = true; src = fetchFromGitHub { owner = "nikolairahimi"; repo = "mitsubishi-comfort"; tag = "v${finalAttrs.version}"; - hash = "sha256-/JP9I5QZYRgQelsJzRyawsCO3xNc/lQu4m5j8CNDX5A="; + hash = "sha256-UzQxUeIqoBTTp2xaNHI1XWh29sLuZ5WESRIEUwV46x8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/modal/default.nix b/pkgs/development/python-modules/modal/default.nix index 37c219d408dd..2e2002f116ef 100644 --- a/pkgs/development/python-modules/modal/default.nix +++ b/pkgs/development/python-modules/modal/default.nix @@ -39,7 +39,7 @@ buildPythonPackage (finalAttrs: { pname = "modal"; - version = "1.5.2"; + version = "1.5.3"; pyproject = true; __structuredAttrs = true; @@ -48,7 +48,7 @@ buildPythonPackage (finalAttrs: { owner = "modal-labs"; repo = "modal-client"; tag = "py/v${finalAttrs.version}"; - hash = "sha256-YWSf5xsap5zfy1KbAyamFmjEIe7qpRcj6TfuWf/Tu68="; + hash = "sha256-XVY+RzedSMVug+mZ6pioO5qYbR6gUaD5QJIENIPWgx8="; }; sourceRoot = "${finalAttrs.src.name}/py"; diff --git a/pkgs/development/python-modules/monzopy/default.nix b/pkgs/development/python-modules/monzopy/default.nix index 5a0163731c51..e20cd39fa1c4 100644 --- a/pkgs/development/python-modules/monzopy/default.nix +++ b/pkgs/development/python-modules/monzopy/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "monzopy"; - version = "1.5.1"; + version = "1.6.0"; pyproject = true; src = fetchFromGitHub { owner = "JakeMartin-ICL"; repo = "monzopy"; tag = "v${finalAttrs.version}"; - hash = "sha256-LMg3hCaNa9LF3pZEQ/uQgt81V6qKmOwZnKHdsI8MHLY="; + hash = "sha256-NmCnCIOCwlTwSfrJOuXMyzXgsjcYpfFNwi6S0BAatk8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/mypyllant/default.nix b/pkgs/development/python-modules/mypyllant/default.nix index 300f956e4efb..06a6811b118a 100644 --- a/pkgs/development/python-modules/mypyllant/default.nix +++ b/pkgs/development/python-modules/mypyllant/default.nix @@ -24,16 +24,16 @@ requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mypyllant"; - version = "0.9.17"; + version = "0.9.18"; pyproject = true; src = fetchFromGitHub { owner = "signalkraft"; repo = "myPyllant"; - tag = "v${version}"; - hash = "sha256-C6/rCpY4Pn8j8dNo1mlz2GRzMBeMo9CZMitlmtuBRE0="; + tag = "v${finalAttrs.version}"; + hash = "sha256-wLdyajxakYvO27DOmWNk9QnGdprdKnQNZHKPFQg0yM8="; }; build-system = [ @@ -66,8 +66,8 @@ buildPythonPackage rec { meta = { description = "Python library to interact with the API behind the myVAILLANT app"; homepage = "https://github.com/signalkraft/myPyllant"; - changelog = "https://github.com/signalkraft/myPyllant/releases/tag/${src.tag}"; + changelog = "https://github.com/signalkraft/myPyllant/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ urbas ]; }; -} +}) diff --git a/pkgs/development/python-modules/napari-nifti/default.nix b/pkgs/development/python-modules/napari-nifti/default.nix index f0b657c38a1e..ca0aa6be9043 100644 --- a/pkgs/development/python-modules/napari-nifti/default.nix +++ b/pkgs/development/python-modules/napari-nifti/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "napari-nifti"; - version = "0.0.17"; + version = "0.0.19"; pyproject = true; src = fetchFromGitHub { owner = "MIC-DKFZ"; repo = "napari-nifti"; tag = "v${version}"; - hash = "sha256-JDyJMg6rsGkfEHBwqKc2L6oRO5Y1MJJlEjUuuqp7URQ="; + hash = "sha256-pj2olQ0znppG0xE/fpFNIGXx0nzN+lAgGdEOtrzS7Vc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ngff-zarr/default.nix b/pkgs/development/python-modules/ngff-zarr/default.nix index 544c9f223ebf..ee2e08bb3d51 100644 --- a/pkgs/development/python-modules/ngff-zarr/default.nix +++ b/pkgs/development/python-modules/ngff-zarr/default.nix @@ -43,7 +43,7 @@ buildPythonPackage (finalAttrs: { pname = "ngff-zarr"; - version = "0.37.1"; + version = "0.39.0"; pyproject = true; __structuredAttrs = true; @@ -51,7 +51,7 @@ buildPythonPackage (finalAttrs: { owner = "fideus-labs"; repo = "ngff-zarr"; tag = "py-v${finalAttrs.version}"; - hash = "sha256-73bduVeH+o7uirhwFcFpU33NUAOZe//GCVYMl6OYgC8="; + hash = "sha256-ukr/P1I9Y6eu7yP6LyUcxAG02vNvmI3OhVKiibSi2Rs="; }; sourceRoot = "${finalAttrs.src.name}/py/"; diff --git a/pkgs/development/python-modules/oelint-data/default.nix b/pkgs/development/python-modules/oelint-data/default.nix index 81c1f3d2286f..a4cb12dbd2ae 100644 --- a/pkgs/development/python-modules/oelint-data/default.nix +++ b/pkgs/development/python-modules/oelint-data/default.nix @@ -8,7 +8,7 @@ buildPythonPackage (finalAttrs: { pname = "oelint-data"; - version = "1.5.10"; + version = "1.5.12"; pyproject = true; __structuredAttrs = true; @@ -16,7 +16,7 @@ buildPythonPackage (finalAttrs: { owner = "priv-kweihmann"; repo = "oelint-data"; tag = finalAttrs.version; - hash = "sha256-8lz1Y0lbsrFPJNWWaxSVFSpd23L5MODe71n+VknfPy8="; + hash = "sha256-ZGA6E+VpNY4Gmu5i8riEQZixsMb83bgvwq/ujeJE+LY="; }; build-system = [ diff --git a/pkgs/development/python-modules/outlines/default.nix b/pkgs/development/python-modules/outlines/default.nix index 475913ba11da..f8b7fbfa7851 100644 --- a/pkgs/development/python-modules/outlines/default.nix +++ b/pkgs/development/python-modules/outlines/default.nix @@ -20,6 +20,7 @@ nest-asyncio, numpy, outlines-core, + pillow, pycountry, pydantic, torch, @@ -89,6 +90,7 @@ buildPythonPackage (finalAttrs: { nest-asyncio numpy outlines-core + pillow pycountry pydantic torch diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 874a41fe8450..4b9e5bfdf6ab 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,12 +11,12 @@ buildPythonPackage (finalAttrs: { pname = "publicsuffixlist"; - version = "1.0.2.20260722"; + version = "1.0.2.20260724"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-eQvXqMOPZpmtMirDStUmKmr5wk1GlNrGTRz5WPCzavw="; + hash = "sha256-2aTYMWvVFZpPmsN8Hp4Fc2ViC2u0b59QsigzT6mdR+g="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pulumi/default.nix b/pkgs/development/python-modules/pulumi/default.nix index adbed7f545ca..76185c5042d6 100644 --- a/pkgs/development/python-modules/pulumi/default.nix +++ b/pkgs/development/python-modules/pulumi/default.nix @@ -12,6 +12,10 @@ pyyaml, debugpy, pip, + opentelemetry-api, + opentelemetry-sdk, + opentelemetry-instrumentation-grpc, + opentelemetry-exporter-otlp-proto-grpc, pytest, pytest-asyncio, pytest-timeout, @@ -48,6 +52,10 @@ buildPythonPackage { pyyaml debugpy pip + opentelemetry-api + opentelemetry-sdk + opentelemetry-instrumentation-grpc + opentelemetry-exporter-otlp-proto-grpc ]; pythonRelaxDeps = [ @@ -55,6 +63,10 @@ buildPythonPackage { "grpcio" "pip" "semver" + "opentelemetry-api" + "opentelemetry-sdk" + "opentelemetry-instrumentation-grpc" + "opentelemetry-exporter-otlp-proto-grpc" ]; nativeCheckInputs = [ @@ -65,18 +77,29 @@ buildPythonPackage { ]; disabledTestPaths = [ - # TODO: remove disabledTestPaths once the test is fixed upstream. - # https://github.com/pulumi/pulumi/pull/19080#discussion_r2309611222 - "lib/test/provider/experimental/test_property_value.py::test_nesting" + # Fail due to missing `pytest.mark.asyncio`, as of v3.253.0 + "lib/test/test_deprecated.py::DeprecatedTests::test_non_deprecated_can_be_called" + "lib/test/test_deprecated.py::DeprecatedTests::test_deprecated_can_be_called" + "lib/test/test_deprecated.py::DeprecatedTests::test_deprecated_can_passthrough" + "lib/test/test_deprecated.py::DeprecatedTests::test_deprecated_prints_warnings" + "lib/test/runtime/test_resource_dep_cycle.py" + "lib/test/test_broken_dynamic_provider.py" ]; + # CheckPhase script based on: # https://github.com/pulumi/pulumi/blob/0acaf8060640fdd892abccf1ce7435cd6aae69fe/sdk/python/scripts/test_fast.sh#L10-L11 # https://github.com/pulumi/pulumi/blob/0acaf8060640fdd892abccf1ce7435cd6aae69fe/sdk/python/scripts/test_fast.sh#L16 + # Script updated in https://github.com/pulumi/pulumi/pull/21365 + # + # Ignore lib/test/langhost because tests require `uv` / virtualenv which is not supported in the Nix sandbox. installCheckPhase = '' runHook preInstallCheck declare -a _disabledTestPathsArray concatTo _disabledTestPathsArray disabledTestPaths - ${python.executable} -m pytest --junit-xml= --ignore=lib/test/automation lib/test \ + ${python.executable} -m pytest --junit-xml= \ + --ignore=lib/test/automation \ + --ignore=lib/test/langhost \ + lib/test \ "''${_disabledTestPathsArray[@]/#/--deselect=}" pushd lib/test_with_mocks ${python.executable} -m pytest --junit-xml= @@ -94,7 +117,9 @@ buildPythonPackage { homepage = "https://www.pulumi.com"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ + nicoo tie + untio11 ]; }; } diff --git a/pkgs/development/python-modules/pybravia/default.nix b/pkgs/development/python-modules/pybravia/default.nix index c082e7bd75ce..453fe2b40037 100644 --- a/pkgs/development/python-modules/pybravia/default.nix +++ b/pkgs/development/python-modules/pybravia/default.nix @@ -4,20 +4,23 @@ buildPythonPackage, fetchFromGitHub, hatchling, + pyprojectVersionPatchHook, }: buildPythonPackage rec { pname = "pybravia"; - version = "0.4.1"; + version = "0.5.1"; pyproject = true; src = fetchFromGitHub { owner = "Drafteed"; repo = "pybravia"; tag = "v${version}"; - hash = "sha256-VNdjdNmWcl8s1jRlA40DHlku3CPL59nJ4pZklZ452FU="; + hash = "sha256-Wx+YEEVZB0aGhgaQiC04GKwTY4yV0wj86b/8EJBs5yc="; }; + nativeBuildInputs = [ pyprojectVersionPatchHook ]; + build-system = [ hatchling ]; dependencies = [ aiohttp ]; diff --git a/pkgs/development/python-modules/pyeconet/default.nix b/pkgs/development/python-modules/pyeconet/default.nix index 12bbc1e6f7a5..51689a2facac 100644 --- a/pkgs/development/python-modules/pyeconet/default.nix +++ b/pkgs/development/python-modules/pyeconet/default.nix @@ -9,14 +9,14 @@ buildPythonPackage (finalAttrs: { pname = "pyeconet"; - version = "0.2.2"; + version = "0.2.5"; pyproject = true; src = fetchFromGitHub { owner = "w1ll1am23"; repo = "pyeconet"; tag = "v${finalAttrs.version}"; - hash = "sha256-sQXIMm5ddkqkFgTYOsy9srKxLUy505iFhrtGAbOLzc0="; + hash = "sha256-GxmtTnpw5DB8vGn+bNnoXxcYOrMRM4VqEKrx1sPM4yg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyimouapi/default.nix b/pkgs/development/python-modules/pyimouapi/default.nix index c5dd8b425b88..70e7d7462d38 100644 --- a/pkgs/development/python-modules/pyimouapi/default.nix +++ b/pkgs/development/python-modules/pyimouapi/default.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "pyimouapi"; - version = "1.3.0"; + version = "1.3.2"; pyproject = true; src = fetchFromGitHub { owner = "Imou-OpenPlatform"; repo = "Py-Imou-Open-Api"; tag = finalAttrs.version; - hash = "sha256-/ZGaJubdeEe5d4wnzrS/e6hPC5i/IRccgYc34su2iw4="; + hash = "sha256-SxAeBh26pgxMGZdkiPMM9hBC40xgLkAVu81AznT8dwk="; }; build-system = [ setuptools ]; @@ -40,7 +40,7 @@ buildPythonPackage (finalAttrs: { meta = { description = "Async Python client for the Imou Open Platform cloud APIs"; homepage = "https://github.com/Imou-OpenPlatform/Py-Imou-Open-Api"; - changelog = "https://github.com/Imou-OpenPlatform/Py-Imou-Open-Api/releases/tag/${finalAttrs.src.tag}"; + changelog = "https://github.com/Imou-OpenPlatform/Py-Imou-Open-Api/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = [ lib.maintainers.jamiemagee ]; }; diff --git a/pkgs/development/python-modules/pyisy/default.nix b/pkgs/development/python-modules/pyisy/default.nix index 005a834e53a6..e9f03af80f26 100644 --- a/pkgs/development/python-modules/pyisy/default.nix +++ b/pkgs/development/python-modules/pyisy/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyisy"; - version = "3.6.1"; + version = "3.7.0"; pyproject = true; src = fetchFromGitHub { owner = "automicus"; repo = "PyISY"; tag = "v${version}"; - hash = "sha256-KEjiMmD4mY1sG/vRo1QINQw31jk8MNV6m13fU2ENmJM="; + hash = "sha256-4mNG3dcDOuhRXSAN8FiKgxAdf7Yt04L+60luJ3FzKMQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pylamarzocco/default.nix b/pkgs/development/python-modules/pylamarzocco/default.nix index b9a5e7642000..8b143caa059c 100644 --- a/pkgs/development/python-modules/pylamarzocco/default.nix +++ b/pkgs/development/python-modules/pylamarzocco/default.nix @@ -16,14 +16,14 @@ buildPythonPackage (finalAttrs: { pname = "pylamarzocco"; - version = "2.4.2"; + version = "2.4.3"; pyproject = true; src = fetchFromGitHub { owner = "zweckj"; repo = "pylamarzocco"; tag = "v${finalAttrs.version}"; - hash = "sha256-9wqSF67MNxnGvDDDVY9epI3hoV8M20L3Fyz80/x8G74="; + hash = "sha256-X2Oyo7pCSb/M5abflAHiPK8tlWO85uTqisdQYcGx66c="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pylint-odoo/default.nix b/pkgs/development/python-modules/pylint-odoo/default.nix index 70fb7baf2daa..7f2c2b88c64c 100644 --- a/pkgs/development/python-modules/pylint-odoo/default.nix +++ b/pkgs/development/python-modules/pylint-odoo/default.nix @@ -8,14 +8,14 @@ }: buildPythonPackage rec { pname = "pylint-odoo"; - version = "10.0.7"; + version = "10.0.8"; pyproject = true; src = fetchFromGitHub { owner = "OCA"; repo = "pylint-odoo"; tag = "v${version}"; - hash = "sha256-xwtIaZTQcS/Q96r3nLeIT3e8B5Z4zpipA56GwIIBLLA="; + hash = "sha256-dCc3jwZOWlwMG0jn1d2rAK4oFQlqTMmvYu9ucR/ORfU="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/pypi-simple/default.nix b/pkgs/development/python-modules/pypi-simple/default.nix new file mode 100644 index 000000000000..1920760d56fb --- /dev/null +++ b/pkgs/development/python-modules/pypi-simple/default.nix @@ -0,0 +1,54 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + hatchling, + beautifulsoup4, + mailbits, + packaging, + pydantic, + requests, + tqdm, +}: + +buildPythonPackage (finalAttrs: { + pname = "pypi-simple"; + version = "1.8.0"; + pyproject = true; + + src = fetchPypi { + pname = "pypi_simple"; + inherit (finalAttrs) version; + hash = "sha256-Rm8vzQ1yOCKq46DM/aIuaP+M1/UKrmiRGUarHdHVh+E="; + }; + + build-system = [ + hatchling + ]; + + dependencies = [ + beautifulsoup4 + mailbits + packaging + pydantic + requests + ]; + + optional-dependencies = { + tqdm = [ + tqdm + ]; + }; + + pythonImportsCheck = [ + "pypi_simple" + ]; + + meta = { + description = "PyPI Simple Repository API client library"; + homepage = "https://pypi.org/project/pypi-simple"; + changelog = "https://github.com/jwodder/pypi-simple/blob/master/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ booxter ]; + }; +}) diff --git a/pkgs/development/python-modules/pypugjs/default.nix b/pkgs/development/python-modules/pypugjs/default.nix index dff64ef34859..aab02bbf74b5 100644 --- a/pkgs/development/python-modules/pypugjs/default.nix +++ b/pkgs/development/python-modules/pypugjs/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "pypugjs"; - version = "6.0.3"; + version = "7.0.0"; pyproject = true; src = fetchFromGitHub { owner = "kakulukia"; repo = "pypugjs"; tag = "v${version}"; - hash = "sha256-7w+YTNBxDQ8UZdvX3JfBQc9HQR3zNTGsEp+OR/LWcmU="; + hash = "sha256-L4vE0INrSsjtMQ2Psx2YUDdfMoetGd1rFgmeP5bSUVo="; }; build-system = [ diff --git a/pkgs/development/python-modules/pysimplesoap/default.nix b/pkgs/development/python-modules/pysimplesoap/default.nix index 80eb5b62070d..db5c14113c7f 100644 --- a/pkgs/development/python-modules/pysimplesoap/default.nix +++ b/pkgs/development/python-modules/pysimplesoap/default.nix @@ -4,22 +4,25 @@ fetchPypi, buildPythonPackage, m2crypto, + setuptools, nix-update-script, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pysimplesoap"; version = "1.16.2"; - format = "setuptools"; + pyproject = true; passthru.updateScript = nix-update-script { }; src = fetchPypi { pname = "PySimpleSOAP"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-sbv00NCt/5tlIZfWGqG3ZzGtYYhJ4n0o/lyyUJFtZ+E="; }; + build-system = [ setuptools ]; + propagatedBuildInputs = [ m2crypto ]; # Patches necessary for Python 3 compatibility plus bugfixes @@ -29,7 +32,7 @@ buildPythonPackage rec { args: fetchDebianPatch ( { - inherit pname version; + inherit (finalAttrs) pname version; debianRevision = "5"; } // args @@ -71,4 +74,4 @@ buildPythonPackage rec { # so co-maintainers would be welcome. maintainers = [ lib.maintainers.nicoo ]; }; -} +}) diff --git a/pkgs/development/python-modules/python-duco-connectivity/default.nix b/pkgs/development/python-modules/python-duco-connectivity/default.nix index bd2dd8d5ed66..481ad2ca02d5 100644 --- a/pkgs/development/python-modules/python-duco-connectivity/default.nix +++ b/pkgs/development/python-modules/python-duco-connectivity/default.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "python-duco-connectivity"; - version = "0.8.0"; + version = "0.11.0"; pyproject = true; src = fetchFromGitHub { owner = "ronaldvdmeer"; repo = "python-duco-connectivity"; tag = "v${finalAttrs.version}"; - hash = "sha256-b0tjx/0GCHJxWDJmRcMwfLGWMphyfocdQNyojWyaVZo="; + hash = "sha256-+DCZdJxxsl8XkQczfTS5zTuoyHAHnsZqzmhtAZOZN+E="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyzhuyin/default.nix b/pkgs/development/python-modules/pyzhuyin/default.nix new file mode 100644 index 000000000000..522d9595c434 --- /dev/null +++ b/pkgs/development/python-modules/pyzhuyin/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + wheel, + nix-update-script, + unittestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "pyzhuyin"; + version = "0.0.3"; + pyproject = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "rku1999"; + repo = "python-zhuyin"; + rev = "82c31bb89871e7567853406471c5849a9c2034f1"; + hash = "sha256-xFY3Eww1i3n+4oCD2ZEVBCLcGNaX8bC0wS6ayXsPpcY="; + }; + + build-system = [ + setuptools + ]; + + pythonImportsCheck = [ + "pyzhuyin" + ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Phonetic and Pinyin conversion tool"; + homepage = "https://pypi.org/project/pyzhuyin"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ vherrmann ]; + }; +}) diff --git a/pkgs/development/python-modules/quart/default.nix b/pkgs/development/python-modules/quart/default.nix index 13c862261919..a4e6789c5c4a 100644 --- a/pkgs/development/python-modules/quart/default.nix +++ b/pkgs/development/python-modules/quart/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "quart"; - version = "0.20.0"; + version = "0.21.0"; pyproject = true; src = fetchFromGitHub { owner = "pallets"; repo = "quart"; tag = version; - hash = "sha256-NApev3nRBS4QDMGq8++rSmK5YgeljkaVAsdezsTbZr4="; + hash = "sha256-BrZtknO8Xne5r4CENF0Uz8NVc8Zc+Yu35spvPw7qZ/w="; }; build-system = [ flit-core ]; @@ -67,11 +67,6 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # click 8.4 compat - "test_cli_blueprints" - ]; - meta = { description = "Async Python micro framework for building web applications"; mainProgram = "quart"; diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index 0fdd71f19769..cdd3b72a89a0 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -14,14 +14,14 @@ buildPythonPackage (finalAttrs: { pname = "rns"; - version = "1.4.0"; + version = "1.4.1"; pyproject = true; __structuredAttrs = true; src = fetchPypi { pname = "rns"; version = finalAttrs.version; - hash = "sha256-+p520KeL8lPq5mE35rvcZfRw2zlQqVsDTOMsqEX/DkQ="; + hash = "sha256-cJOr1BJfV0eWx5f0+J8iCT0svEMoH5QZOTYrLdB5NR4="; }; patches = [ diff --git a/pkgs/development/python-modules/sqlobject/default.nix b/pkgs/development/python-modules/sqlobject/default.nix index f789b97a0eb2..a30641837290 100644 --- a/pkgs/development/python-modules/sqlobject/default.nix +++ b/pkgs/development/python-modules/sqlobject/default.nix @@ -5,8 +5,6 @@ pytestCheckHook, setuptools, formencode, - pastedeploy, - paste, pydispatcher, }: @@ -26,8 +24,6 @@ buildPythonPackage rec { dependencies = [ formencode - paste - pastedeploy pydispatcher ]; diff --git a/pkgs/development/python-modules/stone/default.nix b/pkgs/development/python-modules/stone/default.nix index bc097a2b19e0..ba650dc71d13 100644 --- a/pkgs/development/python-modules/stone/default.nix +++ b/pkgs/development/python-modules/stone/default.nix @@ -5,7 +5,6 @@ jinja2, mock, packaging, - ply, pytestCheckHook, setuptools, setuptools-scm, @@ -13,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "stone"; - version = "3.5.2"; + version = "3.5.3"; pyproject = true; src = fetchFromGitHub { owner = "dropbox"; repo = "stone"; tag = "v${finalAttrs.version}"; - hash = "sha256-05sAhyQx3IalHqNkSrJgRDJz85M331hF5Crc/gtP6jE="; + hash = "sha256-79CY4eJcsMrhJvRCdD3brwmPkl8kxLQbGIqxIA9UXPg="; }; postPatch = '' @@ -38,7 +37,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ jinja2 packaging - ply ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index c17e0d1cc9d4..050db17d7a55 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "stripe"; - version = "15.3.0"; + version = "15.3.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-/wVSQlX1G/ffDlvEqZ29D3N6/QVYe3ZXyC4Nmcf8RaQ="; + hash = "sha256-L5qNlh5cLsGRSftOC0fZcJ0BSmhZLNsfTv0ESryNI1k="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/swh-export/default.nix b/pkgs/development/python-modules/swh-export/default.nix index 398394752106..a9f1dadd28b3 100644 --- a/pkgs/development/python-modules/swh-export/default.nix +++ b/pkgs/development/python-modules/swh-export/default.nix @@ -25,7 +25,7 @@ buildPythonPackage (finalAttrs: { pname = "swh-export"; - version = "1.11.7"; + version = "1.11.8"; pyproject = true; src = fetchFromGitLab { @@ -34,7 +34,7 @@ buildPythonPackage (finalAttrs: { owner = "devel"; repo = "swh-export"; tag = "v${finalAttrs.version}"; - hash = "sha256-aDIGbkyRMNoQOdlXwqfLyRqDfK6jNFMVFJv67OY1SCg="; + hash = "sha256-wqUcoQddN0FJV673u/xcwNuNz/BB9AFWNFEuQPHyVDw="; }; build-system = [ @@ -71,6 +71,9 @@ buildPythonPackage (finalAttrs: { pkgs.pv ]; + # Kafka tests use librdkafka's mock broker bound to the loopback interface. + __darwinAllowLocalNetworking = true; + disabledTests = [ # I don't know how to fix the following error # E fixture 'kafka_server' not found diff --git a/pkgs/development/python-modules/temescal/default.nix b/pkgs/development/python-modules/temescal/default.nix index ba4dda77e158..0d8b6adb5961 100644 --- a/pkgs/development/python-modules/temescal/default.nix +++ b/pkgs/development/python-modules/temescal/default.nix @@ -2,20 +2,26 @@ lib, buildPythonPackage, fetchPypi, + setuptools, pycryptodome, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "temescal"; version = "0.5"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; + pname = "temescal"; + inherit (finalAttrs) version; hash = "sha256-MfTftheNj8zI3iXIIJU+jy9xikvX9eO58LA0NCMJBnY="; }; - propagatedBuildInputs = [ pycryptodome ]; + build-system = [ setuptools ]; + + dependencies = [ pycryptodome ]; # Module has no tests doCheck = false; @@ -28,4 +34,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index c30b150a038f..6a8f7a76b6cc 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage (finalAttrs: { pname = "tencentcloud-sdk-python"; - version = "3.1.138"; + version = "3.1.140"; pyproject = true; src = fetchFromGitHub { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = finalAttrs.version; - hash = "sha256-QzQtubmTzKYiKY5j/Ol0VfsbxP6/Cs6u7JZ1iRj5660="; + hash = "sha256-VEIEWfubjhvMDP/Hywd3bIlTexsAZZf0mtkq20MiCWw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/termstyle/default.nix b/pkgs/development/python-modules/termstyle/default.nix deleted file mode 100644 index b5314ac8f5dd..000000000000 --- a/pkgs/development/python-modules/termstyle/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, -}: - -buildPythonPackage rec { - pname = "termstyle"; - version = "0.1.11"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "ef74b83698ea014112040cf32b1a093c1ab3d91c4dd18ecc03ec178fd99c9f9f"; - }; - - # Only manual tests - doCheck = false; - - meta = { - description = "Console colouring for python"; - homepage = "https://pypi.org/project/python-termstyle/"; - license = lib.licenses.bsdOriginal; - }; -} diff --git a/pkgs/development/python-modules/textblob/default.nix b/pkgs/development/python-modules/textblob/default.nix index 5c7f8b4ff90e..b8da30c321ba 100644 --- a/pkgs/development/python-modules/textblob/default.nix +++ b/pkgs/development/python-modules/textblob/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "textblob"; - version = "0.20.0"; + version = "0.20.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-rpvvOhbOy0quPplcyMb+mKnSpv/dWJkNzWjoF+jWa54="; + hash = "sha256-+9GjMHUy6d3bj1AoSHRVngECDnm1/lrkwdpwmp4gh+o="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/textdistance/default.nix b/pkgs/development/python-modules/textdistance/default.nix index 79e33942424a..7c01f93ae7ed 100644 --- a/pkgs/development/python-modules/textdistance/default.nix +++ b/pkgs/development/python-modules/textdistance/default.nix @@ -2,28 +2,42 @@ lib, buildPythonPackage, fetchPypi, + setuptools, + pytestCheckHook, + hypothesis, + numpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "textdistance"; version = "4.6.3"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; + pname = "textdistance"; + inherit (finalAttrs) version; hash = "sha256-1tq8ULTqgyzc8OHmAhvQx/zZreFViI15u2o8Mfzi3G8="; }; - # There aren't tests - doCheck = false; + build-system = [ setuptools ]; + + nativeCheckInputs = [ + pytestCheckHook + hypothesis + numpy + ]; + + disabledTestPaths = [ "tests/test_external.py" ]; pythonImportsCheck = [ "textdistance" ]; meta = { description = "Python library for comparing distance between two or more sequences"; homepage = "https://github.com/life4/textdistance"; - changelog = "https://github.com/life4/textdistance/releases/tag/${version}"; + changelog = "https://github.com/life4/textdistance/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/uwsgi-chunked/default.nix b/pkgs/development/python-modules/uwsgi-chunked/default.nix index 2bc2834d2f37..5d419fce1c12 100644 --- a/pkgs/development/python-modules/uwsgi-chunked/default.nix +++ b/pkgs/development/python-modules/uwsgi-chunked/default.nix @@ -17,6 +17,11 @@ buildPythonPackage rec { hash = "sha256-5TNCnQhnT1gAblgs+AAW62HoNDPM54hpxgCnYl07j3I="; }; + postPatch = '' + substituteInPlace uwsgi_chunked/version.py \ + --replace-fail "0.1" "${version}" + ''; + build-system = [ setuptools ]; # requires running containers via docker diff --git a/pkgs/development/python-modules/vsure/default.nix b/pkgs/development/python-modules/vsure/default.nix index 9f271596bf9b..9b1e50923b93 100644 --- a/pkgs/development/python-modules/vsure/default.nix +++ b/pkgs/development/python-modules/vsure/default.nix @@ -9,12 +9,12 @@ buildPythonPackage (finalAttrs: { pname = "vsure"; - version = "2.9.0"; + version = "2.10.0"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-OxvRt3Vn53lll8YhNBApi0GWo2AqZ5q3QZeWOjCKjDU="; + hash = "sha256-xygPdwWzYQfA/O2MDTMGustcpcxIUbsTQruUDt205dE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/yalexs-ble/default.nix b/pkgs/development/python-modules/yalexs-ble/default.nix index 24ba441773ff..d4b88a975e73 100644 --- a/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/pkgs/development/python-modules/yalexs-ble/default.nix @@ -15,14 +15,14 @@ buildPythonPackage (finalAttrs: { pname = "yalexs-ble"; - version = "3.4.0"; + version = "3.4.2"; pyproject = true; src = fetchFromGitHub { owner = "Yale-Libs"; repo = "yalexs-ble"; tag = "v${finalAttrs.version}"; - hash = "sha256-sNWLyg+ltwFu14QjoboA6r9zR+5jDHIy+F22Q7+GdoY="; + hash = "sha256-/3OH8MkAs4c5fFP1ickIeurt9SZot03I/ehLpoLr7nY="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/yoto-api/default.nix b/pkgs/development/python-modules/yoto-api/default.nix index e311ec216acc..e803d17fec94 100644 --- a/pkgs/development/python-modules/yoto-api/default.nix +++ b/pkgs/development/python-modules/yoto-api/default.nix @@ -9,14 +9,14 @@ buildPythonPackage (finalAttrs: { pname = "yoto-api"; - version = "4.3.1"; + version = "4.3.2"; pyproject = true; src = fetchFromGitHub { owner = "cdnninja"; repo = "yoto_api"; tag = "v${finalAttrs.version}"; - hash = "sha256-Hy2OE8jol/ttZ1MsIC4EzkYa72DINwcjsHflo8+a7xo="; + hash = "sha256-BJK1kTdiEfBoMW6WhpWc1S52VFIrffU9M0aYtJfvIXs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/zadnegoale/default.nix b/pkgs/development/python-modules/zadnegoale/default.nix deleted file mode 100644 index 4040ad3a9398..000000000000 --- a/pkgs/development/python-modules/zadnegoale/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - lib, - aiohttp, - aioresponses, - buildPythonPackage, - fetchFromGitHub, - dacite, - orjson, - pytest-asyncio, - pytest-error-for-skips, - pytestCheckHook, -}: - -buildPythonPackage rec { - pname = "zadnegoale"; - version = "0.7.0"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "bieniu"; - repo = "zadnegoale"; - tag = version; - hash = "sha256-ij8xou8LXC4/BUTApIV6xSgb7ethwLyrHNJvBgxSBYM="; - }; - - propagatedBuildInputs = [ - aiohttp - dacite - orjson - ]; - - nativeCheckInputs = [ - aioresponses - pytest-asyncio - pytest-error-for-skips - pytestCheckHook - ]; - - pythonImportsCheck = [ "zadnegoale" ]; - - meta = { - description = "Python wrapper for getting allergen concentration data from Żadnego Ale servers"; - homepage = "https://github.com/bieniu/zadnegoale"; - changelog = "https://github.com/bieniu/zadnegoale/releases/tag/${version}"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index f76391c284fd..6ea531b7968a 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -11,14 +11,14 @@ buildPythonPackage (finalAttrs: { pname = "zwave-js-server-python"; - version = "0.72.0"; + version = "0.73.0"; pyproject = true; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "zwave-js-server-python"; tag = finalAttrs.version; - hash = "sha256-SgAKtmyTG36S/Au7uv1U3MLXcINqQql6XEGWAEEHyw0="; + hash = "sha256-xIElSGx6NOKEB5XDgXi6Cf5+XFW2i1riu7RPDHgmIt4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 78cfcb1a8470..182fb61463b8 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -3140,7 +3140,7 @@ let opencv = let opencvGtk = pkgs.opencv.override (old: { - enableGtk2 = true; + enableGtk3 = true; }); in old.opencv.overrideAttrs (attrs: { diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix index 13ce810188b2..bef5e2b41325 100644 --- a/pkgs/development/tools/pnpm/default.nix +++ b/pkgs/development/tools/pnpm/default.nix @@ -61,8 +61,8 @@ let hash = "sha256-zLXEecqxsAYhMlv+fUyaioAx56Ul1ySeJ17L7IGwjbI="; }; "11" = { - version = "11.15.0"; - hash = "sha256-dy+OAPcZr7viJQJxfPl0V4gEYw0C51frPeu8CKD4+Do="; + version = "11.17.0"; + hash = "sha256-ZE61B5ZU6H2uWaB+YtfwmBYrnOWPBgdzKLXd78ochUE="; }; }; diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 08c27feddb44..df3b586a2b0f 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -5,38 +5,38 @@ "lts": false }, "6.1": { - "version": "6.1.177", - "hash": "sha256:0c0ayz4nygcmz4865r7mcgmh7hic4fi7zysnj6vdlyj53bz9nlpn", + "version": "6.1.178", + "hash": "sha256:03vjdk7lk9zgydzamhwvrg066f8748vrfjggqqd2n0vmr9kzm0vx", "lts": true }, "5.15": { - "version": "5.15.211", - "hash": "sha256:0qfry534wl5sbm6b4hf6fxqrr6mzf1k9pa2435sqp4hp6vjm9fdy", + "version": "5.15.212", + "hash": "sha256:1zk51f3pv7ghz68hxkxhds9cjwmk35651pxbyyvyqyhcr7msx5n3", "lts": true }, "5.10": { - "version": "5.10.260", - "hash": "sha256:113bka32apz5pfqjfnv97k9hf9arkn5asfcd6cw7snsh65qjka27", + "version": "5.10.261", + "hash": "sha256:1i6pzaib30r1nmyxsrhqmfsdxy1jvvlmzc9f8lxzv9a00q8a3751", "lts": true }, "6.6": { - "version": "6.6.144", - "hash": "sha256:1hzcax2ypzhrjzmq4b0jyqyc4al0ncyfcj9pq36phl29gcqbh6gc", + "version": "6.6.145", + "hash": "sha256:09h1pzcai0i10pdyyfbsmq03rgk1x5wv2d937m5nz2xdv0rhw46y", "lts": true }, "6.12": { - "version": "6.12.96", - "hash": "sha256:1hapz6xz7plq56jc0drbzcsfcm1amlnphwbfhl0klsxkb9finbkx", + "version": "6.12.97", + "hash": "sha256:0vswyjh91x52ay99mqrdfhwnvd6nnzv4hpncywk908njpfixzgbc", "lts": true }, "6.18": { - "version": "6.18.39", - "hash": "sha256:1c4c3wf00pb8x4kxxrmn46n7mgpnnm78sfi2jx0yg5cxmv9f79x7", + "version": "6.18.40", + "hash": "sha256:0cd42fb4390x73jdzbhacm9g9s0ji58whxhik2ndmr1rr0ggq4ip", "lts": true }, "7.1": { - "version": "7.1.4", - "hash": "sha256:0blfl34vi6vlcdjxd7mbhskl2p7i0zpgdy707a7d6xcn24m94qqw", + "version": "7.1.5", + "hash": "sha256:1rs162gcf6hsafrrmp3y8k9myn20s3s62xdp4zf39pxw7imik812", "lts": false } } diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 6cbfffe22095..c9602d0e5872 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -12,13 +12,13 @@ let # override options if they need using lib.mkForce (that has 50 priority) mkKernelOverride = lib.mkOverride 90; - suffix = "zen2"; + suffix = "zen1"; in buildLinux ( args // rec { - version = "7.1.3"; + version = "7.1.4"; pname = "linux-zen"; modDirVersion = lib.versions.pad 3 "${version}-${suffix}"; isZen = true; @@ -27,7 +27,7 @@ buildLinux ( owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "0af939wq8gfgwrb4s3jjbkqh2pn3zkgk1w48m0hf5fc0qi8ify8x"; + sha256 = "1k27xhzd390krk60kay6cabl0jlpb26m6cwvdh3r8izbwgx1r0ig"; }; # This is based on the following source: diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index bc019bf58e83..0d2a9e7a0db0 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 = "2026.7.3"; + version = "2026.7.4"; components = { "3_day_blinds" = ps: with ps; [ diff --git a/pkgs/servers/home-assistant/custom-components/cover_time_based/package.nix b/pkgs/servers/home-assistant/custom-components/cover_time_based/package.nix new file mode 100644 index 000000000000..76184bec4b0c --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/cover_time_based/package.nix @@ -0,0 +1,39 @@ +{ + buildHomeAssistantComponent, + fetchFromGitHub, + lib, + pytest-homeassistant-custom-component, + pytestCheckHook, +}: + +buildHomeAssistantComponent (finalAttrs: { + owner = "Sese-Schneider"; + domain = "cover_time_based"; + version = "4.9.0"; + + src = fetchFromGitHub { + inherit (finalAttrs) owner; + repo = "ha-cover-time-based"; + tag = "v${finalAttrs.version}"; + hash = "sha256-NVws0FAB88PfgyfrCymyeHVSMzBc/KyILmVOyUQ8T7g="; + }; + + nativeCheckInputs = [ + pytest-homeassistant-custom-component + pytestCheckHook + ]; + + disabledTestPaths = [ + # no need to test development scripts + "tests/test_bump_dev_script.py" + "tests/test_release_script.py" + ]; + + meta = { + changelog = "https://github.com/Sese-Schneider/ha-cover-time-based/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + description = "Integration which allows cover control based on time"; + homepage = "https://github.com/Sese-Schneider/ha-cover-time-based"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.dotlambda ]; + }; +}) diff --git a/pkgs/servers/home-assistant/custom-components/hochwasserportal/package.nix b/pkgs/servers/home-assistant/custom-components/hochwasserportal/package.nix index f5a1dc628e23..a5913a2eddef 100644 --- a/pkgs/servers/home-assistant/custom-components/hochwasserportal/package.nix +++ b/pkgs/servers/home-assistant/custom-components/hochwasserportal/package.nix @@ -11,13 +11,13 @@ buildHomeAssistantComponent rec { owner = "stephan192"; domain = "hochwasserportal"; - version = "1.0.8"; + version = "1.0.9"; src = fetchFromGitHub { owner = "stephan192"; repo = "hochwasserportal"; tag = "v${version}"; - hash = "sha256-q2usHeWcx/1UrM7MQ156SFy8cFIiCcsmIr6721hzSLI="; + hash = "sha256-/mnAQc+s6L9NVzk6gDA5p1+DfY3AZ5Sy6AWhnpkT++Q="; }; dependencies = [ diff --git a/pkgs/servers/home-assistant/custom-components/mypyllant/package.nix b/pkgs/servers/home-assistant/custom-components/mypyllant/package.nix index 12c6360210a1..ea2c69a8f5b6 100644 --- a/pkgs/servers/home-assistant/custom-components/mypyllant/package.nix +++ b/pkgs/servers/home-assistant/custom-components/mypyllant/package.nix @@ -16,16 +16,16 @@ pytestCheckHook, }: -buildHomeAssistantComponent rec { +buildHomeAssistantComponent (finalAttrs: { owner = "signalkraft"; domain = "mypyllant"; - version = "0.9.18"; + version = "0.9.19"; src = fetchFromGitHub { owner = "signalkraft"; repo = "mypyllant-component"; - tag = "v${version}"; - hash = "sha256-7huCAslbm5CLzArYMzSGkKPHlQoX6Qc0WLuv7e6OYLQ="; + tag = "v${finalAttrs.version}"; + hash = "sha256-7+KHmsgfGPIIWu+TTumswcaEoyQF9KvBVAKNGtNhZuQ="; }; dependencies = [ @@ -44,9 +44,9 @@ buildHomeAssistantComponent rec { meta = { description = "Unofficial Home Assistant integration for interacting with myVAILLANT"; - changelog = "https://github.com/signalkraft/mypyllant-component/releases/tag/${src.tag}"; + changelog = "https://github.com/signalkraft/mypyllant-component/releases/tag/${finalAttrs.src.tag}"; homepage = "https://github.com/signalkraft/mypyllant-component"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ urbas ]; }; -} +}) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/package.nix index 8f423edaa23c..53ffd22b3c24 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "multiple-entity-row"; - version = "4.7.0"; + version = "4.7.1"; src = fetchFromGitHub { owner = "benct"; repo = "lovelace-multiple-entity-row"; tag = "v${finalAttrs.version}"; - hash = "sha256-B+FaOITLnNP+rUyDF3bRY+M0xDmWkoTSi+fpWW9khG8="; + hash = "sha256-Tl/XXwIarWFyQUloMEBvIRRrqwPEQxIj0eyQqN1fGU8="; }; offlineCache = fetchYarnDeps { diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index d2ae09ec61b6..d32337b71b99 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -270,7 +270,7 @@ let extraBuildInputs = extraPackages python3Packages; # Don't forget to run update-component-packages.py after updating - hassVersion = "2026.7.3"; + hassVersion = "2026.7.4"; in python3Packages.buildPythonApplication rec { @@ -291,13 +291,13 @@ python3Packages.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; tag = version; - hash = "sha256-P3XpShQivIG39i4inhhFe5lOWKIJWuWOdiIUxpfaH8Y="; + hash = "sha256-EWYJcmjKgWs+JhTLfQ56jpKlTATIsUAeT4XK8XOdh4U="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-zC95f1/p71jag7ex0EGoa5gQobab17a+VDBc7h9YBFA="; + hash = "sha256-i5MzLu22O5bteNwbwp6nct5zcTXpyOYrMW0kuUu/oeQ="; }; build-system = with python3Packages; [ diff --git a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix index 0acf67c2874b..effce4f8641f 100644 --- a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix +++ b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "pytest-homeassistant-custom-component"; - version = "0.13.347"; + version = "0.13.348"; pyproject = true; disabled = pythonOlder "3.13"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "MatthewFlamm"; repo = "pytest-homeassistant-custom-component"; tag = version; - hash = "sha256-Orp6IznDTJlaAAtdDTuevY8JOI0lytH5jeuCtbMnxkc="; + hash = "sha256-pqfTyYvg79QM6kIym8iVGCx4lcZXZFjisjx0lmNb6sU="; }; patches = [ diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 4baaa3389471..acaf06fa6fc2 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 = "2026.7.3"; + version = "2026.7.4"; pyproject = true; disabled = python.version != home-assistant.python3Packages.python.version; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; tag = version; - hash = "sha256-8Fod2L9yCGgrLEzEW2mAsyIgwwxn0llAu8Wb7RySn2U="; + hash = "sha256-JhiFB9lhOelU1ug921DgLUqym7KGwaMbCESHdrMs/O8="; }; build-system = [ diff --git a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix index 68ae78bffda0..4517ab2817c5 100644 --- a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "victoriametrics-logs-datasource"; - version = "0.29.0"; - zipHash = "sha256-zTZRUCWGwJ02/hewJEPclfEWlTYQU0jUUDyxuRkyRHA="; + version = "0.30.1"; + zipHash = "sha256-1dp3TNV+XyFojzzaPrWqwVk1OjLE7b2L7jrwE+J8uZE="; meta = { description = "Grafana datasource for VictoriaLogs"; license = lib.licenses.asl20; diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix index 81ff4297f58c..833bb100dcec 100644 --- a/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/pkgs/servers/nosql/mongodb/mongodb.nix @@ -37,7 +37,7 @@ let python = scons.python.withPackages ( ps: with ps; [ pyyaml - cheetah3 + ct3 psutil setuptools_80 distutils diff --git a/pkgs/servers/sql/postgresql/ext/pgmq.nix b/pkgs/servers/sql/postgresql/ext/pgmq.nix index c3a9eedb7ca0..e74994b49921 100644 --- a/pkgs/servers/sql/postgresql/ext/pgmq.nix +++ b/pkgs/servers/sql/postgresql/ext/pgmq.nix @@ -7,13 +7,13 @@ postgresqlBuildExtension (finalAttrs: { pname = "pgmq"; - version = "1.11.1"; + version = "1.12.0"; src = fetchFromGitHub { owner = "pgmq"; repo = "pgmq"; tag = "v${finalAttrs.version}"; - hash = "sha256-BPOrQ7HcgTaTJIRzWUCG3iJN3mUjwIxa/wPxvJ1l4o4="; + hash = "sha256-yyE5XcwmVC2j4tXx5je6+BvsKD96JVZ/mY5xRyeq8gc="; }; sourceRoot = "${finalAttrs.src.name}/pgmq-extension"; diff --git a/pkgs/shells/fish/plugins/exercism-cli-fish-wrapper.nix b/pkgs/shells/fish/plugins/exercism-cli-fish-wrapper.nix index a8881824d88f..cef847e86eb8 100644 --- a/pkgs/shells/fish/plugins/exercism-cli-fish-wrapper.nix +++ b/pkgs/shells/fish/plugins/exercism-cli-fish-wrapper.nix @@ -6,13 +6,13 @@ }: buildFishPlugin { pname = "exercism-cli-fish-wrapper"; - version = "0-unstable-2026-05-04"; + version = "0-unstable-2026-07-23"; src = fetchFromGitHub { owner = "glennj"; repo = "exercism-cli-fish-wrapper"; - rev = "dcf821898828b53e36f40943719546d41f8434b4"; - hash = "sha256-UupN+Pj1eUx5YXDcfU94lnQdvpDsA0D+AQYuX+WGI14="; + rev = "6b6ac90236308c4cac807225f36fac9283974052"; + hash = "sha256-zfES9Q3NG3UkUekkZ3s/DkPgPsmbfjV4q2LSQFuZFVY="; }; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1e50ef0cadbc..6bdaac7cb3f6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -278,6 +278,7 @@ mapAliases { adobe-reader = throw "'adobe-reader' has been removed, as it was broken, outdated and insecure"; # Added 2025-05-31 aefs = throw "'aefs' has been removed, as it depends on unsupported fuse2 and unmaintained upstream"; # Added 2026-05-30 afpfs-ng = throw "'afpfs-ng' has been removed as it was broken and unmaintained for 10 years"; # Added 2025-05-17 + afterstep = throw "'afterstep' has been removed as it was unmaintained upstream and depends on the deprecated GTK2 engine."; # Added 2026-07-23 afuse = throw "'afuse' has been removed as it is unmaintained upstream, and depends on fuse2, which is deprecated"; # Added 2026-05-05 agrep = throw "'agrep' has been removed due to lack of upstream maintenance. Consider using 'tre' or 'ugrep' instead."; # Added 2025-12-28 akkoma-emoji = throw "'akkoma-emoji' has been renamed to/replaced by 'blobs_gg'"; # Converted to throw 2025-10-27 @@ -659,6 +660,7 @@ mapAliases { deltatouch = throw "'deltatouch' has been removed as it depended on qt5 webengine which reached EOL"; # Added 2026-04-25 desktop-postflop = throw "'desktop-postflop' has been removed as it has been unmaintained upstream since October 2023 and depended on webkitgtk 4.0"; # Added 2026-06-07 devdocs-desktop = throw "'devdocs-desktop' has been removed as it is unmaintained upstream and vendors insecure dependencies"; # Added 2025-06-11 + devmem2 = throw "'devmem2' has been removed due to being broken and lack of maintenance. Consider using the devmem command from 'busybox' or 'toybox'."; # Added 2026-07-24 dfilemanager = throw "'dfilemanager' has been dropped as it was unmaintained"; # Added 2025-06-03 discord-screenaudio = throw "discord-screenaudio has been removed because it was archived upstream. Use vesktop instead."; # added 2025-11-29 disk-inventory-x = throw "disk-inventory-x has been removed as it only supported x86_64-darwin"; # Added 2026-07-12 @@ -1019,6 +1021,7 @@ mapAliases { gtkgnutella = gtk-gnutella; # Added 2026-05-21 gtklp = throw "'gtklp' has been removed, as it depended on GTK 2. Consider using 'system-config-printer' instead."; # Added 2026-05-22 gtkradiant = throw "'gtkradiant' has been removed, as it relies on gtk2"; # Added 2026-06-18 + gtkspell2 = throw "'gtkspell2' has been removed as it depended on the deprecated GTK2 engine. Consider using 'gtkspell3' instead"; # Added 2026-07-23 gtuber = throw "'gtuber' has been removed due to being discontinued by upstream."; # Added 2025-12-12 gui-for-clash = throw "'gui-for-clash' has been removed, as it is unmaintained"; # Added 2026-05-28 guile-disarchive = throw "'guile-disarchive' has been renamed to/replaced by 'disarchive'"; # Converted to throw 2025-10-27 @@ -1113,6 +1116,7 @@ mapAliases { jhentai = throw "'jhentai' has been removed, as it is unmaintained"; # Added 2026-01-25 jikespg = throw "'jikespg' has been removed due to lack of maintenance upstream."; # Added 2025-06-10 jing = jing-trang; # Added 2025-09-18 + jitsi = throw "'jitsi' has been removed as it relies on gtk2 libraries"; # Added 2026-07-24 jmtpfs = throw "'jmtpfs' has been removed, as it is unmaintained"; # Added 2026-06-06 joplin = joplin-cli; # Added 2025-11-03 jscoverage = throw "jscoverage has been removed, as it was broken"; # Added 2025-08-25 @@ -1502,7 +1506,7 @@ mapAliases { mailnagWithPlugins = throw "mailnagWithPlugins has been removed because mailnag has been marked as broken since 2022."; # Added 2025-10-12 makeOverridable = warnAlias "'makeOverridable' has been removed from pkgs, use `lib.makeOverridable` instead" lib.makeOverridable; # Added 2025-10-30 manaplus = throw "manaplus has been removed, as it was broken"; # Added 2025-08-25 - mangowc = throw "'mangowc' has been renamed to 'mango'"; # Added 2026-06-23 + mangowc = mango; # Added 2026-06-23 manrope = throw "'manrope' has been removed because its source has been pulled"; # Added 2025-12-20 mariadb-client = throw "mariadb-client has been renamed to mariadb.client"; # Converted to throw 2025-10-26 marwaita-manjaro = throw "'marwaita-manjaro' has been renamed to/replaced by 'marwaita-teal'"; # Converted to throw 2025-10-27 @@ -1965,6 +1969,7 @@ mapAliases { pythonFull = throw "'pythonFull' previously pointed to Python 2; use `python3` instead"; # Converted to throw 2025-10-27 pythonPackages = throw "`pythonPackages` previously pointed to Python 2; use `python3Packages` instead"; # Converted to throw 2025-10-27 pywal = pywal16; # Added 2026-02-01 + pzip = throw "`pzip` has been removed because it was unmaintained upstream and insecure."; # Added 2026-07-23 q2pro = throw "'q2pro' has been removed as upstream repository was deleted and no direct active forks were available."; # Added 2025-12-27 qcachegrind = throw "'qcachegrind' has been removed, as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20 qes = throw "'qes' has been removed, as it has been merged into shkd"; # Added 2025-12-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c33b87cd6b67..2df4931b1f0e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7981,7 +7981,6 @@ with pkgs; qemu_test = lowPrio ( qemu.override { - hostCpuOnly = true; nixosTestRunner = true; } ); @@ -8437,6 +8436,9 @@ with pkgs; bitwig-studio = bitwig-studio6; + brave = (callPackage ../applications/networking/browsers/brave { }).brave; + brave-origin = (callPackage ../applications/networking/browsers/brave { }).brave-origin; + breezy = with python3Packages; toPythonApplication breezy; # calico-felix and calico-node have not been packaged due to libbpf, linking issues @@ -9433,6 +9435,9 @@ with pkgs; thunderbird-esr-unwrapped = thunderbirdPackages.thunderbird-esr; thunderbird-esr = wrapThunderbird thunderbird-esr-unwrapped { }; + thunderbird-153-unwrapped = thunderbirdPackages.thunderbird-153; + thunderbird-153 = wrapThunderbird thunderbirdPackages.thunderbird-153 { }; + thunderbird-140-unwrapped = thunderbirdPackages.thunderbird-140; thunderbird-140 = wrapThunderbird thunderbirdPackages.thunderbird-140 { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index ac7b229aa309..1a01040d400f 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -152,6 +152,7 @@ mapAliases { chai = throw "'chai' has been removed as it is no longer maintained upstream and the repository was archived"; # Added 2026-06-08 characteristic = throw "'characteristic' has been removed because it is no longer maintained upstream"; # Added 2026-01-14 chart-studio = throw "'chart-studio' has been removed as it is no longer maintained upstream"; # Added 2026-03-12 + cheetah3 = ct3; # added 2026-07-24 chromeprint = throw "'chromaprint' was removed as it depended on m2r which was removed."; # Added 2026-05-27 cirq-rigetti = throw "cirq-rigetti was removed because it is no longer provided by upstream"; # added 2025-09-13 class-registry = throw "'class-registry' has been renamed to/replaced by 'phx-class-registry'"; # Converted to throw 2025-10-29 @@ -666,6 +667,7 @@ mapAliases { tensorflow-estimator_2 = throw "'tensorflow-estimator_2' has been renamed to/replaced by 'tensorflow-estimator'"; # Converted to throw 2025-10-29 tensorflow-tensorboard = throw "'tensorflow-tensorboard' has been renamed to/replaced by 'tensorboard'"; # Converted to throw 2025-10-29 tensorflow-tensorboard_2 = throw "'tensorflow-tensorboard_2' has been renamed to/replaced by 'tensorflow-tensorboard'"; # Converted to throw 2025-10-29 + termstyle = throw "'termstyle' has been removed, since it is unmaintained upstream"; # Added 2026-07-24 testing-postgresql = throw "testing-postgresql has been removed, since it is unmaintained since 2017"; # added 2025-05-25 textwrap3 = throw "'textwrap3' has been removed, since it had no consumers in nixpkgs"; # Added 2026-07-24 tgcrypto = throw "'tgcrypto' has been removed as it was archived upstream"; # Added 2026-03-21 @@ -722,6 +724,7 @@ mapAliases { yasi = throw "'yasi' has been removed as it is unmaintained upstream"; # Added 2026-01-31 ypy-websocket = throw "'ypy-websocket' has been removed as it was archived upstream; consider using 'pycrdt-websocket' instead"; # Added 2026-01-21 z3 = throw "'z3' has been renamed to/replaced by 'z3-solver'"; # Converted to throw 2025-10-29 + zadnegoale = throw "'zadnegoale' has been removed because it was archived upstream"; # Added 2026-07-23 zc-buildout221 = throw "'zc-buildout221' has been renamed to/replaced by 'zc-buildout'"; # Converted to throw 2025-10-29 zc_lockfile = throw "'zc_lockfile' has been renamed to/replaced by 'zc-lockfile'"; # Converted to throw 2025-10-29 zebrafy = throw "'zebrafy' has been removed due to lack of upstream maintenance"; # Added 2026-05-11 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fe4512be9f7e..2b5a87b09493 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3058,8 +3058,6 @@ self: super: with self; { checksumdir = callPackage ../development/python-modules/checksumdir { }; - cheetah3 = callPackage ../development/python-modules/cheetah3 { }; - chefiq-ble = callPackage ../development/python-modules/chefiq-ble { }; cheroot = callPackage ../development/python-modules/cheroot { }; @@ -3767,6 +3765,8 @@ self: super: with self; { csvw = callPackage ../development/python-modules/csvw { }; + ct3 = callPackage ../development/python-modules/ct3 { }; + ctap-keyring-device = callPackage ../development/python-modules/ctap-keyring-device { }; ctranslate2 = callPackage ../development/python-modules/ctranslate2 { @@ -10022,6 +10022,8 @@ self: super: with self; { mail-parser = callPackage ../development/python-modules/mail-parser { }; + mailbits = callPackage ../development/python-modules/mailbits { }; + mailcap-fix = callPackage ../development/python-modules/mailcap-fix { }; mailchecker = callPackage ../development/python-modules/mailchecker { }; @@ -12235,7 +12237,6 @@ self: super: with self; { enableLto = !stdenv.hostPlatform.isLinux; # https://github.com/NixOS/nixpkgs/issues/343123 enableUnfree = false; # prevents cache enableIpp = true; - enableGtk2 = true; enableGtk3 = true; enableVtk = true; enableFfmpeg = true; @@ -15401,6 +15402,8 @@ self: super: with self; { pyphotonfile = callPackage ../development/python-modules/pyphotonfile { }; + pypi-simple = callPackage ../development/python-modules/pypi-simple { }; + pypika = callPackage ../development/python-modules/pypika { }; pypillowfight = callPackage ../development/python-modules/pypillowfight { }; @@ -17174,6 +17177,8 @@ self: super: with self; { pyzerproc = callPackage ../development/python-modules/pyzerproc { }; + pyzhuyin = callPackage ../development/python-modules/pyzhuyin { }; + pyzipper = callPackage ../development/python-modules/pyzipper { }; pyzmq = callPackage ../development/python-modules/pyzmq { }; @@ -20117,8 +20122,6 @@ self: super: with self; { termplotlib = callPackage ../development/python-modules/termplotlib { }; - termstyle = callPackage ../development/python-modules/termstyle { }; - tern = callPackage ../development/python-modules/tern { }; tesla-fleet-api = callPackage ../development/python-modules/tesla-fleet-api { }; @@ -22529,8 +22532,6 @@ self: super: with self; { zabbix-utils = callPackage ../development/python-modules/zabbix-utils { }; - zadnegoale = callPackage ../development/python-modules/zadnegoale { }; - zalgolib = callPackage ../development/python-modules/zalgolib { }; zamg = callPackage ../development/python-modules/zamg { }; diff --git a/shell.nix b/shell.nix index b68b120a2529..81ef55a637f3 100644 --- a/shell.nix +++ b/shell.nix @@ -16,7 +16,44 @@ nixpkgs ? null, }: let - inherit (import ./ci { inherit nixpkgs system; }) pkgs fmt; + version = builtins.readFile ./.version; + + # On 26.05 we need a CI-pinned Nixpkgs revision that supports x86_64-darwin. + # TODO: remove after 26.05 support ends. + nixpkgs' = + if nixpkgs == null && system == "x86_64-darwin" && version == "26.05" then + let + pinned = (builtins.fromJSON (builtins.readFile ./ci/pinned.json)).pins; + warn = builtins.warn or (import ./lib).warn; + + inherit (pinned."nixpkgs-26.05-darwin") + url + hash + revision + branch + ; + + withWarning = warn (toString [ + "The currently pinned Nixpkgs (${pinned.nixpkgs.revision}) does not support ${system}," + "using revision (${revision}) from ${branch}." + "You may experience some differences to CI." + ]); + in + withWarning fetchTarball { + inherit url; + sha256 = hash; + } + else + nixpkgs; + + inherit + (import ./ci { + inherit system; + nixpkgs = nixpkgs'; + }) + pkgs + fmt + ; # For `nix-shell -A hello` curPkgs = removeAttrs (import ./. { inherit system; }) [ @@ -39,3 +76,6 @@ curPkgs fmt.pkg ]; } +// { + formatter = fmt.pkg; +}