diff --git a/ci/OWNERS b/ci/OWNERS index e08961b38210..43ef6f666651 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -74,8 +74,6 @@ /pkgs/build-support/bintools-wrapper @Ericson2314 /pkgs/build-support/setup-hooks @Ericson2314 /pkgs/build-support/setup-hooks/arrayUtilities @ConnorBaker -/pkgs/build-support/setup-hooks/auto-patchelf.sh @layus -/pkgs/by-name/au/auto-patchelf @layus ## Format generators/serializers /pkgs/pkgs-lib @Stunkymonkey @h7x4 diff --git a/doc/languages-frameworks/lua.section.md b/doc/languages-frameworks/lua.section.md index 366f7a497fc8..97161970d8e4 100644 --- a/doc/languages-frameworks/lua.section.md +++ b/doc/languages-frameworks/lua.section.md @@ -162,6 +162,14 @@ the package `luarocks-packages-updater`: nix-shell -p luarocks-packages-updater --run luarocks-packages-updater ``` +To add a new package without updating all packages, run + +```sh + +nix-shell -p luarocks-packages-updater +luarocks-packages-updater add +``` + [luarocks2nix](https://github.com/nix-community/luarocks) is a tool capable of generating nix derivations from both rockspec and src.rock (and favors the src.rock). The automation only goes so far though and some packages need to be customized. These customizations go in [pkgs/development/lua-modules/overrides.nix](https://github.com/NixOS/nixpkgs/tree/master/pkgs/development/lua-modules/overrides.nix). diff --git a/doc/languages-frameworks/neovim.section.md b/doc/languages-frameworks/neovim.section.md index 6296a0389ec2..b131e65a0e59 100644 --- a/doc/languages-frameworks/neovim.section.md +++ b/doc/languages-frameworks/neovim.section.md @@ -151,6 +151,8 @@ For instance: ``` To update these packages, you should use the lua updater rather than vim's. +To add a lua package to the `vimPlugins` set, add it to the `luarocksPackageNames` list in [luaPackagePlugins.nix](https://github.com/nixos/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix). + ## Treesitter {#neovim-plugin-treesitter} [Treesitter](https://tree-sitter.github.io/) provides syntax parsing for Neovim, enabling features like: diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 037d762a9343..61211f99f36c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -27438,6 +27438,13 @@ github = "thattemperature"; githubId = 125476238; }; + thbemme = { + name = "Thomas Bemme"; + email = "thomas.bemme@gmail.com"; + matrix = "@riza:chaos.jetzt"; + github = "thbemme"; + githubId = 14074615; + }; thblt = { name = "Thibault Polge"; email = "thibault@thb.lt"; @@ -28780,6 +28787,12 @@ githubId = 17836748; name = "Mason Mackaman"; }; + username-generic = { + name = "username-generic"; + email = "username-generic@tuta.io"; + github = "username-generic"; + githubId = 202454830; + }; usertam = { name = "Samuel Tam"; email = "code@usertam.dev"; diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index d9e899ca2f45..1eaef0621fbd 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -35,6 +35,7 @@ haskell-tools.nvim,,,,,5.1,mrcjkb http,,,,0.4-0,,vcunat inspect,,,,,, jsregexp,,,,0.0.7-2,, +kulala.nvim,,,,,, ldbus,,,https://luarocks.org/dev,,, ldoc,,,,,, lgi,,,,,, diff --git a/nixos/doc/manual/development/settings-options.section.md b/nixos/doc/manual/development/settings-options.section.md index f3257a56d71b..8675c1ef08a5 100644 --- a/nixos/doc/manual/development/settings-options.section.md +++ b/nixos/doc/manual/development/settings-options.section.md @@ -322,6 +322,14 @@ have a predefined type and string generator already declared under The attribute `lib.type.atom` contains the used INI atom. +`pkgs.formats.configobj` { } + +: A function taking an attribute set with values + + It returns a set with [ConfigObj](https://pypi.org/project/configobj/)-specific attributes `type` and `generate` as specified [below](#pkgs-formats-result). + The type of the input is an attribute mapping supporting both atoms and nested attribute sets (sections/subsections), as supported by ConfigObj. + The renderer is based on Python's `configobj` module. + `pkgs.formats.iniWithGlobalSection` { *`listsAsDuplicateKeys`* ? false, *`listToValue`* ? null, \.\.\. } : A function taking an attribute set with values diff --git a/nixos/modules/programs/clash-verge.nix b/nixos/modules/programs/clash-verge.nix index b54643679279..511599efc9ac 100644 --- a/nixos/modules/programs/clash-verge.nix +++ b/nixos/modules/programs/clash-verge.nix @@ -21,7 +21,15 @@ defaultText = lib.literalExpression "pkgs.clash-verge-rev"; }; serviceMode = lib.mkEnableOption "Service Mode"; - tunMode = lib.mkEnableOption "Setcap for TUN Mode. DNS settings won't work on this way"; + tunMode = lib.mkEnableOption "" // { + description = '' + Whether to set the capabilities required for TUN mode. + + Without these capabilities, Clash Verge's DNS settings will not work in TUN mode. + + When enabled, reverse path filtering will be set to loose instead of strict. + ''; + }; autoStart = lib.mkEnableOption "Clash Verge auto launch"; group = lib.mkOption { type = lib.types.str; @@ -59,6 +67,22 @@ source = "${lib.getExe cfg.package}"; }; + assertions = [ + { + assertion = + cfg.tunMode + -> + config.networking.firewall.checkReversePath != true + && config.networking.firewall.checkReversePath != "strict"; + message = '' + {option}`programs.clash-verge.tunMode` requires {option}`networking.firewall.checkReversePath` + to be set to `false` or `"loose"`. + ''; + } + ]; + + networking.firewall.checkReversePath = lib.mkIf cfg.tunMode (lib.mkDefault "loose"); + systemd.services.clash-verge = lib.mkIf cfg.serviceMode { enable = true; description = "Clash Verge Service Mode"; diff --git a/nixos/modules/services/web-apps/rustical.nix b/nixos/modules/services/web-apps/rustical.nix index a92daf8c07b4..56661c9c24d6 100644 --- a/nixos/modules/services/web-apps/rustical.nix +++ b/nixos/modules/services/web-apps/rustical.nix @@ -149,6 +149,8 @@ in EnvironmentFile = cfg.environmentFiles; Restart = "on-failure"; StateDirectory = "rustical"; + RuntimeDirectory = "rustical"; + RuntimeDirectoryMode = "0750"; CapabilityBoundingSet = ""; DevicePolicy = "closed"; @@ -172,6 +174,7 @@ in RestrictAddressFamilies = [ "AF_INET" "AF_INET6" + "AF_UNIX" ]; RestrictNamespaces = true; RestrictRealtime = true; @@ -181,7 +184,7 @@ in "~@privileged @resources" ]; SystemCallErrorNumber = "EPERM"; - UMask = "0077"; + UMask = "0007"; }; }; }; diff --git a/nixos/modules/services/web-apps/strichliste.nix b/nixos/modules/services/web-apps/strichliste.nix index e32a2a169169..8aa78f62bcd0 100644 --- a/nixos/modules/services/web-apps/strichliste.nix +++ b/nixos/modules/services/web-apps/strichliste.nix @@ -128,21 +128,23 @@ in }; account = { - lower = mkOption { - type = types.int; - default = -200000; - example = 0; - description = '' - The credit limit for user accounts. - ''; - }; + boundary = { + lower = mkOption { + type = types.int; + default = -200000; + example = 0; + description = '' + The credit limit for user accounts. + ''; + }; - upper = mkOption { - type = types.ints.positive; - default = 200000; - description = '' - The maximum balance on a user account. - ''; + upper = mkOption { + type = types.ints.positive; + default = 200000; + description = '' + The maximum balance on a user account. + ''; + }; }; }; @@ -256,7 +258,7 @@ in }; }; - transaction = { + transactions = { enabled = mkOption { type = types.bool; default = true; @@ -476,20 +478,15 @@ in inherit (cfg) environment; serviceConfig = { Type = "oneshot"; + RemainAfterExit = true; User = "strichliste"; Group = "strichliste"; EnvironmentFile = cfg.environmentFiles; - ExecStart = map toString [ - [ - (lib.getExe cfg.packages.backend) - "cache:clear" - ] - [ - (lib.getExe cfg.packages.backend) - "doctrine:migrations:migrate" - "--allow-no-migration" - "--no-interaction" - ] + ExecStart = toString [ + (lib.getExe cfg.packages.backend) + "doctrine:migrations:migrate" + "--allow-no-migration" + "--no-interaction" ]; }; }; @@ -497,6 +494,11 @@ in systemd.services.phpfpm-strichliste = { inherit (cfg) environment; serviceConfig.EnvironmentFile = cfg.environmentFiles; + restartTriggers = [ settingsFile ]; + preStart = toString [ + (lib.getExe cfg.packages.backend) + "cache:clear" + ]; }; services.phpfpm.pools.strichliste = { diff --git a/nixos/tests/web-apps/rustical.nix b/nixos/tests/web-apps/rustical.nix index 15a718e87702..3213cfd61f09 100644 --- a/nixos/tests/web-apps/rustical.nix +++ b/nixos/tests/web-apps/rustical.nix @@ -4,10 +4,6 @@ ... }: -let - port = "4000"; -in - { name = "rustical"; @@ -15,14 +11,21 @@ in containers.machine = { + config, pkgs, ... }: { - services.rustical = { + services.rustical.enable = true; + services.nginx = { enable = true; - settings.http.bind = "[::]:${port}"; + virtualHosts."localhost" = { + locations."/" = { + proxyPass = "http://${config.services.rustical.settings.http.bind}"; + }; + }; }; + systemd.services.nginx.serviceConfig.SupplementaryGroups = [ "rustical" ]; environment.systemPackages = with pkgs; [ calendar-cli ]; }; @@ -32,8 +35,6 @@ in ... }: let - url = "http://localhost:${toString port}"; - createPrincipalScript = pkgs.writeScript "rustical-create-principal" '' #!${lib.getExe pkgs.expect} spawn rustical principals create alice --password @@ -45,30 +46,31 @@ in calendarCliConfig = (pkgs.formats.json { }).generate "rustical-test-calendar-cli.json" { default = { caldav_user = "alice"; - caldav_url = "${url}/caldav/"; - calendar_url = "${url}/caldav/principal/alice"; + caldav_url = "http://localhost/caldav/"; + calendar_url = "http://localhost/caldav/principal/alice"; }; testcal = { inherits = "default"; - calendar_url = "${url}/caldav/principal/alice/testcal"; + calendar_url = "http://localhost/caldav/principal/alice/testcal"; }; }; in # python '' machine.wait_for_unit("rustical.service") - machine.wait_for_open_port(${port}) + machine.wait_for_file("${lib.removePrefix "unix:" containers.machine.services.rustical.settings.http.bind}") + machine.wait_for_open_port(80) with subtest("Smoketest"): - machine.succeed("curl --fail ${url}") + machine.succeed("curl --fail http://localhost") with subtest("Create principal"): machine.succeed("${createPrincipalScript}") machine.succeed("rustical principals list | grep alice") with subtest("Generate token for principal"): - machine.succeed("curl -f -c cookies.txt -d 'username=alice&password=foobar' ${url}/frontend/login") - machine.succeed("curl -f -b cookies.txt -d 'name=mytoken' ${url}/frontend/user/alice/app_token > token.txt") + machine.succeed("curl -f -c cookies.txt -d 'username=alice&password=foobar' http://localhost/frontend/login") + machine.succeed("curl -f -b cookies.txt -d 'name=mytoken' http://localhost/frontend/user/alice/app_token > token.txt") with subtest("Interact with caldav"): machine.succeed('calendar-cli --config-file ${calendarCliConfig} --caldav-pass "$(cat token.txt)" calendar create testcal') diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json deleted file mode 100644 index 3a1e643c6f7f..000000000000 --- a/pkgs/applications/editors/cudatext/deps.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "EncConv": { - "owner": "Alexey-T", - "rev": "2023.04.16", - "hash": "sha256-6KaYv4OO6Ctk+vgow67LKGkbEEd1+lFJ9B1wSk4m3pc=" - }, - "ATBinHex-Lazarus": { - "owner": "Alexey-T", - "rev": "2023.08.12", - "hash": "sha256-dEwz052aYcJtKpRcP8t7gE2RHuHPQ4T0zHFMv6zVZ6g=" - }, - "ATFlatControls": { - "owner": "Alexey-T", - "rev": "2023.10.30", - "hash": "sha256-fuTQnnuWjIsABx457y+n6luLxQf+b9TiZGLXYjNsUrw=" - }, - "ATSynEdit": { - "owner": "Alexey-T", - "rev": "2023.11.23", - "hash": "sha256-LGYGCxEPdZL4BU3TGiFxydu7AN8g5kqOdW+dcbiCf7E=" - }, - "ATSynEdit_Cmp": { - "owner": "Alexey-T", - "rev": "2023.05.31", - "hash": "sha256-QXu/p3o0RSwMyntFYrjIQBtOBGvL9rAsINaglG3fZvo=" - }, - "EControl": { - "owner": "Alexey-T", - "rev": "2023.11.16", - "hash": "sha256-FxUV+K9JRsdr0xqQzvg1UI4bBHyhqxiVoPN58h2+WVg=" - }, - "ATSynEdit_Ex": { - "owner": "Alexey-T", - "rev": "2023.11.23", - "hash": "sha256-RNXP8O3UF+hwA3TNzLorZqlt04Idnc4Z9LA87JJSsZE=" - }, - "Python-for-Lazarus": { - "owner": "Alexey-T", - "rev": "2023.06.30", - "hash": "sha256-mO8/RNJjy9KtFuDUmV2Y8Ff+Jjm9yRd7GSrI6mOONUc=" - }, - "Emmet-Pascal": { - "owner": "Alexey-T", - "rev": "2023.08.12", - "hash": "sha256-s9ZKrL+XIWIwejnLz+uuyDbbDuOZLJhiuiMChKB4Reg=" - }, - "CudaText-lexers": { - "owner": "Alexey-T", - "rev": "2021.07.09", - "hash": "sha256-OyC85mTMi9m5kbtx8TAK2V4voL1i+J+TFoLVwxlHiD4=" - }, - "bgrabitmap": { - "owner": "bgrabitmap", - "rev": "v11.5.6", - "hash": "sha256-7TuHCCaH8/RxiVQmDILPW4T6op/XW6djwA5iSh/Yb5w=" - } -} diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 85489fefd586..dc433b28353a 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -8458,20 +8458,6 @@ final: prev: { meta.hydraPlatforms = [ ]; }; - kulala-nvim = buildVimPlugin { - pname = "kulala.nvim"; - version = "6.11.1"; - src = fetchFromGitHub { - owner = "mistweaverco"; - repo = "kulala.nvim"; - tag = "v6.11.1"; - hash = "sha256-w3psD4EYntFeX7otMPXN3altJf3UPjcaS2XLlqSnH4k="; - }; - meta.homepage = "https://github.com/mistweaverco/kulala.nvim/"; - meta.license = getLicenseFromSpdxId "MIT"; - meta.hydraPlatforms = [ ]; - }; - lackluster-nvim = buildVimPlugin { pname = "lackluster.nvim"; version = "0-unstable-2025-10-06"; diff --git a/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix b/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix index b8c8dccb4960..5bac2daba0b2 100644 --- a/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix @@ -15,6 +15,7 @@ let "grug-far-nvim" "haskell-tools-nvim" "image-nvim" + "kulala-nvim" "lsp-progress-nvim" "lualine-nvim" "luasnip" diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 03edb8dac52b..63cf04e188fa 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -2020,10 +2020,6 @@ assertNoAdditions { ); in { - patches = (old.patches or [ ]) ++ [ - ./patches/kulala-nvim/use-packaged-tree-sitter-parser.patch - ]; - dependencies = [ kulala-http-grammar ]; postPatch = '' diff --git a/pkgs/applications/editors/vim/plugins/patches/kulala-nvim/do-not-install-grammar.patch b/pkgs/applications/editors/vim/plugins/patches/kulala-nvim/do-not-install-grammar.patch deleted file mode 100644 index 00a76f9c0492..000000000000 --- a/pkgs/applications/editors/vim/plugins/patches/kulala-nvim/do-not-install-grammar.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/lua/kulala/config/init.lua b/lua/kulala/config/init.lua -index 7298f95..d781a12 100644 ---- a/lua/kulala/config/init.lua -+++ b/lua/kulala/config/init.lua -@@ -122,6 +122,10 @@ local function setup_treesitter_master() - end - - local function set_kulala_parser() -+ assert(vim.treesitter.language.add("kulala_http")) -+ vim.treesitter.language.register("kulala_http", { "http", "rest" }) -+ do return end -+ - local parsers = vim.F.npcall(require, "nvim-treesitter.parsers") - - if not parsers then diff --git a/pkgs/applications/editors/vim/plugins/patches/kulala-nvim/use-packaged-tree-sitter-parser.patch b/pkgs/applications/editors/vim/plugins/patches/kulala-nvim/use-packaged-tree-sitter-parser.patch deleted file mode 100644 index d7bd71b2c4c6..000000000000 --- a/pkgs/applications/editors/vim/plugins/patches/kulala-nvim/use-packaged-tree-sitter-parser.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/lua/kulala/config/parser.lua b/lua/kulala/config/parser.lua -index 5f37046..c60c474 100644 ---- a/lua/kulala/config/parser.lua -+++ b/lua/kulala/config/parser.lua -@@ -37,7 +37,6 @@ local function sync_queries() - end - - local function load_parser() -- if not Fs.file_exists(parser_target_path) then return false end - return vim.treesitter.language.add(parser_name) == true - end - -@@ -48,7 +47,3 @@ M.register_parser = function() -- -- kulala_http/*.scm live under tree-sitter-kulala-http/queries/ -- vim.opt.rtp:prepend(parser_source_path) -- ensure_site_rtp() -- sync_queries() - vim.treesitter.language.register(parser_name, filetypes) - vim.treesitter.language.register("markdown", "kulala_ui") - local backend = require("kulala.backend") -@@ -94,7 +92,7 @@ local function has_kulala_parser() - end - - M.is_up_to_date = function() -- return has_kulala_parser() and is_parser_ver_current() -+ return load_parser() - end - - M.setup = function() diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 97bcfcc72948..1ca54bd8537c 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -602,7 +602,6 @@ https://github.com/frabjous/knap/,, https://github.com/oskarnurm/koda.nvim/,, https://github.com/b3nj5m1n/kommentary/,, https://github.com/udalov/kotlin-vim/,, -https://github.com/mistweaverco/kulala.nvim/,, https://github.com/slugbyte/lackluster.nvim/,, https://github.com/qnighy/lalrpop.vim/,, https://github.com/Wansmer/langmapper.nvim/,, diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index f1a18f119e1f..d9d36f05055d 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -5156,8 +5156,8 @@ let mktplcRef = { name = "vscode-java-pack"; publisher = "vscjava"; - version = "0.31.0"; - hash = "sha256-E0GJoITZIh2XemVpyPh3gAEtlvM2PZHgNzZDctSpwIA="; + version = "0.31.1"; + hash = "sha256-SfrsL27uQyrtsNyqZe0q5Fv5sHMwRvBZ+iS6/JIpFVo="; }; meta = { description = "Popular extensions for Java development that provides Java IntelliSense, debugging, testing, Maven/Gradle support, project management and more"; diff --git a/pkgs/applications/emulators/libretro/cores/gambatte.nix b/pkgs/applications/emulators/libretro/cores/gambatte.nix index d72170bb68f0..a4b475e12d83 100644 --- a/pkgs/applications/emulators/libretro/cores/gambatte.nix +++ b/pkgs/applications/emulators/libretro/cores/gambatte.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "gambatte"; - version = "0-unstable-2026-06-05"; + version = "0-unstable-2026-06-14"; src = fetchFromGitHub { owner = "libretro"; repo = "gambatte-libretro"; - rev = "6716e6ee39c2abd3ea325f66fb26e7f866f4c5dc"; - hash = "sha256-sn8UWO1YR3qLpsR0dwpyy42L+QWrYpwO2lL4NqgUmWM="; + rev = "e99e1bd9b91de67ac12c77c3679c85447c26e8c8"; + hash = "sha256-i5Bx5MstvwwKfH/Lmlj3jheQsbHP2BU8Ecpp3m5D8HA="; }; meta = { diff --git a/pkgs/applications/emulators/libretro/cores/swanstation.nix b/pkgs/applications/emulators/libretro/cores/swanstation.nix index 4c46caf841d1..13be1cc06c10 100644 --- a/pkgs/applications/emulators/libretro/cores/swanstation.nix +++ b/pkgs/applications/emulators/libretro/cores/swanstation.nix @@ -6,13 +6,13 @@ }: mkLibretroCore { core = "swanstation"; - version = "0-unstable-2026-05-20"; + version = "0-unstable-2026-06-14"; src = fetchFromGitHub { owner = "libretro"; repo = "swanstation"; - rev = "62697276b95848bd35b9c7b81daab899a98e0789"; - hash = "sha256-jisW5Mk5PF3rxj9mF5FJXtktAKEAq2a6DUvCXBgri3E="; + rev = "93b213d805591c4f1488339c4a16f0b4cb68d44a"; + hash = "sha256-l4HhejwOKE/bk9HFf2mDTDqc223m6UofTIF+BgMIDEw="; }; extraNativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index ff6ddba70290..227ed32f4ff0 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -661,13 +661,13 @@ "vendorHash": "sha256-CwTlb0QTq0lpZK90IL6mBLoarFYFLsjiLYauGEaR1Rk=" }, "hashicorp_tfe": { - "hash": "sha256-GRrtwrShJj+d2h6CpxjP+QmRKQLTWoNt5889ek9rfyE=", + "hash": "sha256-otBeETd3wrGdpDU4MbY+qyad7ZVaoljlphBNytB36BY=", "homepage": "https://registry.terraform.io/providers/hashicorp/tfe", "owner": "hashicorp", "repo": "terraform-provider-tfe", - "rev": "v0.77.0", + "rev": "v0.78.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-DutNev1ABazfV6QOWMFsFc0QSkffARhaJ7RXTWG2Jyo=" + "vendorHash": "sha256-PKAFhHCaeCtV1frMyCidCcJgWTA8/7Cbdq6h3RTeqAQ=" }, "hashicorp_time": { "hash": "sha256-5+iPq2It3oFHPBHWshfIuNo1xkOPcuSYyljt6j+j7lg=", diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index c28fe180c3e2..8e43bfa98173 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -15,6 +15,7 @@ fontconfig, foundationdb, freetype, + fuse3, gdk-pixbuf, glib, gmp, @@ -43,6 +44,7 @@ udev, webkitgtk_4_1, zlib, + zstd, buildPackages, ... }: @@ -146,6 +148,11 @@ buildInputs = [ freetype ]; }; + fuser = attrs: { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ fuse3 ]; + }; + glib-sys = attrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib ]; @@ -392,6 +399,12 @@ buildInputs = [ python3 ]; }; + zstd-sys = attrs: { + ZSTD_SYS_USE_PKG_CONFIG = true; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ zstd ]; + }; + atk-sys = attrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ atk ]; diff --git a/pkgs/build-support/setup-hooks/add-bin-to-path.sh b/pkgs/by-name/ad/addBinToPathHook/add-bin-to-path.sh similarity index 100% rename from pkgs/build-support/setup-hooks/add-bin-to-path.sh rename to pkgs/by-name/ad/addBinToPathHook/add-bin-to-path.sh diff --git a/pkgs/by-name/ad/addBinToPathHook/package.nix b/pkgs/by-name/ad/addBinToPathHook/package.nix new file mode 100644 index 000000000000..e8a208611c52 --- /dev/null +++ b/pkgs/by-name/ad/addBinToPathHook/package.nix @@ -0,0 +1,9 @@ +{ + lib, + makeSetupHook, +}: + +makeSetupHook { + name = "add-bin-to-path-hook"; + meta.license = lib.licenses.mit; +} ./add-bin-to-path.sh diff --git a/pkgs/by-name/an/anilibria-winmaclinux/0002-disable-version-check.patch b/pkgs/by-name/an/anilibria-winmaclinux/0001-disable-version-check.patch similarity index 100% rename from pkgs/by-name/an/anilibria-winmaclinux/0002-disable-version-check.patch rename to pkgs/by-name/an/anilibria-winmaclinux/0001-disable-version-check.patch diff --git a/pkgs/by-name/an/anilibria-winmaclinux/0001-fix-installation-paths.patch b/pkgs/by-name/an/anilibria-winmaclinux/0001-fix-installation-paths.patch deleted file mode 100644 index 14f9799e46bd..000000000000 --- a/pkgs/by-name/an/anilibria-winmaclinux/0001-fix-installation-paths.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/AniLibria.pro b/AniLibria.pro -index 3eb7213..ea571ff 100644 ---- a/AniLibria.pro -+++ b/AniLibria.pro -@@ -271,17 +271,8 @@ QML_IMPORT_PATH = - # Additional import path used to resolve QML modules just for Qt Quick Designer - QML_DESIGNER_IMPORT_PATH = - --# Default rules for deployment. --!flatpak{ -- qnx: target.path = /tmp/$${TARGET}/bin -- else: unix:!android: target.path = /opt/$${TARGET}/bin --}else{ -- target.path = $$PREFIX/bin --} --!isEmpty(target.path) { -- unix: INSTALLS += target desktop $${UNIX_ICONS} -- else:macx: INSTALLS += target --} -+target.path = $$PREFIX/bin -+INSTALLS += target $${UNIX_ICONS} - - flatpak { - metadata.path = $$PREFIX/share/metainfo diff --git a/pkgs/by-name/an/anilibria-winmaclinux/package.nix b/pkgs/by-name/an/anilibria-winmaclinux/package.nix index 86d515120c9c..c3a52822ac43 100644 --- a/pkgs/by-name/an/anilibria-winmaclinux/package.nix +++ b/pkgs/by-name/an/anilibria-winmaclinux/package.nix @@ -2,47 +2,40 @@ lib, stdenv, fetchFromGitHub, - libsForQt5, + fetchpatch, + cmake, + qt6Packages, + ninja, pkg-config, gst_all_1, makeDesktopItem, copyDesktopItems, - - withVLC ? true, - libvlc, - withMPV ? true, mpv-unwrapped, }: stdenv.mkDerivation (finalAttrs: { pname = "anilibria-winmaclinux"; - version = "2.2.35"; + version = "2.2.36"; src = fetchFromGitHub { owner = "anilibria"; repo = "anilibria-winmaclinux"; tag = finalAttrs.version; - hash = "sha256-3tiCfL6j2yhhL16mG1LYD41G6nbomwmqZOwgm4bEHTs="; + hash = "sha256-2fwpLHEH1jlxl7r7QiVTHZniBO5k0GWaloNBynZJlTw="; }; sourceRoot = "${finalAttrs.src.name}/src"; - qmakeFlags = [ - "PREFIX=${placeholder "out"}" - ] - ++ lib.optionals withVLC [ "CONFIG+=unixvlc" ] - ++ lib.optionals withMPV [ "CONFIG+=unixmpv" ]; - patches = [ - ./0001-fix-installation-paths.patch - ./0002-disable-version-check.patch + ./0001-disable-version-check.patch + (fetchpatch { + name = "0002-fixed-qt6-folder-modal.patch"; + url = "https://github.com/anilibria/anilibria-winmaclinux/commit/adb4f7e5447d733fc3042f4bff25224ed726f3e6.patch"; + hash = "sha256-6/oXAObmXS+GKjjLNneMIj2gtKNvz6zHshWDYPv4agY="; + stripLen = 1; + }) ]; - preConfigure = '' - substituteInPlace AniLibria.pro \ - --replace "\$\$PREFIX" '${placeholder "out"}' - ''; - qtWrapperArgs = [ "--prefix GST_PLUGIN_PATH : ${ ( @@ -59,17 +52,18 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ - libsForQt5.qmake + cmake pkg-config - libsForQt5.wrapQtAppsHook + ninja + qt6Packages.wrapQtAppsHook copyDesktopItems ]; buildInputs = [ - libsForQt5.qtbase - libsForQt5.qtquickcontrols2 - libsForQt5.qtwebsockets - libsForQt5.qtmultimedia + qt6Packages.qtbase + qt6Packages.qtwebsockets + qt6Packages.qtmultimedia + mpv-unwrapped.dev ] ++ (with gst_all_1; [ gst-plugins-bad @@ -77,34 +71,34 @@ stdenv.mkDerivation (finalAttrs: { gst-plugins-base gst-libav gstreamer - ]) - ++ lib.optionals withVLC [ libvlc ] - ++ lib.optionals withMPV [ mpv-unwrapped.dev ]; + ]); desktopItems = [ (makeDesktopItem { - name = "AniLibria"; - desktopName = "AniLibria"; - icon = "anilibria"; + name = "AniLiberty"; + desktopName = "AniLiberty"; + icon = "aniliberty"; comment = finalAttrs.meta.description; - genericName = "AniLibria desktop client"; + genericName = "AniLiberty (ex AniLibria) desktop client"; categories = [ "Qt" + "Audio" + "Video" "AudioVideo" "Player" ]; keywords = [ "anime" ]; - exec = "AniLibria"; + exec = finalAttrs.meta.mainProgram; terminal = false; }) ]; meta = { homepage = "https://github.com/anilibria/anilibria-winmaclinux"; - description = "AniLibria cross platform desktop client"; + description = "AniLiberty (ex AniLibria) cross platform desktop client, an anime theater for any computer you own"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ _3JlOy-PYCCKUi ]; - inherit (libsForQt5.qtbase.meta) platforms; - mainProgram = "AniLibria"; + inherit (qt6Packages.qtbase.meta) platforms; + mainProgram = "AniLiberty"; }; }) diff --git a/pkgs/by-name/ap/appium-inspector/package.nix b/pkgs/by-name/ap/appium-inspector/package.nix index 16cc3002081a..13616599a684 100644 --- a/pkgs/by-name/ap/appium-inspector/package.nix +++ b/pkgs/by-name/ap/appium-inspector/package.nix @@ -2,19 +2,23 @@ lib, buildNpmPackage, copyDesktopItems, - electron_40, + electron_41, fetchFromGitHub, makeDesktopItem, makeWrapper, nix-update-script, + _experimental-update-script-combinators, + writeShellApplication, + nix, + jq, }: let - electron = electron_40; - version = "2026.2.1"; + electron = electron_41; + version = "2026.5.1"; in -buildNpmPackage { +buildNpmPackage (finalAttrs: { pname = "appium-inspector"; inherit version; @@ -22,10 +26,10 @@ buildNpmPackage { owner = "appium"; repo = "appium-inspector"; tag = "v${version}"; - hash = "sha256-89u8MifBPh5AwaMFp+aGSzsiwp75Skca/t6OyDSzrGo="; + hash = "sha256-SJlTTVTZ/zGIK7Nf35cZ62tdhevXC95MsbiQJCLiVtk="; }; - npmDepsHash = "sha256-mwNn7TllWCtr4sif9Wc3FDtK2Icu72/iI+IllhBswHQ="; + npmDepsHash = "sha256-2rjgKS1mIrjOg+YXuMaqKyEQt0utLA4DGxOs0oI4BaQ="; npmFlags = [ "--ignore-scripts" ]; nativeBuildInputs = [ @@ -75,7 +79,25 @@ buildNpmPackage { }) ]; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = _experimental-update-script-combinators.sequence [ + (nix-update-script { }) + (lib.getExe (writeShellApplication { + name = "${finalAttrs.pname}-electron-updater"; + runtimeInputs = [ + nix + jq + ]; + runtimeEnv = { + PNAME = finalAttrs.pname; + PKG_FILE = toString ./package.nix; + }; + text = '' + new_src="$(nix-build --attr "pkgs.$PNAME.src" --no-out-link)" + new_electron_major="$(jq -r '.devDependencies.electron | split(".")[0] | tonumber' "$new_src/package.json")" + sed -i -E "s/electron_[0-9]+/electron_$new_electron_major/g" "$PKG_FILE" + ''; + })) + ]; meta = { description = "GUI inspector for the appium UI automation tool"; @@ -86,4 +108,4 @@ buildNpmPackage { maintainers = with lib.maintainers; [ marie ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/as/asciimol/package.nix b/pkgs/by-name/as/asciimol/package.nix new file mode 100644 index 000000000000..a2c6077d10aa --- /dev/null +++ b/pkgs/by-name/as/asciimol/package.nix @@ -0,0 +1,38 @@ +{ + fetchPypi, + lib, + nix-update-script, + python3Packages, +}: + +python3Packages.buildPythonApplication (finalAttrs: { + pname = "asciimol"; + version = "1.2.5"; + pyproject = true; + + __structuredAttrs = true; + + src = fetchPypi { + inherit (finalAttrs) pname version; + hash = "sha256-sB8hHtjfCv5jFHXEoUG7zNn3d3QKihPLbgnR+Jyz4GQ="; + }; + + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ + numpy + ase + rdkit + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Curses based ASCII molecule viewer for terminals"; + license = lib.licenses.bsd2; + homepage = "https://github.com/dewberryants/asciimol"; + downloadPage = "https://pypi.org/project/asciimol/"; + maintainers = with lib.maintainers; [ tomasrivera ]; + mainProgram = "asciimol"; + }; +}) diff --git a/pkgs/by-name/au/aubio/package.nix b/pkgs/by-name/au/aubio/package.nix index 26dc445bacd2..362eec53198e 100644 --- a/pkgs/by-name/au/aubio/package.nix +++ b/pkgs/by-name/au/aubio/package.nix @@ -27,11 +27,13 @@ stdenv.mkDerivation (finalAttrs: { wafHook ]; buildInputs = [ - alsa-lib fftw libjack2 libsamplerate libsndfile + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib ]; strictDeps = true; @@ -51,6 +53,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ fpletz ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }) diff --git a/pkgs/by-name/au/auto-patchelf/package.nix b/pkgs/by-name/au/auto-patchelf/package.nix index adff3a5e40c0..7823a55c72e5 100644 --- a/pkgs/by-name/au/auto-patchelf/package.nix +++ b/pkgs/by-name/au/auto-patchelf/package.nix @@ -38,6 +38,9 @@ stdenv.mkDerivation { mainProgram = "auto-patchelf"; license = lib.licenses.mit; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ Scrumplex ]; + maintainers = with lib.maintainers; [ + Scrumplex + layus + ]; }; } diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/by-name/au/autoPatchelfHook/auto-patchelf.sh similarity index 100% rename from pkgs/build-support/setup-hooks/auto-patchelf.sh rename to pkgs/by-name/au/autoPatchelfHook/auto-patchelf.sh diff --git a/pkgs/by-name/au/autoPatchelfHook/package.nix b/pkgs/by-name/au/autoPatchelfHook/package.nix new file mode 100644 index 000000000000..c537f113afcf --- /dev/null +++ b/pkgs/by-name/au/autoPatchelfHook/package.nix @@ -0,0 +1,21 @@ +{ + lib, + makeSetupHook, + auto-patchelf, + bintools, + stdenv, +}: + +makeSetupHook { + name = "auto-patchelf-hook"; + propagatedBuildInputs = [ + auto-patchelf + bintools + ]; + substitutions = { + hostPlatform = stdenv.hostPlatform.config; + }; + meta = { + maintainers = with lib.maintainers; [ layus ]; + }; +} ./auto-patchelf.sh diff --git a/pkgs/build-support/setup-hooks/autoreconf.sh b/pkgs/by-name/au/autoreconfHook/autoreconf.sh similarity index 100% rename from pkgs/build-support/setup-hooks/autoreconf.sh rename to pkgs/by-name/au/autoreconfHook/autoreconf.sh diff --git a/pkgs/by-name/au/autoreconfHook/package.nix b/pkgs/by-name/au/autoreconfHook/package.nix new file mode 100644 index 000000000000..b3f1eefbb247 --- /dev/null +++ b/pkgs/by-name/au/autoreconfHook/package.nix @@ -0,0 +1,18 @@ +{ + lib, + makeSetupHook, + autoconf, + automake, + gettext, + libtool, +}: +makeSetupHook { + name = "autoreconf-hook"; + propagatedBuildInputs = [ + autoconf + automake + gettext + libtool + ]; + meta.license = lib.licenses.mit; +} ./autoreconf.sh diff --git a/pkgs/by-name/ba/badger/package.nix b/pkgs/by-name/ba/badger/package.nix index 90643e18ae4d..0b1581bb915f 100644 --- a/pkgs/by-name/ba/badger/package.nix +++ b/pkgs/by-name/ba/badger/package.nix @@ -6,26 +6,29 @@ buildGoModule (finalAttrs: { pname = "badger"; - version = "4.9.1"; + version = "4.9.2"; src = fetchFromGitHub { owner = "dgraph-io"; repo = "badger"; tag = "v${finalAttrs.version}"; - hash = "sha256-BsKFi4oMNJE09PBjFmqNhbMcQcHk5uR5QssbwN2ZNCk="; + hash = "sha256-L6qGeOZlIl6I87t9Ohk57bA+WXT7NwMOJkiA3WaMFhM="; }; - vendorHash = "sha256-+rXXCVH2xuULPzdM0KVPwYht+tu0qyxPjLLaBMWVIuI="; + vendorHash = "sha256-KDIwEH83nPMJPJGTN3UgO00pjYwR17XqGdPXioP1YcY="; subPackages = [ "badger" ]; doCheck = false; + __structuredAttrs = true; + meta = { + changelog = "https://github.com/dgraph-io/badger/releases/tag/${finalAttrs.src.tag}"; description = "Fast key-value DB in Go"; - homepage = "https://github.com/dgraph-io/badger"; + homepage = "https://dgraph-io.github.io/badger"; license = lib.licenses.asl20; mainProgram = "badger"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ hythera ]; }; }) diff --git a/pkgs/by-name/bu/burn-central-cli/package.nix b/pkgs/by-name/bu/burn-central-cli/package.nix index 793b429274dc..0d0f2dc810f7 100644 --- a/pkgs/by-name/bu/burn-central-cli/package.nix +++ b/pkgs/by-name/bu/burn-central-cli/package.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "burn-central-cli"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "tracel-ai"; repo = "burn-central-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-wXLfmCV6aElnYnhOCScr/3+4I6oOfNPrZ8+0t4TPDOA="; + hash = "sha256-1QXlN1cq5MKZAPgGx5mnf8Jy7o4CnKJDKi0sSith6n0="; }; strictDeps = true; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildAndTestSubdir = "crates/burn-central-cli"; - cargoHash = "sha256-MeDIYFXkyJdxierq9iVIAvEIc8JU13szrbSTfKyUkJk="; + cargoHash = "sha256-c0DfH5wtm/aiK8Mcf7xqVqnFzByMKkbspF1reeGZNJw="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-xwin/package.nix b/pkgs/by-name/ca/cargo-xwin/package.nix index 0cfaa744dda1..a29905cec257 100644 --- a/pkgs/by-name/ca/cargo-xwin/package.nix +++ b/pkgs/by-name/ca/cargo-xwin/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-xwin"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "rust-cross"; repo = "cargo-xwin"; rev = "v${finalAttrs.version}"; - hash = "sha256-lJu/TyzKDj0yHCP83ouc6e52E48taOTQ9WpWAiqUxl4="; + hash = "sha256-pWaJKk4XgBeY4llRTHvuMg0mAfEV4GFpeWGaM8eYsN4="; }; - cargoHash = "sha256-k3PuEjiew012+m4RRVKNOdxKvFPWIxKHgG/SrBjM2WM="; + cargoHash = "sha256-iO0uAYdi8Vy9gi7lHsGRmhDsVNQCqo4E/nbTfI32jDs="; meta = { description = "Cross compile Cargo project to Windows MSVC target with ease"; diff --git a/pkgs/by-name/cl/clipqr/package.nix b/pkgs/by-name/cl/clipqr/package.nix index f40970a80523..a2334473e669 100644 --- a/pkgs/by-name/cl/clipqr/package.nix +++ b/pkgs/by-name/cl/clipqr/package.nix @@ -4,31 +4,37 @@ fetchFromGitLab, lib, libGL, + libdecor, + libgbm, libx11, libxcursor, libxext, libxi, libxinerama, + libxkbcommon, libxrandr, libxxf86vm, makeDesktopItem, - libgbm, + makeWrapper, pkg-config, - stdenv, + wayland, + wl-clipboard, }: buildGoModule (finalAttrs: { pname = "clipqr"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitLab { owner = "imatt-foss"; repo = "clipqr"; rev = "v${finalAttrs.version}"; - hash = "sha256-iuA6RqclMm1CWaiM1kpOpgfYvKaYGOIwFQkLr/nCL5M="; + hash = "sha256-DC6zc1Qe/z7ihuvdawb8bj5MefYGgt7HAV5dWTjeHZc="; }; - vendorHash = null; + vendorHash = "sha256-MrXMbavff6CEKVbL+Mx8hICYB9sZQcvAhnu2X4sVvVw="; + + tags = [ "wayland" ]; ldflags = [ "-s" @@ -37,23 +43,30 @@ buildGoModule (finalAttrs: { buildInputs = [ libGL + libgbm libx11 libxcursor libxext libxi libxinerama + libxkbcommon libxrandr libxxf86vm - libgbm + wayland ]; nativeBuildInputs = [ copyDesktopItems + makeWrapper pkg-config ]; postInstall = '' install -Dm644 icon.svg $out/share/icons/hicolor/scalable/apps/clipqr.svg + + wrapProgram $out/bin/clipqr \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libdecor ]} \ + --prefix PATH : ${lib.makeBinPath [ wl-clipboard ]} ''; desktopItems = [ @@ -73,7 +86,7 @@ buildGoModule (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ MatthieuBarthel ]; homepage = "https://gitlab.com/imatt-foss/clipqr"; - broken = stdenv.hostPlatform.isDarwin; + platforms = lib.platforms.linux; mainProgram = "clipqr"; }; }) diff --git a/pkgs/by-name/cu/cudatext-gtk/package.nix b/pkgs/by-name/cu/cudatext-gtk/package.nix new file mode 100644 index 000000000000..d2afa68f07f1 --- /dev/null +++ b/pkgs/by-name/cu/cudatext-gtk/package.nix @@ -0,0 +1,3 @@ +{ cudatext }: + +cudatext.override { widgetset = "gtk3"; } diff --git a/pkgs/by-name/cu/cudatext-qt/package.nix b/pkgs/by-name/cu/cudatext-qt/package.nix new file mode 100644 index 000000000000..dfed1f03a38b --- /dev/null +++ b/pkgs/by-name/cu/cudatext-qt/package.nix @@ -0,0 +1,3 @@ +{ cudatext }: + +cudatext.override { widgetset = "qt5"; } diff --git a/pkgs/by-name/cu/cudatext/deps.json b/pkgs/by-name/cu/cudatext/deps.json new file mode 100644 index 000000000000..f05c521228cf --- /dev/null +++ b/pkgs/by-name/cu/cudatext/deps.json @@ -0,0 +1,57 @@ +{ + "EncConv": { + "owner": "Alexey-T", + "rev": "2024.12.15", + "hash": "sha256-d57cOh4ucStPxOBYDt8+w1ITpCMbJW69T8mCfgJky3A=" + }, + "ATBinHex-Lazarus": { + "owner": "Alexey-T", + "rev": "2025.09.10", + "hash": "sha256-opt0gy2e+cptPWhPaSjWBikVRiAVTxwtIatdvzpc7eY=" + }, + "ATFlatControls": { + "owner": "Alexey-T", + "rev": "2026.05.06", + "hash": "sha256-qqFYaY9Bm6yMSlMlO/Uwot2Ix0TsxEb21d7X/zCvTyQ=" + }, + "ATSynEdit": { + "owner": "Alexey-T", + "rev": "2026.05.20", + "hash": "sha256-r3DARtsBEXxkC9wBGuIuY6qU9GQcXPeakQsK2P8zXI0=" + }, + "ATSynEdit_Cmp": { + "owner": "Alexey-T", + "rev": "2025.02.15", + "hash": "sha256-mCb2112u5cQOsGpJdgJKZnDsAQs5p5+rSINTs4BaQeQ=" + }, + "EControl": { + "owner": "Alexey-T", + "rev": "2026.05.06", + "hash": "sha256-G2OSGA5MVaZC/6H0agio6cbUg1iXYEz7YszBoRwcPwI=" + }, + "ATSynEdit_Ex": { + "owner": "Alexey-T", + "rev": "2026.01.19", + "hash": "sha256-gfx+2HbssaB1frc8QQh3ua+Z4lEM2JnQtSPNZVusaTM=" + }, + "Python-for-Lazarus": { + "owner": "Alexey-T", + "rev": "2024.10.15", + "hash": "sha256-HKo4GRZ91VDRc6AKs+lJYsFvgd+5VQlFY6pkg3gXz/s=" + }, + "Emmet-Pascal": { + "owner": "Alexey-T", + "rev": "2023.12.02", + "hash": "sha256-NDYhjmVGiw9UKfOQhXLdJiTaGZeTs8kr2hBujI2s+3E=" + }, + "CudaText-lexers": { + "owner": "CudaText-addons", + "rev": "2026.04.05", + "hash": "sha256-LtyfXEaIDjbivuL05E00U8Myy1mQFCzl9LQjiEr4U/E=" + }, + "bgrabitmap": { + "owner": "bgrabitmap", + "rev": "v11.6.6", + "hash": "sha256-bA8tvo7Srm5kIZTVWEA2+gjqHab7LByyL/zqdQxeFlA=" + } +} diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/by-name/cu/cudatext/package.nix similarity index 88% rename from pkgs/applications/editors/cudatext/default.nix rename to pkgs/by-name/cu/cudatext/package.nix index ba0cdf1ea046..21dad5046557 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/by-name/cu/cudatext/package.nix @@ -7,15 +7,16 @@ fpc, libx11, - # GTK2/3 + # GTK3 + harfbuzz, pango, cairo, glib, atk, - gtk2, gtk3, gdk-pixbuf, python3, + wrapGAppsHook3, # Qt5 libsForQt5, @@ -26,7 +27,6 @@ }: assert builtins.elem widgetset [ - "gtk2" "gtk3" "qt5" ]; @@ -42,13 +42,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "cudatext"; - version = "1.202.1"; + version = "1.234.4.0"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; tag = finalAttrs.version; - hash = "sha256-ZFMO986D4RtrTnLFdcL0a2BNjcsB+9pIolylblku7j4="; + hash = "sha256-eVdV02R1YZ3mdoucEoyp7iKhA30+QJNAqdbnOz2Xjy4="; }; patches = [ ./proc_globdata.patch ]; @@ -65,20 +65,21 @@ stdenv.mkDerivation (finalAttrs: { lazarus fpc ] + ++ lib.optional (widgetset == "gtk3") wrapGAppsHook3 # required for FileChooser ++ lib.optional (widgetset == "qt5") libsForQt5.wrapQtAppsHook; buildInputs = [ libx11 ] - ++ lib.optionals (lib.hasPrefix "gtk" widgetset) [ + ++ lib.optionals (widgetset == "gtk3") [ + harfbuzz pango cairo glib atk gdk-pixbuf + gtk3 ] - ++ lib.optional (widgetset == "gtk2") gtk2 - ++ lib.optional (widgetset == "gtk3") gtk3 ++ lib.optional (widgetset == "qt5") libsForQt5.libqtpas; env.NIX_LDFLAGS = toString [ @@ -94,10 +95,6 @@ stdenv.mkDerivation (finalAttrs: { '') deps ) + '' - # See https://wiki.freepascal.org/CudaText#How_to_compile_CudaText - substituteInPlace ATSynEdit/atsynedit/atsynedit_package.lpk \ - --replace GTK2_IME_CODE _GTK2_IME_CODE - lazbuild --lazarusdir=${lazarus}/share/lazarus --pcp=./lazarus --ws=${widgetset} \ bgrabitmap/bgrabitmap/bgrabitmappack.lpk \ EncConv/encconv/encconv_package.lpk \ diff --git a/pkgs/applications/editors/cudatext/proc_globdata.patch b/pkgs/by-name/cu/cudatext/proc_globdata.patch similarity index 100% rename from pkgs/applications/editors/cudatext/proc_globdata.patch rename to pkgs/by-name/cu/cudatext/proc_globdata.patch diff --git a/pkgs/applications/editors/cudatext/update.sh b/pkgs/by-name/cu/cudatext/update.sh similarity index 91% rename from pkgs/applications/editors/cudatext/update.sh rename to pkgs/by-name/cu/cudatext/update.sh index 3ed1f8d56dc3..eb5eb43c46fa 100755 --- a/pkgs/applications/editors/cudatext/update.sh +++ b/pkgs/by-name/cu/cudatext/update.sh @@ -19,8 +19,8 @@ url="https://github.com/Alexey-T/CudaText/archive/refs/tags/${version}.tar.gz" hash=$(nix-prefetch-url --quiet --unpack --type sha256 $url) sriHash=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $hash) -sed -i "s#version = \".*\"#version = \"$version\"#" default.nix -sed -i "s#hash = \".*\"#hash = \"$sriHash\"#" default.nix +sed -i "s#version = \".*\"#version = \"$version\"#" package.nix +sed -i "s#hash = \".*\"#hash = \"$sriHash\"#" package.nix while IFS=$'\t' read repo owner rev; do latest=$(curl -s https://api.github.com/repos/${owner}/${repo}/releases/latest | jq -r '.tag_name') diff --git a/pkgs/build-support/setup-hooks/die.sh b/pkgs/by-name/di/dieHook/die.sh similarity index 100% rename from pkgs/build-support/setup-hooks/die.sh rename to pkgs/by-name/di/dieHook/die.sh diff --git a/pkgs/by-name/di/dieHook/package.nix b/pkgs/by-name/di/dieHook/package.nix new file mode 100644 index 000000000000..e5bb76370426 --- /dev/null +++ b/pkgs/by-name/di/dieHook/package.nix @@ -0,0 +1,9 @@ +{ + lib, + makeSetupHook, +}: + +makeSetupHook { + name = "die-hook"; + meta.license = lib.licenses.mit; +} ./die.sh diff --git a/pkgs/by-name/di/diffoscope/package.nix b/pkgs/by-name/di/diffoscope/package.nix index b65d2d1e07b4..26f003998f58 100644 --- a/pkgs/by-name/di/diffoscope/package.nix +++ b/pkgs/by-name/di/diffoscope/package.nix @@ -108,12 +108,12 @@ in # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python.pkgs.buildPythonApplication rec { pname = "diffoscope"; - version = "318"; + version = "319"; pyproject = true; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - hash = "sha256-rvZxd0mFDzmMFg2QYihkfizYGwiK1QQB9flyYn1uESM="; + hash = "sha256-oIEC3ssdp0p2cE0VunTv6oo5CFuMQyftr4e5kqWmfP4="; }; outputs = [ diff --git a/pkgs/by-name/fa/faas-cli/package.nix b/pkgs/by-name/fa/faas-cli/package.nix index b10b405a7815..490442c52191 100644 --- a/pkgs/by-name/fa/faas-cli/package.nix +++ b/pkgs/by-name/fa/faas-cli/package.nix @@ -24,13 +24,13 @@ let in buildGoModule (finalAttrs: { pname = "faas-cli"; - version = "0.18.8"; + version = "0.18.9"; src = fetchFromGitHub { owner = "openfaas"; repo = "faas-cli"; rev = finalAttrs.version; - sha256 = "sha256-JiIKCrNH6aWiCqw1ji5RwNrHwLHuSbw/iwqzrumfQQQ="; + sha256 = "sha256-QiRO7oJk/zjUOWr1giW29/QJY/YiKkLzROB6OxN8kIc="; }; vendorHash = null; diff --git a/pkgs/by-name/fa/far2l/package.nix b/pkgs/by-name/fa/far2l/package.nix index ea771b7d03cd..ab3e3d2f5c9d 100644 --- a/pkgs/by-name/fa/far2l/package.nix +++ b/pkgs/by-name/fa/far2l/package.nix @@ -44,13 +44,13 @@ stdenv.mkDerivation rec { pname = "far2l"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "elfmz"; repo = "far2l"; tag = "v_${version}"; - hash = "sha256-pqyAZtVeE3awejx1/glJgAQN6fjAe4YHJX/fLHlF1+Y="; + hash = "sha256-LP+agJrYxjH6vLAg6cJTU4/9jYGF9iaZzxA7hozDKNY="; }; nativeBuildInputs = [ @@ -130,7 +130,10 @@ stdenv.mkDerivation rec { description = "Linux port of FAR Manager v2, a program for managing files and archives in Windows operating systems"; homepage = "https://github.com/elfmz/far2l"; license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ hypersw ]; + maintainers = with lib.maintainers; [ + hypersw + smakarov + ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh b/pkgs/by-name/fi/fixDarwinDylibNames/fix-darwin-dylib-names.sh similarity index 100% rename from pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh rename to pkgs/by-name/fi/fixDarwinDylibNames/fix-darwin-dylib-names.sh diff --git a/pkgs/by-name/fi/fixDarwinDylibNames/package.nix b/pkgs/by-name/fi/fixDarwinDylibNames/package.nix new file mode 100644 index 000000000000..3caba19ec6da --- /dev/null +++ b/pkgs/by-name/fi/fixDarwinDylibNames/package.nix @@ -0,0 +1,14 @@ +{ + lib, + targetPackages, + makeSetupHook, +}: + +makeSetupHook { + name = "fix-darwin-dylib-names-hook"; + substitutions = { inherit (targetPackages.stdenv.cc) targetPrefix; }; + meta = { + platforms = lib.platforms.darwin; + license = lib.licenses.mit; + }; +} ./fix-darwin-dylib-names.sh diff --git a/pkgs/by-name/fl/flightcore/override-tauri.conf.json b/pkgs/by-name/fl/flightcore/override-tauri.conf.json new file mode 100644 index 000000000000..9c3b2d049b86 --- /dev/null +++ b/pkgs/by-name/fl/flightcore/override-tauri.conf.json @@ -0,0 +1,8 @@ +{ + "build": { + "beforeBuildCommand": "" + }, + "bundle":{ + "createUpdaterArtifacts": false + } +} diff --git a/pkgs/by-name/fl/flightcore/package.nix b/pkgs/by-name/fl/flightcore/package.nix new file mode 100644 index 000000000000..51783604e22d --- /dev/null +++ b/pkgs/by-name/fl/flightcore/package.nix @@ -0,0 +1,120 @@ +{ + buildNpmPackage, + cargo-tauri, + copyDesktopItems, + fetchFromGitHub, + fetchNpmDeps, + glib-networking, + lib, + makeDesktopItem, + nodejs, + openssl, + pkg-config, + rustPlatform, + stdenv, + webkitgtk_4_1, + wrapGAppsHook4, +}: +rustPlatform.buildRustPackage (finalAttrs: { + __structuredAttrs = true; + pname = "flightcore"; + version = "3.2.2"; + + src = fetchFromGitHub { + owner = "R2NorthstarTools"; + repo = "FlightCore"; + tag = "v${finalAttrs.version}"; + hash = "sha256-eTRtd616hWHgj3wg+jtrt/tFkaxUeKSN0d+XO1CghsE="; + }; + + npmDeps = fetchNpmDeps { + inherit (finalAttrs) pname version src; + + # Hash of dependencies fetched from upstream's `package-lock.json` file. + hash = "sha256-+xrNKFcCatqbl79j/tSLFNTYjxXANFb3/vgWXYY2PGo="; + }; + + frontend = buildNpmPackage { + pname = "${finalAttrs.pname}-frontend"; + inherit (finalAttrs) version src; + sourceRoot = "source/src-vue"; + + # Hash of dependencies fetched from upstream's `src-vue/package-lock.json` + # file. + npmDepsHash = "sha256-2PiMB9X/tp1QtTfUgVnH6caE+m2QSKTMYxPUHAUPWhQ="; + + installPhase = '' + runHook preInstall + + mkdir -p "$out" + cp -a dist "$out" + + runHook postInstall + ''; + }; + + cargoHash = "sha256-weidVeEIo3IIV+Xwe1htV46fRymOo5aRzHAEKQwKbvU="; + + cargoRoot = "src-tauri"; + buildAndTestSubdir = finalAttrs.cargoRoot; + + # This override does the following: + # + # * Disables creating updater artifacts - the default behavior causes issues + # with building the package, but since it is going to be distributed via a + # software repository, it won't need to auto-update itself anyways. + # + # * Empties `beforeBuildCommand` - the upstream Tauri configuration includes + # commands that automatically build the software's front-end, before + # building its back-end. However, since Nixpkgs requires NPM dependencies + # to be hashed, we need to build the front-end in a separate step. + # + # This way, we end up fetching the NPM dependencies from both + # `source/package.json`, and `source/src-vue/package.json`. + tauriBuildFlags = "-c ${./override-tauri.conf.json}"; + + # Copy [frontend] to where it can be picked up by Tauri. + preBuild = '' + ln -s "${finalAttrs.frontend}"/dist src-vue + ''; + + nativeBuildInputs = [ + cargo-tauri.hook + copyDesktopItems + nodejs + pkg-config + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + wrapGAppsHook4 + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + glib-networking + openssl + webkitgtk_4_1 + ]; + + desktopItems = [ + (makeDesktopItem { + name = "FlightCore"; + desktopName = "FlightCore"; + exec = "flightcore"; + icon = "flightcore"; + comment = finalAttrs.meta.description; + categories = [ + "Game" + "PackageManager" + ]; + terminal = false; + }) + ]; + + meta = { + description = "Updater and mod manager for Northstar"; + homepage = "https://github.com/R2NorthstarTools/FlightCore"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ username-generic ]; + mainProgram = "flightcore"; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/fl/fluux-messenger/package.nix b/pkgs/by-name/fl/fluux-messenger/package.nix index 6f588a2378ef..7d34624a1e49 100644 --- a/pkgs/by-name/fl/fluux-messenger/package.nix +++ b/pkgs/by-name/fl/fluux-messenger/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "fluux-messenger"; - version = "0.16.0"; + version = "0.16.1"; __structuredAttrs = true; strictDeps = true; @@ -26,16 +26,16 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "processone"; repo = "fluux-messenger"; rev = "v${finalAttrs.version}"; - hash = "sha256-P4bRyge5EGdlZBdX+gIWh48itkCLQ+EjKLHt4xv6qnY="; + hash = "sha256-os6zEB1E3D4WSRfru/UCDY0mgZxy0Zu/YcjhMbXt47g="; }; cargoRoot = "apps/fluux/src-tauri"; - cargoHash = "sha256-YIX/F9LMuHFGJ89NIsFLUjjrR7XBoJF78OsyXiSjEqU="; + cargoHash = "sha256-V6iDPPBpdJQV5PA/isRy+Gz6NdwUUEj3mf9PM/nX10s="; npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; inherit (finalAttrs) src; - hash = "sha256-rzkFrvLb/0c+pg2SIUnhyTHK2MGL2ugRI9XuHtdm8XE="; + hash = "sha256-iMkb7QZZrKjzmTzvWGbw8reF1nX4Avd1XKzyybz3q00="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gi/giada/package.nix b/pkgs/by-name/gi/giada/package.nix index c76f5c574370..650f37868857 100644 --- a/pkgs/by-name/gi/giada/package.nix +++ b/pkgs/by-name/gi/giada/package.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "giada"; - version = "1.4.2"; + version = "1.5.0"; src = fetchFromGitHub { owner = "monocasual"; repo = "giada"; tag = finalAttrs.version; - hash = "sha256-GVK/VyqRatxptuQGINaev5RVmafZNxogdKUzC5b4ns4="; + hash = "sha256-AceH2FO75WF/Cmk3wd6u495M277iuZp/21nBl3K4jHU="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/gl/glaze/package.nix b/pkgs/by-name/gl/glaze/package.nix index e7268ded081c..2bbad5c6b5fa 100644 --- a/pkgs/by-name/gl/glaze/package.nix +++ b/pkgs/by-name/gl/glaze/package.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "glaze_DISABLE_SIMD_WHEN_SUPPORTED" (!enableSIMD)) (lib.cmakeBool "glaze_ENABLE_SSL" enableSSL) (lib.cmakeBool "glaze_BUILD_INTEROP" enableInterop) + (lib.cmakeBool "glaze_ENABLE_FUZZING" (!stdenv.hostPlatform.isMusl)) ]; meta = { diff --git a/pkgs/build-support/setup-hooks/gog-unpack.sh b/pkgs/by-name/go/gogUnpackHook/gog-unpack.sh similarity index 100% rename from pkgs/build-support/setup-hooks/gog-unpack.sh rename to pkgs/by-name/go/gogUnpackHook/gog-unpack.sh diff --git a/pkgs/by-name/go/gogUnpackHook/package.nix b/pkgs/by-name/go/gogUnpackHook/package.nix new file mode 100644 index 000000000000..d47a750ad961 --- /dev/null +++ b/pkgs/by-name/go/gogUnpackHook/package.nix @@ -0,0 +1,15 @@ +{ + lib, + makeSetupHook, + innoextract, + file-rename, +}: + +makeSetupHook { + name = "gog-unpack-hook"; + propagatedBuildInputs = [ + innoextract + file-rename + ]; + meta.license = lib.licenses.mit; +} ./gog-unpack.sh diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index 92004e0cdb4c..4bc1561e336c 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -179,11 +179,11 @@ let linux = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "149.0.7827.114"; + version = "149.0.7827.155"; src = fetchurl { url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-GVvehY+e5thM3nHYMQd/uI8HTnjvL/w8UeRpUWouzlA="; + hash = "sha256-g0PHfyCIpOQ2bw3+Tmiu+jt+eTJs0so71+tjxhHwZVY="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -289,11 +289,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "149.0.7827.115"; + version = "149.0.7827.156"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/ny2unjynyv52nhojnzjueghuma_149.0.7827.115/GoogleChrome-149.0.7827.115.dmg"; - hash = "sha256-q1jMxveB5FFA+wA5a5mnSPWoQFkNHQ20x51R8A/yUsk="; + url = "http://dl.google.com/release2/chrome/acfqxa67egsofsrqnco2a4sd4pta_149.0.7827.156/GoogleChrome-149.0.7827.156.dmg"; + hash = "sha256-fd7IqNxvaMO28Yhlc4gk8M+P7Sq+ZrplRXbnrxPDcvw="; }; dontPatch = true; diff --git a/pkgs/by-name/go/goperf/package.nix b/pkgs/by-name/go/goperf/package.nix index 72e33364d2c9..8e7dee2c1b42 100644 --- a/pkgs/by-name/go/goperf/package.nix +++ b/pkgs/by-name/go/goperf/package.nix @@ -9,15 +9,15 @@ buildGoModule (finalAttrs: { pname = "goperf"; - version = "0-unstable-2026-05-12"; + version = "0-unstable-2026-06-15"; src = fetchgit { url = "https://go.googlesource.com/perf"; - rev = "3cf34090a3db6bb64df2259e30021db7ff5d9595"; - hash = "sha256-2dz8GCzmyS8LkN1zzyCO8cn/NBKmPhIqFRfILc9/lVo="; + rev = "9e4b9ddef5b6a4371594ec978cb4b8088bec845d"; + hash = "sha256-q03UUW5fJPLd6UicH+q2KEC9sx3Ph64ebzi4sxW4+rg="; }; - vendorHash = "sha256-H9aP7PGzq5gmFvlYrkrOFfqCSdlpoQkIkTwKMgwr2hs="; + vendorHash = "sha256-qGQpf0T1qBcu+25VF2xnbvImj+Fs81Ru9tho/0RJwzo="; passthru.updateScript = writeShellScript "update-goperf" '' export UPDATE_NIX_ATTR_PATH=goperf diff --git a/pkgs/by-name/gz/gzrt/package.nix b/pkgs/by-name/gz/gzrt/package.nix index 034f340604b5..02a2a716673e 100644 --- a/pkgs/by-name/gz/gzrt/package.nix +++ b/pkgs/by-name/gz/gzrt/package.nix @@ -1,17 +1,19 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, zlib, }: stdenv.mkDerivation (finalAttrs: { pname = "gzrt"; - version = "0.8"; + version = "0.9.1"; - src = fetchurl { - url = "https://www.urbanophile.com/arenn/coding/gzrt/gzrt-${finalAttrs.version}.tar.gz"; - sha256 = "1vhzazj47xfpbfhzkwalz27cc0n5gazddmj3kynhk0yxv99xrdxh"; + src = fetchFromGitHub { + owner = "arenn"; + repo = "gzrt"; + tag = "v${finalAttrs.version}"; + hash = "sha256-2RzQ/xrtADplVqUeB6suU3fKhJePYM7EkuIV59JSR3Q="; }; buildInputs = [ zlib ]; @@ -22,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - homepage = "https://www.urbanophile.com/arenn/hacking/gzrt/"; + homepage = "https://github.com/arenn/gzrt"; description = "Gzip Recovery Toolkit"; maintainers = [ ]; mainProgram = "gzrecover"; diff --git a/pkgs/by-name/ha/hackernews-tui/package.nix b/pkgs/by-name/ha/hackernews-tui/package.nix new file mode 100644 index 000000000000..2ea3d0a12463 --- /dev/null +++ b/pkgs/by-name/ha/hackernews-tui/package.nix @@ -0,0 +1,29 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "hackernews-tui"; + version = "0.13.5"; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "aome510"; + repo = "hackernews-TUI"; + tag = "v${finalAttrs.version}"; + hash = "sha256-p2MhVM+dbNiWlhvlSKdwXE37dKEaE2JCmT1Ari3b0WI="; + }; + + cargoHash = "sha256-KuqAyuU/LOFwvvfplHqq56Df4Dkr5PkUK1Fgeaq1REs="; + + meta = { + description = "A Terminal UI to browse Hacker News"; + homepage = "https://github.com/aome510/hackernews-TUI"; + changelog = "https://github.com/aome510/hackernews-TUI/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ paepcke ]; + mainProgram = "hackernews-tui"; + }; +}) diff --git a/pkgs/by-name/ii/iio-niri/package.nix b/pkgs/by-name/ii/iio-niri/package.nix index d3d81b23e81a..46f7f26c112d 100644 --- a/pkgs/by-name/ii/iio-niri/package.nix +++ b/pkgs/by-name/ii/iio-niri/package.nix @@ -9,13 +9,13 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "iio-niri"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "Zhaith-Izaliel"; repo = "iio-niri"; tag = "v${finalAttrs.version}"; - hash = "sha256-EwilbkL1cMH8l63Cm5eikVKc+YndsYsaYJxhCNJgz6M="; + hash = "sha256-2DWNq6qZmC4hNjgu1W6LBHkcDOSwRT0/8MnbJjyPHQM="; }; cargoHash = "sha256-f/pFWlLxQebzawDdHj3UtpT5Kq9a6fm+tAssqg8ibdo="; diff --git a/pkgs/by-name/je/jetbrains-toolbox/package.nix b/pkgs/by-name/je/jetbrains-toolbox/package.nix index 25f9fafe6104..de31cd6bdcb3 100644 --- a/pkgs/by-name/je/jetbrains-toolbox/package.nix +++ b/pkgs/by-name/je/jetbrains-toolbox/package.nix @@ -97,7 +97,7 @@ selectKernel { extraInstallCommands = '' install -Dm0644 ${src}/bin/jetbrains-toolbox.desktop -t $out/share/applications - install -Dm0644 ${src}/bin/toolbox-tray-color.png $out/share/pixmaps/jetbrains-toolbox.png + install -Dm0644 ${src}/bin/toolbox-tray-color.png $out/share/icons/hicolor/32x32/apps/jetbrains-toolbox.png ''; }; diff --git a/pkgs/by-name/li/librewolf-unwrapped/package.nix b/pkgs/by-name/li/librewolf-unwrapped/package.nix index c6384d64ce5a..896157af360f 100644 --- a/pkgs/by-name/li/librewolf-unwrapped/package.nix +++ b/pkgs/by-name/li/librewolf-unwrapped/package.nix @@ -32,6 +32,7 @@ in dwrege fpletz hythera + thbemme ]; platforms = lib.platforms.unix; broken = stdenv.buildPlatform.is32bit; diff --git a/pkgs/by-name/li/libwebsockets/package.nix b/pkgs/by-name/li/libwebsockets/package.nix index f0e50b0f6132..18767b409aa1 100644 --- a/pkgs/by-name/li/libwebsockets/package.nix +++ b/pkgs/by-name/li/libwebsockets/package.nix @@ -65,7 +65,15 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace "cmake/libwebsockets-config.cmake.in" --replace-fail \ "set(LIBWEBSOCKETS_LIBRARIES websockets websockets_shared)" \ "set(LIBWEBSOCKETS_LIBRARIES websockets)" - ''; + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + # Fix doubled store path in macOS install_name + substituteInPlace CMakeLists.txt \ + --replace-fail \ + 'SET(CMAKE_INSTALL_NAME_DIR "''${CMAKE_INSTALL_PREFIX}/''${LWS_INSTALL_LIB_DIR}")' \ + 'SET(CMAKE_INSTALL_NAME_DIR "''${LWS_INSTALL_LIB_DIR}")' + '' + + lib.optionalString stdenv.hostPlatform.isStatic ""; postInstall = '' # Fix path that will be incorrect on move to "dev" output. diff --git a/pkgs/by-name/li/lilypond-unstable/package.nix b/pkgs/by-name/li/lilypond-unstable/package.nix index d9900c23348a..2767cf9cf866 100644 --- a/pkgs/by-name/li/lilypond-unstable/package.nix +++ b/pkgs/by-name/li/lilypond-unstable/package.nix @@ -7,11 +7,11 @@ lilypond.overrideAttrs ( finalAttrs: prevAttrs: { - version = "2.27.0"; + version = "2.27.1"; src = fetchzip { url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor finalAttrs.version}/lilypond-${finalAttrs.version}.tar.gz"; - hash = "sha256-uZKpHmuYFkmj1kI+D09rPNLov83EO1QdXyUSSscBRPE="; + hash = "sha256-SqnBem2dj7w6oRfxk+h5Ahq+NEPDdX7I/NRKZQnK1kU="; }; patches = [ ]; diff --git a/pkgs/by-name/li/linja-sike/package.nix b/pkgs/by-name/li/linja-sike/package.nix index d92f4ce44ee9..f4fecd7b947a 100644 --- a/pkgs/by-name/li/linja-sike/package.nix +++ b/pkgs/by-name/li/linja-sike/package.nix @@ -18,8 +18,6 @@ stdenvNoCC.mkDerivation { __structuredAttrs = true; - stripDeps = true; - postPatch = "cp $src linja-sike-5.otf"; nativeBuildInputs = [ installFonts ]; diff --git a/pkgs/by-name/lo/lowfi/package.nix b/pkgs/by-name/lo/lowfi/package.nix index 5c3d2d6076f8..9a7dc2462388 100644 --- a/pkgs/by-name/lo/lowfi/package.nix +++ b/pkgs/by-name/lo/lowfi/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "lowfi"; - version = "2.0.2"; + version = "2.0.6"; src = fetchFromGitHub { owner = "talwat"; repo = "lowfi"; tag = finalAttrs.version; - hash = "sha256-RSdfZ0GrNhPcqDWutJW0VlplbpBNBCpSvw91fpl0d4E="; + hash = "sha256-t61R68cuAEAjyY5cR2rpTa+pSE3DDDct9G4p/aeTgsQ="; }; - cargoHash = "sha256-OAg3ZpBmuINkc6KZJGKvYFnpv9hVbwlnOEP5ICtYh28="; + cargoHash = "sha256-ogoQWcS6htU515xjJW7jQYqpfHAQ48a8QaaBPvkGrXg="; buildFeatures = [ "scrape" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "mpris" ]; diff --git a/pkgs/by-name/lu/luau/package.nix b/pkgs/by-name/lu/luau/package.nix index cc2b70ce687c..6d29fa4864c2 100644 --- a/pkgs/by-name/lu/luau/package.nix +++ b/pkgs/by-name/lu/luau/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "luau"; - version = "0.720"; + version = "0.725"; src = fetchFromGitHub { owner = "luau-lang"; repo = "luau"; tag = finalAttrs.version; - hash = "sha256-OF0Zsy1O+9rCcOlWRiBmoets7dAZES4Yy6X4QJ3ZdvQ="; + hash = "sha256-zRoB1psMrZRt8mLoaReyc0hvhRBPAotC1LmDNTYGLjA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ma/matrix-tuwunel/package.nix b/pkgs/by-name/ma/matrix-tuwunel/package.nix index 2ac745b9c1f2..a7e994ee4dd7 100644 --- a/pkgs/by-name/ma/matrix-tuwunel/package.nix +++ b/pkgs/by-name/ma/matrix-tuwunel/package.nix @@ -11,7 +11,6 @@ nix-update-script, testers, matrix-tuwunel, - enableBlurhashing ? true, # upstream tuwunel enables jemalloc by default, so we follow suit enableJemalloc ? true, rust-jemalloc-sys, @@ -89,16 +88,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "matrix-tuwunel"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "matrix-construct"; repo = "tuwunel"; tag = "v${finalAttrs.version}"; - hash = "sha256-bB42SEa/gkFlkjb4L12Uh7xI4+3NmJgfbUPU01NXaEQ="; + hash = "sha256-KbcijWL4PwEUycE9pxdJjnBP0pxK6ywuf7wpuy2eA60="; }; - cargoHash = "sha256-czCKzV/DCMJK0sN/jP5Jo98Zdii9DIAGAVnFnK0YtmY="; + cargoHash = "sha256-RsZWk+cm9JJ6+8xsWXNyN2QcHSMFOD3CikNm84DhXWU="; nativeBuildInputs = [ pkg-config @@ -127,7 +126,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildNoDefaultFeatures = true; # See https://github.com/matrix-construct/tuwunel/blob/main/src/main/Cargo.toml # for available features. - # We enable all default features except jemalloc, blurhashing, and io_uring, which + # We enable all default features except jemalloc and io_uring, which # we guard behind our own (default-enabled) flags. buildFeatures = [ "brotli_compression" @@ -140,7 +139,6 @@ rustPlatform.buildRustPackage (finalAttrs: { "url_preview" "zstd_compression" ] - ++ lib.optional enableBlurhashing "blurhashing" ++ lib.optional enableJemalloc [ "jemalloc" "jemalloc_conf" diff --git a/pkgs/by-name/mi/mistral-rs/package.nix b/pkgs/by-name/mi/mistral-rs/package.nix index 760ba33786d0..88733f003905 100644 --- a/pkgs/by-name/mi/mistral-rs/package.nix +++ b/pkgs/by-name/mi/mistral-rs/package.nix @@ -73,14 +73,14 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "mistral-rs"; - version = "0.8.3"; + version = "0.8.4"; __structuredAttrs = true; src = fetchFromGitHub { owner = "EricLBuehler"; repo = "mistral.rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-Ohkr45VXuXB7Ms8igZxQ7shrJa3+WBVT1fNYlc6JvZQ="; + hash = "sha256-BSP8fi4grbEzGOfR4tGCJVjIom/1d2mnFrK8O6BRWL4="; }; patches = [ @@ -94,9 +94,22 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail \ "lto = true" \ "lto = false" + '' + # Prevent build scripts from attempting to clone cutlass (which would fail in the sandbox anyway). + # Instead, we provide cutlass in buildInputs. + + lib.optionalString cudaSupport '' + substituteInPlace mistralrs-flash-attn/build.rs \ + --replace-fail \ + ".with_cutlass(Some(CUTLASS_COMMIT))" \ + "" + + substituteInPlace mistralrs-quant/build.rs \ + --replace-fail \ + 'builder = builder.with_cutlass(Some("7d49e6c7e2f8896c47f586706e67e1fb215529dc"));' \ + "" ''; - cargoHash = "sha256-ZwUCzbRpDgT7KwsT9kPGsGp4iU/0I+lrMFqM3UCwkYw="; + cargoHash = "sha256-T4TPm31fihx9ZvQ6jme67yrc0osl4c9CiAm4+rISgFs="; nativeBuildInputs = [ pkg-config @@ -121,6 +134,9 @@ rustPlatform.buildRustPackage (finalAttrs: { cudaPackages.cuda_nvrtc cudaPackages.libcublas cudaPackages.libcurand + + # For compiling kernels + cudaPackages.cutlass ] ++ lib.optionals mklSupport [ mkl ]; diff --git a/pkgs/by-name/mt/mtail/package.nix b/pkgs/by-name/mt/mtail/package.nix index 262b534718f5..2de15aec8add 100644 --- a/pkgs/by-name/mt/mtail/package.nix +++ b/pkgs/by-name/mt/mtail/package.nix @@ -8,17 +8,17 @@ buildGoModule (finalAttrs: { pname = "mtail"; - version = "3.3.0"; + version = "3.3.2"; src = fetchFromGitHub { owner = "jaqx0r"; repo = "mtail"; rev = "v${finalAttrs.version}"; - hash = "sha256-zJ30T9+Jy1RqUERlkHbY3w2Beuefwd/otwPXnS4oFrU="; + hash = "sha256-Cn6Ssj5ik0G/MORbx+YwY7ekheXim64zUx7oKH5JXD0="; }; proxyVendor = true; - vendorHash = "sha256-AXMqLwFcRoFRKrGH8srsH1GjeI25XgjgqrcOpQY3ZbY="; + vendorHash = "sha256-v00wX7uz3z/ldwppQd9aJLN/bnhoN/wweY3nbO/fu2I="; nativeBuildInputs = [ gotools # goyacc diff --git a/pkgs/by-name/ni/nile/package.nix b/pkgs/by-name/ni/nile/package.nix index d7c22df3f02f..8afc79a11894 100644 --- a/pkgs/by-name/ni/nile/package.nix +++ b/pkgs/by-name/ni/nile/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "nile"; - version = "1.1.2"; + version = "1.2.0"; pyproject = true; src = fetchFromGitHub { owner = "imLinguin"; repo = "nile"; tag = "v${finalAttrs.version}"; - hash = "sha256-/C4b8wPKWHGgiheuAN7AvU+KcD5aj5i6KzgFSdTIkNI="; + hash = "sha256-tzf3sqD7P32AXzZu/WDauOSsEe/xhCh6x4KGQ1YnJqw="; }; build-system = with python3Packages; [ setuptools ]; @@ -50,6 +50,6 @@ python3Packages.buildPythonApplication (finalAttrs: { changelog = "https://github.com/imLinguin/nile/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl3Only; mainProgram = "nile"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ theobori ]; }; }) diff --git a/pkgs/by-name/os/osmium/package.nix b/pkgs/by-name/os/osmium/package.nix index b8f515f72ec5..97114e38aee1 100644 --- a/pkgs/by-name/os/osmium/package.nix +++ b/pkgs/by-name/os/osmium/package.nix @@ -25,18 +25,15 @@ libnotify, libpulseaudio, writeShellApplication, - curl, - yq, - common-updater-scripts, }: stdenv.mkDerivation rec { pname = "osmium"; - version = "0.0.26-alpha"; + version = "0.0.29-alpha"; src = fetchurl { url = "https://updater.osmium.chat/Osmium-${version}-x64.tar.gz"; - hash = "sha256-6hsXZ9ykM7x4RNqixolK3/C9K0OBjMuUNIWYjjj8uCs="; + hash = "sha256-UbYnT/9bkMCii4rkAlkUBQcHc6DyAkOa8rQl+9e3NZU="; }; nativeBuildInputs = [ @@ -108,18 +105,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = lib.getExe (writeShellApplication { - name = "update-osmium"; - runtimeInputs = [ - curl - yq - common-updater-scripts - ]; - text = '' - version="$(curl -s https://updater.osmium.chat/alpha-linux.yml | yq .version)" - update-source-version osmium "$version" - ''; - }); + updateScript = ./update.sh; }; meta = { diff --git a/pkgs/by-name/os/osmium/update.sh b/pkgs/by-name/os/osmium/update.sh new file mode 100755 index 000000000000..cc6387968829 --- /dev/null +++ b/pkgs/by-name/os/osmium/update.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl yq common-updater-scripts + +version="$(curl -s https://updater.osmium.chat/alpha-linux.yml | yq -r .version)" +update-source-version osmium "$version" diff --git a/pkgs/by-name/os/ostui/package.nix b/pkgs/by-name/os/ostui/package.nix index 47eac25c8244..a1b51c13c2c5 100644 --- a/pkgs/by-name/os/ostui/package.nix +++ b/pkgs/by-name/os/ostui/package.nix @@ -8,13 +8,13 @@ }: buildGoModule (finalAttrs: { pname = "ostui"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromSourcehut { owner = "~ser"; repo = "ostui"; rev = "v${finalAttrs.version}"; - hash = "sha256-kg0sMLH7rZ+RmOi8lnjIya4l9W/HIU9bP2Eyj1+vWSQ="; + hash = "sha256-Zm7j4s+GLILLnH+CjF8JsJB4APYeWV7TyCUkKLW2SGQ="; }; vendorHash = "sha256-yhoTwouYlv2VkCWmvwvvpbQmrFwzwpraf0EV2Tegq94="; diff --git a/pkgs/by-name/pa/palemoon-bin/package.nix b/pkgs/by-name/pa/palemoon-bin/package.nix index c43324e7d19a..fbb903774a53 100644 --- a/pkgs/by-name/pa/palemoon-bin/package.nix +++ b/pkgs/by-name/pa/palemoon-bin/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "palemoon-bin"; - version = "34.3.0"; + version = "34.3.0.1"; src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}"; @@ -171,11 +171,11 @@ stdenv.mkDerivation (finalAttrs: { { gtk3 = fetchzip { urls = urlRegionVariants "gtk3"; - hash = "sha256-yoZqZJLxgDIxIeyrn6VW6c6iKpU84ZDsJbCz3yf4gdU="; + hash = "sha256-U9OwgiQMVOayt5Krlina2s33wS55HuLN255tkVyQxoY="; }; gtk2 = fetchzip { urls = urlRegionVariants "gtk2"; - hash = "sha256-QhrW1ZD1ouPvWJLvnIEMHgTViGNBshFlT6Ax0l0xGv8="; + hash = "sha256-Yzr2ovHKFFNIem1PXTaajlxVKXB5frZQ/kfOL+jsmtE="; }; }; diff --git a/pkgs/by-name/pb/pb/package.nix b/pkgs/by-name/pb/pb/package.nix index db8e599965c8..b9f5823cd6ee 100644 --- a/pkgs/by-name/pb/pb/package.nix +++ b/pkgs/by-name/pb/pb/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "pb"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "parseablehq"; repo = "pb"; tag = "v${finalAttrs.version}"; - hash = "sha256-OXxLHi7v/xJZVvxHZvJ0eH4MYrlLFxDAMT9CVG2mWTM="; + hash = "sha256-q389FVNVxIoDr65imIg5gjn8/CnKl437a04ojm9uyrA="; }; - vendorHash = "sha256-N6m0qvj65Ls3yQmVGw0AklsO1zs1KHdi/Y6FZRghnCs="; + vendorHash = "sha256-hEVoz8EgC2hAkiC0LNZ+h/Hy7toVxWvv2gchymfpMK8="; ldflags = [ "-s" diff --git a/pkgs/by-name/pe/peacock/missing-hashes.json b/pkgs/by-name/pe/peacock/missing-hashes.json index 7bf27a804eda..b311845972cf 100644 --- a/pkgs/by-name/pe/peacock/missing-hashes.json +++ b/pkgs/by-name/pe/peacock/missing-hashes.json @@ -30,23 +30,49 @@ "@msgpackr-extract/msgpackr-extract-linux-arm@npm:3.0.2": "a65e847f6a53a74d5b91d10f8a575c43724a6b6530918ca8f71784ba763e1e0e2e2ce5f02a8709273d033a5a8b1361026adce08f69c0fcf778c3f1aae1aa9099", "@msgpackr-extract/msgpackr-extract-linux-x64@npm:3.0.2": "d5af7600096b93294d5e2c8a75661979996e7d0a7eaddfa3fd45a1b41c54f2c4a21765f0852ce6ef28506309c1f19761310e345613edb2d74d5582a205e1514e", "@msgpackr-extract/msgpackr-extract-win32-x64@npm:3.0.2": "10ab009b2032b638ad9c00c87b91af09e96d85991806bc73ae3bf5c956fe8172057515df4265b0d13e8b46bd5b74fff0682b5b513e3c2cf52bfac42268f6ab94", - "@rollup/rollup-android-arm-eabi@npm:4.35.0": "6608c59811f515fd3817c7b891d34ad042e9a3f4c0edd94fb8af839f17b1748eb5c27b7b12e2431406acd9d174abb60e8e520310d1a8add31046852651b96431", - "@rollup/rollup-android-arm64@npm:4.35.0": "51e6a45d4bd1048c7a6be7b4a091a9af063388f5731d455100a6e090ec6c84d44d927aa0bf8ea508a19f2f8343eaae319db06df0acfdb51eeb708d1a314ae611", - "@rollup/rollup-darwin-arm64@npm:4.35.0": "844a8ae0b0ab412fcc98979f0a91965a93fb60c5cce6edc7971792acf08d592fe42413eab0692ae1880dc118b669897a28c2896bfe0a9c272f1b481db662d71c", - "@rollup/rollup-darwin-x64@npm:4.35.0": "cbcd6d74096e9732db56444d79f4cc739ade75f4a4768e14b259829b2b2905b7e2e5c5811f6294632ae035e813b36a7ee9edf57f529449ae128ce7b4f83f6e80", - "@rollup/rollup-freebsd-arm64@npm:4.35.0": "0a29880358b751650db7ab294131572c3952288169d88919510ad7f1e7534cf2f46ea561c600fba27d89fff0cdabe5efb8c19cf6572d08bc0c126832d52d95d8", - "@rollup/rollup-freebsd-x64@npm:4.35.0": "fed915fc432c395645bbcbc9f2a88bae25c8e5ba4fb7f813e7d11c007954767ae8b78fcfc445d1c1f4f95d637745e27dcfe3acc710022d7c999c80da32f70fae", - "@rollup/rollup-linux-arm-gnueabihf@npm:4.35.0": "47336911b4c51a55c21a9197593acb8e7b578c9e30b4a4e446e6d4ea3aeedc4afca8d2dfa46002d076d4c456a43065eea89dcf863b80daa0b840f95717579a2f", - "@rollup/rollup-linux-arm-musleabihf@npm:4.35.0": "66cb126a20e735224c1caf23531f6d8a6e0f377e5be2ea4943c3043b8d0345eafecfa7d02a763b09c057ca682d4e43fdad8d79c62b3f366d1c4dbadad9758bfd", - "@rollup/rollup-linux-arm64-gnu@npm:4.35.0": "ad2cb0b631f3163709706d77d9ef111bc2bd2cefe9484b89ab00069a150df7d84ddfb3d0bec0e488363f8dcb0dacc1333533e5223ddf818af3d5da84201a1952", - "@rollup/rollup-linux-arm64-musl@npm:4.35.0": "c757a761365e717b2cc48b136d7ba1d0bb298ab475639dbe9393328354afde574248ee278ed66fd7715e72bd56b82f5a84e280dd5358d98736e6f6eaabad6509", - "@rollup/rollup-linux-loongarch64-gnu@npm:4.35.0": "44c1b076ebdea504f1bf64fe17770a1702e833fc84f1fb47a5263d03c965dbae3a18573c594fbacc1a618088dcba42f5dc004bd85c694e72317b84b8e76c0d26", - "@rollup/rollup-linux-powerpc64le-gnu@npm:4.35.0": "24cd93ccc079d4c5af42f06b3b7ce065056ec143720ccf54002e9539934863fda88771fdd62c6dc6388e6d35f15e5e562e372eda86a1a68232b33744e75b8917", - "@rollup/rollup-linux-riscv64-gnu@npm:4.35.0": "2ef06fd488795343cd8f91fb684679a08c5ecc2084e831335358e668d3ea02e121dca662cb8685f2ad16802b6c04eadb0891b1036e800eff1d4b3de258f7011c", - "@rollup/rollup-linux-s390x-gnu@npm:4.35.0": "37a11392d357debd1c9d3c03540028dc4d733e91e1f11525951fb76b572cadfadac821062436bf72100e4cea83e796d1d34c9331834d56cdae9b5fb1cf676ed7", - "@rollup/rollup-linux-x64-gnu@npm:4.35.0": "6406cd583d15a9b6862ed8baa70b90de271663127a9729456efec31b8647d882f3ed3ea5d630cfa46b7330e5795babfa090874feb5a832b9b0964eb01fba1e79", - "@rollup/rollup-linux-x64-musl@npm:4.35.0": "102d679f7347ec8986eb5ceb7eaed73f1948b53f8867ae90f2e60b0efa04acc462d6d7f32ee14c73194e965fca15edcb629bb323865f3ad7953695fcd2e7aaca", - "@rollup/rollup-win32-arm64-msvc@npm:4.35.0": "5344cd7bebdea17e5b8cd517e5ef590df7db23e1589d1bc1665839cb9fea82e331b69fd06859efad00544bf24a5b2af33e3f3f08e1c1a58322cddf52d5b3829a", - "@rollup/rollup-win32-ia32-msvc@npm:4.35.0": "30bd40356401961443c5e2a9c2e96d086d491e7cd956de34bd073a0cbcc8f3a4c87c4e29601b8b27ef1f7d3a13f89e4a59fd6458bd7ef43565b7ac72b2ff30b0", - "@rollup/rollup-win32-x64-msvc@npm:4.35.0": "c684bf21414814a3f7d451be07c1716fc85bf340bcc87eb37ed3f5ea0adbef869af533392971fdc44c932de8b43b9161237cd093a47e233caf66c7be76f54a9d" + "@oxfmt/binding-android-arm-eabi@npm:0.42.0": "cfed4cc07be186ab9f04956ec5faac8c7bdad7953afad8057b985c9b1703971067b61d606c9f231226d94cf61ad2f1d757c17e3f0f9a723a60960af889563950", + "@oxfmt/binding-android-arm64@npm:0.42.0": "442332e0c820fda900b67de5d6309f4050f7b9322ce94153477ce429f4a1bfaecf921a28c15665b643febcfefdebf3bca31eeeae52cd10cc8fd15fe67ee70bad", + "@oxfmt/binding-darwin-arm64@npm:0.42.0": "ee19cb362477eb9be51852ef1add3ba121defa0b25bbb4736b1927b49786c9c74241f630ac3e5f71180f2eea1bdbc510cffd654831f4d8d815a6e69b91ab5e24", + "@oxfmt/binding-darwin-x64@npm:0.42.0": "798a208adcbe43ef9a3ead702a63ae91d0da868e3a34c6d21fd9cdc2933e3cd584423b96c4fa9a80a91ba50cac61f198ecaab1c1970dd1460b62706894c004be", + "@oxfmt/binding-freebsd-x64@npm:0.42.0": "1375f7fe8875d15ad99110d30fcf2b62f271c149b8676b7203261edc7afcd425fc6e2c1f03c688eb7792a8b407db29cc80be99508636c3ae9c5e01f7511a9019", + "@oxfmt/binding-linux-arm-gnueabihf@npm:0.42.0": "ffc7b9c8368b3234fa6750cf7c97ecb48e6f7399120005cef0dc667138465a78d4542da3ef84b049496d7c7f2737a73da7bd655b25a6ac0cd581110b1c5ea97f", + "@oxfmt/binding-linux-arm-musleabihf@npm:0.42.0": "3536d4c804af4dcbdf97aeb01862a63401ab84f430af2652a8d49a6b3559b0cc13c48bb6b65a5d88bee109e8bc56eae09279b3db927506e0423b9a2c4a1a2faf", + "@oxfmt/binding-linux-arm64-gnu@npm:0.42.0": "ab50b3dcefa2646e070344ade3c96e1f1cf6de6b82fff0d15223d5315e530536284740a67544c16d9d030235dc0e25174314d894b2f6a9870824a02d8b3dc850", + "@oxfmt/binding-linux-arm64-musl@npm:0.42.0": "fc6cc62590f450829b4e95d64c72fde805138dea7050c520d45cecd01fd20f47f94db0c539ce69ff0cc067ac79f852a7560369a3e39d01471294358a295215e6", + "@oxfmt/binding-linux-ppc64-gnu@npm:0.42.0": "cfe429d5056af70cfc910603e8901ec9a45afd21221900d4fef3880ac8d591f61586c49f1e2fa92c738f7c1e0b3d2178bc7c14238b0b3465360e1d66d962a671", + "@oxfmt/binding-linux-riscv64-gnu@npm:0.42.0": "943f26bc82e8964f0b49159585590805f79d6af7bde611dedfe139fe63d862ad26165d01b27df80cd3b75ba485c7b361761d3f1f1e2a58ec3d99510af8782a75", + "@oxfmt/binding-linux-riscv64-musl@npm:0.42.0": "fc5a41699e6fba09e10628eb73c4baf71630f7a88736ec8339bdf396223d276577d1239e89c6395751680641d7c15400eacbbba175a7618cd113f656d58b65b4", + "@oxfmt/binding-linux-s390x-gnu@npm:0.42.0": "12fd4491796031630eaf950a8fe96d652a490e07240dfcafe25ce3e2f120bf01f5472d9e1ddb9cc2862debcbc4f5a14139edbd114b9a8ba11dfcb1e50af98a04", + "@oxfmt/binding-linux-x64-gnu@npm:0.42.0": "831e37318b98817cc7f590bd5c4f9c4a85dd8c661611834ea97f897625a902c950aadc51133506014e7823d2b6049d70aafbec1e998e12fc7a27399b227e0974", + "@oxfmt/binding-linux-x64-musl@npm:0.42.0": "6442ca0a5098ba5eff96aa846d675bed07e391caa3915cd709f489334caa807255a84abb26c2ffc9bc86f3b7be60ace90f3c8ba92ca3f22ddf31567af285cbc5", + "@oxfmt/binding-openharmony-arm64@npm:0.42.0": "3146f6b340e2ee236297bec9502527ea536e27d6241f836c127e9cfce2d393d6d827737486bdc2ac28efd1a85af610326b83e7c2d28cfe01c9adec89b113a3dc", + "@oxfmt/binding-win32-arm64-msvc@npm:0.42.0": "d8f205779c9b58cbb5a5ba8105ebce093647ab643486b6f879555908219f5343d680250a1adb84b609e4933d3fa10dfda120e62430b76c9c9e63983c546181b1", + "@oxfmt/binding-win32-ia32-msvc@npm:0.42.0": "b8761448bc3286a71e89419416507b15c7a6a935ab39e862ef5242c654c288155e540b9a9dddef1d55fb45ec485390bdd5ff5961f70d6fcd71154f336a2403bc", + "@oxfmt/binding-win32-x64-msvc@npm:0.42.0": "7bdbcfb041739a6c655b8eb9acdafdb29925276c26c393da2325f0041658fc5306a9f274fbe50c18763a87c2878219db264b1c9cbc8ff5e63e77350d595a4cc8", + "@rolldown/binding-android-arm64@npm:1.0.0-rc.10": "d4cc5896e0fb0fe10a0bb374b53824dc73ffe672693e4151a1acef3a16861f08aa10dc5c22132aaf7533028d85eb0610d90bbac73d2d7da1a7c8c9d51f58cdde", + "@rolldown/binding-darwin-arm64@npm:1.0.0-rc.10": "81bb998e37f7ee6ad779a192240ee8c55c06539a2c5afc4a9a52afc4aac85340943cfa4a47d0156dcefeb57ba42d5cdfab3bd51a9ce76baa5e4b2876eee95751", + "@rolldown/binding-darwin-x64@npm:1.0.0-rc.10": "73f6a9a9c793d873fe5bd7c6602c8d3330bc6f960974c28df9e6b621503d962507b7e72d83541f4abd4af0d752998eaffbac66f07ee7b7450d5ffe0d908e0fee", + "@rolldown/binding-freebsd-x64@npm:1.0.0-rc.10": "900d53dfc0f0738a261137581e155527a9e25e5a50e38f211d6155d84a16a253d5b7ba56b6692bf674d7677e33499aeb2a622e66faadb3b673151bb809b4d0f3", + "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-rc.10": "9b5375d3f1140a1e69bc64e281ac31fd5f801d33cc82f9cc4ad3ae1380f974425af54b151bac92d7729f103ba72a4c3565e04f98fda4aca905e3273605a4dfe0", + "@rolldown/binding-linux-arm64-gnu@npm:1.0.0-rc.10": "eed78ec8240558ab0e68c343fc5d29a8965e41eac0dcbd63ec63645af7fd69767cb7b25fb03d27a8e3f8b51ea880294451379d3e3fd75d7a2a17545cfd2fee69", + "@rolldown/binding-linux-arm64-musl@npm:1.0.0-rc.10": "1abf65bf031874306b1e5f6efd90eaccdf961e2341eeb285789596bfc9b870c6aca9e9fae57b1de51c1d5f27832cbc07208297e13dd516dc1f93ed26d0ca7d53", + "@rolldown/binding-linux-ppc64-gnu@npm:1.0.0-rc.10": "cce773d4e27c07e28ad619cf6af148927a8e737b29070af838ab2583262a66bceae93af902db92556c9794da79b738624a0ecef79d3a07649f529742bd8360f7", + "@rolldown/binding-linux-s390x-gnu@npm:1.0.0-rc.10": "68f34d542ab61a8fb7b485a611f0eabca4f87a8c37b888d373ebe439bf1243c9571a4962ec447a285629fd49a6aca48b26832354c16cb192a2099f3e2f223015", + "@rolldown/binding-linux-x64-gnu@npm:1.0.0-rc.10": "e7c10be739aa7b5e93818672055ee2ec6af9545057a0d9ef88aa28c7bf852ed72652bdf96be0fb9d06e17f2c0250f1823b7ec1a5bcbfd82d6ab9911bd00b446f", + "@rolldown/binding-linux-x64-musl@npm:1.0.0-rc.10": "a8ba6e75f7a96b5df7b9dbed53f2eb8193b31950754617906c6079c74ba7c557edcb1a32b1122acb53bd954b7aac1d574ebe887916d63ee71d6404ea812ee800", + "@rolldown/binding-openharmony-arm64@npm:1.0.0-rc.10": "4018ac89bd56c0ffa5e42b1e91f1b94a2c021aa967b2332c4289ca2032ed688819080527ad8876eb820f547e8e6a6b2e2ab0032ca022f208e135d54c691db3dd", + "@rolldown/binding-wasm32-wasi@npm:1.0.0-rc.10": "659214e120a40d4fdd2e3400f05957c75605737005f60e63aa1e6b3975f76ff8616a28621458c1b5c627c5b625aa87e1b383fb6ef3e1ce47b3bc83af97f3dc41", + "@rolldown/binding-win32-arm64-msvc@npm:1.0.0-rc.10": "4be61ac40624cdfa0b065ad40e9678f326a2d33c075b1f753386d9d1060ccade471146e476af3ae484cf1a2e58d58d87c3ab657b65c1d2d202b15fa537375145", + "@rolldown/binding-win32-x64-msvc@npm:1.0.0-rc.10": "dca5229af78dd34b1c7fcb753c9d3b580d9ebc03ee06d41c215c0ca3ab800fcf0ecfbe6c505446eeeb81cd5897e26532d9374e60ce9ecb5c8bd8c1e5476f0801", + "lightningcss-android-arm64@npm:1.32.0": "119b578a5ce59674c45fe8dc269fdb2770d678571e7fd3f7eca763807d15542689d01f75f2836e1aa49b9ddd0caa7ab3a5301bb23b39418eaeba1efab3e85975", + "lightningcss-darwin-arm64@npm:1.32.0": "55010ae8ee7aac61da41fbc81992e11b1ca386087bb8493deb1014ea90c2deeef1b4126621722aa5b8a1aeee039ec7e3b1b9f7779d128963d6e436743f5d23aa", + "lightningcss-darwin-x64@npm:1.32.0": "dd74c964c85c93842576f8caaf6c31ea273545e2f39f931716fed7700668f30d7ca92516197913ded19d836f6ff1876a91cca008125f097e254c98177e67bf86", + "lightningcss-freebsd-x64@npm:1.32.0": "29b43c1a450171da1dece9ba2a13a6dc0866178e46fa51a8cf050fe9562eb81b45f8580a3aeaf2ac97fb2fd381d8cb88d950e701774c8d012e72a355df7ac264", + "lightningcss-linux-arm-gnueabihf@npm:1.32.0": "783e6f8bba55ffd585f17229e97056c370ed834e0123d0002884b51a7fb54d6807e97076726fd0bfd949396134983e21a0aace0d4f69b916994db679a0d8a360", + "lightningcss-linux-arm64-gnu@npm:1.32.0": "d694a6148f86d20e23b0806e8c6366de3bfc6927925ad17d226cd86c2ff4f025b1c88ae3d214dea06b45af2aa2d356cf504b1057b2a0a7027b44bfac11dc1f4d", + "lightningcss-linux-arm64-musl@npm:1.32.0": "ad946ead9c3ff13b43818d94426940b50cf1ff3dacd07835b8c50f0d412f64574be3c467410786dfb3524e93bc98fb789ebb73e6de845ceb1729fceb5296fe6f", + "lightningcss-linux-x64-gnu@npm:1.32.0": "183d5cda546283523761f606032596d70383d6fd153cfca56ab348d551ef06394ee009fae7818b0732de10d9d0ee27db483cbc7e0d0899305a37a118504d609e", + "lightningcss-linux-x64-musl@npm:1.32.0": "67079567d13d5464a2556630dcbcbb8ccd0e3188d56b0a732c651930a823a708b91faa067256a15be6f289f07f1b57ca433d38ad397a9a102fbb85d0b85b5ea0", + "lightningcss-win32-arm64-msvc@npm:1.32.0": "6117fdfb4ef1c2d8054fb469659e406ae32adae9dc712e2e5ed3f813bf25a52f0954911e92a5d397aeeba7151bafb3370dfc50504b94e719f4018de7d3cc3687", + "lightningcss-win32-x64-msvc@npm:1.32.0": "f4a917eebae4f3718eaa4d3a16e268a42f117180e6bda101b380939f6738d2754dbb69bd454ee412bbc6e6290e2d8446c5f6ee3a63b144c9bd6f40a93109b7ab" } diff --git a/pkgs/by-name/pe/peacock/package.nix b/pkgs/by-name/pe/peacock/package.nix index e74931c727bd..74184e9b0ae4 100644 --- a/pkgs/by-name/pe/peacock/package.nix +++ b/pkgs/by-name/pe/peacock/package.nix @@ -13,13 +13,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "peacock"; - version = "8.7.0"; + version = "8.8.1"; src = fetchFromGitHub { owner = "thepeacockproject"; repo = "Peacock"; tag = "v${finalAttrs.version}"; - hash = "sha256-kDR2ObXzo8UudjfqU/lQl6dqblFhIEgnr20EKjiWKVw="; + hash = "sha256-OeROaz2Uvg3nsB0R9Ojo65a+zhnw/QmYaagcBrnIdIk="; }; patches = [ @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { missingHashes = ./missing-hashes.json; offlineCache = yarn-berry.fetchYarnBerryDeps { inherit (finalAttrs) src missingHashes patches; - hash = "sha256-DgkmBd9/voLLxIo1R7MNknFmH62RUYrG0MeV074ZX7U="; + hash = "sha256-9u/w/zy4f51uPFfkzf0fDZlsj8GFXAfw7RGR9owo5n8="; }; meta = { diff --git a/pkgs/by-name/pe/peacock/yarn-4.14-support.patch b/pkgs/by-name/pe/peacock/yarn-4.14-support.patch index 1885f6de9f13..eb94dd5a821e 100644 --- a/pkgs/by-name/pe/peacock/yarn-4.14-support.patch +++ b/pkgs/by-name/pe/peacock/yarn-4.14-support.patch @@ -1,19 +1,8 @@ -diff --git a/.yarnrc.yml b/.yarnrc.yml ---- a/.yarnrc.yml -+++ b/.yarnrc.yml -@@ -14,4 +14,7 @@ plugins: - - path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs - spec: "https://mskelton.dev/yarn-outdated/v2" - --yarnPath: .yarn/releases/yarn-4.7.0.cjs -+approvedGitRepositories: -+ - "**" -+ -+enableScripts: true diff --git a/yarn.lock b/yarn.lock +index 286ec90499..ee9a3a9fd3 100644 --- a/yarn.lock +++ b/yarn.lock -@@ -2,6 +2,6 @@ +@@ -2,7 +2,7 @@ # Manual changes might be lost - proceed with caution! __metadata: @@ -21,3 +10,4 @@ diff --git a/yarn.lock b/yarn.lock + version: 9 cacheKey: 10 + "@aashutoshrathi/word-wrap@npm:^1.2.3": diff --git a/pkgs/by-name/ph/phrase-cli/package.nix b/pkgs/by-name/ph/phrase-cli/package.nix index 99710f030816..ea116e76f006 100644 --- a/pkgs/by-name/ph/phrase-cli/package.nix +++ b/pkgs/by-name/ph/phrase-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "phrase-cli"; - version = "2.64.0"; + version = "2.65.0"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = finalAttrs.version; - sha256 = "sha256-UTfVHUExjTsswhTaoDPIckkqRbVyo95AwBUOXEFQE/M="; + sha256 = "sha256-9GFprrLcae/uiQCi2PolLAUP89nCa02DZ3tEXUyXvhw="; }; - vendorHash = "sha256-HbgLFtKpmacjArmV3t1AkPKQ+nY9OLLyivZNlxbuoNY="; + vendorHash = "sha256-vlssNVS1zTjYdp63NrR2rWOan5ng6t2BYEXv4L9q8Gc="; ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${finalAttrs.version}" ]; diff --git a/pkgs/by-name/ra/rasm/package.nix b/pkgs/by-name/ra/rasm/package.nix index dbbd77ca3183..998529d3e015 100644 --- a/pkgs/by-name/ra/rasm/package.nix +++ b/pkgs/by-name/ra/rasm/package.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rasm"; - version = "3.2.4bis"; + version = "3.2.5"; __structuredAttrs = true; strictDeps = true; @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "EdouardBERGE"; repo = "rasm"; tag = "v${finalAttrs.version}"; - hash = "sha256-D9V9CqCCy0EYRIX0nr+kwxPH7W2KIIq67jabP7ZzETE="; + hash = "sha256-sLSODTaVxhybtkzRAjQw4bRSPhp9O69S5OzkEq/pK0M="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/re/re-isearch/package.nix b/pkgs/by-name/re/re-isearch/package.nix index 03b6ffbc4fe6..be99cd7ee0a4 100644 --- a/pkgs/by-name/re/re-isearch/package.nix +++ b/pkgs/by-name/re/re-isearch/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ writableTmpDirAsHomeHook ]; - buildinputs = [ + buildInputs = [ db file # libmagic libnsl diff --git a/pkgs/by-name/ru/rustfinity/package.nix b/pkgs/by-name/ru/rustfinity/package.nix index a73d835f43aa..e2a9cdc21077 100644 --- a/pkgs/by-name/ru/rustfinity/package.nix +++ b/pkgs/by-name/ru/rustfinity/package.nix @@ -1,6 +1,5 @@ { lib, - stdenv, rustPlatform, fetchCrate, pkg-config, @@ -8,32 +7,38 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "rustfinity"; - version = "0.3.0"; + version = "0.4.9"; + __structuredAttrs = true; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-5UhKL6lXli1mGorThv3SFclVKDATmxklZQ+S5hwqQgc="; + hash = "sha256-0xEVYHvVOugfE4mQxYt+U7AsejOxm/SnDV8HsmcZxBs="; }; - cargoHash = "sha256-ZzVGr/Zj+WKKAUqJEbDZgEL7fHzRiI/aSF6e5sLZY+o="; + cargoHash = "sha256-Zc3m+hTotgCqBguUB/KM4BtGsdD4W5MR/ZBg2X/0nNk="; - nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ]; + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ]; env.OPENSSL_NO_VENDOR = 1; - # Requires network and fs access - checkFlags = [ - "--skip=challenge::tests::test_challenge_exists" - "--skip=crates_io::tests::test_get_latest_version" - "--skip=dir::tests::test_get_current_dir" - "--skip=download::tests::download_file::test_downloads_file" - "--skip=download::tests::download_file::test_renames_starter" + # Fail to run in sandbox environment + checkFlags = map (t: "--skip=${t}") [ + "challenge::tests::test_challenge_exists" + "crates_io::tests::test_get_latest_version" + "dir::tests::test_get_current_dir" + "download::tests::download_file::test_downloads_file" + "download::tests::download_file::test_renames_starter" ]; meta = { description = "CLI for Rustfinity challenges solving"; - homepage = "https://github.com/dcodesdev/rustfinity.com/tree/main/crates/cli"; + homepage = "https://github.com/rustfinity/rustfinity/tree/main/crates/cli"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ nartsiss ]; mainProgram = "rustfinity"; diff --git a/pkgs/by-name/sa/salt/package.nix b/pkgs/by-name/sa/salt/package.nix index 481c2e370eea..6f0fcb1ba5a6 100644 --- a/pkgs/by-name/sa/salt/package.nix +++ b/pkgs/by-name/sa/salt/package.nix @@ -11,12 +11,12 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "salt"; - version = "3008.0"; + version = "3008.1"; format = "setuptools"; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-az5PJTHJnD2wZtgds1KDnHdn3oRsk94/+UZRoX054tE="; + hash = "sha256-abf3Phwx7IjP7CqbvVZsf84Ajdqrmiab4xfPeyb2j/w="; }; patches = [ diff --git a/pkgs/by-name/sa/samim-fonts/package.nix b/pkgs/by-name/sa/samim-fonts/package.nix index d495c7331785..9a3f007c1aca 100644 --- a/pkgs/by-name/sa/samim-fonts/package.nix +++ b/pkgs/by-name/sa/samim-fonts/package.nix @@ -2,32 +2,32 @@ lib, stdenvNoCC, fetchFromGitHub, + installFonts, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "samim-fonts"; version = "4.0.5"; + outputs = [ + "out" + "webfont" + ]; + src = fetchFromGitHub { owner = "rastikerdar"; repo = "samim-font"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-DVBMsNOVAVwzlZ3cDus/3CSsC05bLZalQ2KeueEvwXs="; }; - installPhase = '' - runHook preInstall - - find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/samim-fonts {} \; - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { homepage = "https://github.com/rastikerdar/samim-font"; description = "Persian (Farsi) Font - فونت (قلم) فارسی صمیم"; license = lib.licenses.ofl; platforms = lib.platforms.all; - maintainers = [ ]; + maintainers = with lib.maintainers; [ pancaek ]; }; -} +}) diff --git a/pkgs/by-name/sa/sampo/package.nix b/pkgs/by-name/sa/sampo/package.nix index 37e2834096c2..d88d26101e3e 100644 --- a/pkgs/by-name/sa/sampo/package.nix +++ b/pkgs/by-name/sa/sampo/package.nix @@ -9,21 +9,22 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "sampo"; - version = "0.17.4"; + version = "0.18.0"; + __structuredAttrs = true; src = fetchFromGitHub { owner = "bruits"; repo = "sampo"; - tag = "sampo-v${finalAttrs.version}"; - hash = "sha256-P+CekuDM3u+iG2HmCNWxZoTCaKtAUMnrNre4zeGNPrQ="; + tag = "cargo-sampo-v${finalAttrs.version}"; + hash = "sha256-LPgY/UA2AF871bid8wqxzIhTDnsHsQ7IhY/eNYE6Npk="; }; + cargoHash = "sha256-U52xGXJlz7cM1fJWZMp51iNgYQRA8AKJ0OkbxlAB5C8="; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; - cargoHash = "sha256-udMpH0LWNqPTORSb1/c686stgvti5shx/O9rcH7YZNs="; - cargoBuildFlags = [ "-p" "sampo" @@ -35,12 +36,14 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; - passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=sampo-v([0-9\\.]*)" ]; }; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version-regex=cargo-sampo-v([0-9\\.]*)" ]; + }; meta = { description = "Automate changelogs, versioning, and publishing—even for monorepos across multiple package registries"; homepage = "https://github.com/bruits/sampo"; - changelog = "https://github.com/bruits/sampo/blob/sampo-v${finalAttrs.version}/crates/sampo/CHANGELOG.md"; + changelog = "https://github.com/bruits/sampo/blob/${finalAttrs.src.tag}/crates/sampo/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ nartsiss ]; mainProgram = "sampo"; diff --git a/pkgs/by-name/se/setJavaClassPath/package.nix b/pkgs/by-name/se/setJavaClassPath/package.nix new file mode 100644 index 000000000000..f02a40c4f225 --- /dev/null +++ b/pkgs/by-name/se/setJavaClassPath/package.nix @@ -0,0 +1,9 @@ +{ + lib, + makeSetupHook, +}: + +makeSetupHook { + name = "set-java-classpath-hook"; + meta.license = lib.licenses.mit; +} ./set-java-classpath.sh diff --git a/pkgs/build-support/setup-hooks/set-java-classpath.sh b/pkgs/by-name/se/setJavaClassPath/set-java-classpath.sh similarity index 100% rename from pkgs/build-support/setup-hooks/set-java-classpath.sh rename to pkgs/by-name/se/setJavaClassPath/set-java-classpath.sh diff --git a/pkgs/by-name/sh/shen-sbcl/package.nix b/pkgs/by-name/sh/shen-sbcl/package.nix index 605d5f17fe8f..35eaafd5ccc6 100644 --- a/pkgs/by-name/sh/shen-sbcl/package.nix +++ b/pkgs/by-name/sh/shen-sbcl/package.nix @@ -4,16 +4,20 @@ fetchzip, sbcl, installStandardLibrary ? true, + installConcurrency ? true, + installThorn ? true, + installLogicLab ? true, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "shen-sbcl"; - version = "41"; + version = "41.1"; src = fetchzip { url = "https://www.shenlanguage.org/Download/S${finalAttrs.version}.zip"; - hash = "sha256-uWGMET1zjGbI/+yM1zeMfhVYBgrGawafAEBBGXANXGE="; + hash = "sha256-v/hlP23yfpkpFEDCTKYoxeMJbfR2qVF9LFUkqsFwo6g="; }; + sourceRoot = "${finalAttrs.src.name}/S41"; nativeBuildInputs = [ sbcl ]; dontStrip = true; # necessary to prevent runtime errors with sbcl @@ -38,11 +42,18 @@ stdenvNoCC.mkDerivation (finalAttrs: { substituteInPlace Primitives/globals.lsp \ --replace-fail '"2.0.0"' '(LISP-IMPLEMENTATION-VERSION)' - # remove interactive prompt during image creation - substituteInPlace install.lsp \ - --replace-fail '(Y-OR-N-P "Load Shen Standard Library? ")' '${ - if installStandardLibrary then "T" else "NIL" - }' + # remove interactive prompts during image creation + # shen/tk requires further configuration and isn't supported by default + substituteInPlace Lib/install.shen \ + --replace-fail '(y-or-n? "install standard library?")' '${ + if installStandardLibrary then "true" else "false" + }' \ + --replace-fail '(y-or-n? "install concurrency? (required for Shen/tk)")' '${ + if installConcurrency then "true" else "false" + }' \ + --replace-fail '(y-or-n? "install Shen/tk + IDE?")' 'false' \ + --replace-fail '(y-or-n? "install THORN?")' '${if installThorn then "true" else "false"}' \ + --replace-fail '(y-or-n? "install Logic Lab?")' '${if installLogicLab then "true" else "false"}' ''; meta = { diff --git a/pkgs/by-name/sh/shortenPerlShebang/package.nix b/pkgs/by-name/sh/shortenPerlShebang/package.nix new file mode 100644 index 000000000000..7b8037a44709 --- /dev/null +++ b/pkgs/by-name/sh/shortenPerlShebang/package.nix @@ -0,0 +1,11 @@ +{ + lib, + makeSetupHook, + dieHook, +}: + +makeSetupHook { + name = "shorten-perl-shebang-hook"; + propagatedBuildInputs = [ dieHook ]; + meta.license = lib.licenses.mit; +} ./shorten-perl-shebang.sh diff --git a/pkgs/build-support/setup-hooks/shorten-perl-shebang.sh b/pkgs/by-name/sh/shortenPerlShebang/shorten-perl-shebang.sh similarity index 100% rename from pkgs/build-support/setup-hooks/shorten-perl-shebang.sh rename to pkgs/by-name/sh/shortenPerlShebang/shorten-perl-shebang.sh diff --git a/pkgs/by-name/si/signal-desktop/chromium-147-llvm-22.patch b/pkgs/by-name/si/signal-desktop/chromium-147-llvm-22.patch new file mode 100644 index 000000000000..1d79abd77e10 --- /dev/null +++ b/pkgs/by-name/si/signal-desktop/chromium-147-llvm-22.patch @@ -0,0 +1,13 @@ +diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn +index c092446fa0715351f72913fd449c8dddb855a10f..83670b496575a85ecb02a4671c0287fd0e052c5a 100644 +--- a/build/config/compiler/BUILD.gn ++++ b/build/config/compiler/BUILD.gn +@@ -616,7 +616,7 @@ config("compiler") { + # The performance improvement does not seem worth the risk. See + # https://crbug.com/484082200 for background and https://crrev.com/c/7593035 + # for discussion. +- if (!is_wasm) { ++ if (false) { + cflags += [ "-fno-lifetime-dse" ] + } + diff --git a/pkgs/by-name/si/signal-desktop/libsignal-node.nix b/pkgs/by-name/si/signal-desktop/libsignal-node.nix index 5bca80dff986..003d78c4a602 100644 --- a/pkgs/by-name/si/signal-desktop/libsignal-node.nix +++ b/pkgs/by-name/si/signal-desktop/libsignal-node.nix @@ -15,23 +15,23 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "libsignal-node"; - version = "0.94.1"; + version = "0.94.4"; src = fetchFromGitHub { owner = "signalapp"; repo = "libsignal"; tag = "v${finalAttrs.version}"; - hash = "sha256-re9IAC0R2QOIjyOLUjdaJw/TgDA4JT1nhtOskE5A0FQ="; + hash = "sha256-Uh/j8cXUWgWgSo9UBfYOFuC8i+2YdMwGHcXf55PkGgU="; }; - cargoHash = "sha256-EVwIRUJ8SmajjocZj3dAHkTiR7Q78m/lf+4qls/oZAM="; + cargoHash = "sha256-st6zTKvxSsyMce22E8nFsJMGjQkk9sEAzSCmyZP8x20="; npmRoot = "node"; npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-npm-deps"; inherit (finalAttrs) version src; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}"; - hash = "sha256-bEQb+36IB+kXSbIkAFDpeIXWeHoQoIIiHo9q5AbaTio="; + hash = "sha256-A/RTWBHnI9eBrguXezOb5qSkGzIyVl66ATAA/ZUtk3Y="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix index de8764171560..85db438a0183 100644 --- a/pkgs/by-name/si/signal-desktop/package.nix +++ b/pkgs/by-name/si/signal-desktop/package.nix @@ -6,12 +6,12 @@ node-gyp, fetchPnpmDeps, pnpmConfigHook, - electron_41, + pnpmBuildHook, + electron_42, python3, makeWrapper, callPackage, fetchFromGitHub, - fetchpatch, fetchurl, jq, makeDesktopItem, @@ -32,7 +32,7 @@ assert lib.warnIf (commandLineArgs != "") let nodejs = nodejs_24; pnpm = pnpm_10_29_2; - electron = electron_41; + electron = electron_42; libsignal-node = callPackage ./libsignal-node.nix { inherit nodejs; }; signal-sqlcipher = callPackage ./signal-sqlcipher.nix { inherit pnpm nodejs; }; @@ -40,13 +40,13 @@ let webrtc = callPackage ./webrtc.nix { }; ringrtc = callPackage ./ringrtc.nix { inherit webrtc; }; - version = "8.13.0"; + version = "8.14.0"; src = fetchFromGitHub { owner = "signalapp"; repo = "Signal-Desktop"; tag = "v${version}"; - hash = "sha256-gOYnjNCjI1eNVzcb7sx0XDXbhrAdvlgsZQaRuyBXpwI="; + hash = "sha256-U5xJumoKWc1hGZ7OML05U7U3DFdrnRHUlfIU3qYph6w="; # Emoji font files will be added in `postFetch` if `withAppleEmojis` is enabled. They # are fetched separately below. postFetch = '' @@ -68,23 +68,18 @@ let pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname src version; inherit pnpm; - fetcherVersion = 3; - hash = "sha256-CPZkybD/rCBMBK9qUSweBdLr9hXu0Ztn8fekqrRzUR4="; + fetcherVersion = 4; + hash = "sha256-WmDSa4PrASaqs8X68LYaPBeE+i+Jh3FfWF30SseN74Y="; }; strictDeps = true; nativeBuildInputs = [ nodejs pnpmConfigHook + pnpmBuildHook pnpm ]; - buildPhase = '' - runHook preBuild - pnpm run build - runHook postBuild - ''; - installPhase = '' runHook preInstall cp -r dist $out @@ -101,6 +96,7 @@ stdenv.mkDerivation (finalAttrs: { node-gyp nodejs pnpmConfigHook + pnpmBuildHook pnpm makeWrapper python3 @@ -173,14 +169,14 @@ stdenv.mkDerivation (finalAttrs: { patches ; inherit pnpm; - fetcherVersion = 3; - hash = "sha256-3EEeHmtOAdcm2Q3eNUEl2RbTFRB4YBKcZLFtEmwbVOk="; + fetcherVersion = 4; + hash = "sha256-YQY+ohfLcaR2jzB9bzWpNQImuLja2DQ9iwDKhoH8kiU="; }; env = { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; SIGNAL_ENV = "production"; - SOURCE_DATE_EPOCH = 1780508208; + SOURCE_DATE_EPOCH = 1781124627; }; preBuild = '' @@ -234,17 +230,15 @@ stdenv.mkDerivation (finalAttrs: { node-gyp rebuild popd test -f node_modules/fs-xattr/build/Release/xattr.node - ''; - buildPhase = '' - runHook preBuild - - export npm_config_nodedir=${electron.headers} cp -r ${electron.dist} electron-dist chmod -R u+w electron-dist cp -r ${sticker-creator} sticker-creator/dist + ''; - pnpm run generate + pnpmBuildScript = "generate"; + + postBuild = '' pnpm exec electron-builder \ ${ if stdenv.hostPlatform.isDarwin then "--mac" else "--linux" @@ -254,8 +248,6 @@ stdenv.mkDerivation (finalAttrs: { -c.electronVersion=${electron.version} \ -c.npmRebuild=false \ ${lib.optionalString stdenv.hostPlatform.isDarwin "-c.mac.identity=null"} - - runHook postBuild ''; installPhase = '' diff --git a/pkgs/by-name/si/signal-desktop/ringrtc.nix b/pkgs/by-name/si/signal-desktop/ringrtc.nix index a3e26f4cab83..f406a0956ed3 100644 --- a/pkgs/by-name/si/signal-desktop/ringrtc.nix +++ b/pkgs/by-name/si/signal-desktop/ringrtc.nix @@ -19,16 +19,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "ringrtc"; - version = "2.69.0"; + version = "2.69.1"; src = fetchFromGitHub { owner = "signalapp"; repo = "ringrtc"; tag = "v${finalAttrs.version}"; - hash = "sha256-KQ/zAyj9caArZvl8SwMFfRcye1IzPoChjnYA0A8GcWw="; + hash = "sha256-XKzZ9AUGunOTs4vchWNlBYDIln25kRfxyQ2RZCr29Bs="; }; - cargoHash = "sha256-DlRAPFluKdfU1YutDNQbAEF95aydd+duc6T2hqYWwGQ="; + cargoHash = "sha256-U1Zf7fCNoJNBYyIN/IRI41Gj6sK+iiUwGbAfYEo+a/0="; preConfigure = '' # Check for matching webrtc version diff --git a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix index 4b3a7dfc07c0..bdbf1db57ebd 100644 --- a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix +++ b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix @@ -5,6 +5,7 @@ fetchFromGitHub, fetchPnpmDeps, pnpmConfigHook, + pnpmBuildHook, nodejs, rustPlatform, cargo, @@ -27,8 +28,8 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; inherit pnpm; # may be different than top-level pnpm - fetcherVersion = 3; - hash = "sha256-/EcPuqTXXGw1dEN6l1x84cUGyx890/rujjT+zJouIvM="; + fetcherVersion = 4; + hash = "sha256-HK3AetwGqFq/dhxX+aWgUww6eLCeQEkZIVsmmnYqdmM="; }; cargoRoot = "deps/extension"; @@ -42,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ nodejs pnpmConfigHook + pnpmBuildHook pnpm rustPlatform.cargoSetupHook cargo @@ -53,16 +55,14 @@ stdenv.mkDerivation (finalAttrs: { cctools.libtool ]; - buildPhase = '' - runHook preBuild - + preBuild = '' export npm_config_nodedir=${nodejs} - pnpm run prebuildify --strip false --arch "${stdenv.hostPlatform.node.arch}" --platform "${stdenv.hostPlatform.node.platform}" - pnpm run build - runHook postBuild + pnpm run prebuildify --strip false --arch "${stdenv.hostPlatform.node.arch}" --platform "${stdenv.hostPlatform.node.platform}" ''; + pnpmBuildScript = "build"; + installPhase = '' runHook preInstall diff --git a/pkgs/by-name/si/signal-desktop/webrtc-sources.json b/pkgs/by-name/si/signal-desktop/webrtc-sources.json index 8033f49cabf0..f8d8f9204096 100644 --- a/pkgs/by-name/si/signal-desktop/webrtc-sources.json +++ b/pkgs/by-name/si/signal-desktop/webrtc-sources.json @@ -1,25 +1,25 @@ { "src": { "args": { - "hash": "sha256-TsVGiR9qXq6AmvPETkCQP7BGgO21/SUwZJZrSXlj7p8=", + "hash": "sha256-T3zxuDqTiThU9Tv3cmJASK6cMo2W/crYYPyshVeV6LM=", "owner": "signalapp", "repo": "webrtc", - "tag": "7680g" + "tag": "7778b" }, "fetcher": "fetchFromGitHub" }, "src/build": { "args": { - "hash": "sha256-ZPEL0Oy07aAd/qtboCcbD7t55f4EzHiOnE3fiVkZE3Q=", - "rev": "a37e61dc22fd633ab32146e7000068a57a2864ff", + "hash": "sha256-XmuuR4mLcaoAPCr82ka6ldtE4OmYFmXlWjNaP/wM2BQ=", + "rev": "dd54dd5186566a13bda647123c22540666b12ace", "url": "https://chromium.googlesource.com/chromium/src/build" }, "fetcher": "fetchFromGitiles" }, "src/buildtools": { "args": { - "hash": "sha256-wR2qwqxiRmInKzQiVIiZ13SNKuY5k+aJ+dxKAWV1zdo=", - "rev": "6a18683f555b4ac8b05ac8395c29c84483ac9588", + "hash": "sha256-BvGCdJ3EgUZX6MC3jf86YNl4LzUxpxiptCEBv3bqBIo=", + "rev": "95ed44cf5f06dbb5861030b91c9db9ccb4316762", "url": "https://chromium.googlesource.com/chromium/src/buildtools" }, "fetcher": "fetchFromGitiles" @@ -35,40 +35,40 @@ }, "src/testing": { "args": { - "hash": "sha256-cE8uCDkhkzFjrEJ3ccXq5H45WJ3wvmirLeeSymnR8bk=", - "rev": "b887106bc278bb2a49e21f3a0ab2019574e7e47a", + "hash": "sha256-tUh/eOrf71OjndY6p6IOJ5MFJUnuisDGWXJzsHHyrHs=", + "rev": "629b7bb6055714e23d8125bf790cfc8d94a94159", "url": "https://chromium.googlesource.com/chromium/src/testing" }, "fetcher": "fetchFromGitiles" }, "src/third_party": { "args": { - "hash": "sha256-fSsA88V0cv/hAJEZJ7p+RnrnkceLMZCa+XaP+1awo9M=", - "rev": "e43b96b7a65dd3f45f066983061e6f8b2f3a112d", + "hash": "sha256-sLMCkUCadVZIX5bTVovDd5tPn0ZB/CH/d0tQic8lEQg=", + "rev": "4923971b35e39f6bd9be8bc19c4680785a15c80d", "url": "https://chromium.googlesource.com/chromium/src/third_party" }, "fetcher": "fetchFromGitiles" }, "src/third_party/boringssl/src": { "args": { - "hash": "sha256-4eCoRVe47hZ6hc3gXgBS1gY64d+sPqeI08hNMh6JkUY=", - "rev": "305bcfce00b189f2297f53365b0454f96009927d", + "hash": "sha256-OIaU7GoHYKq1ZyPaW/gLSKNq1ipw5nAgjqcPIFXtGwE=", + "rev": "8dce4fd20ab7e768c0a5103edc1d8cb7e54366ba", "url": "https://boringssl.googlesource.com/boringssl.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/breakpad/breakpad": { "args": { - "hash": "sha256-dtuBGcYwwaqSKiW7ASFveAeJqcdnFLeU97ip8D786/Q=", - "rev": "79099fdf668ae097c9eca7052fd5c4c5de6c9098", + "hash": "sha256-igcX5XwacIwoGbqIcZKwlJYpRWl9Uc32WdpXyHO7UVA=", + "rev": "8be0e3114685fcc1589561067282edf75ea1259a", "url": "https://chromium.googlesource.com/breakpad/breakpad.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/catapult": { "args": { - "hash": "sha256-Buh+Ixx8CTqBb0vuu/Fnv6fx15lPMOatYGPAgQ0aWEI=", - "rev": "39805a224bb6c6e80e403a4ebe9a150c7ca0b4d1", + "hash": "sha256-f57wYazKyGrjfzcQ7EVqwIG8p+bHLGK0Qb/tZERxwY8=", + "rev": "5a34891efa6e41c8aca8842386b8ee528963ffdf", "url": "https://chromium.googlesource.com/catapult.git" }, "fetcher": "fetchFromGitiles" @@ -99,16 +99,16 @@ }, "src/third_party/compiler-rt/src": { "args": { - "hash": "sha256-7Jnb0tzi0SkS9vL7VurdTk6Igz5I8ol4H4nRqcZ2+O0=", - "rev": "d606e955eec3d4fb0bf831dea336c3b24cba2f27", + "hash": "sha256-ay0gzhNjAah27LQd/i0ex6EcHEdqpsWBT9Tw510coRM=", + "rev": "bb7645f5e11c9c1d719a890fcb09ccfaaa14580f", "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/cpuinfo/src": { "args": { - "hash": "sha256-eXrfeFK0ADKAYoy/vESv7nQnH0oGpeZKlX8XEqPQspo=", - "rev": "84818a41e074779dbb00521a4731d3e14160ff15", + "hash": "sha256-LnLtCMMRg+DwB7MijBdt/tmCKD/zN5y2oTgXlYw3hTg=", + "rev": "7607ca500436b37ad23fb8d18614bec7796b68a7", "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git" }, "fetcher": "fetchFromGitiles" @@ -123,24 +123,24 @@ }, "src/third_party/dav1d/libdav1d": { "args": { - "hash": "sha256-E3da/LJ8HNy1osExmupovqnL8JHgVNzPUCG5F8TJKXQ=", - "rev": "b546257f770768b2c88258c533da38b91a06f737", + "hash": "sha256-iKq6TYscIBK4ydv+0msNV3tcs82Ljk5ZNr954Qv2lII=", + "rev": "d69235dd804b24c04ed05639cffcc912cd6cfd75", "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/depot_tools": { "args": { - "hash": "sha256-RsmH8kxnmzOKsrfmDqULDeQsvRr1l+p8ZE1a4bPLVLs=", - "rev": "9fd48a305e18b9bbaf61734557ce2c46497192b3", + "hash": "sha256-r/mmibfbCBpV9reVbHc/S7FKffrtE729y2Mot/JsHgc=", + "rev": "ce1ebad2c35c9387186f01d77edeea28a254c955", "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/eigen3/src": { "args": { - "hash": "sha256-GpuSoq887Z1qGKsc4+Vz8X+Sx40P6UnWhaQgrmigkdQ=", - "rev": "afb43805349cf1cbec0083d94256bb8f72cbc53b", + "hash": "sha256-/nzzcoJ87L7EVsRfAeok3UbxNKQeAWOFjmwZ3TYmGmI=", + "rev": "002229ce470065878afb7c2f6f96d22c9a9b7ba0", "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git" }, "fetcher": "fetchFromGitiles" @@ -155,8 +155,8 @@ }, "src/third_party/ffmpeg": { "args": { - "hash": "sha256-LphjwzqsrvAOzd+O+lJ/gGfaWuX4h2/UrRC694ftwSs=", - "rev": "9e588ab02e16326026aa61cc3b6515da20520cec", + "hash": "sha256-JHAicFKBvtkwmZPRBKYPT6JVqYqF8hyXxU0H7kfgCBs=", + "rev": "b5e18fb9da84e26ceef30d4e4886696bf59337c0", "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git" }, "fetcher": "fetchFromGitiles" @@ -187,16 +187,16 @@ }, "src/third_party/freetype/src": { "args": { - "hash": "sha256-CorCyTiS2fumIF0jhqQgw7VjGkjGXNVD8efdmfZ2wUo=", - "rev": "e3a0652b6d706ee1ce77d4dda606b6597dd8b5c4", + "hash": "sha256-H5RzBFYWIp/QYKyeBM2wfuX7FvXHPbhCAp7qne5Zvhw=", + "rev": "99b479dc34728936b006679a31e12b8cf432fc55", "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/fuzztest/src": { "args": { - "hash": "sha256-CqJJ1hj9nQkGONB+5tJgafg1xvrPgTuE3tM8RjO2RY0=", - "rev": "54dfec04d5c9ad1f22b08002ab6a5e2d0de77671", + "hash": "sha256-0Fk2W4rS1xB6YcXsDbrMfmZUfMxNlGz29xRcBHZbijA=", + "rev": "dc327134097700121e4ecd6e1d54d1d0a832a18d", "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git" }, "fetcher": "fetchFromGitiles" @@ -235,8 +235,8 @@ }, "src/third_party/grpc/src": { "args": { - "hash": "sha256-GvzPndJkPZsVCp0LtaQ29rnORQ7xSZ76if/feEIhvkI=", - "rev": "f394c3f07b4c685b9f6948b36d65ca10a629f4fa", + "hash": "sha256-LQrig9/ceXS1LclfN9b9DoAvwltIA1R5fSpmHTmaN8s=", + "rev": "5e9fb9cbfb12a10ff9c16fbc360328d224b838d6", "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git" }, "fetcher": "fetchFromGitiles" @@ -251,16 +251,16 @@ }, "src/third_party/harfbuzz-ng/src": { "args": { - "hash": "sha256-pXAQYEotsqZmfaJSQFaJmZAQVzUiNrHw52z0vmbxQRQ=", - "rev": "fa2908bf16d2ccd6623f4d575455fea72a1a722b", + "hash": "sha256-jQZElINbJgiVj1IHhkrtBCL5jGYzZrjJkO7gt+bgMA4=", + "rev": "6f4c5cec306d31e6822303f5ba248a14293d588e", "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/icu": { "args": { - "hash": "sha256-zFxeAY6lEFRGNbCOOJij0CFjp3512WkyaN1Ld0+WADs=", - "rev": "a86a32e67b8d1384b33f8fa48c83a6079b86f8cd", + "hash": "sha256-hKIzBQVs4C/QJ4BdP3DTm6au9hq8BE0kG1VphtbtHVE=", + "rev": "b4aae6832c06df9d538d41b249403cf0678f16b4", "url": "https://chromium.googlesource.com/chromium/deps/icu.git" }, "fetcher": "fetchFromGitiles" @@ -291,8 +291,8 @@ }, "src/third_party/libaom/source/libaom": { "args": { - "hash": "sha256-SE9nevzv+e2pVvRECQM0bg3dU1l7rE/4bLPuZDHFi18=", - "rev": "557586fde2fdc09dff9c3edf6943d6d54aa8914c", + "hash": "sha256-uO+zjmt0g5m780WR823UJ0AmQA+dfVFOjPChTLAciTM=", + "rev": "f3dddebddd0dba76fbfb97b96b6336bcf1d3a30c", "url": "https://aomedia.googlesource.com/aom.git" }, "fetcher": "fetchFromGitiles" @@ -323,56 +323,56 @@ }, "src/third_party/libjpeg_turbo": { "args": { - "hash": "sha256-FeSS7D3NietL34KgpaDFenBf/GcvapGSpkiKwgIOOHs=", - "rev": "6bb85251a8382b5e07f635a981ac685cc5ab5053", + "hash": "sha256-KGeB/lTjhm8DQBDZVSPENvZEGSHeLTkviJrYsFh5vEM=", + "rev": "d1f5f2393e0d51f840207342ae86e55a86443288", "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/libpfm4/src": { "args": { - "hash": "sha256-awpZ22rovLZWQkX/qog93vL4u2gJ+F3w5IGFNlZ0heQ=", - "rev": "964baf9d35d5f88d8422f96d8a82c672042e7064", + "hash": "sha256-6YaPJcI6Qk0F1Dv5evfFq3MVSsBpsQ7sIreSuHZmOUo=", + "rev": "41878eab48c50bb9ec5f741a013e971bb5a9dff2", "url": "https://chromium.googlesource.com/external/git.code.sf.net/p/perfmon2/libpfm4.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/libsrtp": { "args": { - "hash": "sha256-bkG1+ss+1a2rCHGwZjhvf5UaNVbPPZJt9HZSIPBKGwM=", - "rev": "a52756acb1c5e133089c798736dd171567df11f5", + "hash": "sha256-xC//VEFrI94nCkyLnRa6uQ+hJQqe41v0Qjm4LJ7K84I=", + "rev": "e8383771af8aa4096f5bcfe3743a5ea128f88a9a", "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/libunwind/src": { "args": { - "hash": "sha256-iRfpzVN+QEpN6okwVs5oEtZqIJYzFGxsUO/IJY1c/W8=", - "rev": "ba19d93d6d4f467fba11ff20fe2fc7c056f79345", + "hash": "sha256-miwz3+/fq+7Ohsn8J6xrLsQn/VqyezS9vZO9XzEuZZA=", + "rev": "db838d918570d4e381ecf9f5cc70a0098c9c2cd6", "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/libvpx/source/libvpx": { "args": { - "hash": "sha256-/FtYzbcOgOlaaWCoJfYns5oye7DoRZx1/xew3lN7tAM=", - "rev": "e83e25f791932202256479052f18bdd03a091147", + "hash": "sha256-8vej9g9+L73eOIuXZNfOWe6pV/cNr4JZOihZUtRxbFA=", + "rev": "3fce57ecc905d95a4619f33d09851d68c5a88663", "url": "https://chromium.googlesource.com/webm/libvpx.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/libyuv": { "args": { - "hash": "sha256-2lnobd22L9u+h6JGWJoWT/0gjhI5JImDsEjn+RRYzJg=", - "rev": "917276084a49be726c90292ff0a6b0a3d571a6af", + "hash": "sha256-DW7PuRqA1x0K8/uJbxBJ4Cn9YEPFhZ9vhuGVVyGKK98=", + "rev": "30809ff64a9ca5e45f86439c0d474c2d3eef3d05", "url": "https://chromium.googlesource.com/libyuv/libyuv.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/llvm-libc/src": { "args": { - "hash": "sha256-ZPsVBO+5v1xR9lvzHi616unK4HEak07Sy/reMSYwiok=", - "rev": "d99c56d4b9f6663bff528c4fac5313bceb32e762", + "hash": "sha256-nrd+E7LRTclF/Qa3wBvlutJ/wbLQKr73LOBk9k0qFOI=", + "rev": "adccc443070c58badd6414fd9a4380ca8c78e7c4", "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git" }, "fetcher": "fetchFromGitiles" @@ -387,8 +387,8 @@ }, "src/third_party/nasm": { "args": { - "hash": "sha256-vH3OUzfLZbaPY4DMAvSW0jKYRJmOa7aE8EfIJtZ1/Xs=", - "rev": "af5eeeb054bebadfbb79c7bcd100a95e2ad4525f", + "hash": "sha256-0KsHYi76IaVNwk0dBhem2AnUXd9PpeS+jUsY+zPmeJ8=", + "rev": "45252858722aad12e545819b2d0f370eb865431b", "url": "https://chromium.googlesource.com/chromium/deps/nasm.git" }, "fetcher": "fetchFromGitiles" @@ -411,8 +411,8 @@ }, "src/third_party/perfetto": { "args": { - "hash": "sha256-xOFm5u6uwzktkHCLuLmy3ryiuVN8B8Fo+ltHbFmilOY=", - "rev": "2074b65d22dd04b65c2688647b9386a63338f0b9", + "hash": "sha256-ZDQsBVFq9TgGGf5r2vv8nsHvFy03NM+SkbaXPoa345Q=", + "rev": "40b1342aa7bd47d9c963c3617fd98ec1551528f9", "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git" }, "fetcher": "fetchFromGitiles" @@ -443,32 +443,32 @@ }, "src/third_party/ruy/src": { "args": { - "hash": "sha256-zJ7EYxIoZvN2uOfPscKzWycBO057g4bMnTys2sUrp2M=", - "rev": "576e020f06334118994496b45f9796ed7fda3280", + "hash": "sha256-4To1BMUgzj2/sV7USN9W0CgHnpRmaktEspfhwWWeVBc=", + "rev": "2af88863614a8298689cc52b1a47b3fcad7be835", "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/tflite/src": { "args": { - "hash": "sha256-pIhOSb9eLzel5oDPCpxCvI2XJ2jGLdLURCRkd1BbMkk=", - "rev": "01e030d23d3b904d98cbf908da74d63b3c186949", + "hash": "sha256-nvU3p6TzEqBkDtZEoxCZGPsQA0oZNJID8raqHBDS0ko=", + "rev": "8fd527849069a358ad6c2980b9a9b34a53c53717", "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git" }, "fetcher": "fetchFromGitiles" }, "src/third_party/xnnpack/src": { "args": { - "hash": "sha256-OdrwYAazY0E3han/fpFjlAiguY4M/xnCMJjL3KAIhvw=", - "rev": "4574c4d9b00703c15f2218634ddf101597b22b18", + "hash": "sha256-vOUwMXZJbYxTGPpdD5uc9ATfPIpThCDHV/YTlWN0ajw=", + "rev": "97f3177fd836fff03b48a886bb130591866ad7ca", "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git" }, "fetcher": "fetchFromGitiles" }, "src/tools": { "args": { - "hash": "sha256-QKFYNmNwVcm7aAP3aeuSrY2ScbgMPs4/odf62dI0WJg=", - "rev": "f8f65faf07b1132c9d01932ef95846e9a82b8d54", + "hash": "sha256-PDjcHq8BTDLD6OsYFfvjw8ffmam/4YSx8SF0G/NvebY=", + "rev": "f363a79871a91f36322e845e3134e2f04e1fc18a", "url": "https://chromium.googlesource.com/chromium/src/tools" }, "fetcher": "fetchFromGitiles" diff --git a/pkgs/by-name/si/signal-desktop/webrtc.nix b/pkgs/by-name/si/signal-desktop/webrtc.nix index 4bec7936bc87..9f6465a4e84b 100644 --- a/pkgs/by-name/si/signal-desktop/webrtc.nix +++ b/pkgs/by-name/si/signal-desktop/webrtc.nix @@ -97,6 +97,32 @@ stdenv.mkDerivation (finalAttrs: { revert = true; hash = "sha256-WZsN2qm6lX121bDf7SoN75flXtCTmPPpwtHK0ayjkPc="; }) + + # https://github.com/NixOS/nixpkgs/blob/8e689a91c5b4e47b57dee488dd7e319cc704eb9d/pkgs/applications/networking/browsers/chromium/common.nix#L620-L623 + # clang++: error: unknown argument: '-fno-lifetime-dse' + ./chromium-147-llvm-22.patch + + # https://github.com/NixOS/nixpkgs/blob/8e689a91c5b4e47b57dee488dd7e319cc704eb9d/pkgs/applications/networking/browsers/chromium/common.nix#L624-L644 + # clang++: error: unknown argument: '-fsanitize-ignore-for-ubsan-feature=return' + (fetchpatch { + name = "chromium-148-revert-build-Add--fsanitizer=return-config.patch"; + # https://chromium-review.googlesource.com/c/chromium/src/+/7629257 + url = "https://chromium.googlesource.com/chromium/src/+/99ba1f5302f9433efdb4df302cb7b7de56c72e4c^!?format=TEXT"; + decode = "base64 -d"; + revert = true; + hash = "sha256-/qzzxwTdPMwIdsqD/G02S7kKHCj3QxECL+g1WYEaWmU="; + }) + # ERROR Unresolved dependencies. + # //apps:apps(//build/toolchain/linux/unbundle:default) + # needs //build/config/compiler:sanitize_return(//build/toolchain/linux/unbundle:default) + (fetchpatch { + name = "chromium-148-revert-build-Enable--fsanitizer=return-config.patch"; + # https://chromium-review.googlesource.com/c/chromium/src/+/7629258 + url = "https://chromium.googlesource.com/chromium/src/+/9357bfbea03753fe52264c9ec36abe74f48cfef5^!?format=TEXT"; + decode = "base64 -d"; + revert = true; + hash = "sha256-14fTHNh3vGsf4KgeH8uLX+aK3lrjK0VKd1dfK1g7r0I="; + }) ]; postPatch = '' @@ -196,7 +222,6 @@ stdenv.mkDerivation (finalAttrs: { description = "WebRTC library used by Signal"; homepage = "https://github.com/SignalApp/webrtc"; license = lib.licenses.bsd3; - maintainers = [ ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }) diff --git a/pkgs/by-name/si/simple64/package.nix b/pkgs/by-name/si/simple64/package.nix index 49457d450826..c393ebb4a1b7 100644 --- a/pkgs/by-name/si/simple64/package.nix +++ b/pkgs/by-name/si/simple64/package.nix @@ -45,7 +45,8 @@ stdenv.mkDerivation (finalAttrs: { cp ${cheats-json} cheats.json ''; - stictDeps = true; + strictDeps = true; + __structuredAttrs = true; nativeBuildInputs = [ qt6.wrapQtAppsHook diff --git a/pkgs/by-name/si/sirius/package.nix b/pkgs/by-name/si/sirius/package.nix index 7106069f47db..3d38dd8b071b 100644 --- a/pkgs/by-name/si/sirius/package.nix +++ b/pkgs/by-name/si/sirius/package.nix @@ -161,7 +161,7 @@ stdenv.mkDerivation (finalAttrs: { "-DSIRIUS_CREATE_PYTHON_MODULE=ON" ]; - doCheck = true; + doCheck = !umpire.passthru.rocmSupport; # Can not run parallel checks generally as it requires exactly multiples of 4 MPI ranks # Even cpu_serial tests had to be disabled as they require scalapack routines in the sandbox diff --git a/pkgs/by-name/sn/snx-rs/package.nix b/pkgs/by-name/sn/snx-rs/package.nix index 1400702fb362..d48a683fc66c 100644 --- a/pkgs/by-name/sn/snx-rs/package.nix +++ b/pkgs/by-name/sn/snx-rs/package.nix @@ -15,13 +15,13 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "snx-rs"; - version = "6.1.0"; + version = "6.1.1"; src = fetchFromGitHub { owner = "ancwrd1"; repo = "snx-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-WIaCvtlQ6iqc7LA8XRauwI3o5paGIDYqd5lANe5V6HA="; + hash = "sha256-64xwXC8s7BY8fzwrmpoF2sNqkknUj2AHLZprnuM1Be8="; }; passthru.updateScript = nix-update-script { }; @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; - cargoHash = "sha256-TwuaquPHlPJNn6JpMhyoqsqy7D64QHAqFdXXVjvxEck="; + cargoHash = "sha256-/SQBcItOANmqcCzZ5/uKcVYA9btDqzApHJRSNbDh/ws="; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/snx-rs"; diff --git a/pkgs/by-name/st/strichliste/package.nix b/pkgs/by-name/st/strichliste/package.nix index f81fceed7452..03ce5c895245 100644 --- a/pkgs/by-name/st/strichliste/package.nix +++ b/pkgs/by-name/st/strichliste/package.nix @@ -21,13 +21,17 @@ php.buildComposerProject2 (finalAttrs: { vendorHash = "sha256-PLq+XiZIJyyzVq+87timGO/jbPB4ZYQqSZilZMIE4Cw="; composerNoDev = true; composerNoPlugins = false; - composerStrictValidation = false; + composerStrictValidation = true; postPatch = '' substituteInPlace config/services.yaml \ --replace-fail "strichliste.yaml" "/etc/strichliste.yaml" ''; + postBuild = '' + composer dump-autoload --optimize --no-dev --no-scripts --no-interaction --no-cache + ''; + postInstall = '' mkdir $out/bin ln -s $out/share/php/strichliste-backend/bin/console $out/bin/strichliste-console diff --git a/pkgs/by-name/st/stripJavaArchivesHook/package.nix b/pkgs/by-name/st/stripJavaArchivesHook/package.nix new file mode 100644 index 000000000000..699fd78e73bd --- /dev/null +++ b/pkgs/by-name/st/stripJavaArchivesHook/package.nix @@ -0,0 +1,11 @@ +{ + lib, + makeSetupHook, + strip-nondeterminism, +}: + +makeSetupHook { + name = "strip-java-archives-hook"; + propagatedBuildInputs = [ strip-nondeterminism ]; + meta.license = lib.licenses.mit; +} ./strip-java-archives.sh diff --git a/pkgs/build-support/setup-hooks/strip-java-archives.sh b/pkgs/by-name/st/stripJavaArchivesHook/strip-java-archives.sh similarity index 100% rename from pkgs/build-support/setup-hooks/strip-java-archives.sh rename to pkgs/by-name/st/stripJavaArchivesHook/strip-java-archives.sh diff --git a/pkgs/by-name/su/sunshine/package-lock.json b/pkgs/by-name/su/sunshine/package-lock.json index 8ba531828603..f8381b168b8e 100644 --- a/pkgs/by-name/su/sunshine/package-lock.json +++ b/pkgs/by-name/su/sunshine/package-lock.json @@ -8,70 +8,85 @@ "name": "sunshine", "version": "0.0.0", "dependencies": { - "@lizardbyte/shared-web": "2025.922.181114", - "vue": "3.5.21", - "vue-i18n": "11.1.12" + "bootstrap": "5.3.8", + "date-fns": "4.1.0", + "lucide-vue-next": "1.0.0", + "marked": "18.0.3", + "vue": "3.5.34", + "vue-i18n": "11.4.2", + "vue3-simple-icons": "16.10.0" }, "devDependencies": { - "@codecov/vite-plugin": "1.9.1", - "@vitejs/plugin-vue": "6.0.1", - "serve": "14.2.5", - "vite": "6.3.6", + "@codecov/vite-plugin": "2.0.1", + "@vitejs/plugin-vue": "6.0.7", + "serve": "14.2.6", + "vite": "6.4.2", "vite-plugin-ejs": "1.7.0" } }, "node_modules/@actions/core": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.11.1.tgz", - "integrity": "sha512-hXJCSrkwfA46Vd9Z3q4cpEpHB1rL5NG04+/rbqW9d3+CSvtB1tYe8UTpAlixa1vj0m/ULglfEK2UKxMGxCxv5A==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@actions/core/-/core-3.0.1.tgz", + "integrity": "sha512-a6d/Nwahm9fliVGRhdhofo40HjHQasUPusmc7vBfyky+7Z+P2A1J68zyFVaNcEclc/Se+eO595oAr5nwEIoIUA==", "dev": true, "license": "MIT", "dependencies": { - "@actions/exec": "^1.1.1", - "@actions/http-client": "^2.0.1" + "@actions/exec": "^3.0.0", + "@actions/http-client": "^4.0.0" } }, "node_modules/@actions/exec": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@actions/exec/-/exec-1.1.1.tgz", - "integrity": "sha512-+sCcHHbVdk93a0XT19ECtO/gIXoxvdsgQLzb2fE2/5sIZmWQuluYyjPQtrtTHdU1YzTZ7bAPN4sITq2xi1679w==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@actions/exec/-/exec-3.0.0.tgz", + "integrity": "sha512-6xH/puSoNBXb72VPlZVm7vQ+svQpFyA96qdDBvhB8eNZOE8LtPf9L4oAsfzK/crCL8YZ+19fKYVnM63Sl+Xzlw==", "dev": true, "license": "MIT", "dependencies": { - "@actions/io": "^1.0.1" + "@actions/io": "^3.0.2" } }, "node_modules/@actions/github": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/@actions/github/-/github-6.0.1.tgz", - "integrity": "sha512-xbZVcaqD4XnQAe35qSQqskb3SqIAfRyLBrHMd/8TuL7hJSz2QtbDwnNM8zWx4zO5l2fnGtseNE3MbEvD7BxVMw==", + "version": "9.1.1", + "resolved": "https://registry.npmjs.org/@actions/github/-/github-9.1.1.tgz", + "integrity": "sha512-tL5JbYOBZHc0ngEnCsaDcryUizIUIlQyIMwy1Wkx93H5HzbBJ7TbiPx2PnFjBwZW0Vh05JmfFZhecE6gglYegA==", "dev": true, "license": "MIT", "dependencies": { - "@actions/http-client": "^2.2.0", - "@octokit/core": "^5.0.1", - "@octokit/plugin-paginate-rest": "^9.2.2", - "@octokit/plugin-rest-endpoint-methods": "^10.4.0", - "@octokit/request": "^8.4.1", - "@octokit/request-error": "^5.1.1", - "undici": "^5.28.5" + "@actions/http-client": "^3.0.2", + "@octokit/core": "^7.0.6", + "@octokit/plugin-paginate-rest": "^14.0.0", + "@octokit/plugin-rest-endpoint-methods": "^17.0.0", + "@octokit/request": "^10.0.7", + "@octokit/request-error": "^7.1.0", + "undici": "^6.23.0" } }, - "node_modules/@actions/http-client": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.2.3.tgz", - "integrity": "sha512-mx8hyJi/hjFvbPokCg4uRd4ZX78t+YyRPtnKWwIl+RzNaVuFpQHfmlGVfsKEJN8LwTCvL+DfVgAM04XaHkm6bA==", + "node_modules/@actions/github/node_modules/@actions/http-client": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-3.0.2.tgz", + "integrity": "sha512-JP38FYYpyqvUsz+Igqlc/JG6YO9PaKuvqjM3iGvaLqFnJ7TFmcLyy2IDrY0bI0qCQug8E9K+elv5ZNfw62ZJzA==", "dev": true, "license": "MIT", "dependencies": { "tunnel": "^0.0.6", - "undici": "^5.25.4" + "undici": "^6.23.0" + } + }, + "node_modules/@actions/http-client": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-4.0.1.tgz", + "integrity": "sha512-+Nvd1ImaOZBSoPbsUtEhv+1z99H12xzncCkz0a3RuehINE81FZSe2QTj3uvAPTcJX/SCzUQHQ0D1GrPMbrPitg==", + "dev": true, + "license": "MIT", + "dependencies": { + "tunnel": "^0.0.6", + "undici": "^6.23.0" } }, "node_modules/@actions/io": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.1.3.tgz", - "integrity": "sha512-wi9JjgKLYS7U/z8PPbco+PvTb/nRWjeoFlJ1Qer83k/3C5PHQi28hiVdeE2kHXmIL99mQFawx8qt/JPjZilJ8Q==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@actions/io/-/io-3.0.2.tgz", + "integrity": "sha512-nRBchcMM+QK1pdjO7/idu86rbJI5YHUKCvKs0KxnSYbVe3F51UfGxuZX4Qy/fWlp6l7gWFwIkrOzN+oUK03kfw==", "dev": true, "license": "MIT" }, @@ -85,21 +100,21 @@ } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz", - "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==", + "version": "7.28.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz", + "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==", "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/parser": { - "version": "7.28.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.4.tgz", - "integrity": "sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg==", + "version": "7.29.3", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.3.tgz", + "integrity": "sha512-b3ctpQwp+PROvU/cttc4OYl4MzfJUWy6FZg+PMXfzmt/+39iHVF0sDfqay8TQM3JA2EUOyKcFZt75jWriQijsA==", "license": "MIT", "dependencies": { - "@babel/types": "^7.28.4" + "@babel/types": "^7.29.0" }, "bin": { "parser": "bin/babel-parser.js" @@ -109,57 +124,57 @@ } }, "node_modules/@babel/types": { - "version": "7.28.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.4.tgz", - "integrity": "sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q==", + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz", + "integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==", "license": "MIT", "dependencies": { "@babel/helper-string-parser": "^7.27.1", - "@babel/helper-validator-identifier": "^7.27.1" + "@babel/helper-validator-identifier": "^7.28.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@codecov/bundler-plugin-core": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/@codecov/bundler-plugin-core/-/bundler-plugin-core-1.9.1.tgz", - "integrity": "sha512-dt3ic7gMswz4p/qdkYPVJwXlLiLsz55rBBn2I7mr0HTG8pCoLRqnANJIwo5WrqGBZgPyVSMPBqBra6VxLWfDyA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@codecov/bundler-plugin-core/-/bundler-plugin-core-2.0.1.tgz", + "integrity": "sha512-TkdKn/rEwZQ723M7DDUmHe5r0IJa23rUT4TAx5jXmg12wGZGAHGWWU7LKeQsYCsKdLMxK7bLaGk9M++4wSRD5w==", "dev": true, "license": "MIT", "dependencies": { - "@actions/core": "^1.10.1", - "@actions/github": "^6.0.0", + "@actions/core": "^3.0.0", + "@actions/github": "^9.0.0", "chalk": "4.1.2", "semver": "^7.5.4", "unplugin": "^1.10.1", "zod": "^3.22.4" }, "engines": { - "node": ">=18.0.0" + "node": ">=20.0.0" } }, "node_modules/@codecov/vite-plugin": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/@codecov/vite-plugin/-/vite-plugin-1.9.1.tgz", - "integrity": "sha512-S6Yne7comVulJ1jD3T7rCfYFHPR0zUjAYoLjUDPXNJCUrdzWJdf/ak/UepE7TicqQG+yBa6eb5WusqcPgg+1AQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@codecov/vite-plugin/-/vite-plugin-2.0.1.tgz", + "integrity": "sha512-w7nGA9SSc0WECzn05yRrw3uN8293I620Kd9x97I0kyyxUjtWxCMmlgmAbS364gJZYvljd0A6iQyAigVV2dOX9A==", "dev": true, "license": "MIT", "dependencies": { - "@codecov/bundler-plugin-core": "^1.9.1", + "@codecov/bundler-plugin-core": "^2.0.1", "unplugin": "^1.10.1" }, "engines": { - "node": ">=18.0.0" + "node": ">=20.0.0" }, "peerDependencies": { "vite": "4.x || 5.x || 6.x" } }, "node_modules/@esbuild/aix-ppc64": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.10.tgz", - "integrity": "sha512-0NFWnA+7l41irNuaSVlLfgNT12caWJVLzp5eAVhZ0z1qpxbockccEt3s+149rE64VUI3Ml2zt8Nv5JVc4QXTsw==", + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.12.tgz", + "integrity": "sha512-Hhmwd6CInZ3dwpuGTF8fJG6yoWmsToE+vYgD4nytZVxcu1ulHpUQRAB1UJ8+N1Am3Mz4+xOByoQoSZf4D+CpkA==", "cpu": [ "ppc64" ], @@ -174,9 +189,9 @@ } }, "node_modules/@esbuild/android-arm": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.10.tgz", - "integrity": "sha512-dQAxF1dW1C3zpeCDc5KqIYuZ1tgAdRXNoZP7vkBIRtKZPYe2xVr/d3SkirklCHudW1B45tGiUlz2pUWDfbDD4w==", + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.12.tgz", + "integrity": "sha512-VJ+sKvNA/GE7Ccacc9Cha7bpS8nyzVv0jdVgwNDaR4gDMC/2TTRc33Ip8qrNYUcpkOHUT5OZ0bUcNNVZQ9RLlg==", "cpu": [ "arm" ], @@ -191,9 +206,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.10.tgz", - "integrity": "sha512-LSQa7eDahypv/VO6WKohZGPSJDq5OVOo3UoFR1E4t4Gj1W7zEQMUhI+lo81H+DtB+kP+tDgBp+M4oNCwp6kffg==", + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.12.tgz", + "integrity": "sha512-6AAmLG7zwD1Z159jCKPvAxZd4y/VTO0VkprYy+3N2FtJ8+BQWFXU+OxARIwA46c5tdD9SsKGZ/1ocqBS/gAKHg==", "cpu": [ "arm64" ], @@ -208,9 +223,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.10.tgz", - "integrity": "sha512-MiC9CWdPrfhibcXwr39p9ha1x0lZJ9KaVfvzA0Wxwz9ETX4v5CHfF09bx935nHlhi+MxhA63dKRRQLiVgSUtEg==", + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.12.tgz", + "integrity": "sha512-5jbb+2hhDHx5phYR2By8GTWEzn6I9UqR11Kwf22iKbNpYrsmRB18aX/9ivc5cabcUiAT/wM+YIZ6SG9QO6a8kg==", "cpu": [ "x64" ], @@ -225,9 +240,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.10.tgz", - "integrity": "sha512-JC74bdXcQEpW9KkV326WpZZjLguSZ3DfS8wrrvPMHgQOIEIG/sPXEN/V8IssoJhbefLRcRqw6RQH2NnpdprtMA==", + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.12.tgz", + "integrity": "sha512-N3zl+lxHCifgIlcMUP5016ESkeQjLj/959RxxNYIthIg+CQHInujFuXeWbWMgnTo4cp5XVHqFPmpyu9J65C1Yg==", "cpu": [ "arm64" ], @@ -242,9 +257,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.10.tgz", - "integrity": "sha512-tguWg1olF6DGqzws97pKZ8G2L7Ig1vjDmGTwcTuYHbuU6TTjJe5FXbgs5C1BBzHbJ2bo1m3WkQDbWO2PvamRcg==", + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.12.tgz", + "integrity": "sha512-HQ9ka4Kx21qHXwtlTUVbKJOAnmG1ipXhdWTmNXiPzPfWKpXqASVcWdnf2bnL73wgjNrFXAa3yYvBSd9pzfEIpA==", "cpu": [ "x64" ], @@ -259,9 +274,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.10.tgz", - "integrity": "sha512-3ZioSQSg1HT2N05YxeJWYR+Libe3bREVSdWhEEgExWaDtyFbbXWb49QgPvFH8u03vUPX10JhJPcz7s9t9+boWg==", + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.12.tgz", + "integrity": "sha512-gA0Bx759+7Jve03K1S0vkOu5Lg/85dou3EseOGUes8flVOGxbhDDh/iZaoek11Y8mtyKPGF3vP8XhnkDEAmzeg==", "cpu": [ "arm64" ], @@ -276,9 +291,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.10.tgz", - "integrity": "sha512-LLgJfHJk014Aa4anGDbh8bmI5Lk+QidDmGzuC2D+vP7mv/GeSN+H39zOf7pN5N8p059FcOfs2bVlrRr4SK9WxA==", + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.12.tgz", + "integrity": "sha512-TGbO26Yw2xsHzxtbVFGEXBFH0FRAP7gtcPE7P5yP7wGy7cXK2oO7RyOhL5NLiqTlBh47XhmIUXuGciXEqYFfBQ==", "cpu": [ "x64" ], @@ -293,9 +308,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.10.tgz", - "integrity": "sha512-oR31GtBTFYCqEBALI9r6WxoU/ZofZl962pouZRTEYECvNF/dtXKku8YXcJkhgK/beU+zedXfIzHijSRapJY3vg==", + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.12.tgz", + "integrity": "sha512-lPDGyC1JPDou8kGcywY0YILzWlhhnRjdof3UlcoqYmS9El818LLfJJc3PXXgZHrHCAKs/Z2SeZtDJr5MrkxtOw==", "cpu": [ "arm" ], @@ -310,9 +325,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.10.tgz", - "integrity": "sha512-5luJWN6YKBsawd5f9i4+c+geYiVEw20FVW5x0v1kEMWNq8UctFjDiMATBxLvmmHA4bf7F6hTRaJgtghFr9iziQ==", + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.12.tgz", + "integrity": "sha512-8bwX7a8FghIgrupcxb4aUmYDLp8pX06rGh5HqDT7bB+8Rdells6mHvrFHHW2JAOPZUbnjUpKTLg6ECyzvas2AQ==", "cpu": [ "arm64" ], @@ -327,9 +342,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.10.tgz", - "integrity": "sha512-NrSCx2Kim3EnnWgS4Txn0QGt0Xipoumb6z6sUtl5bOEZIVKhzfyp/Lyw4C1DIYvzeW/5mWYPBFJU3a/8Yr75DQ==", + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.12.tgz", + "integrity": "sha512-0y9KrdVnbMM2/vG8KfU0byhUN+EFCny9+8g202gYqSSVMonbsCfLjUO+rCci7pM0WBEtz+oK/PIwHkzxkyharA==", "cpu": [ "ia32" ], @@ -344,9 +359,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.10.tgz", - "integrity": "sha512-xoSphrd4AZda8+rUDDfD9J6FUMjrkTz8itpTITM4/xgerAZZcFW7Dv+sun7333IfKxGG8gAq+3NbfEMJfiY+Eg==", + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.12.tgz", + "integrity": "sha512-h///Lr5a9rib/v1GGqXVGzjL4TMvVTv+s1DPoxQdz7l/AYv6LDSxdIwzxkrPW438oUXiDtwM10o9PmwS/6Z0Ng==", "cpu": [ "loong64" ], @@ -361,9 +376,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.10.tgz", - "integrity": "sha512-ab6eiuCwoMmYDyTnyptoKkVS3k8fy/1Uvq7Dj5czXI6DF2GqD2ToInBI0SHOp5/X1BdZ26RKc5+qjQNGRBelRA==", + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.12.tgz", + "integrity": "sha512-iyRrM1Pzy9GFMDLsXn1iHUm18nhKnNMWscjmp4+hpafcZjrr2WbT//d20xaGljXDBYHqRcl8HnxbX6uaA/eGVw==", "cpu": [ "mips64el" ], @@ -378,9 +393,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.10.tgz", - "integrity": "sha512-NLinzzOgZQsGpsTkEbdJTCanwA5/wozN9dSgEl12haXJBzMTpssebuXR42bthOF3z7zXFWH1AmvWunUCkBE4EA==", + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.12.tgz", + "integrity": "sha512-9meM/lRXxMi5PSUqEXRCtVjEZBGwB7P/D4yT8UG/mwIdze2aV4Vo6U5gD3+RsoHXKkHCfSxZKzmDssVlRj1QQA==", "cpu": [ "ppc64" ], @@ -395,9 +410,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.10.tgz", - "integrity": "sha512-FE557XdZDrtX8NMIeA8LBJX3dC2M8VGXwfrQWU7LB5SLOajfJIxmSdyL/gU1m64Zs9CBKvm4UAuBp5aJ8OgnrA==", + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.12.tgz", + "integrity": "sha512-Zr7KR4hgKUpWAwb1f3o5ygT04MzqVrGEGXGLnj15YQDJErYu/BGg+wmFlIDOdJp0PmB0lLvxFIOXZgFRrdjR0w==", "cpu": [ "riscv64" ], @@ -412,9 +427,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.10.tgz", - "integrity": "sha512-3BBSbgzuB9ajLoVZk0mGu+EHlBwkusRmeNYdqmznmMc9zGASFjSsxgkNsqmXugpPk00gJ0JNKh/97nxmjctdew==", + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.12.tgz", + "integrity": "sha512-MsKncOcgTNvdtiISc/jZs/Zf8d0cl/t3gYWX8J9ubBnVOwlk65UIEEvgBORTiljloIWnBzLs4qhzPkJcitIzIg==", "cpu": [ "s390x" ], @@ -429,9 +444,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.10.tgz", - "integrity": "sha512-QSX81KhFoZGwenVyPoberggdW1nrQZSvfVDAIUXr3WqLRZGZqWk/P4T8p2SP+de2Sr5HPcvjhcJzEiulKgnxtA==", + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.12.tgz", + "integrity": "sha512-uqZMTLr/zR/ed4jIGnwSLkaHmPjOjJvnm6TVVitAa08SLS9Z0VM8wIRx7gWbJB5/J54YuIMInDquWyYvQLZkgw==", "cpu": [ "x64" ], @@ -446,9 +461,9 @@ } }, "node_modules/@esbuild/netbsd-arm64": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.10.tgz", - "integrity": "sha512-AKQM3gfYfSW8XRk8DdMCzaLUFB15dTrZfnX8WXQoOUpUBQ+NaAFCP1kPS/ykbbGYz7rxn0WS48/81l9hFl3u4A==", + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.12.tgz", + "integrity": "sha512-xXwcTq4GhRM7J9A8Gv5boanHhRa/Q9KLVmcyXHCTaM4wKfIpWkdXiMog/KsnxzJ0A1+nD+zoecuzqPmCRyBGjg==", "cpu": [ "arm64" ], @@ -463,9 +478,9 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.10.tgz", - "integrity": "sha512-7RTytDPGU6fek/hWuN9qQpeGPBZFfB4zZgcz2VK2Z5VpdUxEI8JKYsg3JfO0n/Z1E/6l05n0unDCNc4HnhQGig==", + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.12.tgz", + "integrity": "sha512-Ld5pTlzPy3YwGec4OuHh1aCVCRvOXdH8DgRjfDy/oumVovmuSzWfnSJg+VtakB9Cm0gxNO9BzWkj6mtO1FMXkQ==", "cpu": [ "x64" ], @@ -480,9 +495,9 @@ } }, "node_modules/@esbuild/openbsd-arm64": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.10.tgz", - "integrity": "sha512-5Se0VM9Wtq797YFn+dLimf2Zx6McttsH2olUBsDml+lm0GOCRVebRWUvDtkY4BWYv/3NgzS8b/UM3jQNh5hYyw==", + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.12.tgz", + "integrity": "sha512-fF96T6KsBo/pkQI950FARU9apGNTSlZGsv1jZBAlcLL1MLjLNIWPBkj5NlSz8aAzYKg+eNqknrUJ24QBybeR5A==", "cpu": [ "arm64" ], @@ -497,9 +512,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.10.tgz", - "integrity": "sha512-XkA4frq1TLj4bEMB+2HnI0+4RnjbuGZfet2gs/LNs5Hc7D89ZQBHQ0gL2ND6Lzu1+QVkjp3x1gIcPKzRNP8bXw==", + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.12.tgz", + "integrity": "sha512-MZyXUkZHjQxUvzK7rN8DJ3SRmrVrke8ZyRusHlP+kuwqTcfWLyqMOE3sScPPyeIXN/mDJIfGXvcMqCgYKekoQw==", "cpu": [ "x64" ], @@ -514,9 +529,9 @@ } }, "node_modules/@esbuild/openharmony-arm64": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.10.tgz", - "integrity": "sha512-AVTSBhTX8Y/Fz6OmIVBip9tJzZEUcY8WLh7I59+upa5/GPhh2/aM6bvOMQySspnCCHvFi79kMtdJS1w0DXAeag==", + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.12.tgz", + "integrity": "sha512-rm0YWsqUSRrjncSXGA7Zv78Nbnw4XL6/dzr20cyrQf7ZmRcsovpcRBdhD43Nuk3y7XIoW2OxMVvwuRvk9XdASg==", "cpu": [ "arm64" ], @@ -531,9 +546,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.10.tgz", - "integrity": "sha512-fswk3XT0Uf2pGJmOpDB7yknqhVkJQkAQOcW/ccVOtfx05LkbWOaRAtn5SaqXypeKQra1QaEa841PgrSL9ubSPQ==", + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.12.tgz", + "integrity": "sha512-3wGSCDyuTHQUzt0nV7bocDy72r2lI33QL3gkDNGkod22EsYl04sMf0qLb8luNKTOmgF/eDEDP5BFNwoBKH441w==", "cpu": [ "x64" ], @@ -548,9 +563,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.10.tgz", - "integrity": "sha512-ah+9b59KDTSfpaCg6VdJoOQvKjI33nTaQr4UluQwW7aEwZQsbMCfTmfEO4VyewOxx4RaDT/xCy9ra2GPWmO7Kw==", + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.12.tgz", + "integrity": "sha512-rMmLrur64A7+DKlnSuwqUdRKyd3UE7oPJZmnljqEptesKM8wx9J8gx5u0+9Pq0fQQW8vqeKebwNXdfOyP+8Bsg==", "cpu": [ "arm64" ], @@ -565,9 +580,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.10.tgz", - "integrity": "sha512-QHPDbKkrGO8/cz9LKVnJU22HOi4pxZnZhhA2HYHez5Pz4JeffhDjf85E57Oyco163GnzNCVkZK0b/n4Y0UHcSw==", + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.12.tgz", + "integrity": "sha512-HkqnmmBoCbCwxUKKNPBixiWDGCpQGVsrQfJoVGYLPT41XWF8lHuE5N6WhVia2n4o5QK5M4tYr21827fNhi4byQ==", "cpu": [ "ia32" ], @@ -582,9 +597,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.10.tgz", - "integrity": "sha512-9KpxSVFCu0iK1owoez6aC/s/EdUQLDN3adTxGCqxMVhrPDj6bt5dbrHDXUuq+Bs2vATFBBrQS5vdQ/Ed2P+nbw==", + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.12.tgz", + "integrity": "sha512-alJC0uCZpTFrSL0CCDjcgleBXPnCrEAhTBILpeAp7M/OFgoqtAetfBzX0xM00MUsVVPpVjlPuMbREqnZCXaTnA==", "cpu": [ "x64" ], @@ -598,33 +613,31 @@ "node": ">=18" } }, - "node_modules/@fastify/busboy": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.1.1.tgz", - "integrity": "sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=14" - } - }, - "node_modules/@fortawesome/fontawesome-free": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-7.0.1.tgz", - "integrity": "sha512-RLmb9U6H2rJDnGxEqXxzy7ANPrQz7WK2/eTjdZqyU9uRU5W+FkAec9uU5gTYzFBH7aoXIw2WTJSCJR4KPlReQw==", - "license": "(CC-BY-4.0 AND OFL-1.1 AND MIT)", - "engines": { - "node": ">=6" - } - }, "node_modules/@intlify/core-base": { - "version": "11.1.12", - "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-11.1.12.tgz", - "integrity": "sha512-whh0trqRsSqVLNEUCwU59pyJZYpU8AmSWl8M3Jz2Mv5ESPP6kFh4juas2NpZ1iCvy7GlNRffUD1xr84gceimjg==", + "version": "11.4.2", + "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-11.4.2.tgz", + "integrity": "sha512-7fpuCcVmeLv2T9qHsARqGvh8xt+sV2fH+Q+gMHFwB/rPXzo85DpbJFKn7dBH1L5p0c2cSh2DW+2h/64EKrISmA==", "license": "MIT", "dependencies": { - "@intlify/message-compiler": "11.1.12", - "@intlify/shared": "11.1.12" + "@intlify/devtools-types": "11.4.2", + "@intlify/message-compiler": "11.4.2", + "@intlify/shared": "11.4.2" + }, + "engines": { + "node": ">= 16" + }, + "funding": { + "url": "https://github.com/sponsors/kazupon" + } + }, + "node_modules/@intlify/devtools-types": { + "version": "11.4.2", + "resolved": "https://registry.npmjs.org/@intlify/devtools-types/-/devtools-types-11.4.2.tgz", + "integrity": "sha512-3u8EN1kB6EMSi96KXs5k7a8y2X2g4+h3X6iwVZU47cP4n+mTuq//WMjG588BzSp/2XQ/dTXo2BLUXX+XS+PNfA==", + "license": "MIT", + "dependencies": { + "@intlify/core-base": "11.4.2", + "@intlify/shared": "11.4.2" }, "engines": { "node": ">= 16" @@ -634,12 +647,12 @@ } }, "node_modules/@intlify/message-compiler": { - "version": "11.1.12", - "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-11.1.12.tgz", - "integrity": "sha512-Fv9iQSJoJaXl4ZGkOCN1LDM3trzze0AS2zRz2EHLiwenwL6t0Ki9KySYlyr27yVOj5aVz0e55JePO+kELIvfdQ==", + "version": "11.4.2", + "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-11.4.2.tgz", + "integrity": "sha512-a6CDSGSMTGrg0BjD97x8TBYPf7qQMDlZipJ6UDfv/pd4OIym8TMlHu3MsH0bTNnRdAG2D6EFEykIgiQPqvtTkA==", "license": "MIT", "dependencies": { - "@intlify/shared": "11.1.12", + "@intlify/shared": "11.4.2", "source-map-js": "^1.0.2" }, "engines": { @@ -650,9 +663,9 @@ } }, "node_modules/@intlify/shared": { - "version": "11.1.12", - "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-11.1.12.tgz", - "integrity": "sha512-Om86EjuQtA69hdNj3GQec9ZC0L0vPSAnXzB3gP/gyJ7+mA7t06d9aOAiqMZ+xEOsumGP4eEBlfl8zF2LOTzf2A==", + "version": "11.4.2", + "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-11.4.2.tgz", + "integrity": "sha512-NzpHbguRCsOHDwxmlBa9qu/imc+/QWgsYUaK6FZeNC0wK8QfAbhqrktEp/haVzxU1aikH8IX4ytD+mfFEMi/9A==", "license": "MIT", "engines": { "node": ">= 16" @@ -667,189 +680,142 @@ "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==", "license": "MIT" }, - "node_modules/@lizardbyte/shared-web": { - "version": "2025.922.181114", - "resolved": "https://registry.npmjs.org/@lizardbyte/shared-web/-/shared-web-2025.922.181114.tgz", - "integrity": "sha512-ISJLK79h10WkZf/fz7wEkrmlEEf9tUe5RQpADdOONXIybAKP/TC2cTfPr1NSRvL4sCoHTHv1oOlMkauaEAI3kg==", - "license": "AGPL-3.0-only", - "dependencies": { - "@fortawesome/fontawesome-free": "7.0.1", - "bootstrap": "5.3.8" - }, - "funding": { - "url": "https://app.lizardbyte.dev" - } - }, "node_modules/@octokit/auth-token": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-4.0.0.tgz", - "integrity": "sha512-tY/msAuJo6ARbK6SPIxZrPBms3xPbfwBrulZe0Wtr/DIY9lje2HeV1uoebShn6mx7SjCHif6EjMvoREj+gZ+SA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-6.0.0.tgz", + "integrity": "sha512-P4YJBPdPSpWTQ1NU4XYdvHvXJJDxM6YwpS0FZHRgP7YFkdVxsWcpWGy/NVqlAA7PcPCnMacXlRm1y2PFZRWL/w==", "dev": true, "license": "MIT", "engines": { - "node": ">= 18" + "node": ">= 20" } }, "node_modules/@octokit/core": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/@octokit/core/-/core-5.2.2.tgz", - "integrity": "sha512-/g2d4sW9nUDJOMz3mabVQvOGhVa4e/BN/Um7yca9Bb2XTzPPnfTWHWQg+IsEYO7M3Vx+EXvaM/I2pJWIMun1bg==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/@octokit/core/-/core-7.0.6.tgz", + "integrity": "sha512-DhGl4xMVFGVIyMwswXeyzdL4uXD5OGILGX5N8Y+f6W7LhC1Ze2poSNrkF/fedpVDHEEZ+PHFW0vL14I+mm8K3Q==", "dev": true, "license": "MIT", "dependencies": { - "@octokit/auth-token": "^4.0.0", - "@octokit/graphql": "^7.1.0", - "@octokit/request": "^8.4.1", - "@octokit/request-error": "^5.1.1", - "@octokit/types": "^13.0.0", - "before-after-hook": "^2.2.0", - "universal-user-agent": "^6.0.0" + "@octokit/auth-token": "^6.0.0", + "@octokit/graphql": "^9.0.3", + "@octokit/request": "^10.0.6", + "@octokit/request-error": "^7.0.2", + "@octokit/types": "^16.0.0", + "before-after-hook": "^4.0.0", + "universal-user-agent": "^7.0.0" }, "engines": { - "node": ">= 18" + "node": ">= 20" } }, "node_modules/@octokit/endpoint": { - "version": "9.0.6", - "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-9.0.6.tgz", - "integrity": "sha512-H1fNTMA57HbkFESSt3Y9+FBICv+0jFceJFPWDePYlR/iMGrwM5ph+Dd4XRQs+8X+PUFURLQgX9ChPfhJ/1uNQw==", + "version": "11.0.3", + "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-11.0.3.tgz", + "integrity": "sha512-FWFlNxghg4HrXkD3ifYbS/IdL/mDHjh9QcsNyhQjN8dplUoZbejsdpmuqdA76nxj2xoWPs7p8uX2SNr9rYu0Ag==", "dev": true, "license": "MIT", "dependencies": { - "@octokit/types": "^13.1.0", - "universal-user-agent": "^6.0.0" + "@octokit/types": "^16.0.0", + "universal-user-agent": "^7.0.2" }, "engines": { - "node": ">= 18" + "node": ">= 20" } }, "node_modules/@octokit/graphql": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-7.1.1.tgz", - "integrity": "sha512-3mkDltSfcDUoa176nlGoA32RGjeWjl3K7F/BwHwRMJUW/IteSa4bnSV8p2ThNkcIcZU2umkZWxwETSSCJf2Q7g==", + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-9.0.3.tgz", + "integrity": "sha512-grAEuupr/C1rALFnXTv6ZQhFuL1D8G5y8CN04RgrO4FIPMrtm+mcZzFG7dcBm+nq+1ppNixu+Jd78aeJOYxlGA==", "dev": true, "license": "MIT", "dependencies": { - "@octokit/request": "^8.4.1", - "@octokit/types": "^13.0.0", - "universal-user-agent": "^6.0.0" + "@octokit/request": "^10.0.6", + "@octokit/types": "^16.0.0", + "universal-user-agent": "^7.0.0" }, "engines": { - "node": ">= 18" + "node": ">= 20" } }, "node_modules/@octokit/openapi-types": { - "version": "24.2.0", - "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-24.2.0.tgz", - "integrity": "sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==", + "version": "27.0.0", + "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-27.0.0.tgz", + "integrity": "sha512-whrdktVs1h6gtR+09+QsNk2+FO+49j6ga1c55YZudfEG+oKJVvJLQi3zkOm5JjiUXAagWK2tI2kTGKJ2Ys7MGA==", "dev": true, "license": "MIT" }, "node_modules/@octokit/plugin-paginate-rest": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-9.2.2.tgz", - "integrity": "sha512-u3KYkGF7GcZnSD/3UP0S7K5XUFT2FkOQdcfXZGZQPGv3lm4F2Xbf71lvjldr8c1H3nNbF+33cLEkWYbokGWqiQ==", + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-14.0.0.tgz", + "integrity": "sha512-fNVRE7ufJiAA3XUrha2omTA39M6IXIc6GIZLvlbsm8QOQCYvpq/LkMNGyFlB1d8hTDzsAXa3OKtybdMAYsV/fw==", "dev": true, "license": "MIT", "dependencies": { - "@octokit/types": "^12.6.0" + "@octokit/types": "^16.0.0" }, "engines": { - "node": ">= 18" + "node": ">= 20" }, "peerDependencies": { - "@octokit/core": "5" - } - }, - "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/openapi-types": { - "version": "20.0.0", - "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-20.0.0.tgz", - "integrity": "sha512-EtqRBEjp1dL/15V7WiX5LJMIxxkdiGJnabzYx5Apx4FkQIFgAfKumXeYAqqJCj1s+BMX4cPFIFC4OLCR6stlnA==", - "dev": true, - "license": "MIT" - }, - "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/types": { - "version": "12.6.0", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.6.0.tgz", - "integrity": "sha512-1rhSOfRa6H9w4YwK0yrf5faDaDTb+yLyBUKOCV4xtCDB5VmIPqd/v9yr9o6SAzOAlRxMiRiCic6JVM1/kunVkw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@octokit/openapi-types": "^20.0.0" + "@octokit/core": ">=6" } }, "node_modules/@octokit/plugin-rest-endpoint-methods": { - "version": "10.4.1", - "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-10.4.1.tgz", - "integrity": "sha512-xV1b+ceKV9KytQe3zCVqjg+8GTGfDYwaT1ATU5isiUyVtlVAO3HNdzpS4sr4GBx4hxQ46s7ITtZrAsxG22+rVg==", + "version": "17.0.0", + "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-17.0.0.tgz", + "integrity": "sha512-B5yCyIlOJFPqUUeiD0cnBJwWJO8lkJs5d8+ze9QDP6SvfiXSz1BF+91+0MeI1d2yxgOhU/O+CvtiZ9jSkHhFAw==", "dev": true, "license": "MIT", "dependencies": { - "@octokit/types": "^12.6.0" + "@octokit/types": "^16.0.0" }, "engines": { - "node": ">= 18" + "node": ">= 20" }, "peerDependencies": { - "@octokit/core": "5" - } - }, - "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/openapi-types": { - "version": "20.0.0", - "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-20.0.0.tgz", - "integrity": "sha512-EtqRBEjp1dL/15V7WiX5LJMIxxkdiGJnabzYx5Apx4FkQIFgAfKumXeYAqqJCj1s+BMX4cPFIFC4OLCR6stlnA==", - "dev": true, - "license": "MIT" - }, - "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types": { - "version": "12.6.0", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.6.0.tgz", - "integrity": "sha512-1rhSOfRa6H9w4YwK0yrf5faDaDTb+yLyBUKOCV4xtCDB5VmIPqd/v9yr9o6SAzOAlRxMiRiCic6JVM1/kunVkw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@octokit/openapi-types": "^20.0.0" + "@octokit/core": ">=6" } }, "node_modules/@octokit/request": { - "version": "8.4.1", - "resolved": "https://registry.npmjs.org/@octokit/request/-/request-8.4.1.tgz", - "integrity": "sha512-qnB2+SY3hkCmBxZsR/MPCybNmbJe4KAlfWErXq+rBKkQJlbjdJeS85VI9r8UqeLYLvnAenU8Q1okM/0MBsAGXw==", + "version": "10.0.8", + "resolved": "https://registry.npmjs.org/@octokit/request/-/request-10.0.8.tgz", + "integrity": "sha512-SJZNwY9pur9Agf7l87ywFi14W+Hd9Jg6Ifivsd33+/bGUQIjNujdFiXII2/qSlN2ybqUHfp5xpekMEjIBTjlSw==", "dev": true, "license": "MIT", "dependencies": { - "@octokit/endpoint": "^9.0.6", - "@octokit/request-error": "^5.1.1", - "@octokit/types": "^13.1.0", - "universal-user-agent": "^6.0.0" + "@octokit/endpoint": "^11.0.3", + "@octokit/request-error": "^7.0.2", + "@octokit/types": "^16.0.0", + "fast-content-type-parse": "^3.0.0", + "json-with-bigint": "^3.5.3", + "universal-user-agent": "^7.0.2" }, "engines": { - "node": ">= 18" + "node": ">= 20" } }, "node_modules/@octokit/request-error": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-5.1.1.tgz", - "integrity": "sha512-v9iyEQJH6ZntoENr9/yXxjuezh4My67CBSu9r6Ve/05Iu5gNgnisNWOsoJHTP6k0Rr0+HQIpnH+kyammu90q/g==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-7.1.0.tgz", + "integrity": "sha512-KMQIfq5sOPpkQYajXHwnhjCC0slzCNScLHs9JafXc4RAJI+9f+jNDlBNaIMTvazOPLgb4BnlhGJOTbnN0wIjPw==", "dev": true, "license": "MIT", "dependencies": { - "@octokit/types": "^13.1.0", - "deprecation": "^2.0.0", - "once": "^1.4.0" + "@octokit/types": "^16.0.0" }, "engines": { - "node": ">= 18" + "node": ">= 20" } }, "node_modules/@octokit/types": { - "version": "13.10.0", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.10.0.tgz", - "integrity": "sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==", + "version": "16.0.0", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-16.0.0.tgz", + "integrity": "sha512-sKq+9r1Mm4efXW1FCk7hFSeJo4QKreL/tTbR0rz/qx/r1Oa2VV83LTA/H/MuCOX7uCIJmQVRKBcbmWoySjAnSg==", "dev": true, "license": "MIT", "dependencies": { - "@octokit/openapi-types": "^24.2.0" + "@octokit/openapi-types": "^27.0.0" } }, "node_modules/@popperjs/core": { @@ -864,16 +830,16 @@ } }, "node_modules/@rolldown/pluginutils": { - "version": "1.0.0-beta.29", - "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.29.tgz", - "integrity": "sha512-NIJgOsMjbxAXvoGq/X0gD7VPMQ8j9g0BiDaNjVNVjvl+iKXxL3Jre0v31RmBYeLEmkbj2s02v8vFTbUXi5XS2Q==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.1.tgz", + "integrity": "sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw==", "dev": true, "license": "MIT" }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.52.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.52.4.tgz", - "integrity": "sha512-BTm2qKNnWIQ5auf4deoetINJm2JzvihvGb9R6K/ETwKLql/Bb3Eg2H1FBp1gUb4YGbydMA3jcmQTR73q7J+GAA==", + "version": "4.60.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.60.3.tgz", + "integrity": "sha512-x35CNW/ANXG3hE/EZpRU8MXX1JDN86hBb2wMGAtltkz7pc6cxgjpy1OMMfDosOQ+2hWqIkag/fGok1Yady9nGw==", "cpu": [ "arm" ], @@ -885,9 +851,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.52.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.52.4.tgz", - "integrity": "sha512-P9LDQiC5vpgGFgz7GSM6dKPCiqR3XYN1WwJKA4/BUVDjHpYsf3iBEmVz62uyq20NGYbiGPR5cNHI7T1HqxNs2w==", + "version": "4.60.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.60.3.tgz", + "integrity": "sha512-xw3xtkDApIOGayehp2+Rz4zimfkaX65r4t47iy+ymQB2G4iJCBBfj0ogVg5jpvjpn8UWn/+q9tprxleYeNp3Hw==", "cpu": [ "arm64" ], @@ -899,9 +865,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.52.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.52.4.tgz", - "integrity": "sha512-QRWSW+bVccAvZF6cbNZBJwAehmvG9NwfWHwMy4GbWi/BQIA/laTIktebT2ipVjNncqE6GLPxOok5hsECgAxGZg==", + "version": "4.60.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.60.3.tgz", + "integrity": "sha512-vo6Y5Qfpx7/5EaamIwi0WqW2+zfiusVihKatLvtN1VFVy3D13uERk/6gZLU1UiHRL6fDXqj/ELIeVRGnvcTE1g==", "cpu": [ "arm64" ], @@ -913,9 +879,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.52.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.52.4.tgz", - "integrity": "sha512-hZgP05pResAkRJxL1b+7yxCnXPGsXU0fG9Yfd6dUaoGk+FhdPKCJ5L1Sumyxn8kvw8Qi5PvQ8ulenUbRjzeCTw==", + "version": "4.60.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.60.3.tgz", + "integrity": "sha512-D+0QGcZhBzTN82weOnsSlY7V7+RMmPuF1CkbxyMAGE8+ZHeUjyb76ZiWmBlCu//AQQONvxcqRbwZTajZKqjuOw==", "cpu": [ "x64" ], @@ -927,9 +893,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-arm64": { - "version": "4.52.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.52.4.tgz", - "integrity": "sha512-xmc30VshuBNUd58Xk4TKAEcRZHaXlV+tCxIXELiE9sQuK3kG8ZFgSPi57UBJt8/ogfhAF5Oz4ZSUBN77weM+mQ==", + "version": "4.60.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.60.3.tgz", + "integrity": "sha512-6HnvHCT7fDyj6R0Ph7A6x8dQS/S38MClRWeDLqc0MdfWkxjiu1HSDYrdPhqSILzjTIC/pnXbbJbo+ft+gy/9hQ==", "cpu": [ "arm64" ], @@ -941,9 +907,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-x64": { - "version": "4.52.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.52.4.tgz", - "integrity": "sha512-WdSLpZFjOEqNZGmHflxyifolwAiZmDQzuOzIq9L27ButpCVpD7KzTRtEG1I0wMPFyiyUdOO+4t8GvrnBLQSwpw==", + "version": "4.60.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.60.3.tgz", + "integrity": "sha512-KHLgC3WKlUYW3ShFKnnosZDOJ0xjg9zp7au3sIm2bs/tGBeC2ipmvRh/N7JKi0t9Ue20C0dpEshi8WUubg+cnA==", "cpu": [ "x64" ], @@ -955,13 +921,16 @@ ] }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.52.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.52.4.tgz", - "integrity": "sha512-xRiOu9Of1FZ4SxVbB0iEDXc4ddIcjCv2aj03dmW8UrZIW7aIQ9jVJdLBIhxBI+MaTnGAKyvMwPwQnoOEvP7FgQ==", + "version": "4.60.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.60.3.tgz", + "integrity": "sha512-DV6fJoxEYWJOvaZIsok7KrYl0tPvga5OZ2yvKHNNYyk/2roMLqQAbGhr78EQ5YhHpnhLKJD3S1WFusAkmUuV5g==", "cpu": [ "arm" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -969,13 +938,16 @@ ] }, "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.52.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.52.4.tgz", - "integrity": "sha512-FbhM2p9TJAmEIEhIgzR4soUcsW49e9veAQCziwbR+XWB2zqJ12b4i/+hel9yLiD8pLncDH4fKIPIbt5238341Q==", + "version": "4.60.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.60.3.tgz", + "integrity": "sha512-mQKoJAzvuOs6F+TZybQO4GOTSMUu7v0WdxEk24krQ/uUxXoPTtHjuaUuPmFhtBcM4K0ons8nrE3JyhTuCFtT/w==", "cpu": [ "arm" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -983,13 +955,16 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.52.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.52.4.tgz", - "integrity": "sha512-4n4gVwhPHR9q/g8lKCyz0yuaD0MvDf7dV4f9tHt0C73Mp8h38UCtSCSE6R9iBlTbXlmA8CjpsZoujhszefqueg==", + "version": "4.60.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.60.3.tgz", + "integrity": "sha512-Whjj2qoiJ6+OOJMGptTYazaJvjOJm+iKHpXQM1P3LzGjt7Ff++Tp7nH4N8J/BUA7R9IHfDyx4DJIflifwnbmIA==", "cpu": [ "arm64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -997,13 +972,16 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.52.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.52.4.tgz", - "integrity": "sha512-u0n17nGA0nvi/11gcZKsjkLj1QIpAuPFQbR48Subo7SmZJnGxDpspyw2kbpuoQnyK+9pwf3pAoEXerJs/8Mi9g==", + "version": "4.60.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.60.3.tgz", + "integrity": "sha512-4YTNHKqGng5+yiZt3mg77nmyuCfmNfX4fPmyUapBcIk+BdwSwmCWGXOUxhXbBEkFHtoN5boLj/5NON+u5QC9tg==", "cpu": [ "arm64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -1011,13 +989,33 @@ ] }, "node_modules/@rollup/rollup-linux-loong64-gnu": { - "version": "4.52.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.52.4.tgz", - "integrity": "sha512-0G2c2lpYtbTuXo8KEJkDkClE/+/2AFPdPAbmaHoE870foRFs4pBrDehilMcrSScrN/fB/1HTaWO4bqw+ewBzMQ==", + "version": "4.60.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.60.3.tgz", + "integrity": "sha512-SU3kNlhkpI4UqlUc2VXPGK9o886ZsSeGfMAX2ba2b8DKmMXq4AL7KUrkSWVbb7koVqx41Yczx6dx5PNargIrEA==", "cpu": [ "loong64" ], "dev": true, + "libc": [ + "glibc" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-loong64-musl": { + "version": "4.60.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.60.3.tgz", + "integrity": "sha512-6lDLl5h4TXpB1mTf2rQWnAk/LcXrx9vBfu/DT5TIPhvMhRWaZ5MxkIc8u4lJAmBo6klTe1ywXIUHFjylW505sg==", + "cpu": [ + "loong64" + ], + "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -1025,13 +1023,33 @@ ] }, "node_modules/@rollup/rollup-linux-ppc64-gnu": { - "version": "4.52.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.52.4.tgz", - "integrity": "sha512-teSACug1GyZHmPDv14VNbvZFX779UqWTsd7KtTM9JIZRDI5NUwYSIS30kzI8m06gOPB//jtpqlhmraQ68b5X2g==", + "version": "4.60.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.60.3.tgz", + "integrity": "sha512-BMo8bOw8evlup/8G+cj5xWtPyp93xPdyoSN16Zy90Q2QZ0ZYRhCt6ZJSwbrRzG9HApFabjwj2p25TUPDWrhzqQ==", "cpu": [ "ppc64" ], "dev": true, + "libc": [ + "glibc" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-ppc64-musl": { + "version": "4.60.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.60.3.tgz", + "integrity": "sha512-E0L8X1dZN1/Rph+5VPF6Xj2G7JJvMACVXtamTJIDrVI44Y3K+G8gQaMEAavbqCGTa16InptiVrX6eM6pmJ+7qA==", + "cpu": [ + "ppc64" + ], + "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -1039,13 +1057,16 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.52.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.52.4.tgz", - "integrity": "sha512-/MOEW3aHjjs1p4Pw1Xk4+3egRevx8Ji9N6HUIA1Ifh8Q+cg9dremvFCUbOX2Zebz80BwJIgCBUemjqhU5XI5Eg==", + "version": "4.60.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.60.3.tgz", + "integrity": "sha512-oZJ/WHaVfHUiRAtmTAeo3DcevNsVvH8mbvodjZy7D5QKvCefO371SiKRpxoDcCxB3PTRTLayWBkvmDQKTcX/sw==", "cpu": [ "riscv64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -1053,13 +1074,16 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-musl": { - "version": "4.52.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.52.4.tgz", - "integrity": "sha512-1HHmsRyh845QDpEWzOFtMCph5Ts+9+yllCrREuBR/vg2RogAQGGBRC8lDPrPOMnrdOJ+mt1WLMOC2Kao/UwcvA==", + "version": "4.60.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.60.3.tgz", + "integrity": "sha512-Dhbyh7j9FybM3YaTgaHmVALwA8AkUwTPccyCQ79TG9AJUsMQqgN1DDEZNr4+QUfwiWvLDumW5vdwzoeUF+TNxQ==", "cpu": [ "riscv64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -1067,13 +1091,16 @@ ] }, "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.52.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.52.4.tgz", - "integrity": "sha512-seoeZp4L/6D1MUyjWkOMRU6/iLmCU2EjbMTyAG4oIOs1/I82Y5lTeaxW0KBfkUdHAWN7j25bpkt0rjnOgAcQcA==", + "version": "4.60.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.60.3.tgz", + "integrity": "sha512-cJd1X5XhHHlltkaypz1UcWLA8AcoIi1aWhsvaWDskD1oz2eKCypnqvTQ8ykMNI0RSmm7NkTdSqSSD7zM0xa6Ig==", "cpu": [ "s390x" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -1081,13 +1108,16 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.52.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.52.4.tgz", - "integrity": "sha512-Wi6AXf0k0L7E2gteNsNHUs7UMwCIhsCTs6+tqQ5GPwVRWMaflqGec4Sd8n6+FNFDw9vGcReqk2KzBDhCa1DLYg==", + "version": "4.60.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.60.3.tgz", + "integrity": "sha512-DAZDBHQfG2oQuhY7mc6I3/qB4LU2fQCjRvxbDwd/Jdvb9fypP4IJ4qmtu6lNjes6B531AI8cg1aKC2di97bUxA==", "cpu": [ "x64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -1095,9 +1125,26 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.52.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.52.4.tgz", - "integrity": "sha512-dtBZYjDmCQ9hW+WgEkaffvRRCKm767wWhxsFW3Lw86VXz/uJRuD438/XvbZT//B96Vs8oTA8Q4A0AfHbrxP9zw==", + "version": "4.60.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.60.3.tgz", + "integrity": "sha512-cRxsE8c13mZOh3vP+wLDxpQBRrOHDIGOWyDL93Sy0Ga8y515fBcC2pjUfFwUe5T7tqvTvWbCpg1URM/AXdWIXA==", + "cpu": [ + "x64" + ], + "dev": true, + "libc": [ + "musl" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-openbsd-x64": { + "version": "4.60.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.60.3.tgz", + "integrity": "sha512-QaWcIgRxqEdQdhJqW4DJctsH6HCmo5vHxY0krHSX4jMtOqfzC+dqDGuHM87bu4H8JBeibWx7jFz+h6/4C8wA5Q==", "cpu": [ "x64" ], @@ -1105,13 +1152,13 @@ "license": "MIT", "optional": true, "os": [ - "linux" + "openbsd" ] }, "node_modules/@rollup/rollup-openharmony-arm64": { - "version": "4.52.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.52.4.tgz", - "integrity": "sha512-1ox+GqgRWqaB1RnyZXL8PD6E5f7YyRUJYnCqKpNzxzP0TkaUh112NDrR9Tt+C8rJ4x5G9Mk8PQR3o7Ku2RKqKA==", + "version": "4.60.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.60.3.tgz", + "integrity": "sha512-AaXwSvUi3QIPtroAUw1t5yHGIyqKEXwH54WUocFolZhpGDruJcs8c+xPNDRn4XiQsS7MEwnYsHW2l0MBLDMkWg==", "cpu": [ "arm64" ], @@ -1123,9 +1170,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.52.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.52.4.tgz", - "integrity": "sha512-8GKr640PdFNXwzIE0IrkMWUNUomILLkfeHjXBi/nUvFlpZP+FA8BKGKpacjW6OUUHaNI6sUURxR2U2g78FOHWQ==", + "version": "4.60.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.60.3.tgz", + "integrity": "sha512-65LAKM/bAWDqKNEelHlcHvm2V+Vfb8C6INFxQXRHCvaVN1rJfwr4NvdP4FyzUaLqWfaCGaadf6UbTm8xJeYfEg==", "cpu": [ "arm64" ], @@ -1137,9 +1184,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.52.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.52.4.tgz", - "integrity": "sha512-AIy/jdJ7WtJ/F6EcfOb2GjR9UweO0n43jNObQMb6oGxkYTfLcnN7vYYpG+CN3lLxrQkzWnMOoNSHTW54pgbVxw==", + "version": "4.60.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.60.3.tgz", + "integrity": "sha512-EEM2gyhBF5MFnI6vMKdX1LAosE627RGBzIoGMdLloPZkXrUN0Ckqgr2Qi8+J3zip/8NVVro3/FjB+tjhZUgUHA==", "cpu": [ "ia32" ], @@ -1151,9 +1198,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-gnu": { - "version": "4.52.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.52.4.tgz", - "integrity": "sha512-UF9KfsH9yEam0UjTwAgdK0anlQ7c8/pWPU2yVjyWcF1I1thABt6WXE47cI71pGiZ8wGvxohBoLnxM04L/wj8mQ==", + "version": "4.60.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.60.3.tgz", + "integrity": "sha512-E5Eb5H/DpxaoXH++Qkv28RcUJboMopmdDUALBczvHMf7hNIxaDZqwY5lK12UK1BHacSmvupoEWGu+n993Z0y1A==", "cpu": [ "x64" ], @@ -1165,9 +1212,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.52.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.52.4.tgz", - "integrity": "sha512-bf9PtUa0u8IXDVxzRToFQKsNCRz9qLYfR/MpECxl4mRoWYjAeFjgxj1XdZr2M/GNVpT05p+LgQOHopYDlUu6/w==", + "version": "4.60.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.60.3.tgz", + "integrity": "sha512-hPt/bgL5cE+Qp+/TPHBqptcAgPzgj46mPcg/16zNUmbQk0j+mOEQV/+Lqu8QRtDV3Ek95Q6FeFITpuhl6OTsAA==", "cpu": [ "x64" ], @@ -1186,70 +1233,70 @@ "license": "MIT" }, "node_modules/@vitejs/plugin-vue": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-6.0.1.tgz", - "integrity": "sha512-+MaE752hU0wfPFJEUAIxqw18+20euHHdxVtMvbFcOEpjEyfqXH/5DCoTHiVJ0J29EhTJdoTkjEv5YBKU9dnoTw==", + "version": "6.0.7", + "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-6.0.7.tgz", + "integrity": "sha512-km+p+XdSz9Sxm5rqUbqcSfZYaAniKxWBj1KURl+Jr7UaPvvX7BmaWMdP69I5rrFDeQGyxAG7NXdc57vz+snhWg==", "dev": true, "license": "MIT", "dependencies": { - "@rolldown/pluginutils": "1.0.0-beta.29" + "@rolldown/pluginutils": "^1.0.1" }, "engines": { "node": "^20.19.0 || >=22.12.0" }, "peerDependencies": { - "vite": "^5.0.0 || ^6.0.0 || ^7.0.0", + "vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0", "vue": "^3.2.25" } }, "node_modules/@vue/compiler-core": { - "version": "3.5.21", - "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.21.tgz", - "integrity": "sha512-8i+LZ0vf6ZgII5Z9XmUvrCyEzocvWT+TeR2VBUVlzIH6Tyv57E20mPZ1bCS+tbejgUgmjrEh7q/0F0bibskAmw==", + "version": "3.5.34", + "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.34.tgz", + "integrity": "sha512-s9cLyK5mLcvZ4Agva5QgRsQyLKvts9WbU9DB6NqiZkkGEdwmcEiylj5Jbwkp680drF/NNCV8OlAJSe+yMLxaJw==", "license": "MIT", "dependencies": { - "@babel/parser": "^7.28.3", - "@vue/shared": "3.5.21", - "entities": "^4.5.0", + "@babel/parser": "^7.29.3", + "@vue/shared": "3.5.34", + "entities": "^7.0.1", "estree-walker": "^2.0.2", "source-map-js": "^1.2.1" } }, "node_modules/@vue/compiler-dom": { - "version": "3.5.21", - "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.21.tgz", - "integrity": "sha512-jNtbu/u97wiyEBJlJ9kmdw7tAr5Vy0Aj5CgQmo+6pxWNQhXZDPsRr1UWPN4v3Zf82s2H3kF51IbzZ4jMWAgPlQ==", + "version": "3.5.34", + "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.34.tgz", + "integrity": "sha512-EbF/T++k0e2MMZlJsBhzK8Sgwt0HcIPOhzn1CTB/lv6sQcyk+OWf8YeiLxZp3ro7MbbLcAfAJ6sEvjFWuNgUCw==", "license": "MIT", "dependencies": { - "@vue/compiler-core": "3.5.21", - "@vue/shared": "3.5.21" + "@vue/compiler-core": "3.5.34", + "@vue/shared": "3.5.34" } }, "node_modules/@vue/compiler-sfc": { - "version": "3.5.21", - "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.21.tgz", - "integrity": "sha512-SXlyk6I5eUGBd2v8Ie7tF6ADHE9kCR6mBEuPyH1nUZ0h6Xx6nZI29i12sJKQmzbDyr2tUHMhhTt51Z6blbkTTQ==", + "version": "3.5.34", + "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.34.tgz", + "integrity": "sha512-D/ihr6uZeIt6r+pVZf46RWT1fAsLFMbUP7k8G1VkiiWexriED9GrX3echHd4Abbt17zjlfiFJ8z7a3BxZOPNjg==", "license": "MIT", "dependencies": { - "@babel/parser": "^7.28.3", - "@vue/compiler-core": "3.5.21", - "@vue/compiler-dom": "3.5.21", - "@vue/compiler-ssr": "3.5.21", - "@vue/shared": "3.5.21", + "@babel/parser": "^7.29.3", + "@vue/compiler-core": "3.5.34", + "@vue/compiler-dom": "3.5.34", + "@vue/compiler-ssr": "3.5.34", + "@vue/shared": "3.5.34", "estree-walker": "^2.0.2", - "magic-string": "^0.30.18", - "postcss": "^8.5.6", + "magic-string": "^0.30.21", + "postcss": "^8.5.14", "source-map-js": "^1.2.1" } }, "node_modules/@vue/compiler-ssr": { - "version": "3.5.21", - "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.21.tgz", - "integrity": "sha512-vKQ5olH5edFZdf5ZrlEgSO1j1DMA4u23TVK5XR1uMhvwnYvVdDF0nHXJUblL/GvzlShQbjhZZ2uvYmDlAbgo9w==", + "version": "3.5.34", + "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.34.tgz", + "integrity": "sha512-cDtTHKibkThKGHH1SP+WdccquNRYQDFH6rRjQCqT9G2ltFAfoR5pUftpab/z+aM5mW9HLLVQW7hfKKQe/1GBeQ==", "license": "MIT", "dependencies": { - "@vue/compiler-dom": "3.5.21", - "@vue/shared": "3.5.21" + "@vue/compiler-dom": "3.5.34", + "@vue/shared": "3.5.34" } }, "node_modules/@vue/devtools-api": { @@ -1259,53 +1306,53 @@ "license": "MIT" }, "node_modules/@vue/reactivity": { - "version": "3.5.21", - "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.21.tgz", - "integrity": "sha512-3ah7sa+Cwr9iiYEERt9JfZKPw4A2UlbY8RbbnH2mGCE8NwHkhmlZt2VsH0oDA3P08X3jJd29ohBDtX+TbD9AsA==", + "version": "3.5.34", + "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.34.tgz", + "integrity": "sha512-y9XDjCEuBp+98k+UL5dbYkh57AHU4o6cxZedOPXw3bmrZZYLQsVHguGurq7hVrPCSrQtrnz1f9dssyFr+dMXfQ==", "license": "MIT", "dependencies": { - "@vue/shared": "3.5.21" + "@vue/shared": "3.5.34" } }, "node_modules/@vue/runtime-core": { - "version": "3.5.21", - "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.21.tgz", - "integrity": "sha512-+DplQlRS4MXfIf9gfD1BOJpk5RSyGgGXD/R+cumhe8jdjUcq/qlxDawQlSI8hCKupBlvM+3eS1se5xW+SuNAwA==", + "version": "3.5.34", + "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.34.tgz", + "integrity": "sha512-mKeBYvu8tcMSLhypAHBmriUFfWXKTCF/23Z4jiCoYK3UtWepkliViNLuR90V9XOyD62mUxs9p1jsrpK3CCGIzw==", "license": "MIT", "dependencies": { - "@vue/reactivity": "3.5.21", - "@vue/shared": "3.5.21" + "@vue/reactivity": "3.5.34", + "@vue/shared": "3.5.34" } }, "node_modules/@vue/runtime-dom": { - "version": "3.5.21", - "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.21.tgz", - "integrity": "sha512-3M2DZsOFwM5qI15wrMmNF5RJe1+ARijt2HM3TbzBbPSuBHOQpoidE+Pa+XEaVN+czbHf81ETRoG1ltztP2em8w==", + "version": "3.5.34", + "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.34.tgz", + "integrity": "sha512-e8kZzERmCwUnBRVsgSQlAfrfU2rGoy0FFKPBXSlfEjc/O3KfA7QP0t1/2ZylrbchjmIKB4dPTd07A6WPr0eOrg==", "license": "MIT", "dependencies": { - "@vue/reactivity": "3.5.21", - "@vue/runtime-core": "3.5.21", - "@vue/shared": "3.5.21", - "csstype": "^3.1.3" + "@vue/reactivity": "3.5.34", + "@vue/runtime-core": "3.5.34", + "@vue/shared": "3.5.34", + "csstype": "^3.2.3" } }, "node_modules/@vue/server-renderer": { - "version": "3.5.21", - "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.21.tgz", - "integrity": "sha512-qr8AqgD3DJPJcGvLcJKQo2tAc8OnXRcfxhOJCPF+fcfn5bBGz7VCcO7t+qETOPxpWK1mgysXvVT/j+xWaHeMWA==", + "version": "3.5.34", + "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.34.tgz", + "integrity": "sha512-nHxmJoTrKsmrkbILRhkC9gY1G3moZbJTqCzDd7DOOzG5KH9oeJ0Unqrff5f9v0pW//jES05ZkJcNtfE8JjOIew==", "license": "MIT", "dependencies": { - "@vue/compiler-ssr": "3.5.21", - "@vue/shared": "3.5.21" + "@vue/compiler-ssr": "3.5.34", + "@vue/shared": "3.5.34" }, "peerDependencies": { - "vue": "3.5.21" + "vue": "3.5.34" } }, "node_modules/@vue/shared": { - "version": "3.5.21", - "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.21.tgz", - "integrity": "sha512-+2k1EQpnYuVuu3N7atWyG3/xoFWIVJZq4Mz8XNOdScFI0etES75fbny/oU4lKWk/577P1zmg0ioYvpGEDZ3DLw==", + "version": "3.5.34", + "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.34.tgz", + "integrity": "sha512-24uqU4OIiX29ryC3MeWid/Xf2fa2EFRUVLb77nRhk+UrTVrh/XiGtFAFmJBAtBRbjwNdsPRP+jj/OL27Eg1NDA==", "license": "MIT" }, "node_modules/@zeit/schemas": { @@ -1316,9 +1363,9 @@ "license": "MIT" }, "node_modules/acorn": { - "version": "8.15.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", - "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz", + "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==", "dev": true, "license": "MIT", "bin": { @@ -1329,16 +1376,16 @@ } }, "node_modules/ajv": { - "version": "8.12.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", - "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", + "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", "dev": true, "license": "MIT", "dependencies": { - "fast-deep-equal": "^3.1.1", + "fast-deep-equal": "^3.1.3", + "fast-uri": "^3.0.1", "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" + "require-from-string": "^2.0.2" }, "funding": { "type": "github", @@ -1472,9 +1519,9 @@ "license": "MIT" }, "node_modules/before-after-hook": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.3.tgz", - "integrity": "sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-4.0.0.tgz", + "integrity": "sha512-q6tR3RPqIB1pMiTRMFcZwuG5T8vwp+vUvEG0vuI6B+Rikh5BfPp2fQ82c925FOs+b0lcFQ8CFrL+KbilfZFhOQ==", "dev": true, "license": "Apache-2.0" }, @@ -1534,9 +1581,9 @@ } }, "node_modules/brace-expansion": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", - "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz", + "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==", "dev": true, "license": "MIT", "dependencies": { @@ -1716,11 +1763,21 @@ } }, "node_modules/csstype": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", - "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==", + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz", + "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==", "license": "MIT" }, + "node_modules/date-fns": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.1.0.tgz", + "integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/kossnocorp" + } + }, "node_modules/debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -1741,13 +1798,6 @@ "node": ">=4.0.0" } }, - "node_modules/deprecation": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz", - "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==", - "dev": true, - "license": "ISC" - }, "node_modules/eastasianwidth": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", @@ -1779,9 +1829,9 @@ "license": "MIT" }, "node_modules/entities": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", - "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/entities/-/entities-7.0.1.tgz", + "integrity": "sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA==", "license": "BSD-2-Clause", "engines": { "node": ">=0.12" @@ -1791,9 +1841,9 @@ } }, "node_modules/esbuild": { - "version": "0.25.10", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.10.tgz", - "integrity": "sha512-9RiGKvCwaqxO2owP61uQ4BgNborAQskMR6QusfWzQqv7AZOg5oGehdY2pRJMTKuwxd1IDBP4rSbI5lHzU7SMsQ==", + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.12.tgz", + "integrity": "sha512-bbPBYYrtZbkt6Os6FiTLCTFxvq4tt3JKall1vRwshA3fdVztsLAatFaZobhkBC8/BrPetoa0oksYoKXoG4ryJg==", "dev": true, "hasInstallScript": true, "license": "MIT", @@ -1804,32 +1854,32 @@ "node": ">=18" }, "optionalDependencies": { - "@esbuild/aix-ppc64": "0.25.10", - "@esbuild/android-arm": "0.25.10", - "@esbuild/android-arm64": "0.25.10", - "@esbuild/android-x64": "0.25.10", - "@esbuild/darwin-arm64": "0.25.10", - "@esbuild/darwin-x64": "0.25.10", - "@esbuild/freebsd-arm64": "0.25.10", - "@esbuild/freebsd-x64": "0.25.10", - "@esbuild/linux-arm": "0.25.10", - "@esbuild/linux-arm64": "0.25.10", - "@esbuild/linux-ia32": "0.25.10", - "@esbuild/linux-loong64": "0.25.10", - "@esbuild/linux-mips64el": "0.25.10", - "@esbuild/linux-ppc64": "0.25.10", - "@esbuild/linux-riscv64": "0.25.10", - "@esbuild/linux-s390x": "0.25.10", - "@esbuild/linux-x64": "0.25.10", - "@esbuild/netbsd-arm64": "0.25.10", - "@esbuild/netbsd-x64": "0.25.10", - "@esbuild/openbsd-arm64": "0.25.10", - "@esbuild/openbsd-x64": "0.25.10", - "@esbuild/openharmony-arm64": "0.25.10", - "@esbuild/sunos-x64": "0.25.10", - "@esbuild/win32-arm64": "0.25.10", - "@esbuild/win32-ia32": "0.25.10", - "@esbuild/win32-x64": "0.25.10" + "@esbuild/aix-ppc64": "0.25.12", + "@esbuild/android-arm": "0.25.12", + "@esbuild/android-arm64": "0.25.12", + "@esbuild/android-x64": "0.25.12", + "@esbuild/darwin-arm64": "0.25.12", + "@esbuild/darwin-x64": "0.25.12", + "@esbuild/freebsd-arm64": "0.25.12", + "@esbuild/freebsd-x64": "0.25.12", + "@esbuild/linux-arm": "0.25.12", + "@esbuild/linux-arm64": "0.25.12", + "@esbuild/linux-ia32": "0.25.12", + "@esbuild/linux-loong64": "0.25.12", + "@esbuild/linux-mips64el": "0.25.12", + "@esbuild/linux-ppc64": "0.25.12", + "@esbuild/linux-riscv64": "0.25.12", + "@esbuild/linux-s390x": "0.25.12", + "@esbuild/linux-x64": "0.25.12", + "@esbuild/netbsd-arm64": "0.25.12", + "@esbuild/netbsd-x64": "0.25.12", + "@esbuild/openbsd-arm64": "0.25.12", + "@esbuild/openbsd-x64": "0.25.12", + "@esbuild/openharmony-arm64": "0.25.12", + "@esbuild/sunos-x64": "0.25.12", + "@esbuild/win32-arm64": "0.25.12", + "@esbuild/win32-ia32": "0.25.12", + "@esbuild/win32-x64": "0.25.12" } }, "node_modules/estree-walker": { @@ -1862,6 +1912,23 @@ "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, + "node_modules/fast-content-type-parse": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/fast-content-type-parse/-/fast-content-type-parse-3.0.0.tgz", + "integrity": "sha512-ZvLdcY8P+N8mGQJahJV5G4U88CSvT1rP8ApL6uETe88MBXrBHAkZlSEySdUlyztF7ccb+Znos3TFqaepHxdhBg==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/fastify" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/fastify" + } + ], + "license": "MIT" + }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -1869,6 +1936,23 @@ "dev": true, "license": "MIT" }, + "node_modules/fast-uri": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.2.tgz", + "integrity": "sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/fastify" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/fastify" + } + ], + "license": "BSD-3-Clause" + }, "node_modules/fdir": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", @@ -1888,9 +1972,9 @@ } }, "node_modules/filelist": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", - "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.6.tgz", + "integrity": "sha512-5giy2PkLYY1cP39p17Ech+2xlpTRL9HLspOfEgm0L6CwBXBTgsK5ou0JtzYuepxkaQ/tvhCFIJ5uXo0OrM2DxA==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -1898,9 +1982,9 @@ } }, "node_modules/filelist/node_modules/brace-expansion": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", - "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.0.tgz", + "integrity": "sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w==", "dev": true, "license": "MIT", "dependencies": { @@ -1908,9 +1992,9 @@ } }, "node_modules/filelist/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "version": "5.1.9", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz", + "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==", "dev": true, "license": "ISC", "dependencies": { @@ -2072,15 +2156,43 @@ "dev": true, "license": "MIT" }, + "node_modules/json-with-bigint": { + "version": "3.5.8", + "resolved": "https://registry.npmjs.org/json-with-bigint/-/json-with-bigint-3.5.8.tgz", + "integrity": "sha512-eq/4KP6K34kwa7TcFdtvnftvHCD9KvHOGGICWwMFc4dOOKF5t4iYqnfLK8otCRCRv06FXOzGGyqE8h8ElMvvdw==", + "dev": true, + "license": "MIT" + }, + "node_modules/lucide-vue-next": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lucide-vue-next/-/lucide-vue-next-1.0.0.tgz", + "integrity": "sha512-V6SPvx1IHTj/UY+FrIYWV5faISsPSb8BnWSFDxAtezWKvWc9ZZ40PDrdu1/Qb5vg4lHWr1hs1BAMGVGm6V1Xdg==", + "license": "ISC", + "peerDependencies": { + "vue": ">=3.0.1" + } + }, "node_modules/magic-string": { - "version": "0.30.19", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.19.tgz", - "integrity": "sha512-2N21sPY9Ws53PZvsEpVtNuSW+ScYbQdp4b9qUaL+9QkHUrGFKo56Lg9Emg5s9V/qrtNBmiR01sYhUOwu3H+VOw==", + "version": "0.30.21", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz", + "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==", "license": "MIT", "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.5" } }, + "node_modules/marked": { + "version": "18.0.3", + "resolved": "https://registry.npmjs.org/marked/-/marked-18.0.3.tgz", + "integrity": "sha512-7VT90JOkDeaRWpfjOReRGPEKn0ecdARBkDGL+tT1wZY0efPPqkUxLUSmzy/C7TIylQYJC9STISEsCHrqb/7VIA==", + "license": "MIT", + "bin": { + "marked": "bin/marked.js" + }, + "engines": { + "node": ">= 20" + } + }, "node_modules/merge-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", @@ -2132,9 +2244,9 @@ } }, "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", + "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", "dev": true, "license": "ISC", "dependencies": { @@ -2162,9 +2274,9 @@ "license": "MIT" }, "node_modules/nanoid": { - "version": "3.3.11", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz", - "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==", + "version": "3.3.12", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.12.tgz", + "integrity": "sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ==", "funding": [ { "type": "github", @@ -2212,16 +2324,6 @@ "node": ">= 0.8" } }, - "node_modules/once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dev": true, - "license": "ISC", - "dependencies": { - "wrappy": "1" - } - }, "node_modules/onetime": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", @@ -2269,9 +2371,9 @@ "license": "ISC" }, "node_modules/picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", + "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", "dev": true, "license": "MIT", "engines": { @@ -2282,9 +2384,9 @@ } }, "node_modules/postcss": { - "version": "8.5.6", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz", - "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==", + "version": "8.5.14", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.14.tgz", + "integrity": "sha512-SoSL4+OSEtR99LHFZQiJLkT59C5B1amGO1NzTwj7TT1qCUgUO6hxOvzkOYxD+vMrXBM3XJIKzokoERdqQq/Zmg==", "funding": [ { "type": "opencollective", @@ -2309,16 +2411,6 @@ "node": "^10 || ^12 || >=14" } }, - "node_modules/punycode": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", - "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, "node_modules/range-parser": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz", @@ -2380,9 +2472,9 @@ } }, "node_modules/rollup": { - "version": "4.52.4", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.52.4.tgz", - "integrity": "sha512-CLEVl+MnPAiKh5pl4dEWSyMTpuflgNQiLGhMv8ezD5W/qP8AKvmYpCOKRRNOh7oRKnauBZ4SyeYkMS+1VSyKwQ==", + "version": "4.60.3", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.60.3.tgz", + "integrity": "sha512-pAQK9HalE84QSm4Po3EmWIZPd3FnjkShVkiMlz1iligWYkWQ7wHYd1PF/T7QZ5TVSD6uSTon5gBVMSM4JfBV+A==", "dev": true, "license": "MIT", "dependencies": { @@ -2396,28 +2488,31 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.52.4", - "@rollup/rollup-android-arm64": "4.52.4", - "@rollup/rollup-darwin-arm64": "4.52.4", - "@rollup/rollup-darwin-x64": "4.52.4", - "@rollup/rollup-freebsd-arm64": "4.52.4", - "@rollup/rollup-freebsd-x64": "4.52.4", - "@rollup/rollup-linux-arm-gnueabihf": "4.52.4", - "@rollup/rollup-linux-arm-musleabihf": "4.52.4", - "@rollup/rollup-linux-arm64-gnu": "4.52.4", - "@rollup/rollup-linux-arm64-musl": "4.52.4", - "@rollup/rollup-linux-loong64-gnu": "4.52.4", - "@rollup/rollup-linux-ppc64-gnu": "4.52.4", - "@rollup/rollup-linux-riscv64-gnu": "4.52.4", - "@rollup/rollup-linux-riscv64-musl": "4.52.4", - "@rollup/rollup-linux-s390x-gnu": "4.52.4", - "@rollup/rollup-linux-x64-gnu": "4.52.4", - "@rollup/rollup-linux-x64-musl": "4.52.4", - "@rollup/rollup-openharmony-arm64": "4.52.4", - "@rollup/rollup-win32-arm64-msvc": "4.52.4", - "@rollup/rollup-win32-ia32-msvc": "4.52.4", - "@rollup/rollup-win32-x64-gnu": "4.52.4", - "@rollup/rollup-win32-x64-msvc": "4.52.4", + "@rollup/rollup-android-arm-eabi": "4.60.3", + "@rollup/rollup-android-arm64": "4.60.3", + "@rollup/rollup-darwin-arm64": "4.60.3", + "@rollup/rollup-darwin-x64": "4.60.3", + "@rollup/rollup-freebsd-arm64": "4.60.3", + "@rollup/rollup-freebsd-x64": "4.60.3", + "@rollup/rollup-linux-arm-gnueabihf": "4.60.3", + "@rollup/rollup-linux-arm-musleabihf": "4.60.3", + "@rollup/rollup-linux-arm64-gnu": "4.60.3", + "@rollup/rollup-linux-arm64-musl": "4.60.3", + "@rollup/rollup-linux-loong64-gnu": "4.60.3", + "@rollup/rollup-linux-loong64-musl": "4.60.3", + "@rollup/rollup-linux-ppc64-gnu": "4.60.3", + "@rollup/rollup-linux-ppc64-musl": "4.60.3", + "@rollup/rollup-linux-riscv64-gnu": "4.60.3", + "@rollup/rollup-linux-riscv64-musl": "4.60.3", + "@rollup/rollup-linux-s390x-gnu": "4.60.3", + "@rollup/rollup-linux-x64-gnu": "4.60.3", + "@rollup/rollup-linux-x64-musl": "4.60.3", + "@rollup/rollup-openbsd-x64": "4.60.3", + "@rollup/rollup-openharmony-arm64": "4.60.3", + "@rollup/rollup-win32-arm64-msvc": "4.60.3", + "@rollup/rollup-win32-ia32-msvc": "4.60.3", + "@rollup/rollup-win32-x64-gnu": "4.60.3", + "@rollup/rollup-win32-x64-msvc": "4.60.3", "fsevents": "~2.3.2" } }, @@ -2443,9 +2538,9 @@ "license": "MIT" }, "node_modules/semver": { - "version": "7.7.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz", - "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==", + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz", + "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==", "dev": true, "license": "ISC", "bin": { @@ -2456,14 +2551,14 @@ } }, "node_modules/serve": { - "version": "14.2.5", - "resolved": "https://registry.npmjs.org/serve/-/serve-14.2.5.tgz", - "integrity": "sha512-Qn/qMkzCcMFVPb60E/hQy+iRLpiU8PamOfOSYoAHmmF+fFFmpPpqa6Oci2iWYpTdOUM3VF+TINud7CfbQnsZbA==", + "version": "14.2.6", + "resolved": "https://registry.npmjs.org/serve/-/serve-14.2.6.tgz", + "integrity": "sha512-QEjUSA+sD4Rotm1znR8s50YqA3kYpRGPmtd5GlFxbaL9n/FdUNbqMhxClqdditSk0LlZyA/dhud6XNRTOC9x2Q==", "dev": true, "license": "MIT", "dependencies": { "@zeit/schemas": "2.36.0", - "ajv": "8.12.0", + "ajv": "8.18.0", "arg": "5.0.2", "boxen": "7.0.0", "chalk": "5.0.1", @@ -2471,7 +2566,7 @@ "clipboardy": "3.0.0", "compression": "1.8.1", "is-port-reachable": "4.0.0", - "serve-handler": "6.1.6", + "serve-handler": "6.1.7", "update-check": "1.5.4" }, "bin": { @@ -2482,16 +2577,16 @@ } }, "node_modules/serve-handler": { - "version": "6.1.6", - "resolved": "https://registry.npmjs.org/serve-handler/-/serve-handler-6.1.6.tgz", - "integrity": "sha512-x5RL9Y2p5+Sh3D38Fh9i/iQ5ZK+e4xuXRd/pGbM4D13tgo/MGwbttUk8emytcr1YYzBYs+apnUngBDFYfpjPuQ==", + "version": "6.1.7", + "resolved": "https://registry.npmjs.org/serve-handler/-/serve-handler-6.1.7.tgz", + "integrity": "sha512-CinAq1xWb0vR3twAv9evEU8cNWkXCb9kd5ePAHUKJBkOsUpR1wt/CvGdeca7vqumL1U5cSaeVQ6zZMxiJ3yWsg==", "dev": true, "license": "MIT", "dependencies": { "bytes": "3.0.0", "content-disposition": "0.5.2", "mime-types": "2.1.18", - "minimatch": "3.1.2", + "minimatch": "3.1.5", "path-is-inside": "1.0.2", "path-to-regexp": "3.3.0", "range-parser": "1.2.0" @@ -2578,13 +2673,13 @@ } }, "node_modules/strip-ansi": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", - "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz", + "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==", "dev": true, "license": "MIT", "dependencies": { - "ansi-regex": "^6.0.1" + "ansi-regex": "^6.2.2" }, "engines": { "node": ">=12" @@ -2627,14 +2722,14 @@ } }, "node_modules/tinyglobby": { - "version": "0.2.15", - "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz", - "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==", + "version": "0.2.16", + "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.16.tgz", + "integrity": "sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==", "dev": true, "license": "MIT", "dependencies": { "fdir": "^6.5.0", - "picomatch": "^4.0.3" + "picomatch": "^4.0.4" }, "engines": { "node": ">=12.0.0" @@ -2667,22 +2762,19 @@ } }, "node_modules/undici": { - "version": "5.29.0", - "resolved": "https://registry.npmjs.org/undici/-/undici-5.29.0.tgz", - "integrity": "sha512-raqeBD6NQK4SkWhQzeYKd1KmIG6dllBOTt55Rmkt4HtI9mwdWtJljnrXjAFUBLTSN67HWrOIZ3EPF4kjUw80Bg==", + "version": "6.25.0", + "resolved": "https://registry.npmjs.org/undici/-/undici-6.25.0.tgz", + "integrity": "sha512-ZgpWDC5gmNiuY9CnLVXEH8rl50xhRCuLNA97fAUnKi8RRuV4E6KG31pDTsLVUKnohJE0I3XDrTeEydAXRw47xg==", "dev": true, "license": "MIT", - "dependencies": { - "@fastify/busboy": "^2.0.0" - }, "engines": { - "node": ">=14.0" + "node": ">=18.17" } }, "node_modules/universal-user-agent": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.1.tgz", - "integrity": "sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==", + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-7.0.3.tgz", + "integrity": "sha512-TmnEAEAsBJVZM/AADELsK76llnwcf9vMKuPz8JflO1frO8Lchitr0fNaN9d+Ap0BjKtqWqd/J17qeDnXh8CL2A==", "dev": true, "license": "ISC" }, @@ -2711,16 +2803,6 @@ "registry-url": "3.1.0" } }, - "node_modules/uri-js": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "punycode": "^2.1.0" - } - }, "node_modules/vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", @@ -2732,9 +2814,9 @@ } }, "node_modules/vite": { - "version": "6.3.6", - "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.6.tgz", - "integrity": "sha512-0msEVHJEScQbhkbVTb/4iHZdJ6SXp/AvxL2sjwYQFfBqleHtnCqv1J3sa9zbWz/6kW1m9Tfzn92vW+kZ1WV6QA==", + "version": "6.4.2", + "resolved": "https://registry.npmjs.org/vite/-/vite-6.4.2.tgz", + "integrity": "sha512-2N/55r4JDJ4gdrCvGgINMy+HH3iRpNIz8K6SFwVsA+JbQScLiC+clmAxBgwiSPgcG9U15QmvqCGWzMbqda5zGQ==", "dev": true, "license": "MIT", "dependencies": { @@ -2820,16 +2902,16 @@ } }, "node_modules/vue": { - "version": "3.5.21", - "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.21.tgz", - "integrity": "sha512-xxf9rum9KtOdwdRkiApWL+9hZEMWE90FHh8yS1+KJAiWYh+iGWV1FquPjoO9VUHQ+VIhsCXNNyZ5Sf4++RVZBA==", + "version": "3.5.34", + "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.34.tgz", + "integrity": "sha512-WdLBG9gm02OgJIG9axd5Hpx0TFLdzVgfG2evFFu8Rur5O/IoGc5cMjnjh3tPL6GnRGsYvUhBSKVPYVcxRKpMCA==", "license": "MIT", "dependencies": { - "@vue/compiler-dom": "3.5.21", - "@vue/compiler-sfc": "3.5.21", - "@vue/runtime-dom": "3.5.21", - "@vue/server-renderer": "3.5.21", - "@vue/shared": "3.5.21" + "@vue/compiler-dom": "3.5.34", + "@vue/compiler-sfc": "3.5.34", + "@vue/runtime-dom": "3.5.34", + "@vue/server-renderer": "3.5.34", + "@vue/shared": "3.5.34" }, "peerDependencies": { "typescript": "*" @@ -2841,13 +2923,14 @@ } }, "node_modules/vue-i18n": { - "version": "11.1.12", - "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-11.1.12.tgz", - "integrity": "sha512-BnstPj3KLHLrsqbVU2UOrPmr0+Mv11bsUZG0PyCOzsawCivk8W00GMXHeVUWIDOgNaScCuZah47CZFE+Wnl8mw==", + "version": "11.4.2", + "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-11.4.2.tgz", + "integrity": "sha512-sADDeKXqAGsPX6tK3t3y2ZiMpbVWN12tG+MhTiJ06rVoh58eGtM4wFyw3uWGbVkXByVp9Ne/AP+nSSzI+J9OAQ==", "license": "MIT", "dependencies": { - "@intlify/core-base": "11.1.12", - "@intlify/shared": "11.1.12", + "@intlify/core-base": "11.4.2", + "@intlify/devtools-types": "11.4.2", + "@intlify/shared": "11.4.2", "@vue/devtools-api": "^6.5.0" }, "engines": { @@ -2860,6 +2943,15 @@ "vue": "^3.0.0" } }, + "node_modules/vue3-simple-icons": { + "version": "16.10.0", + "resolved": "https://registry.npmjs.org/vue3-simple-icons/-/vue3-simple-icons-16.10.0.tgz", + "integrity": "sha512-i5i4K3R+ZLFLsb+Gjw7jHxOQW5hhH4NcB0U2Xe1v3FKnqFJow8A5sgRglAwFtFDHLw1peDIRRRe8dCxs9yhVdQ==", + "license": "MIT", + "dependencies": { + "vue": "^3" + } + }, "node_modules/webpack-virtual-modules": { "version": "0.6.2", "resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.6.2.tgz", @@ -2930,13 +3022,6 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true, - "license": "ISC" - }, "node_modules/zod": { "version": "3.25.76", "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz", diff --git a/pkgs/by-name/su/sunshine/package.nix b/pkgs/by-name/su/sunshine/package.nix index b3ee2368c6cf..41618a442b1e 100644 --- a/pkgs/by-name/su/sunshine/package.nix +++ b/pkgs/by-name/su/sunshine/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchzip, autoPatchelfHook, autoAddDriverRunpath, makeWrapper, @@ -44,9 +45,11 @@ numactl, amf-headers, svt-av1, + shaderc, vulkan-loader, libappindicator, libnotify, + pipewire, miniupnpc, nlohmann_json, config, @@ -55,20 +58,53 @@ cudaSupport ? config.cudaSupport, cudaPackages ? { }, apple-sdk_15, + darwinMinVersionHook, }: let inherit (stdenv.hostPlatform) isDarwin isLinux; stdenv' = if cudaSupport then cudaPackages.backendStdenv else stdenv; + + # Upstream's cmake fetches a pre-built ffmpeg from LizardByte/build-deps at + # configure time. We can't do network I/O during the build, so fetch it via + # a fixed-output derivation and point cmake at it via FFMPEG_PREPARED_BINARIES. + # The tag must match the commit of the third-party/build-deps submodule pinned + # in the Sunshine release. + buildDepsTag = "v2026.516.30821"; + ffmpegArch = + { + x86_64-linux = "Linux-x86_64"; + aarch64-linux = "Linux-aarch64"; + x86_64-darwin = "Darwin-x86_64"; + aarch64-darwin = "Darwin-arm64"; + } + .${stdenv.hostPlatform.system} + or (throw "sunshine: unsupported system ${stdenv.hostPlatform.system} for prebuilt ffmpeg"); + ffmpegPrebuilt = fetchzip { + url = "https://github.com/LizardByte/build-deps/releases/download/${buildDepsTag}/${ffmpegArch}-ffmpeg.tar.gz"; + # stripRoot defaults to true; the hash here matches what + # `nix-prefetch-url --unpack` produces, so the updater can refresh it + # with the built-in command (which also caches downloads by URL, + # unlike the empty-hash trick). + hash = + { + x86_64-linux = "sha256-VT+4qP2FaizCoIBBbBkzbYw4YOvGhuBUoZxWL0IYVZo="; + aarch64-linux = "sha256-X5v/GsJy8G3/LHW/8s0VAS0Vegr7JhZSqYotXL/s81o="; + x86_64-darwin = "sha256-rrOGahWwJikRfUn27Q4jVra2Q/MMSNitu0wS2UGKGWk="; + aarch64-darwin = "sha256-xkfwLJgb7uz1H7mJrQFW79w2T/T/Zv7biXlvXz5UvXc="; + } + .${stdenv.hostPlatform.system}; + }; + in stdenv'.mkDerivation (finalAttrs: { pname = "sunshine"; - version = "2025.924.154138"; + version = "2026.516.143833"; src = fetchFromGitHub { owner = "LizardByte"; repo = "Sunshine"; tag = "v${finalAttrs.version}"; - hash = "sha256-QrPfZqd9pgufohUjxlTpO6V0v7B41UrXHZaESsFjZ48="; + hash = "sha256-3yuhOyW1Rqz4ddZ40z2ZzpAReZQFva0SL595XrnFB60="; fetchSubmodules = true; }; @@ -76,7 +112,7 @@ stdenv'.mkDerivation (finalAttrs: { ui = buildNpmPackage { inherit (finalAttrs) src version; pname = "sunshine-ui"; - npmDepsHash = "sha256-miRw5JGZ8L+CKnoZkCuVW+ptzFV3Dg21zuS9lqNeHro="; + npmDepsHash = "sha256-YnNnuAdj/S5LGNytqIsmCApIec8DTWKF6VIJ7AXUctU="; # use generated package-lock.json as upstream does not provide one postPatch = '' @@ -101,8 +137,8 @@ stdenv'.mkDerivation (finalAttrs: { # use system boost instead of FetchContent. # FETCH_CONTENT_BOOST_USED prevents Simple-Web-Server from re-finding boost + '' - substituteInPlace cmake/dependencies/Boost_Sunshine.cmake \ - --replace-fail 'set(BOOST_VERSION "1.87.0")' 'set(BOOST_VERSION "${boost.version}")' + sed -i -E 's/set\(BOOST_VERSION "[^"]*"\)/set(BOOST_VERSION "${boost.version}")/' \ + cmake/dependencies/Boost_Sunshine.cmake echo 'set(FETCH_CONTENT_BOOST_USED TRUE)' >> cmake/dependencies/Boost_Sunshine.cmake '' # remove upstream dependency on systemd and udev @@ -111,27 +147,31 @@ stdenv'.mkDerivation (finalAttrs: { --replace-fail 'find_package(Systemd)' "" \ --replace-fail 'find_package(Udev)' "" + # The remaining @VAR@ placeholders in the .desktop file (PROJECT_NAME, + # PROJECT_DESCRIPTION, PROJECT_FQDN, SUNSHINE_DESKTOP_ICON, + # CMAKE_INSTALL_FULL_DATAROOTDIR) are substituted by cmake's + # configure_file(... @ONLY) during the build. substituteInPlace packaging/linux/dev.lizardbyte.app.Sunshine.desktop \ - --subst-var-by PROJECT_NAME 'Sunshine' \ - --subst-var-by PROJECT_DESCRIPTION 'Self-hosted game stream host for Moonlight' \ - --subst-var-by SUNSHINE_DESKTOP_ICON 'sunshine' \ - --subst-var-by CMAKE_INSTALL_FULL_DATAROOTDIR "$out/share" \ - --replace-fail '/usr/bin/env systemctl start --u sunshine' 'sunshine' + --replace-fail '/usr/bin/env systemctl start --u app-@PROJECT_FQDN@' 'sunshine' - substituteInPlace packaging/linux/sunshine.service.in \ - --subst-var-by PROJECT_DESCRIPTION 'Self-hosted game stream host for Moonlight' \ - --subst-var-by SUNSHINE_EXECUTABLE_PATH $out/bin/sunshine \ + substituteInPlace packaging/linux/app-dev.lizardbyte.app.Sunshine.service.in \ --replace-fail '/bin/sleep' '${lib.getExe' coreutils "sleep"}' ''; nativeBuildInputs = [ cmake pkg-config - python3 + # glad's generator needs Jinja2 + setuptools at configure time; + # GLAD_SKIP_PIP_INSTALL=ON tells cmake not to pip-install them. + (python3.withPackages (ps: [ + ps.jinja2 + ps.setuptools + ])) makeWrapper ] ++ lib.optionals isLinux [ wayland-scanner + shaderc # provides glslc, needed at configure time for shader compilation # Avoid fighting upstream's usage of vendored ffmpeg libraries autoPatchelfHook ] @@ -180,6 +220,8 @@ stdenv'.mkDerivation (finalAttrs: { libgbm amf-headers svt-av1 + vulkan-loader + pipewire libappindicator libnotify ] @@ -189,6 +231,8 @@ stdenv'.mkDerivation (finalAttrs: { ] ++ lib.optionals isDarwin [ apple-sdk_15 + # av_audio.mm calls AudioHardwareCreateProcessTap, introduced in macOS 14.2 + (darwinMinVersionHook "14.2") ]; runtimeDependencies = lib.optionals isLinux [ @@ -206,6 +250,10 @@ stdenv'.mkDerivation (finalAttrs: { (lib.cmakeFeature "SUNSHINE_PUBLISHER_NAME" "nixpkgs") (lib.cmakeFeature "SUNSHINE_PUBLISHER_WEBSITE" "https://nixos.org") (lib.cmakeFeature "SUNSHINE_PUBLISHER_ISSUE_URL" "https://github.com/NixOS/nixpkgs/issues") + # avoid cmake's network download of the LizardByte/build-deps ffmpeg tarball + (lib.cmakeFeature "FFMPEG_PREPARED_BINARIES" "${ffmpegPrebuilt}") + # we provide Jinja2/setuptools via python3.withPackages; don't pip-install + (lib.cmakeBool "GLAD_SKIP_PIP_INSTALL" true) ] # upstream tries to use systemd and udev packages to find these directories in FHS; set the paths explicitly instead ++ lib.optionals isLinux [ @@ -214,6 +262,8 @@ stdenv'.mkDerivation (finalAttrs: { (lib.cmakeFeature "UDEV_RULES_INSTALL_DIR" "lib/udev/rules.d") (lib.cmakeFeature "SYSTEMD_USER_UNIT_INSTALL_DIR" "lib/systemd/user") (lib.cmakeFeature "SYSTEMD_MODULES_LOAD_DIR" "lib/modules-load.d") + # used in the generated systemd unit's ExecStart= line + (lib.cmakeFeature "SUNSHINE_EXECUTABLE_PATH" "${placeholder "out"}/bin/sunshine") ] ++ lib.optionals (!cudaSupport) [ (lib.cmakeBool "SUNSHINE_ENABLE_CUDA" false) @@ -250,10 +300,6 @@ stdenv'.mkDerivation (finalAttrs: { runHook postInstall ''; - postInstall = lib.optionalString isLinux '' - install -Dm644 ../packaging/linux/dev.lizardbyte.app.Sunshine.desktop $out/share/applications/dev.lizardbyte.app.Sunshine.desktop - ''; - # allow Sunshine to find libvulkan postFixup = lib.optionalString cudaSupport '' wrapProgram $out/bin/sunshine \ diff --git a/pkgs/by-name/su/sunshine/updater.sh b/pkgs/by-name/su/sunshine/updater.sh index 82e74a44c0e3..e2838d2860b8 100755 --- a/pkgs/by-name/su/sunshine/updater.sh +++ b/pkgs/by-name/su/sunshine/updater.sh @@ -1,13 +1,127 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p gnugrep curl jq nix-update +#! nix-shell -i bash -p gnugrep gnused coreutils curl jq nix-update nix-prefetch-git +# shellcheck shell=bash set -euo pipefail -version=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} --silent --location https://api.github.com/repos/LizardByte/Sunshine/releases/latest | jq --raw-output .tag_name | grep -oP "^v\K.*") +script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +package_nix="$script_dir/package.nix" +nixpkgs_root="$(cd "$script_dir/../../../.." && pwd)" +cd "$nixpkgs_root" -if [[ "$UPDATE_NIX_OLD_VERSION" == "$version" ]]; then - echo "Already up to date!" +log() { + printf '\n==> %s\n' "$*" >&2 +} + +api() { + curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} --silent --location "$@" +} + +log "Querying latest Sunshine release from GitHub" +version=$(api https://api.github.com/repos/LizardByte/Sunshine/releases/latest | jq --raw-output .tag_name | grep -oP "^v\K.*") +log "Latest version: $version" + +if [[ "${UPDATE_NIX_OLD_VERSION:-}" == "$version" ]]; then + log "Already up to date!" exit 0 fi -nix-update sunshine --version $version --generate-lockfile --subpackage ui +log "Updating sunshine version (src hash refreshed separately, see below)" +# --no-src: nix-update can't fetch submodules, so we refresh the src hash +# ourselves via nix-prefetch-git below. +nix-update sunshine --version "$version" --no-src + +log "Prefetching sunshine src with submodules (this can take several minutes)" +# nix-prefetch-git outputs SRI under .hash on recent versions. The submodule +# tree NAR-hashes identically on Linux and Darwin, so one hash serves both. +src_hash=$(nix-prefetch-git \ + --quiet \ + --fetch-submodules \ + --url "https://github.com/LizardByte/Sunshine" \ + --rev "v$version" \ + | jq --raw-output .hash) + +if [[ -z "$src_hash" || "$src_hash" == "null" ]]; then + echo "ERROR: failed to prefetch sunshine src hash" >&2 + exit 1 +fi +log "src hash: $src_hash" + +log "Patching src hash in $package_nix" +# The src fetchFromGitHub is the only one with fetchSubmodules; anchor on it so +# we don't touch the ffmpeg or npmDepsHash entries. sed -z spans newlines. +sed -i -zE "s#hash = \"sha256-[A-Za-z0-9+/=]+\"(\\s*fetchSubmodules = true;)#hash = \"$src_hash\"\\1#" "$package_nix" + +if ! grep -q "$src_hash" "$package_nix"; then + echo "ERROR: failed to write src hash into $package_nix" >&2 + exit 1 +fi + +log "Regenerating sunshine.ui package-lock.json" +# `--generate-lockfile` only regenerates package-lock.json; it skips the npmDepsHash +# refresh (see nix-update's dependency_hashes.py). Run a second pass to update the hash. +# `--no-src` avoids re-fetching the (already-pinned) sunshine src on each pass. +nix-update sunshine --version=skip --no-src --generate-lockfile --subpackage ui + +log "Refreshing sunshine.ui npmDepsHash" +nix-update sunshine --version=skip --no-src --subpackage ui + +# Update the LizardByte/build-deps tag and pinned ffmpeg tarball hashes. +# Sunshine pins build-deps via a git submodule at third-party/build-deps; the +# tag we need is whichever build-deps release tag points at that submodule's +# commit. +log "Resolving LizardByte/build-deps submodule commit and tag" +build_deps_sha=$(api "https://api.github.com/repos/LizardByte/Sunshine/contents/third-party?ref=v$version" \ + | jq --raw-output '.[] | select(.name=="build-deps") | .sha') +log "build-deps submodule commit: $build_deps_sha" +build_deps_tag=$(api "https://api.github.com/repos/LizardByte/build-deps/tags?per_page=100" \ + | jq --raw-output --arg sha "$build_deps_sha" '.[] | select(.commit.sha==$sha) | .name' \ + | head -n1) + +if [[ -z "$build_deps_tag" ]]; then + echo "ERROR: no LizardByte/build-deps tag points at submodule commit $build_deps_sha" >&2 + exit 1 +fi +log "build-deps tag: $build_deps_tag" + +# Compute the SRI hash of a `fetchzip` (default stripRoot=true) for a URL. +# `nix-prefetch-url --unpack` produces the same NAR hash AND caches by URL +# (whereas the empty-hash + fetchzip trick re-downloads every invocation). +prefetch_unpacked_sri() { + local raw + raw=$(nix-prefetch-url --unpack --type sha256 "$1") + nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri "$raw" +} + +ffmpeg_url() { + echo "https://github.com/LizardByte/build-deps/releases/download/$build_deps_tag/$1-ffmpeg.tar.gz" +} + +# Map nix system → upstream tarball arch token. Keep this in sync with the +# `ffmpegArch` attrset in package.nix. +declare -A ffmpeg_arch=( + [x86_64-linux]=Linux-x86_64 + [aarch64-linux]=Linux-aarch64 + [x86_64-darwin]=Darwin-x86_64 + [aarch64-darwin]=Darwin-arm64 +) + +declare -A ffmpeg_hash +for system in "${!ffmpeg_arch[@]}"; do + log "Prefetching ffmpeg tarball for $system (${ffmpeg_arch[$system]})" + h=$(prefetch_unpacked_sri "$(ffmpeg_url "${ffmpeg_arch[$system]}")") + if [[ -z "$h" ]]; then + echo "ERROR: failed to prefetch ffmpeg tarball for $system" >&2 + exit 1 + fi + log " $system -> $h" + ffmpeg_hash[$system]=$h +done + +log "Patching $package_nix" +sed_args=(-E -e "s#buildDepsTag = \"v[^\"]*\";#buildDepsTag = \"$build_deps_tag\";#") +for system in "${!ffmpeg_hash[@]}"; do + sed_args+=(-e "s#$system = (lib\\.fakeHash|\"sha256-[A-Za-z0-9+/=]+\");#$system = \"${ffmpeg_hash[$system]}\";#") +done +sed -i "${sed_args[@]}" "$package_nix" +log "Done." diff --git a/pkgs/by-name/tu/tuxedo/package.nix b/pkgs/by-name/tu/tuxedo/package.nix index 717095bca829..aba3f266771b 100644 --- a/pkgs/by-name/tu/tuxedo/package.nix +++ b/pkgs/by-name/tu/tuxedo/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tuxedo"; - version = "2026.5.12"; + version = "2026.6.2"; __structuredAttrs = true; src = fetchFromGitHub { owner = "webstonehq"; repo = "tuxedo"; tag = "v${finalAttrs.version}"; - hash = "sha256-s4GIHq4kjj+FiNBJJjWeXmg4f40ARUILzwsEl0CDV1o="; + hash = "sha256-0ulyr7AbB6KZbAAvxc/s0NJTPBYS42UCbEXYREJTWMo="; }; - cargoHash = "sha256-rIdjrwNuY0DySdk4jc880JrFgoIuKTYEcx6XoSfllp4="; + cargoHash = "sha256-Sd3O/bw3/FZeas2eWAvSV3HWcDQg8Cla2hagWVYRKsc="; preCheck = '' export HOME="$TMPDIR/home" diff --git a/pkgs/by-name/um/umpire/package.nix b/pkgs/by-name/um/umpire/package.nix index e46c3e002de2..bb36d87cc71c 100644 --- a/pkgs/by-name/um/umpire/package.nix +++ b/pkgs/by-name/um/umpire/package.nix @@ -6,6 +6,8 @@ config, cudaSupport ? config.cudaSupport, cudaPackages ? null, + rocmSupport ? config.rocmSupport, + rocmPackages, }: assert cudaSupport -> cudaPackages != null; @@ -27,6 +29,9 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc + ] + ++ lib.optionals rocmSupport [ + rocmPackages.clr ]; buildInputs = lib.optionals cudaSupport ( @@ -37,11 +42,17 @@ stdenv.mkDerivation (finalAttrs: { ] ); - cmakeFlags = lib.optionals cudaSupport [ - "-DCUDA_TOOLKIT_ROOT_DIR=${cudaPackages.cudatoolkit}" - "-DENABLE_CUDA=ON" - (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString) - ]; + cmakeFlags = + lib.optionals cudaSupport [ + "-DCUDA_TOOLKIT_ROOT_DIR=${cudaPackages.cudatoolkit}" + "-DENABLE_CUDA=ON" + (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString) + ] + ++ lib.optionals rocmSupport [ + "-DENABLE_HIP=ON" + ]; + + passthru = { inherit rocmSupport; }; meta = { description = "Application-focused API for memory management on NUMA & GPU architectures"; diff --git a/pkgs/by-name/va/vazir-fonts/package.nix b/pkgs/by-name/va/vazirmatn/package.nix similarity index 56% rename from pkgs/by-name/va/vazir-fonts/package.nix rename to pkgs/by-name/va/vazirmatn/package.nix index a5b32ddb5dd0..cc8e45175041 100644 --- a/pkgs/by-name/va/vazir-fonts/package.nix +++ b/pkgs/by-name/va/vazirmatn/package.nix @@ -2,34 +2,39 @@ lib, stdenvNoCC, fetchFromGitHub, + installFonts, }: -stdenvNoCC.mkDerivation rec { - pname = "vazir-fonts"; +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "vazirmatn"; version = "33.003"; src = fetchFromGitHub { owner = "rastikerdar"; - repo = "vazir-font"; - rev = "v${version}"; + repo = "vazirmatn"; + tag = "v${finalAttrs.version}"; hash = "sha256-C1UtfrRFzz0uv/hj8e7huXe4sNd5h7ozVhirWEAyXGg="; }; - + __structuredAttrs = true; + strictDeps = true; dontBuild = true; + outputs = [ + "out" + "webfont" + ]; + nativeBuildInputs = [ installFonts ]; + installPhase = '' runHook preInstall - - find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \; - runHook postInstall ''; meta = { - homepage = "https://github.com/rastikerdar/vazir-font"; - description = "Persian (Farsi) Font - قلم (فونت) فارسی وزیر"; + homepage = "https://github.com/rastikerdar/vazirmatn"; + description = "Persian (Farsi) Font - قلم (فونت) فارسی وزیرمتن"; license = lib.licenses.ofl; platforms = lib.platforms.all; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/zc/zcool-qingke-huangyou/package.nix b/pkgs/by-name/zc/zcool-qingke-huangyou/package.nix new file mode 100644 index 000000000000..54f2bb03e63f --- /dev/null +++ b/pkgs/by-name/zc/zcool-qingke-huangyou/package.nix @@ -0,0 +1,31 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + installFonts, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "zcool-qingke-huangyou"; + version = "1.000"; + + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + owner = "googlefonts"; + repo = "zcool-qingke-huangyou"; + rev = "c9dac424b0a9f47d3b113cff4a4922f632d82c94"; + hash = "sha256-xIIDP8gCtwNtY6AReeuLZSbnDXczS5ycObP3EKxk+hU="; + }; + + nativeBuildInputs = [ installFonts ]; + + meta = { + description = "Futuristic stiff geometric font"; + homepage = "https://fonts.google.com/specimen/ZCOOL+QingKe+HuangYou"; + license = lib.licenses.ofl; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ gigahawk ]; + }; +}) diff --git a/pkgs/desktops/gnome/extensions/forge/default.nix b/pkgs/desktops/gnome/extensions/forge/default.nix index eeb41376e369..c146fd868c5c 100644 --- a/pkgs/desktops/gnome/extensions/forge/default.nix +++ b/pkgs/desktops/gnome/extensions/forge/default.nix @@ -10,13 +10,13 @@ let in stdenv.mkDerivation { pname = "gnome-shell-extension-forge"; - version = "49.3-development"; + version = "50.1-development"; src = fetchFromGitHub { owner = "forge-ext"; repo = "forge"; - rev = "a2fabeb5102d3b96661cde0e332c288bea21a1a5"; - hash = "sha256-nk2olkhNX7dIKO9xYR1yWaaKHjxtMv7mPvmUf2sCDD8="; + rev = "0319a7125db1088556b159a69bbec77e111afca7"; + hash = "sha256-IyjHjL1RqxZZZgMnRlmavnae3OqZvRT6aSwKouQRopc="; }; nativeBuildInputs = [ glib ]; diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 7059d3b6e6d4..f9d65d943136 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -1312,6 +1312,38 @@ final: prev: { } ) { }; + kulala-nvim = callPackage ( + { + buildLuarocksPackage, + fetchurl, + fetchzip, + luaOlder, + tree-sitter-kulala_http, + }: + buildLuarocksPackage { + pname = "kulala.nvim"; + version = "6.14.0-1"; + knownRockspec = + (fetchurl { + url = "mirror://luarocks/kulala.nvim-6.14.0-1.rockspec"; + sha256 = "05nj8yy1cqs2ybpx53zg06a4cisz5xwp8nir6p1vamnmmsj8xq06"; + }).outPath; + src = fetchzip { + url = "https://github.com/mistweaverco/kulala.nvim/archive/v6.14.0.zip"; + sha256 = "1y8bbc3v9508pg500gx5vip5pd416zx4kkmsqfjjcnq86x8wsl7q"; + }; + + disabled = luaOlder "5.1"; + propagatedBuildInputs = [ tree-sitter-kulala_http ]; + + meta = { + homepage = "https://kulala.app/usage"; + license = lib.licenses.mit; + description = "A fully-featured 🤏 HTTP/GraphQL/gRPC/Websocket-client 🐼 interface 🖥️ for Neovim ❤️, that supports the Jetbrains .http spec (with full scripting support)."; + }; + } + ) { }; + ldbus = callPackage ( { buildLuarocksPackage, diff --git a/pkgs/development/python-modules/adjusttext/default.nix b/pkgs/development/python-modules/adjusttext/default.nix index dd45d9ebbb08..7e67a9344451 100644 --- a/pkgs/development/python-modules/adjusttext/default.nix +++ b/pkgs/development/python-modules/adjusttext/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "adjusttext"; - version = "1.3.0"; + version = "1.4.0"; pyproject = true; src = fetchFromGitHub { owner = "Phlya"; repo = "adjusttext"; tag = "v${version}"; - hash = "sha256-WMWT2os3ADQOc1ogoCFKBEWnb6/CxgtiWmY45bYomks="; + hash = "sha256-MzVyY5GKy41kaGnV234OHmokrUarrV3HCq5GnrdjibM="; }; build-system = [ diff --git a/pkgs/development/python-modules/aioopenssl/default.nix b/pkgs/development/python-modules/aioopenssl/default.nix index cb6336de2438..2079742d0e93 100644 --- a/pkgs/development/python-modules/aioopenssl/default.nix +++ b/pkgs/development/python-modules/aioopenssl/default.nix @@ -66,8 +66,6 @@ buildPythonPackage rec { "test_starttls" ]; - __darwinAlowLocalNetworking = true; - meta = { description = "TLS-capable transport using OpenSSL for asyncio"; homepage = "https://github.com/horazont/aioopenssl"; diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix index 9b9f77523e7e..b288342f6d75 100644 --- a/pkgs/development/python-modules/cohere/default.nix +++ b/pkgs/development/python-modules/cohere/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "cohere"; - version = "7.0.3"; + version = "7.0.4"; pyproject = true; src = fetchFromGitHub { owner = "cohere-ai"; repo = "cohere-python"; tag = version; - hash = "sha256-MEw1H17Cy5ItCek72HSPLDYBmRpTzFEDg9SZE1iMWFE="; + hash = "sha256-iFqzWuWOKbJcvmGFEI0jt0fkBlZHlzmzZXZO7tIn638="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/correctionlib/default.nix b/pkgs/development/python-modules/correctionlib/default.nix index ca0d6a987256..b5e79d0e1a0b 100644 --- a/pkgs/development/python-modules/correctionlib/default.nix +++ b/pkgs/development/python-modules/correctionlib/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, @@ -13,6 +14,8 @@ ninja, # buildInputs + boost, + eigen, zlib, # dependencies @@ -30,19 +33,29 @@ buildPythonPackage (finalAttrs: { pname = "correctionlib"; - version = "2.8.0"; + version = "2.9.0"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "cms-nanoAOD"; repo = "correctionlib"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-zIKxMulID6JomaSDuI57cHA7xAZIfGBOOYCKS7Xrkaw="; + hash = "sha256-jxn5AYqHPtEPE9C5Gv9s556UH6KE1liC8JDw00vMaLg="; }; postPatch = '' - substituteInPlace CMakeLists.txt --replace-fail "-Wall -Wextra -Wpedantic -Werror" "" + substituteInPlace CMakeLists.txt \ + --replace-fail \ + "-Wall -Wextra -Wpedantic -Werror" \ + "" \ + --replace-fail \ + "set(BUILTIN_BOOST ON)" \ + "set(BUILTIN_BOOST OFF)" \ + --replace-fail \ + "set(BUILTIN_EIGEN ON)" \ + "set(BUILTIN_EIGEN OFF)" ''; build-system = [ @@ -57,7 +70,11 @@ buildPythonPackage (finalAttrs: { ]; dontUseCmakeConfigure = true; - buildInputs = [ zlib ]; + buildInputs = [ + boost + eigen + zlib + ]; dependencies = [ numpy @@ -66,6 +83,8 @@ buildPythonPackage (finalAttrs: { rich ]; + pythonImportsCheck = [ "correctionlib" ]; + nativeCheckInputs = [ # One test requires running the produced `correctionlib` binary addBinToPathHook @@ -75,7 +94,10 @@ buildPythonPackage (finalAttrs: { scipy ]; - pythonImportsCheck = [ "correctionlib" ]; + disabledTests = lib.optionals stdenv.hostPlatform.isAarch64 [ + # AssertionError: assert 0.9518682535564676 == 0.9518682535564679 + "test_lwtnn_example" + ]; meta = { description = "Provides a well-structured JSON data format for a wide variety of ad-hoc correction factors encountered in a typical HEP analysis"; diff --git a/pkgs/development/python-modules/css-inline/Cargo.lock b/pkgs/development/python-modules/css-inline/Cargo.lock index c133908f899e..31deb8f6548a 100644 --- a/pkgs/development/python-modules/css-inline/Cargo.lock +++ b/pkgs/development/python-modules/css-inline/Cargo.lock @@ -25,9 +25,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" +checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53" [[package]] name = "base64" @@ -37,9 +37,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bitflags" -version = "2.11.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af" +checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8" [[package]] name = "built" @@ -53,9 +53,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.20.2" +version = "3.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb" +checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649" [[package]] name = "bytes" @@ -77,9 +77,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.58" +version = "1.2.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e928d4b69e3077709075a938a05ffbedfa53a84c8f766efbf8220bb1ff60e1" +checksum = "dad887fd958be91b5098c0248def011f4523ab786cd411be668777e55063501f" dependencies = [ "find-msvc-tools", "shlex", @@ -99,9 +99,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chrono" -version = "0.4.44" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0" +checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327" dependencies = [ "iana-time-zone", "num-traits", @@ -141,7 +141,7 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "css-inline" -version = "0.20.2" +version = "0.21.0" dependencies = [ "cssparser", "html5ever", @@ -157,7 +157,7 @@ dependencies = [ [[package]] name = "css-inline-python" -version = "0.20.2" +version = "0.21.0" dependencies = [ "built", "css-inline", @@ -169,9 +169,9 @@ dependencies = [ [[package]] name = "cssparser" -version = "0.36.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dae61cf9c0abb83bd659dab65b7e4e38d8236824c85f0f804f173567bda257d2" +checksum = "8c9cdaae01d5ed7882b04d795e7f752f46ff52d2fa3b50a20d28c464510bba98" dependencies = [ "cssparser-macros", "dtoa-short", @@ -182,9 +182,9 @@ dependencies = [ [[package]] name = "cssparser-macros" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" +checksum = "10a2a99df6e410a8ff4245aa2006499ea662245f967cc7c0a38c83ef8eb44dbf" dependencies = [ "quote", "syn", @@ -213,9 +213,9 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +checksum = "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f" dependencies = [ "proc-macro2", "quote", @@ -239,9 +239,9 @@ dependencies = [ [[package]] name = "either" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" +checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e" [[package]] name = "equivalent" @@ -251,9 +251,9 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "fastrand" -version = "2.3.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" +checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6" [[package]] name = "find-msvc-tools" @@ -354,9 +354,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.16.1" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" +checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" dependencies = [ "allocator-api2", "equivalent", @@ -381,9 +381,9 @@ dependencies = [ [[package]] name = "http" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" +checksum = "6970f50e31d6fc17d3fa27329444bfa74e196cf62e95052a3f6fee181dba6425" dependencies = [ "bytes", "itoa", @@ -420,9 +420,9 @@ checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" [[package]] name = "hyper" -version = "1.9.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6299f016b246a94207e63da54dbe807655bf9e00044f73ded42c3ac5305fbcca" +checksum = "55281c53a1894c864990125767da440a4e630446785086f52523b20033b74498" dependencies = [ "atomic-waker", "bytes", @@ -440,15 +440,14 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.7" +version = "0.27.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" +checksum = "33ca68d021ef39cf6463ab54c1d0f5daf03377b70561305bb89a8f83aab66e0f" dependencies = [ "http", "hyper", "hyper-util", "rustls", - "rustls-pki-types", "tokio", "tokio-rustls", "tower-service", @@ -606,9 +605,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.13.1" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a8a2b9cb3e0b0c1803dbb0758ffac5de2f425b23c28f518faabd9d805342ff" +checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" dependencies = [ "equivalent", "hashbrown", @@ -620,16 +619,6 @@ version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2" -[[package]] -name = "iri-string" -version = "0.7.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25e659a4bb38e810ebc252e53b5814ff908a8c58c2a9ce2fae1bbec24cbf4e20" -dependencies = [ - "memchr", - "serde", -] - [[package]] name = "itoa" version = "1.0.18" @@ -638,21 +627,20 @@ checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" [[package]] name = "js-sys" -version = "0.3.94" +version = "0.3.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e04e2ef80ce82e13552136fabeef8a5ed1f985a96805761cbb9a2c34e7664d9" +checksum = "03d04c30968dffe80775bd4d7fb676131cd04a1fb46d2686dbffbaec2d9dfd31" dependencies = [ "cfg-if", "futures-util", - "once_cell", "wasm-bindgen", ] [[package]] name = "libc" -version = "0.2.184" +version = "0.2.186" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48f5d2a454e16a5ea0f4ced81bd44e4cfc7bd3a507b61887c99fd3538b28e4af" +checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" [[package]] name = "litemap" @@ -671,15 +659,15 @@ dependencies = [ [[package]] name = "log" -version = "0.4.29" +version = "0.4.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" +checksum = "953f07c43838f8e6f9758cab68bf5bed85465e7587ebe0b823f1bcd81978ad3a" [[package]] name = "lru" -version = "0.16.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1dc47f592c06f33f8e3aea9591776ec7c9f9e4124778ff8a3c3b87159f7e593" +checksum = "8a860605968fce16869fd239cf4237a82f3ac470723415db603b0e8b6c8d4fb9" dependencies = [ "hashbrown", ] @@ -703,15 +691,15 @@ dependencies = [ [[package]] name = "memchr" -version = "2.8.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" +checksum = "88904434abc2901f197fe8cc55f0445e7ded921dba5911dad2e2b39b48e663c4" [[package]] name = "mio" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1" +checksum = "02bd0af71c67b473010cbbc60715ee815645a4dc942899111f494b4b737d6fda" dependencies = [ "libc", "wasi", @@ -868,9 +856,9 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.28.3" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fd8e38a3b50ed1167fb981cd6fd60147e091784c427b8f7183a7ee32c31c12" +checksum = "cd274650b21d4bfc26a0a47587962c1edb425f69287324355cd040c3ea66071c" dependencies = [ "libc", "once_cell", @@ -882,9 +870,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.28.3" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e368e7ddfdeb98c9bca7f8383be1648fd84ab466bf2bc015e94008db6d35611e" +checksum = "c5e2a7d2f0d013342f295c048ad19237add5154a55b1c5a254c0ec93d4109078" dependencies = [ "target-lexicon", ] @@ -897,9 +885,9 @@ checksum = "4bf83fcee540452241ba030140f50418b973e840a64727c967b9266660f0a690" [[package]] name = "pyo3-ffi" -version = "0.28.3" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f29e10af80b1f7ccaf7f69eace800a03ecd13e883acfacc1e5d0988605f651e" +checksum = "ca85c467da1bbc8d866eea5deff9cf29ea5f7785054a17da36e65bda9c05845b" dependencies = [ "libc", "pyo3-build-config", @@ -907,9 +895,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.28.3" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df6e520eff47c45997d2fc7dd8214b25dd1310918bbb2642156ef66a67f29813" +checksum = "9ac53762fd065daa3194dd09337a38bd793a188100fd1a9304c4ab312d901771" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -919,13 +907,12 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.28.3" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cdc218d835738f81c2338f822078af45b4afdf8b2e33cbb5916f108b813acb" +checksum = "4ca3a1557399783172dc5bf39cfca835157732532cba56b71d2292161e53b362" dependencies = [ "heck", "proc-macro2", - "pyo3-build-config", "quote", "syn", ] @@ -1002,9 +989,9 @@ checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" [[package]] name = "rand" -version = "0.9.2" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" +checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea" dependencies = [ "rand_chacha", "rand_core", @@ -1031,9 +1018,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" +checksum = "fb39b166781f92d482534ef4b4b1b2568f42613b53e5b6c160e24cfbfa30926d" dependencies = [ "either", "rayon-core", @@ -1129,9 +1116,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.37" +version = "0.23.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "758025cb5fccfd3bc2fd74708fd4682be41d99e5dff73c377c0646c6012c73a4" +checksum = "ef86cd5876211988985292b91c96a8f2d298df24e75989a43a3c73f2d4d8168b" dependencies = [ "once_cell", "ring", @@ -1143,9 +1130,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.14.0" +version = "1.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd" +checksum = "30a7197ae7eb376e574fe940d068c30fe0462554a3ddbe4eca7838e049c937a9" dependencies = [ "web-time", "zeroize", @@ -1153,9 +1140,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.103.10" +version = "0.103.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df33b2b81ac578cabaf06b89b0631153a3f416b0a886e8a7a1707fb51abbd1ef" +checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e" dependencies = [ "ring", "rustls-pki-types", @@ -1182,9 +1169,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "selectors" -version = "0.36.1" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5d9c0c92a92d33f08817311cf3f2c29a3538a8240e94a6a3c622ce652d7e00c" +checksum = "8adfa1c298912827b8a28b223b3b874357397ae706e6190acd9bf28cee99114d" dependencies = [ "bitflags", "cssparser", @@ -1201,9 +1188,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" +checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd" dependencies = [ "serde", "serde_core", @@ -1241,9 +1228,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.149" +version = "1.0.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" +checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9" dependencies = [ "itoa", "memchr", @@ -1284,15 +1271,15 @@ dependencies = [ [[package]] name = "shlex" -version = "1.3.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba" [[package]] name = "siphasher" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e" +checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649" [[package]] name = "slab" @@ -1302,15 +1289,15 @@ checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" [[package]] name = "smallvec" -version = "1.15.1" +version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" +checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90" [[package]] name = "socket2" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" +checksum = "52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51" dependencies = [ "libc", "windows-sys 0.61.2", @@ -1354,9 +1341,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.117" +version = "2.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99" +checksum = "1b9ae57f904213ebb649ce6895b8a66c66f0203b9319718f69a5612a065b1422" dependencies = [ "proc-macro2", "quote", @@ -1446,9 +1433,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.50.0" +version = "1.52.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27ad5e34374e03cfffefc301becb44e9dc3c17584f414349ebe29ed26661822d" +checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe" dependencies = [ "bytes", "libc", @@ -1526,20 +1513,20 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.6.8" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" +checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840" dependencies = [ "bitflags", "bytes", "futures-util", "http", "http-body", - "iri-string", "pin-project-lite", "tower", "tower-layer", "tower-service", + "url", ] [[package]] @@ -1641,9 +1628,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.117" +version = "0.2.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0551fc1bb415591e3372d0bc4780db7e587d84e2a7e79da121051c5c4b89d0b0" +checksum = "8ddb3f79143bced6de84270411622a2699cee572fc0875aeaf1e7867cf9fca1a" dependencies = [ "cfg-if", "once_cell", @@ -1654,9 +1641,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.67" +version = "0.4.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03623de6905b7206edd0a75f69f747f134b7f0a2323392d664448bf2d3c5d87e" +checksum = "503b14d284f2c8dac03b819967e155ea753f573586193b2b2c95990cb5d69280" dependencies = [ "js-sys", "wasm-bindgen", @@ -1664,9 +1651,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.117" +version = "0.2.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fbdf9a35adf44786aecd5ff89b4563a90325f9da0923236f6104e603c7e86be" +checksum = "4e21a184b13fb19e157296e2c46056aec9092264fab83e4ba59e68c61b323c3d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1674,9 +1661,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.117" +version = "0.2.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dca9693ef2bab6d4e6707234500350d8dad079eb508dca05530c85dc3a529ff2" +checksum = "fecefd9c35bd935a20fc3fc344b5f29138961e4f47fb03297d88f2587afb5ebd" dependencies = [ "bumpalo", "proc-macro2", @@ -1687,18 +1674,18 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.117" +version = "0.2.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39129a682a6d2d841b6c429d0c51e5cb0ed1a03829d8b3d1e69a011e62cb3d3b" +checksum = "23939e44bb9a5d7576fa2b563dc2e136628f1224e88a8deed09e04858b77871f" dependencies = [ "unicode-ident", ] [[package]] name = "web-sys" -version = "0.3.94" +version = "0.3.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd70027e39b12f0849461e08ffc50b9cd7688d942c1c8e3c7b22273236b4dd0a" +checksum = "a6430a72df5eb332242960fe84b3002a241163998241eb596d4f739b9757061d" dependencies = [ "js-sys", "wasm-bindgen", @@ -1716,9 +1703,9 @@ dependencies = [ [[package]] name = "web_atoms" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a9779e9f04d2ac1ce317aee707aa2f6b773afba7b931222bff6983843b1576" +checksum = "d7cff6eef815df1834fd250e3a2ff436044d82a9f1bc1980ca1dbdf07effc538" dependencies = [ "phf", "phf_codegen", @@ -1728,9 +1715,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22cfaf3c063993ff62e73cb4311efde4db1efb31ab78a3e5c457939ad5cc0bed" +checksum = "52f5ee44c96cf55f1b349600768e3ece3a8f26010c05265ab73f945bb1a2eb9d" dependencies = [ "rustls-pki-types", ] @@ -1973,9 +1960,9 @@ checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4" [[package]] name = "yoke" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca" +checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5" dependencies = [ "stable_deref_trait", "yoke-derive", @@ -1996,18 +1983,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.48" +version = "0.8.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9" +checksum = "ce1022995ff5ff5d841ad7d994facc23098cd40152f2c1d11cd607c6f530653f" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.48" +version = "0.8.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4" +checksum = "1ae7f38b72ec2a254e2b87ef277cf2cd4fb97cbebf944faa6f33354da0867930" dependencies = [ "proc-macro2", "quote", @@ -2016,9 +2003,9 @@ dependencies = [ [[package]] name = "zerofrom" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69faa1f2a1ea75661980b013019ed6687ed0e83d069bc1114e2cc74c6c04c4df" +checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272" dependencies = [ "zerofrom-derive", ] @@ -2037,9 +2024,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.8.2" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" +checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e" [[package]] name = "zerotrie" diff --git a/pkgs/development/python-modules/css-inline/default.nix b/pkgs/development/python-modules/css-inline/default.nix index 3cc64092fe69..4de308eaf582 100644 --- a/pkgs/development/python-modules/css-inline/default.nix +++ b/pkgs/development/python-modules/css-inline/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "css-inline"; - version = "0.20.2"; + version = "0.21.0"; pyproject = true; src = fetchFromGitHub { owner = "Stranger6667"; repo = "css-inline"; rev = "python-v${version}"; - hash = "sha256-tJEeYvM7T2Lerz5SYpQTuuMoHS6obiMuFexfN8+quHc="; + hash = "sha256-hXrcomE//BScA395zXSKQayeRn8G8ivfcIJkIKu+PUE="; }; postPatch = '' @@ -43,7 +43,7 @@ buildPythonPackage rec { cd bindings/python ln -s ${./Cargo.lock} Cargo.lock ''; - hash = "sha256-sScfevpg/BZngzipANHxwIjqDsaBPF4xCSgJc5YR2gM="; + hash = "sha256-Nj7DA20qCvSQ6EhC6GO+25TBqPeAf3SV/gmpRISgWtM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cxxheaderparser/default.nix b/pkgs/development/python-modules/cxxheaderparser/default.nix index 00bb14afb027..ccd4ea738153 100644 --- a/pkgs/development/python-modules/cxxheaderparser/default.nix +++ b/pkgs/development/python-modules/cxxheaderparser/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "cxxheaderparser"; - version = "1.7.0"; + version = "1.7.3"; pyproject = true; src = fetchFromGitHub { owner = "robotpy"; repo = "cxxheaderparser"; tag = version; - hash = "sha256-Go5oIYwB2DONPbgajQuXfgpUCiGZvgcTZuFJ5z5qC3U="; + hash = "sha256-1i8HbVq1dEXktKCZg/ZGX0n5J8LrZx64flMCP/c6ltI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/gekko/default.nix b/pkgs/development/python-modules/gekko/default.nix index 86117f7ded48..5f763a440a0f 100644 --- a/pkgs/development/python-modules/gekko/default.nix +++ b/pkgs/development/python-modules/gekko/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { dependencies = [ numpy ]; # Module has no tests - doCHeck = false; + doCheck = false; pythonImportsCheck = [ "gekko" ]; diff --git a/pkgs/development/python-modules/git-revise/default.nix b/pkgs/development/python-modules/git-revise/default.nix index b7c099dd5b8b..12cc6f7e715a 100644 --- a/pkgs/development/python-modules/git-revise/default.nix +++ b/pkgs/development/python-modules/git-revise/default.nix @@ -8,7 +8,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage { pname = "git-revise"; version = "0.7.0-unstable-2025-01-28"; format = "setuptools"; @@ -37,7 +37,7 @@ buildPythonPackage rec { meta = { description = "Efficiently update, split, and rearrange git commits"; homepage = "https://github.com/mystor/git-revise"; - changelog = "https://github.com/mystor/git-revise/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/mystor/git-revise/blob/main/CHANGELOG.md"; license = lib.licenses.mit; mainProgram = "git-revise"; maintainers = with lib.maintainers; [ _9999years ]; diff --git a/pkgs/development/python-modules/hetzner/default.nix b/pkgs/development/python-modules/hetzner/default.nix index 592804449801..aee75ab0c4bc 100644 --- a/pkgs/development/python-modules/hetzner/default.nix +++ b/pkgs/development/python-modules/hetzner/default.nix @@ -2,20 +2,23 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hetzner"; version = "0.8.3"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { - repo = "hetzner"; owner = "aszlig"; - rev = "v${version}"; - sha256 = "0nhm7j2y4rgmrl0c1rklg982qllp7fky34dchqwd4czbsdnv9j7a"; + repo = "hetzner"; + tag = "v${finalAttrs.version}"; + hash = "sha256-6si0bdPrM9I4hqyR4ac7l1IsUHp05sAAzfVl4oU8FVo="; }; + build-system = [ setuptools ]; + meta = { homepage = "https://github.com/RedMoonStudios/hetzner"; description = "High-level Python API for accessing the Hetzner robot"; @@ -23,4 +26,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ aszlig ]; }; -} +}) diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 2db60782171a..14f3391f329d 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -21,16 +21,17 @@ traitlets, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jupyterlab"; - version = "4.5.7"; + version = "4.5.8"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "jupyterlab"; repo = "jupyterlab"; - tag = "v${version}"; - hash = "sha256-kJ9DWfb9VWEPfpG17E3KIvGqWlr0iO2a094Ne7LS1U8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-OtytFZdgGzbQF3icglwRpAn0HhJNyjI6oNS01gfpzkA="; }; nativeBuildInputs = [ @@ -43,9 +44,9 @@ buildPythonPackage rec { ''; offlineCache = yarn-berry_3.fetchYarnBerryDeps { - inherit src; - sourceRoot = "${src.name}/jupyterlab/staging"; - hash = "sha256-2YGs0clj44BSEGdp3wChw97jFSMiAeMnCv3PNhdnEeA="; + inherit (finalAttrs) src; + sourceRoot = "${finalAttrs.src.name}/jupyterlab/staging"; + hash = "sha256-wgqwEl01VinYU5haL1X8Na1lNNcyqCfRaRBze4ypPPo="; }; preBuild = '' @@ -85,11 +86,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "jupyterlab" ]; meta = { - changelog = "https://github.com/jupyterlab/jupyterlab/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/jupyterlab/jupyterlab/blob/${finalAttrs.src.tag}/CHANGELOG.md"; description = "Jupyter lab environment notebook server extension"; license = lib.licenses.bsd3; homepage = "https://jupyter.org/"; teams = [ lib.teams.jupyter ]; mainProgram = "jupyter-lab"; }; -} +}) diff --git a/pkgs/development/python-modules/nmcli/default.nix b/pkgs/development/python-modules/nmcli/default.nix index 2f16ca8d6947..fa427355ed68 100644 --- a/pkgs/development/python-modules/nmcli/default.nix +++ b/pkgs/development/python-modules/nmcli/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "nmcli"; - version = "1.7.0"; + version = "1.8.0"; pyproject = true; src = fetchFromGitHub { owner = "ushiboy"; repo = "nmcli"; tag = "v${version}"; - hash = "sha256-OQwvSg8IzBsZJgAAjoKvHyXBE/gSyhcvFLuEidqstzI="; + hash = "sha256-x3P+bayBG8SKnMxacIE9UQSE6GFqCX47Z4xtrFJOoRg="; }; build-system = [ diff --git a/pkgs/development/python-modules/pyobjus/default.nix b/pkgs/development/python-modules/pyobjus/default.nix index 7ad8bd677dd1..29438e2effd4 100644 --- a/pkgs/development/python-modules/pyobjus/default.nix +++ b/pkgs/development/python-modules/pyobjus/default.nix @@ -18,7 +18,7 @@ buildPythonPackage (finalAttrs: { pname = "pyobjus"; version = "1.2.4"; pyproject = true; - __structureAttrs = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "kivy"; diff --git a/pkgs/development/python-modules/wasabi/default.nix b/pkgs/development/python-modules/wasabi/default.nix index 57f498e3c13d..286cdf7a1ecd 100644 --- a/pkgs/development/python-modules/wasabi/default.nix +++ b/pkgs/development/python-modules/wasabi/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + setuptools, # tests ipykernel, @@ -10,16 +11,20 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "wasabi"; version = "1.1.3"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-S7MAjwA4CdsMPii02vIJBuqHGiu0P5kUGX1UD08uCHg="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ ipykernel nbconvert @@ -33,9 +38,9 @@ buildPythonPackage rec { meta = { description = "Lightweight console printing and formatting toolkit"; - homepage = "https://github.com/ines/wasabi"; - changelog = "https://github.com/ines/wasabi/releases/tag/v${version}"; + homepage = "https://github.com/explosion/wasabi"; + changelog = "https://github.com/explosion/wasabi/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/webthing/default.nix b/pkgs/development/python-modules/webthing/default.nix index 24712666a4d8..1fad7df705ec 100644 --- a/pkgs/development/python-modules/webthing/default.nix +++ b/pkgs/development/python-modules/webthing/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, ifaddr, jsonschema, pyee, @@ -9,19 +10,23 @@ zeroconf, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "webthing"; version = "0.15.0"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "WebThingsIO"; repo = "webthing-python"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-z4GVycdq25QZxuzZPLg6nhj0MAD1bHrsqph4yHgmRhg="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ ifaddr jsonschema pyee @@ -40,4 +45,4 @@ buildPythonPackage rec { license = with lib.licenses; [ mpl20 ]; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/wiffi/default.nix b/pkgs/development/python-modules/wiffi/default.nix index 1a600ed76375..929f2ec335f7 100644 --- a/pkgs/development/python-modules/wiffi/default.nix +++ b/pkgs/development/python-modules/wiffi/default.nix @@ -3,21 +3,26 @@ aiohttp, buildPythonPackage, fetchFromGitHub, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "wiffi"; version = "1.1.2"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "mampfes"; repo = "python-wiffi"; - tag = version; + tag = finalAttrs.version; hash = "sha256-pnbzJxq8K947Yg54LysPPho6IRKf0cc+szTETgyzFao="; }; - propagatedBuildInputs = [ aiohttp ]; + build-system = [ setuptools ]; + + dependencies = [ aiohttp ]; # Project has no tests doCheck = false; @@ -27,8 +32,8 @@ buildPythonPackage rec { meta = { description = "Python module to interface with STALL WIFFI devices"; homepage = "https://github.com/mampfes/python-wiffi"; - changelog = "https://github.com/mampfes/python-wiffi/blob/${version}/HISTORY.md"; + changelog = "https://github.com/mampfes/python-wiffi/blob/${finalAttrs.version}/HISTORY.md"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/xstatic/default.nix b/pkgs/development/python-modules/xstatic/default.nix index cbf3b968d58b..9b50ad332bf0 100644 --- a/pkgs/development/python-modules/xstatic/default.nix +++ b/pkgs/development/python-modules/xstatic/default.nix @@ -2,26 +2,33 @@ buildPythonPackage, lib, fetchPypi, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "xstatic"; version = "1.0.3"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { pname = "XStatic"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-QCVEzJ4XlIlEEFTwnIB4BOEV6iRpB96HwDVftPWjEmg="; }; + build-system = [ setuptools ]; + # no tests implemented doCheck = false; + pythonImportsCheck = [ "xstatic" ]; + meta = { - homepage = "https://bitbucket.org/thomaswaldmann/xstatic"; + homepage = "https://github.com/xstatic-py/xstatic"; description = "Base packaged static files for python"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ makefu ]; }; -} +}) diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix index e6806816d1c8..cd42759bdf98 100644 --- a/pkgs/pkgs-lib/formats.nix +++ b/pkgs/pkgs-lib/formats.nix @@ -131,6 +131,8 @@ optionalAttrs allowAliases aliases php = (import ./formats/php/default.nix { inherit lib pkgs; }).format; + configobj = (import ./formats/configobj/default.nix { inherit lib pkgs; }).format; + json = { }: { diff --git a/pkgs/pkgs-lib/formats/configobj/default.nix b/pkgs/pkgs-lib/formats/configobj/default.nix new file mode 100644 index 000000000000..8179c4412e5f --- /dev/null +++ b/pkgs/pkgs-lib/formats/configobj/default.nix @@ -0,0 +1,36 @@ +{ + lib, + pkgs, +}: +let + inherit (lib) + toJSON + ; + + inherit (lib.types) + serializableValueWith + ; +in +{ + format = + { }: + { + type = serializableValueWith { typeName = "ConfigObj mapping"; }; + + generate = + name: value: + pkgs.runCommandLocal name + { + nativeBuildInputs = [ + (pkgs.python3.withPackages (ps: [ ps.configobj ])) + ]; + + valuesJSON = toJSON value; + __structuredAttrs = true; + strictDeps = true; + } + '' + printf "%s" "$valuesJSON" | python3 ${./generate.py} > "$out" + ''; + }; +} diff --git a/pkgs/pkgs-lib/formats/configobj/generate.py b/pkgs/pkgs-lib/formats/configobj/generate.py new file mode 100644 index 000000000000..5863396c120d --- /dev/null +++ b/pkgs/pkgs-lib/formats/configobj/generate.py @@ -0,0 +1,7 @@ +import json +import sys +from configobj import ConfigObj + +config = ConfigObj(interpolation=False, encoding="UTF8") +config.update(json.load(sys.stdin)) +config.write(sys.stdout.buffer) diff --git a/pkgs/pkgs-lib/tests/formats.nix b/pkgs/pkgs-lib/tests/formats.nix index 7e3f6457588f..ee6d817287c2 100644 --- a/pkgs/pkgs-lib/tests/formats.nix +++ b/pkgs/pkgs-lib/tests/formats.nix @@ -229,6 +229,110 @@ runBuildTests { ''; }; + configobjAtoms = shouldPass { + format = formats.configobj { }; + input = { + bool = true; + int = 10; + float = 3.141; + str = "string"; + }; + expected = '' + bool = True + float = 3.141 + int = 10 + str = string + ''; + }; + + configobjListWithoutListToValue = shouldPass { + format = formats.configobj { }; + input = { + items = [ + 1 + true + "x" + ]; + }; + expected = '' + items = 1, True, x + ''; + }; + + configobjNestedAttrsets = shouldPass { + format = formats.configobj { }; + input = { + server = { + host = "127.0.0.1"; + port = 8080; + enabled = true; + tags = [ + "web" + "nix" + 42 + ]; + }; + + logging = { + level = "info"; + rotate = true; + }; + + interfaces = { + local = { + address = "123"; + coin = { + foo = "bar"; + }; + }; + remote = { + address = "456"; + }; + }; + }; + expected = '' + [interfaces] + [[local]] + address = 123 + [[[coin]]] + foo = bar + [[remote]] + address = 456 + [logging] + level = info + rotate = True + [server] + enabled = True + host = 127.0.0.1 + port = 8080 + tags = web, nix, 42 + ''; + }; + + configobjNullableValues = shouldPass { + format = formats.configobj { }; + input = { + nullable = null; + nested = { + keep = "ok"; + missing = null; + }; + }; + expected = '' + nullable = None + [nested] + keep = ok + missing = None + ''; + }; + + configobjInvalidAtom = shouldFail { + format = formats.configobj { }; + input = { + function = _: 1; + }; + }; + iniInvalidAtom = shouldFail { format = formats.ini { }; input = { diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index d585c9aa8529..2ec782aa8ee7 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,7 +1,8 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.131" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.138" +gem "getoptlong" gem "syslog", "~> 0.3.0" gem 'mini_portile2', '~> 2.8.0' diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 67268ea9ea24..1b52846420a0 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 69fa9eb257ea532c8e0f6ecd545b7e1257d42899 - ref: refs/tags/6.4.131 + revision: 3c697125a820552a1d5f9e2a75c05c18dc9c53bb + ref: refs/tags/6.4.138 specs: - metasploit-framework (6.4.131) + metasploit-framework (6.4.138) aarch64 abbrev actionpack (~> 7.2.0) @@ -75,7 +75,7 @@ GIT pdf-reader pg puma - rack (~> 2.2) + rack (~> 3.1) railties rasn1 (= 0.14.0) rb-readline @@ -105,16 +105,16 @@ GIT rinda ruby-macho ruby-mysql - ruby_smb (~> 3.3.17) + ruby_smb (~> 3.3.19) rubyntlm rubyzip - sinatra (~> 3.2) + sinatra (~> 4.1) sqlite3 (= 1.7.3) sshkey stringio (= 3.1.1) swagger-blocks syslog - thin (~> 1.x) + thin (~> 2.0) tzinfo tzinfo-data unix-crypt @@ -175,8 +175,8 @@ GEM arel-helpers (2.17.0) activerecord (>= 3.1.0) aws-eventstream (1.4.0) - aws-partitions (1.1245.0) - aws-sdk-core (3.246.0) + aws-partitions (1.1260.0) + aws-sdk-core (3.252.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) @@ -184,24 +184,24 @@ GEM bigdecimal jmespath (~> 1, >= 1.6.1) logger - aws-sdk-ec2 (1.614.0) - aws-sdk-core (~> 3, >= 3.244.0) + aws-sdk-ec2 (1.623.0) + aws-sdk-core (~> 3, >= 3.248.0) aws-sigv4 (~> 1.5) - aws-sdk-ec2instanceconnect (1.70.0) - aws-sdk-core (~> 3, >= 3.244.0) + aws-sdk-ec2instanceconnect (1.73.0) + aws-sdk-core (~> 3, >= 3.248.0) aws-sigv4 (~> 1.5) - aws-sdk-iam (1.143.0) - aws-sdk-core (~> 3, >= 3.244.0) + aws-sdk-iam (1.148.0) + aws-sdk-core (~> 3, >= 3.248.0) aws-sigv4 (~> 1.5) - aws-sdk-kms (1.124.0) - aws-sdk-core (~> 3, >= 3.244.0) + aws-sdk-kms (1.129.0) + aws-sdk-core (~> 3, >= 3.248.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.220.0) - aws-sdk-core (~> 3, >= 3.244.0) + aws-sdk-s3 (1.225.1) + aws-sdk-core (~> 3, >= 3.248.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) - aws-sdk-ssm (1.212.0) - aws-sdk-core (~> 3, >= 3.244.0) + aws-sdk-ssm (1.216.0) + aws-sdk-core (~> 3, >= 3.248.0) aws-sigv4 (~> 1.5) aws-sigv4 (1.12.1) aws-eventstream (~> 1, >= 1.0.2) @@ -211,7 +211,7 @@ GEM benchmark (0.5.0) bigdecimal (4.1.2) bindata (2.4.15) - bootsnap (1.24.3) + bootsnap (1.24.6) msgpack (~> 1.2) bson (5.2.0) builder (3.3.0) @@ -247,11 +247,11 @@ GEM eventmachine (1.2.7) faker (3.8.0) i18n (>= 1.8.11, < 2) - faraday (2.14.1) + faraday (2.14.3) faraday-net_http (>= 2.0, < 3.5) json logger - faraday-net_http (3.4.2) + faraday-net_http (3.4.4) net-http (~> 0.5) faraday-retry (2.4.0) faraday (~> 2.0) @@ -291,7 +291,7 @@ GEM jmespath (1.6.2) jsobfu (0.4.2) rkelly-remix - json (2.19.5) + json (2.19.9) json-schema (6.2.0) addressable (~> 2.8) bigdecimal (>= 3.1, < 5) @@ -306,7 +306,7 @@ GEM lru_redux (1.1.0) mcp (0.13.0) json-schema (>= 4.1) - metasm (1.0.5) + metasm (1.0.6) metasploit-concern (5.0.6) activemodel (>= 7.0, < 8.1) activesupport (>= 7.0, < 8.1) @@ -314,7 +314,7 @@ GEM mutex_m railties (>= 7.0, < 8.1) zeitwerk - metasploit-credential (6.0.23) + metasploit-credential (6.0.26) bigdecimal csv drb @@ -327,7 +327,7 @@ GEM railties rex-socket rubyntlm - rubyzip (< 3.0.0) + rubyzip (>= 3.1.1, < 4.0) metasploit-model (5.0.5) activemodel (>= 7.0, < 8.1) activesupport (>= 7.0, < 8.1) @@ -365,7 +365,7 @@ GEM nessus_rest (0.1.6) net-http (0.9.1) uri (>= 0.11.1) - net-imap (0.6.4) + net-imap (0.6.4.1) date net-protocol net-ldap (0.20.0) @@ -390,7 +390,7 @@ GEM octokit (10.0.0) faraday (>= 1, < 3) sawyer (~> 0.9) - openssl (3.3.2) + openssl (3.3.3) openssl-ccm (1.3.0) openssl (~> 3.0) openssl-cmac (2.1.0) @@ -413,24 +413,25 @@ GEM prettyprint prettyprint (0.2.0) prism (1.9.0) - psych (5.3.1) + psych (5.4.0) date stringio public_suffix (7.0.5) - puma (8.0.1) + puma (8.0.2) nio4r (~> 2.0) racc (1.8.1) - rack (2.2.23) - rack-protection (3.2.0) + rack (3.2.6) + rack-protection (4.2.1) base64 (>= 0.1.0) - rack (~> 2.2, >= 2.2.4) - rack-session (1.0.2) - rack (< 3) + logger (>= 1.6.0) + rack (>= 3.0.0, < 4) + rack-session (2.1.2) + base64 (>= 0.1.0) + rack (>= 3.0.0) rack-test (2.2.0) rack (>= 1.3) - rackup (1.0.1) - rack (< 3) - webrick + rackup (2.3.1) + rack (>= 3) rails-dom-testing (2.3.0) activesupport (>= 5.0.0) minitest @@ -456,7 +457,7 @@ GEM erb psych (>= 4.0.0) tsort - recog (3.1.26) + recog (3.1.29) nokogiri redcarpet (3.6.1) reline (0.6.3) @@ -466,7 +467,7 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rex-arch (0.1.19) + rex-arch (0.1.20) rex-text rex-bin_tools (0.1.16) metasm @@ -509,7 +510,7 @@ GEM metasm rex-core rex-text - rex-socket (0.1.66) + rex-socket (0.1.67) dnsruby rex-core rex-sslscan (0.1.13) @@ -517,7 +518,7 @@ GEM rex-socket rex-text rex-struct2 (0.1.5) - rex-text (0.2.62) + rex-text (0.2.64) bigdecimal rex-zip (0.1.6) rex-text @@ -530,7 +531,7 @@ GEM ruby-macho (5.0.0) ruby-mysql (4.2.1) ruby-rc4 (0.1.5) - ruby_smb (3.3.19) + ruby_smb (3.3.21) bindata (= 2.4.15) openssl-ccm openssl-cmac @@ -538,16 +539,18 @@ GEM windows_error (>= 0.1.4) rubyntlm (0.6.5) base64 - rubyzip (2.4.1) + rubyzip (3.4.0) sawyer (0.9.3) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) securerandom (0.4.1) simpleidn (0.2.3) - sinatra (3.2.0) + sinatra (4.2.1) + logger (>= 1.6.0) mustermann (~> 3.0) - rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.2.0) + rack (>= 3.0.0, < 4) + rack-protection (= 4.2.1) + rack-session (>= 2.0.0, < 3) tilt (~> 2.0) sqlite3 (1.7.3) mini_portile2 (~> 2.8.0) @@ -557,10 +560,11 @@ GEM swagger-blocks (3.0.0) syslog (0.3.0) logger - thin (1.8.2) + thin (2.0.1) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) - rack (>= 1, < 3) + logger + rack (>= 1, < 4) thor (1.5.0) tilt (2.7.0) timeout (0.6.1) @@ -576,7 +580,7 @@ GEM warden (1.2.9) rack (>= 2.0.9) webrick (1.9.2) - websocket-driver (0.8.0) + websocket-driver (0.8.1) base64 websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -598,12 +602,13 @@ GEM xmlrpc (0.3.4) rexml webrick - zeitwerk (2.7.5) + zeitwerk (2.8.2) PLATFORMS ruby DEPENDENCIES + getoptlong metasploit-framework! mini_portile2 (~> 2.8.0) syslog (~> 0.3.0) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 79373b655e7e..72b90c13cf11 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "metasploit-framework"; - version = "6.4.131"; + version = "6.4.138"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; tag = finalAttrs.version; - hash = "sha256-7u03A8H5vLQXekVLQ6oQtLwC6SW0JLqk37GUyjgtiZU="; + hash = "sha256-T1wo7sBcUXdVfcd0ipgYgJaOPwk4YMch45fGBrZB4gs="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 5ea6776a5ce2..b6f5bc69f171 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -124,80 +124,80 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ipmr7n0affhj0y08a049wyz3n480i92y2s49v6qgsxs86y02dbi"; + sha256 = "0yik5fxc7cvz1qi5w1idim1d47wf110k3q1rix9jc081prwzynh4"; type = "gem"; }; - version = "1.1245.0"; + version = "1.1260.0"; }; aws-sdk-core = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1k6xqkipjli9vl40d4wqxcl7035lav9f9hnczilhwmj8i7n68f1r"; + sha256 = "074awkbb7rs9332vvxifxndrjambxf1bkj8w8hwj5krazk5l5h09"; type = "gem"; }; - version = "3.246.0"; + version = "3.252.0"; }; aws-sdk-ec2 = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0qq191bqffds55aw0dpi7iyl9135p12gj52ianrkan4l5l0bmwkb"; + sha256 = "1q7vdkpf7hdrmnmrzkzwp34rpn1w6d2r1ww8mb509kyknj0w4akc"; type = "gem"; }; - version = "1.614.0"; + version = "1.623.0"; }; aws-sdk-ec2instanceconnect = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ln5gqbni3z635k5fxvajn05mbx9j1i6qd20x7dblkxcryy7dmyi"; + sha256 = "05y3jzikzlwmm6hgjm37xdgmy05nml5pv3vqj3v38s7lqibymca0"; type = "gem"; }; - version = "1.70.0"; + version = "1.73.0"; }; aws-sdk-iam = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "14lhz5awd4g7nyaqq7vdigsw45r1vz7vbmkfhgp3946pxiib6cv5"; + sha256 = "06pspb80vy866gy7qi9i10m2pf8kyljxqq4xhcq88pm2pi306d4y"; type = "gem"; }; - version = "1.143.0"; + version = "1.148.0"; }; aws-sdk-kms = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0z7k84m1wqf2zra9pm5xb8lndwj6npfd02r743b9zr6p0svhml20"; + sha256 = "0hrkb8ar61zgswz16rcf1x00n1liwn236lh5zpya9x11yf6m8grn"; type = "gem"; }; - version = "1.124.0"; + version = "1.129.0"; }; aws-sdk-s3 = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0z4cl87lbyw9qgp1l52sbjnysw63zmxih9wfhjfdvv67d9gdlzr3"; + sha256 = "04k5wasssinx66vws2jn4vhzfisg30mkhbdmcs3m99dhp66kmcnl"; type = "gem"; }; - version = "1.220.0"; + version = "1.225.1"; }; aws-sdk-ssm = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1nkv1vz1ziw7myj20cdvha0bw36ax3bw98bj8v8jkqzqhkkpq4w9"; + sha256 = "0b5n97zwv8zj2rx392wplakgrh2z45npcwxllkjml0l3s4rv00vx"; type = "gem"; }; - version = "1.212.0"; + version = "1.216.0"; }; aws-sigv4 = { groups = [ "default" ]; @@ -274,10 +274,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1n6a9m8rb20yzb20w89fkjgggm2lzf1vl6ha5fjhlbvyb4h3vypp"; + sha256 = "0jhnvalyqhjv10y2m804z2s9wabmys4a4di6187jjch3qy4an2y6"; type = "gem"; }; - version = "1.24.3"; + version = "1.24.6"; }; bson = { groups = [ "default" ]; @@ -504,20 +504,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "077n5ss3z3ds4vj54w201kd12smai853dp9c9n7ii7g3q7nwwg54"; + sha256 = "0y7j6yzv07zggic6g0p2v1ivnvkzsbqjnfdl4215qqb6cxz290hq"; type = "gem"; }; - version = "2.14.1"; + version = "2.14.3"; }; faraday-net_http = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0v4hfmc7d4lrqqj2wl366rm9551gd08zkv2ppwwnjlnkc217aizi"; + sha256 = "125m3qri52vwh5v9dhq0dkqxf8629cxrf99yyc01pva72wasyy0f"; type = "gem"; }; - version = "3.4.2"; + version = "3.4.4"; }; faraday-retry = { groups = [ "default" ]; @@ -744,10 +744,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0n9ch455pnvl9vxs2f3j77bpdmxg5g3mn3vyr9wxa0a87raii2i1"; + sha256 = "16mp8vzgxa8nsa81np042za453j8b0ihpjkf666s7byxrnvjb44v"; type = "gem"; }; - version = "2.19.5"; + version = "2.19.9"; }; json-schema = { groups = [ "default" ]; @@ -824,10 +824,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0dpjbkdvi4h6v0g01db7vlcsg15pfiyslkz3zd7wfk04yrc6g7wi"; + sha256 = "1j6c64fnsifna8x7b6bcpb286fiiapn7fnqrc1zwpxjdw78fg1mg"; type = "gem"; }; - version = "1.0.5"; + version = "1.0.6"; }; metasploit-concern = { groups = [ "default" ]; @@ -844,22 +844,22 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1czk0s3nrf0a2f72l1jg81fdi9a91bfw88m6y11xsm2g1wpw8x1f"; + sha256 = "10gkaf04nbiya1rd2pxasap451sn91ykwn4ja3qa7sbpwhiavymy"; type = "gem"; }; - version = "6.0.23"; + version = "6.0.26"; }; metasploit-framework = { groups = [ "default" ]; platforms = [ ]; source = { fetchSubmodules = false; - rev = "69fa9eb257ea532c8e0f6ecd545b7e1257d42899"; - sha256 = "15c95lwcm55ivyjbl95l4plh5g5l22m46js5g8bv9g7rq41kgvgf"; + rev = "3c697125a820552a1d5f9e2a75c05c18dc9c53bb"; + sha256 = "02z286v0dilpwchwfq1q14zqx5l032c8lx67gmapflawq3p2hp2g"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.4.131"; + version = "6.4.138"; }; metasploit-model = { groups = [ "default" ]; @@ -1016,10 +1016,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ax0f0r97jm83q462vsrcbdxprs894fyyc44v62c48ihgb39hmcs"; + sha256 = "03ga2h4i5hsk8pdlicyfvqfsbh55vrbikb0nkx9x7vx7fl6kdw19"; type = "gem"; }; - version = "0.6.4"; + version = "0.6.4.1"; }; net-ldap = { groups = [ "default" ]; @@ -1150,10 +1150,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0v0grpg9gi59zr3imxy1745k9rp3dd095mkir8gvxi69blhh2kkz"; + sha256 = "0dfkwb2n4l7wrcal4f8niadvphhi181jdf7s48qw31r9iw9h4sfl"; type = "gem"; }; - version = "3.3.2"; + version = "3.3.3"; }; openssl-ccm = { groups = [ "default" ]; @@ -1290,10 +1290,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0x0r3gc66abv8i4dw0x0370b5hrshjfp6kpp7wbp178cy775fypb"; + sha256 = "1dx5bc3s1mb1i53np4cdkypg7ccygnvagr3hglyndbqilrljvxql"; type = "gem"; }; - version = "5.3.1"; + version = "5.4.0"; }; public_suffix = { groups = [ "default" ]; @@ -1310,10 +1310,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0z6k79ns8wgz12k3m2r0jc9ddiq6zh8imr4azg0ihmv50w6fb53v"; + sha256 = "1yw6nvkvddriacmva8hm0za0961d6j96dm7zm6748rmyzcfqgvf8"; type = "gem"; }; - version = "8.0.1"; + version = "8.0.2"; }; racc = { groups = [ "default" ]; @@ -1330,30 +1330,30 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "175ni9qsai9x2ykwvdbd5dzfyncaxpyn6dhjxjw70iq60xz9vzm8"; + sha256 = "1hhjy9gcp52dzij05gmidqac8g28ski5xm67prwmdqmjfcgqxmsy"; type = "gem"; }; - version = "2.2.23"; + version = "3.2.6"; }; rack-protection = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1zzvivmdb4dkscc58i3gmcyrnypynsjwp6xgc4ylarlhqmzvlx1w"; + sha256 = "1b4bamcbpk29i7jvly3i7ayfj69yc1g03gm4s7jgamccvx12hvng"; type = "gem"; }; - version = "3.2.0"; + version = "4.2.1"; }; rack-session = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0xhxhlsz6shh8nm44jsmd9276zcnyzii364vhcvf0k8b8bjia8d0"; + sha256 = "1s7zcxlmg88a6dam4aqbgk9xkpy6dkdfqmmcszkkliy3q3w38m2r"; type = "gem"; }; - version = "1.0.2"; + version = "2.1.2"; }; rack-test = { groups = [ "default" ]; @@ -1370,10 +1370,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0jf2ncj2nx56vh96hh2nh6h4r530nccxh87z7c2f37wq515611ms"; + sha256 = "0s48d2a0z5f0cg4npvzznf933vipi6j7gmk16yc913kpadkw4ybc"; type = "gem"; }; - version = "1.0.1"; + version = "2.3.1"; }; rails-dom-testing = { groups = [ "default" ]; @@ -1450,10 +1450,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1b7kx4d9gmifph452fflx0ddp1bns53sb4p3xp4qnaw0ix4s6wm7"; + sha256 = "115v9cgqf7l66rybv9846dfhs0fma475jn8akcpxgb85wy1q4ma5"; type = "gem"; }; - version = "3.1.26"; + version = "3.1.29"; }; redcarpet = { groups = [ "default" ]; @@ -1490,10 +1490,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "080avj9lqd7pr3g3cfrs4sh22c2fadhzc4q72plfsh13cfgchflz"; + sha256 = "0b9svs55zi4bi53wj792qc43d1gjn1p96sb36ikr7f4pfz13yry7"; type = "gem"; }; - version = "0.1.19"; + version = "0.1.20"; }; rex-bin_tools = { groups = [ "default" ]; @@ -1620,10 +1620,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0qjvlk214vm2nj5kxw47iy595vai0pp9x4c5vns2nlllij21734x"; + sha256 = "18khrgjlkzwy91jc67rparjw22jbf1p7wwk5qh8nm9i8nbzm5f54"; type = "gem"; }; - version = "0.1.66"; + version = "0.1.67"; }; rex-sslscan = { groups = [ "default" ]; @@ -1650,10 +1650,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0b3pr6v6b376ca40xsixbsg5qvnzkjsr3yqn9693gl0543dx2gp7"; + sha256 = "0fbrnxsbrqvy799ppizyg9hdklml5j9mv7480lcnw4366a7mz0a5"; type = "gem"; }; - version = "0.2.62"; + version = "0.2.64"; }; rex-zip = { groups = [ "default" ]; @@ -1730,10 +1730,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "14k7yqad3cbg82y6yl0xxdbkhq9abxa7knffn0xz3jk9vk7ql56v"; + sha256 = "0v63xqvlkprvxmlwav43qlkdffvr4bbhk6im0978l9w5qyqd1fdn"; type = "gem"; }; - version = "3.3.19"; + version = "3.3.21"; }; rubyntlm = { groups = [ "default" ]; @@ -1750,10 +1750,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "05an0wz87vkmqwcwyh5rjiaavydfn5f4q1lixcsqkphzvj7chxw5"; + sha256 = "0yzmmwya4zis5f7zkhhp8p92m1xh2sg6rlbnlhsvc0m3xg4rpqvd"; type = "gem"; }; - version = "2.4.1"; + version = "3.4.0"; }; sawyer = { groups = [ "default" ]; @@ -1790,10 +1790,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "01wq20aqk5kfggq3wagx5xr1cz0x08lg6dxbk9yhd1sf0d6pywkf"; + sha256 = "103h6wjpcqp3i034hi44za2v365yz7qk9s5df8lmasq43nqvkbmp"; type = "gem"; }; - version = "3.2.0"; + version = "4.2.1"; }; sqlite3 = { groups = [ "default" ]; @@ -1860,10 +1860,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "08g1yq6zzvgndj8fd98ah7pp8g2diw28p8bfjgv7rvjvp8d2am8w"; + sha256 = "1sddrm5n8jfvyqcmfhxrif6jsp1vla4wv9sx9f3c7xbphdjfbgav"; type = "gem"; }; - version = "1.8.2"; + version = "2.0.1"; }; thor = { groups = [ "default" ]; @@ -1990,10 +1990,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0qj9dmkmgahmadgh88kydb7cv15w13l1fj3kk9zz28iwji5vl3gd"; + sha256 = "15idgibqpdaj97f734drx8a7k1jcc8wvxlk2nbafac72ihikicjs"; type = "gem"; }; - version = "0.8.0"; + version = "0.8.1"; }; websocket-extensions = { groups = [ "default" ]; @@ -2060,9 +2060,9 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1pbkiwwla5gldgb3saamn91058nl1sq1344l5k36xsh9ih995nnq"; + sha256 = "04hx33lsnp4q0qf8982mz0acs1dap5s2bsmihi0n0g08249sc4kj"; type = "gem"; }; - version = "2.7.5"; + version = "2.8.2"; }; } diff --git a/pkgs/tools/security/metasploit/update.sh b/pkgs/tools/security/metasploit/update.sh index 76d7cf0ca945..ccebeebf7742 100755 --- a/pkgs/tools/security/metasploit/update.sh +++ b/pkgs/tools/security/metasploit/update.sh @@ -4,11 +4,14 @@ set -eu -o pipefail cd "$(dirname "$(readlink -f "$0")")" -latest=$(curl https://github.com/rapid7/metasploit-framework/tags.atom | xmlstarlet sel -N atom="http://www.w3.org/2005/Atom" -t -m /atom:feed/atom:entry -v atom:title -n | head -n1) +latest=$(curl -sL https://github.com/rapid7/metasploit-framework/tags.atom | xmlstarlet sel -N atom="http://www.w3.org/2005/Atom" -t -m /atom:feed/atom:entry -v atom:title -n | head -n1) echo "Updating metasploit to $latest" sed -i "s#refs/tags/.*#refs/tags/$latest\"#" Gemfile +# Remove stale bundler git cache so bundle lock fetches the updated tags +find "${XDG_DATA_HOME:-$HOME/.local/share}/gem/ruby" -maxdepth 4 -type d -name "metasploit-framework-*" -exec rm -rf {} + 2>/dev/null || true + BUNDLE_FORCE_RUBY_PLATFORM=true bundle lock --update bundix sed -i '/[ ]*dependencies =/d' gemset.nix diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ccfc72823133..3d514fe34a78 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2270,6 +2270,7 @@ mapAliases { varnish77 = throw "varnish 7.7 is EOL. Please upgrade to 'varnish80' or 'vinyl-cache_9'."; # Added 2026-05-01 varnish77Packages = throw "varnish 7.7 is EOL. Please upgrade to 'varnish80' or 'vinyl-cache_9'."; # Added 2026-05-01 vaultwarden-vault = throw "'vaultwarden-vault' has been renamed to/replaced by 'vaultwarden.webvault'"; # Converted to throw 2025-10-27 + vazir-fonts = throw "'vazir-fonts' has been renamed to 'vazirmatn'"; # Added 2026-06-15 vbetool = throw "'vbetool' has been removed as it is broken and not maintained upstream."; # Added 2025-06-11 vboot_reference = vboot-utils; # Added 2025-11-01 vc_0_7 = throw "'vc_0_7' has been removed as it was broken, unused in nixpkgs and unmaintained"; # Added 2025-10-20 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10c6ab434f02..7ef8e80ffb41 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -243,14 +243,6 @@ with pkgs; in recurseIntoAttrs arrayUtilitiesPackages; - addBinToPathHook = callPackage ( - { makeSetupHook }: - makeSetupHook { - name = "add-bin-to-path-hook"; - meta.license = lib.licenses.mit; - } ../build-support/setup-hooks/add-bin-to-path.sh - ) { }; - aider-chat-with-playwright = aider-chat.withOptional { withPlaywright = true; }; aider-chat-with-browser = aider-chat.withOptional { withBrowser = true; }; @@ -261,51 +253,14 @@ with pkgs; aider-chat-full = aider-chat.withOptional { withAll = true; }; - autoreconfHook = callPackage ( - { - makeSetupHook, - autoconf, - automake, - gettext, - libtool, - }: - makeSetupHook { - name = "autoreconf-hook"; - propagatedBuildInputs = [ - autoconf - automake - gettext - libtool - ]; - meta.license = lib.licenses.mit; - } ../build-support/setup-hooks/autoreconf.sh - ) { }; - autoreconfHook269 = autoreconfHook.override { autoconf = autoconf269; }; - autoPatchelfHook = makeSetupHook { - name = "auto-patchelf-hook"; - propagatedBuildInputs = [ - auto-patchelf - bintools - ]; - substitutions = { - hostPlatform = stdenv.hostPlatform.config; - }; - } ../build-support/setup-hooks/auto-patchelf.sh; - appimageTools = callPackage ../build-support/appimage { }; appimageupdate-qt = appimageupdate.override { withQtUI = true; }; - stripJavaArchivesHook = makeSetupHook { - name = "strip-java-archives-hook"; - propagatedBuildInputs = [ strip-nondeterminism ]; - meta.license = lib.licenses.mit; - } ../build-support/setup-hooks/strip-java-archives.sh; - ensureNewerSourcesHook = { year }: makeSetupHook @@ -352,15 +307,6 @@ with pkgs; meta.license = lib.licenses.mit; } ../build-support/setup-hooks/update-autotools-gnu-config-scripts.sh; - gogUnpackHook = makeSetupHook { - name = "gog-unpack-hook"; - propagatedBuildInputs = [ - innoextract - file-rename - ]; - meta.license = lib.licenses.mit; - } ../build-support/setup-hooks/gog-unpack.sh; - buildEnv = callPackage ../build-support/buildenv { }; # not actually a package buildFHSEnv = buildFHSEnvBubblewrap; @@ -434,11 +380,6 @@ with pkgs; diffPlugins = (callPackage ../build-support/plugins.nix { }).diffPlugins; - dieHook = makeSetupHook { - name = "die-hook"; - meta.license = lib.licenses.mit; - } ../build-support/setup-hooks/die.sh; - devShellTools = callPackage ../build-support/dev-shell-tools { }; dockerTools = callPackage ../build-support/docker { @@ -842,12 +783,6 @@ with pkgs; setupSystemdUnits = callPackage ../build-support/setup-systemd-units.nix { }; - shortenPerlShebang = makeSetupHook { - name = "shorten-perl-shebang-hook"; - propagatedBuildInputs = [ dieHook ]; - meta.license = lib.licenses.mit; - } ../build-support/setup-hooks/shorten-perl-shebang.sh; - singularity-tools = callPackage ../build-support/singularity-tools { }; srcOnly = callPackage ../build-support/src-only { }; @@ -900,27 +835,6 @@ with pkgs; inherit (lib.systems) platforms; - setJavaClassPath = makeSetupHook { - name = "set-java-classpath-hook"; - meta.license = lib.licenses.mit; - } ../build-support/setup-hooks/set-java-classpath.sh; - - fixDarwinDylibNames = callPackage ( - { - lib, - targetPackages, - makeSetupHook, - }: - makeSetupHook { - name = "fix-darwin-dylib-names-hook"; - substitutions = { inherit (targetPackages.stdenv.cc) targetPrefix; }; - meta = { - platforms = lib.platforms.darwin; - license = lib.licenses.mit; - }; - } ../build-support/setup-hooks/fix-darwin-dylib-names.sh - ) { }; - writeDarwinBundle = callPackage ../build-support/make-darwin-bundle/write-darwin-bundle.nix { }; desktopToDarwinBundle = makeSetupHook { @@ -8667,10 +8581,6 @@ with pkgs; codeblocksFull = codeblocks.override { contribPlugins = true; }; - cudatext-qt = callPackage ../applications/editors/cudatext { widgetset = "qt5"; }; - cudatext-gtk = callPackage ../applications/editors/cudatext { widgetset = "gtk2"; }; - cudatext = cudatext-qt; - darcs = haskell.lib.compose.disableCabalFlag "library" ( haskell.lib.compose.justStaticExecutables haskellPackages.darcs );