diff options
668 files changed, 4745 insertions, 4247 deletions
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 85561029c86a..45a55eb45dce 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -38,10 +38,3 @@ For new packages please briefly describe the package or provide a link to its ho [nixos/tests]: https://github.com/NixOS/nixpkgs/blob/master/nixos/tests [pkgs/README.md]: https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md [pkgs/test]: https://github.com/NixOS/nixpkgs/blob/master/pkgs/test - ---- - -Add a :+1: [reaction] to [pull requests you find important]. - -[reaction]: https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/ -[pull requests you find important]: https://github.com/NixOS/nixpkgs/pulls?q=is%3Aopen+sort%3Areactions-%2B1-desc diff --git a/maintainers/README.md b/maintainers/README.md index dee6bde1fae9..5a4009055aa6 100644 --- a/maintainers/README.md +++ b/maintainers/README.md @@ -145,18 +145,11 @@ When adding users to [`maintainer-list.nix`](./maintainer-list.nix), the followi Feel free to create a new maintainer team in [`team-list.nix`](./team-list.nix) when a group is collectively responsible for a collection of packages. Use taste and personal judgment when deciding if a team is warranted. -Teams are allowed to define their own rules about membership. +Teams should be organised around areas of maintenance interest and expertise, rather than employer or participation in another project or organization. +For example, a team dedicated to maintaining support for a desktop environment or programming language in Nixpkgs makes sense, as does a team to maintain packaging of software from a given vendor, but a team exclusive to employees of a company or maintainers of another project does not. -For example, some teams will represent a business or other group which wants to carefully track its members. -Other teams may be very open about who can join, and allow anybody to participate. - -When reviewing changes to a team, read the team's scope and the context around the member list for indications about the team's membership policy. - -In any case, request reviews from the existing team members. -If the team lists no specific membership policy, feel free to merge changes to the team after giving the existing members a few days to respond. - -> [!IMPORTANT] -> If a team says it is a closed group, do not merge additions to the team without an approval by at least one existing member. +When reviewing changes to a team, request reviews from the existing team members. +Feel free to merge changes to the team if the existing members are unresponsive. #### Synced GitHub teams diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ef50ebc387ae..a7f18929b11b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1989,12 +1989,6 @@ githubId = 25783780; name = "aos"; }; - apeschar = { - email = "albert@peschar.net"; - github = "apeschar"; - githubId = 122977; - name = "Albert Peschar"; - }; apeyroux = { email = "alex@px.io"; github = "apeyroux"; @@ -6729,12 +6723,6 @@ githubId = 392583; name = "Dirk-Willem van Gulik"; }; - disassembler = { - email = "disasm@gmail.com"; - github = "disassembler"; - githubId = 651205; - name = "Samuel Leathers"; - }; disserman = { email = "disserman@gmail.com"; github = "divi255"; @@ -7194,12 +7182,6 @@ name = "Louis Orleans"; keys = [ { fingerprint = "llSOkL8Tn5+LOmWa4PDci+dQXZIRy11NSumDiFzNkAM"; } ]; }; - dudymas = { - email = "jeremy.white@cloudposse.com"; - github = "dudymas"; - githubId = 928448; - name = "Jeremy White"; - }; dukc = { email = "ajieskola@gmail.com"; github = "dukc"; @@ -7653,12 +7635,6 @@ githubId = 161958668; name = "Élise Souche"; }; - elitak = { - email = "elitak@gmail.com"; - github = "elitak"; - githubId = 769073; - name = "Eric Litak"; - }; elizagamedev = { email = "eliza@eliza.sh"; github = "elizagamedev"; @@ -8647,6 +8623,13 @@ githubId = 52276064; name = "figboy9"; }; + figsoda = { + email = "figsoda@pm.me"; + matrix = "@figsoda:matrix.org"; + github = "figsoda"; + githubId = 40620903; + name = "figsoda"; + }; fionera = { email = "nix@fionera.de"; github = "fionera"; @@ -11291,12 +11274,6 @@ name = "Antoine Labarussias"; keys = [ { fingerprint = "5CB5 9AA0 D180 1997 2FB3 E0EC 943A 1DE9 372E BE4E"; } ]; }; - invokes-su = { - email = "nixpkgs-commits@deshaw.com"; - github = "invokes-su"; - githubId = 88038050; - name = "Souvik Sen"; - }; io12 = { github = "io12"; githubId = 7348004; @@ -16057,13 +16034,6 @@ githubId = 7802795; name = "Manoj Karthick"; }; - manveru = { - email = "m.fellinger@gmail.com"; - matrix = "@manveru:matrix.org"; - github = "manveru"; - githubId = 3507; - name = "Michael Fellinger"; - }; maolonglong = { email = "shaolong.chen@outlook.it"; github = "maolonglong"; @@ -17362,6 +17332,12 @@ githubId = 20436235; name = "Billy Zaelani Malik"; }; + mio = { + name = "Mio"; + email = "mio@mio19.uk"; + github = "mio-19"; + githubId = 57285379; + }; mir06 = { email = "armin.leuprecht@uni-graz.at"; github = "mir06"; @@ -19142,18 +19118,6 @@ githubId = 3521180; name = "Tom Sydney Kerckhove"; }; - normalcea = { - name = "normalcea"; - email = "normalc@posteo.net"; - github = "normalcea"; - githubId = 190049873; - keys = [ - { - fingerprint = "6057 1155 7BA4 B922 66D6 2064 3DE3 BCB2 142A 8C71"; - } - ]; - matrix = "@normalcea:matrix.org"; - }; norpol = { name = "Syd Lightyear"; email = "norpol+nixpkgs@exaple.org"; @@ -23448,12 +23412,6 @@ githubId = 30531572; name = "Robert James Hernandez"; }; - sargon = { - email = "danielehlers@mindeye.net"; - github = "sargon"; - githubId = 178904; - name = "Daniel Ehlers"; - }; sarunint = { email = "nixpkgs@sarunint.com"; github = "sarunint"; @@ -25224,12 +25182,6 @@ githubId = 45735; keys = [ { fingerprint = "0AFE 77F7 474D 1596 EE55 7A29 1D9A 17DF D23D CB91"; } ]; }; - stesie = { - email = "stesie@brokenpipe.de"; - github = "stesie"; - githubId = 113068; - name = "Stefan Siegl"; - }; steve-chavez = { email = "stevechavezast@gmail.com"; github = "steve-chavez"; @@ -25871,11 +25823,6 @@ githubId = 156964; name = "Thomas Boerger"; }; - tbwanderer = { - github = "tbwanderer"; - githubId = 125365236; - name = "Ice Layer"; - }; tc-kaluza = { github = "tc-kaluza"; githubId = 101565936; @@ -27555,6 +27502,13 @@ githubId = 27813; name = "Vincent Breitmoser"; }; + valpackett = { + email = "val@invisiblethingslab.com"; + github = "valpackett"; + githubId = 208340; + matrix = "@valpackett:mozilla.org"; + name = "Val Packett"; + }; vamega = { email = "github@madiathv.com"; github = "vamega"; @@ -27711,12 +27665,6 @@ githubId = 116078858; keys = [ { fingerprint = "CDEA 7E04 69E3 0885 A754 4B05 0104 BC05 F41B 77B8"; } ]; }; - victormeriqui = { - name = "Victor Meriqui"; - email = "victor.meriqui@ororatech.com"; - github = "victormeriqui"; - githubId = 1396008; - }; videl = { email = "thibaut.smith@mailbox.org"; github = "videl"; @@ -28392,12 +28340,6 @@ githubId = 78392041; name = "Winter"; }; - wintrmvte = { - name = "Jakub Lutczyn"; - email = "kubalutczyn@gmail.com"; - github = "wintrmvte"; - githubId = 41823252; - }; wirew0rm = { email = "alex@wirew0rm.de"; github = "wirew0rm"; @@ -28537,12 +28479,6 @@ github = "wrrrzr"; githubId = 161970349; }; - wr0belj = { - name = "Jakub Wróbel"; - email = "wrobel.jakub@protonmail.com"; - github = "wr0belj"; - githubId = 40501814; - }; wr7 = { name = "wr7"; email = "d-wr7@outlook.com"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index fe37f175fff7..f12ce735d58a 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -141,13 +141,6 @@ with lib.maintainers; enableFeatureFreezePing = true; }; - cloudposse = { - members = [ dudymas ]; - scope = "Maintain atmos and applications made by the Cloud Posse team."; - shortName = "CloudPosse"; - enableFeatureFreezePing = true; - }; - coq = { members = [ cohencyril @@ -195,17 +188,6 @@ with lib.maintainers; enableFeatureFreezePing = true; }; - deshaw = { - # Verify additions to this team with at least one already existing member of the team. - members = [ - de11n - despsyched - invokes-su - ]; - scope = "Group registration for D. E. Shaw employees who collectively maintain packages."; - shortName = "D. E. Shaw employees"; - }; - dhall = { members = [ Gabriella439 @@ -363,17 +345,6 @@ with lib.maintainers; enableFeatureFreezePing = true; }; - helsinki-systems = { - # Verify additions to this team with at least one already existing member of the team. - members = [ - das_j - conni2461 - helsinki-Jo - ]; - scope = "Group registration for packages maintained by Helsinki Systems"; - shortName = "Helsinki Systems employees"; - }; - home-assistant = { members = [ dotlambda @@ -395,16 +366,6 @@ with lib.maintainers; shortName = "Infisical"; }; - iog = { - members = [ - cleverca22 - disassembler - manveru - ]; - scope = "Input-Output Global employees, which maintain critical software"; - shortName = "Input-Output Global employees"; - }; - java = { github = "java"; enableFeatureFreezePing = true; @@ -556,18 +517,6 @@ with lib.maintainers; shortName = "Matrix"; }; - mercury = { - members = [ - _9999years - Gabriella439 - curran - lf- - jkachmar - ]; - scope = "Group registry for packages maintained by Mercury"; - shortName = "Mercury Employees"; - }; - minimal-bootstrap = { members = [ alejandrosame @@ -680,17 +629,6 @@ with lib.maintainers; shortName = "OpenStack"; }; - ororatech = { - # email: nixdevs@ororatech.com - shortName = "OroraTech GmbH. employees"; - scope = "Team for packages maintained by employees of OroraTech GmbH."; - # Edits to this list should only be done by an already existing member. - members = [ - kip93 - victormeriqui - ]; - }; - pantheon = { github = "pantheon"; enableFeatureFreezePing = true; @@ -747,16 +685,6 @@ with lib.maintainers; enableFeatureFreezePing = true; }; - redcodelabs = { - members = [ - unrooted - wr0belj - wintrmvte - ]; - scope = "Maintain Red Code Labs related packages and modules."; - shortName = "Red Code Labs"; - }; - rocm = { github = "rocm"; }; diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json index d35b554cbff8..a7e2010fe10e 100644 --- a/nixos/doc/manual/redirects.json +++ b/nixos/doc/manual/redirects.json @@ -65,12 +65,17 @@ "module-services-keycloak-unix-socket": [ "index.html#module-services-keycloak-unix-socket" ], - "module-services-tandoor-recipes-migrating-media-option-1": [ + "module-services-tandoor-recipes-migrating-media-option-move": [ + "index.html#module-services-tandoor-recipes-migrating-media-option-move", "index.html#module-services-tandoor-recipes-migrating-media-option-1" ], - "module-services-tandoor-recipes-migrating-media-option-2": [ + "module-services-tandoor-recipes-migrating-media-option-postgresql": [ + "index.html#module-services-tandoor-recipes-migrating-media-option-postgresql", "index.html#module-services-tandoor-recipes-migrating-media-option-2" ], + "module-services-tandoor-recipes-migrating-media-option-disallow-access": [ + "index.html#module-services-tandoor-recipes-migrating-media-option-disallow-access" + ], "sec-override-nixos-test": [ "index.html#sec-override-nixos-test" ], diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md index 534bc7a9a09a..fa13d6c7c4f6 100644 --- a/nixos/doc/manual/release-notes/rl-2605.section.md +++ b/nixos/doc/manual/release-notes/rl-2605.section.md @@ -67,6 +67,8 @@ of pulling the upstream container image from Docker Hub. If you want the old beh - `services.cgit` before always had the git-http-backend and its "export all" setting enabled, which sidestepped any access control configured in cgit's settings. Now you have to make a decision and either enable or disable `services.cgit.gitHttpBackend.checkExportOkFiles` (or disable the git-http-backend). +- `rocmPackages_6` has been removed. `rocmPackages` has been updated to ROCm 7.x. Out of tree packages may rely on obsolete hipblas APIs or compile time constant warp size and need to be updated. + - The Bash implementation of the `nixos-rebuild` program is removed. All switchable systems now use the Python rewrite. Any prior usage of `system.rebuild.enableNg` must now be removed. If you have any outstanding issues with the new implementation, please open an issue on GitHub. - `services.desktopManager.gnome` no longer installs the Geary e-mail client since it is not part of the GNOME [core applications](https://apps.gnome.org/) list. Geary's position in the default favorite apps section has been replaced by GNOME Text Editor. To keep it installed, add `programs.geary.enable = true;` to your configuration. diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix index e9955859bffd..aa8f06d1c7f2 100644 --- a/nixos/modules/config/i18n.nix +++ b/nixos/modules/config/i18n.nix @@ -7,19 +7,22 @@ let sanitizeUTF8Capitalization = lang: (lib.replaceStrings [ "utf8" "utf-8" "UTF8" ] [ "UTF-8" "UTF-8" "UTF-8" ] lang); - aggregatedLocales = [ - "${config.i18n.defaultLocale}/${config.i18n.defaultCharset}" - ] - ++ lib.pipe config.i18n.extraLocaleSettings [ - # See description of extraLocaleSettings for why is this ignored here. - (x: lib.removeAttrs x [ "LANGUAGE" ]) - (lib.mapAttrs (n: v: (sanitizeUTF8Capitalization v))) - (lib.mapAttrsToList (LCRole: lang: lang + "/" + (config.i18n.localeCharsets.${LCRole} or "UTF-8"))) - ] - ++ (map sanitizeUTF8Capitalization ( - lib.optionals (builtins.isList config.i18n.extraLocales) config.i18n.extraLocales - )) - ++ (lib.optional (builtins.isString config.i18n.extraLocales) config.i18n.extraLocales); + aggregatedLocales = + lib.optionals (config.i18n.defaultLocale != "C") [ + "${config.i18n.defaultLocale}/${config.i18n.defaultCharset}" + ] + ++ lib.pipe config.i18n.extraLocaleSettings [ + # See description of extraLocaleSettings for why is this ignored here. + (x: lib.removeAttrs x [ "LANGUAGE" ]) + (lib.mapAttrs (n: v: (sanitizeUTF8Capitalization v))) + # C locales are always installed + (lib.filterAttrs (n: v: v != "C")) + (lib.mapAttrsToList (LCRole: lang: lang + "/" + (config.i18n.localeCharsets.${LCRole} or "UTF-8"))) + ] + ++ (map sanitizeUTF8Capitalization ( + lib.optionals (builtins.isList config.i18n.extraLocales) config.i18n.extraLocales + )) + ++ (lib.optional (builtins.isString config.i18n.extraLocales) config.i18n.extraLocales); in { ###### interface @@ -111,6 +114,9 @@ in description = '' Per each {option}`i18n.extraLocaleSettings`, choose the character set to use for it. Essentially defaults to UTF-8 for all of them. + + Note that for a locale category that uses the `C` locale, setting a + character set to it via this setting is ignored. ''; }; diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index f6f99b6218d2..68f6494510cb 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,8 +1,8 @@ { - x86_64-linux = "/nix/store/x30lnlgk1s16rynrfslbf8phr6h6rqf2-nix-2.31.2"; - i686-linux = "/nix/store/ix94q6rrdg6cr4893cjpzdbmibhlm0dv-nix-2.31.2"; - aarch64-linux = "/nix/store/xnybj9lk0kwvmr2va253avanq7m3cpyg-nix-2.31.2"; - riscv64-linux = "/nix/store/33as1vqp8mq36nr5bb5gr7ziw1nf4q1v-nix-riscv64-unknown-linux-gnu-2.31.2"; - x86_64-darwin = "/nix/store/b9dvary8rcljj7ajv1x64hwwch4cvyvp-nix-2.31.2"; - aarch64-darwin = "/nix/store/lvv1j8qbrvlnl3aagcjrhf42d458zgb5-nix-2.31.2"; + x86_64-linux = "/nix/store/mxn3vxpvk2b42kgd08aw4bn27qhf434w-nix-2.31.3"; + i686-linux = "/nix/store/b7d35ifww9683l74ydkb0qhrq6lqcisi-nix-2.31.3"; + aarch64-linux = "/nix/store/ysz7dwmy4zd1zm3wzx5dh9g999xv7pbm-nix-2.31.3"; + riscv64-linux = "/nix/store/avfv2lqbnphj2ap8y5ihg1l0sqhpjll7-nix-riscv64-unknown-linux-gnu-2.31.3"; + x86_64-darwin = "/nix/store/s8lcl6nrd5ia7nr4zx9mg720i9f8qm37-nix-2.31.3"; + aarch64-darwin = "/nix/store/vfjzbcl3kf9jjwh0g2x03cvz2x5hg8py-nix-2.31.3"; } diff --git a/nixos/modules/services/display-managers/ly.nix b/nixos/modules/services/display-managers/ly.nix index d9505c440a43..368a067a4d9a 100644 --- a/nixos/modules/services/display-managers/ly.nix +++ b/nixos/modules/services/display-managers/ly.nix @@ -45,6 +45,8 @@ let xauth_cmd = lib.optionalString xcfg.enable "${pkgs.xorg.xauth}/bin/xauth"; x_cmd = lib.optionalString xcfg.enable xserverWrapper; setup_cmd = dmcfg.sessionData.wrapper; + brightness_up_cmd = "${lib.getExe pkgs.brightnessctl} -q -n s +10%"; + brightness_down_cmd = "${lib.getExe pkgs.brightnessctl} -q -n s 10%-"; }; finalConfig = defaultConfig // cfg.settings; diff --git a/nixos/modules/services/matrix/continuwuity.nix b/nixos/modules/services/matrix/continuwuity.nix index b1aaae05cc39..7651080c91d1 100644 --- a/nixos/modules/services/matrix/continuwuity.nix +++ b/nixos/modules/services/matrix/continuwuity.nix @@ -216,6 +216,8 @@ in startLimitBurst = 5; startLimitIntervalSec = 60; serviceConfig = { + Type = "notify"; + DynamicUser = true; User = cfg.user; Group = cfg.group; diff --git a/nixos/modules/services/misc/tandoor-recipes.md b/nixos/modules/services/misc/tandoor-recipes.md index 762ab56c5c6d..7888805eff70 100644 --- a/nixos/modules/services/misc/tandoor-recipes.md +++ b/nixos/modules/services/misc/tandoor-recipes.md @@ -1,19 +1,53 @@ # Tandoor Recipes {#module-services-tandoor-recipes} -## Dealing with `MEDIA_ROOT` for installations prior 26.05 {#module-services-tandoor-recipes-migrating-media} +## Remediating insecure `MEDIA_ROOT` for installations prior to 26.05 {#module-services-tandoor-recipes-migrating-media} -See https://github.com/NixOS/nixpkgs/issues/338339 for some background. +Tandoor Recipes installations initialized with `system.stateVersion < 26.05` +may suffer from a security vulnerability. To remediate this issue, apply one of +the recommendations below. -### Option 1: Migrate media to new `MEDIA_ROOT` {#module-services-tandoor-recipes-migrating-media-option-1} +See [NixOS/nixpkgs#338339](https://github.com/NixOS/nixpkgs/issues/338339) and +[GHSA-g8w3-p77x-mmxh](https://github.com/NixOS/nixpkgs/security/advisories/GHSA-g8w3-p77x-mmxh) +for some background. + +### Recommended: Move `MEDIA_ROOT` into a subdirectory {#module-services-tandoor-recipes-migrating-media-option-move} + +The issue is only present when `MEDIA_ROOT` is the same as the data directory. Moving it into a subdirectory of `/var/lib/tandoor-recipes` remediates this and any similar issues in the future. 1. Stop the currently running service: `systemctl stop tandoor-recipes.service` 2. Create a media folder. NixOS `26.05` creates the media path at `/var/lib/tandoor-recipes/media` by default, but you may choose any other path as well. `mkdir -p /var/lib/tandoor-recipes/media` 3. Move existing media to the new path: `mv /var/lib/tandoor-recipes/{files,recipes} /var/lib/tandoor-recipes/media` 4. Set `services.tandoor-recipes.extraConfig.MEDIA_ROOT = "/var/lib/tandoor-recipes/media";` in your NixOS configuration (not needed if `system.stateVersion >= 26.05`). -5. Rebuild and switch! +5. If not using `GUNICORN_MEDIA`, update your reverse proxy / web server configuration accordingly. +6. Rebuild and switch! These changes can be reverted by moving the files back into the state directory. -### Option 2: Keep existing directory (may be insecure) {#module-services-tandoor-recipes-migrating-media-option-2} +### Not recommended: Switch to PostgreSQL {#module-services-tandoor-recipes-migrating-media-option-postgresql} + +When using an external database like PostgreSQL (the only other option available in Tandoor Recipes) this issue does not manifest. + +A simple PostgreSQL configuration can be enabled using the option +[`services.tandoor-recipes.database.createLocally`](https://search.nixos.org/options?channel=unstable&show=services.tandoor-recipes.database.createLocally). + +Note that this will require migrating the existing database to PostgreSQL. Refer to the [upstream documentation](https://docs.tandoor.dev/system/migration_sqlite-postgres/) for this procedure. It is important to delete or move the `db.sqlite3` file out of the media path, after this has been done. + +More information on configuring PostgreSQL can be found in the [upstream documentation](https://docs.tandoor.dev/system/configuration/#database). + +Set the following option to ignore the evaluation warnings once `db.sqlite3` has been deleted. + +```nix +{ + services.tandoor-recipes.extraConfig.MEDIA_ROOT = "/var/lib/tandoor-recipes"; +} +``` + +As future releases of Tandoor Recipes could add additional files to the data +directory, this is not a future-proof solution. + +### Not recommended: Disallow access to `db.sqlite3` {#module-services-tandoor-recipes-migrating-media-option-disallow-access} + +When using a web server like nginx, access to this file can be disabled. -To keep the existing directory, set `services.tandoor-recipes.extraConfig.MEDIA_ROOT = "/var/lib/tandoor-recipes";`. +As future releases of Tandoor Recipes could add additional files to the data +directory, this is not a future-proof solution. diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index 3751fa5e57fd..1e21fe20d714 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -104,6 +104,8 @@ in config = mkIf cfg.enable (mkMerge [ { + system.switch.inhibitors.dbus-implementation = cfg.implementation; + environment.etc."dbus-1".source = configDir; environment.pathsToLink = [ diff --git a/nixos/modules/services/system/userborn.nix b/nixos/modules/services/system/userborn.nix index 73b7581bd2b7..f9595fe72654 100644 --- a/nixos/modules/services/system/userborn.nix +++ b/nixos/modules/services/system/userborn.nix @@ -35,6 +35,9 @@ let }; userbornConfigJson = pkgs.writeText "userborn.json" (builtins.toJSON userbornConfig); + userbornStaticFiles = + pkgs.runCommand "static-userborn" { } + "mkdir -p $out; ${lib.getExe cfg.package} ${userbornConfigJson} $out"; immutableEtc = config.system.etc.overlay.enable && !config.system.etc.overlay.mutable; # The filenames created by userborn. @@ -51,12 +54,29 @@ in enable = lib.mkEnableOption "userborn"; + static = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Whether to generate the password files at build time and store them directly + in the system closure, without requiring any services at boot time. + + This is STRICTLY intended for embedded appliance images that only have system + users with manually managed static user IDs, and CANNOT be used with generation + updates. + + WARNING: In this mode, you MUST statically manage user IDs yourself, carefully. + Beware, UID reuse is a serious security issue and it's your responsibility + to avoid it over the entire lifetime of the system. + ''; + }; + package = lib.mkPackageOption pkgs "userborn" { }; passwordFilesLocation = lib.mkOption { type = lib.types.str; - default = if immutableEtc then "/var/lib/nixos" else "/etc"; - defaultText = lib.literalExpression ''if immutableEtc then "/var/lib/nixos" else "/etc"''; + default = if immutableEtc && !cfg.static then "/var/lib/nixos" else "/etc"; + defaultText = lib.literalExpression ''if immutableEtc && !config.services.userborn.static then "/var/lib/nixos" else "/etc"''; description = '' The location of the original password files. @@ -83,8 +103,12 @@ in message = "system.activationScripts.users has to be empty to use userborn"; } { - assertion = immutableEtc -> (cfg.passwordFilesLocation != "/etc"); - message = "When `system.etc.overlay.mutable = false`, `services.userborn.passwordFilesLocation` cannot be set to `/etc`"; + assertion = (immutableEtc && !cfg.static) -> (cfg.passwordFilesLocation != "/etc"); + message = "When `system.etc.overlay.mutable = false` and `services.userborn.static = false`, `services.userborn.passwordFilesLocation` cannot be set to `/etc`"; + } + { + assertion = !(cfg.static && config.system.switch.enable); + message = "You cannot use `services.userborn.static = true` with switchable configurations, it is ONLY indended for appliance images with fully static user IDs"; } ]; @@ -110,7 +134,7 @@ in ) userCfg.users ); - services.userborn = { + services.userborn = lib.mkIf (!cfg.static) { wantedBy = [ "sysinit.target" ]; requiredBy = [ "sysinit-reactivation.target" ]; after = [ @@ -166,20 +190,35 @@ in }; }; - # Statically create the symlinks to passwordFilesLocation when they're not - # inside /etc because we will not be able to do it at runtime in case of an - # immutable /etc! - environment.etc = lib.mkIf (cfg.passwordFilesLocation != "/etc") ( - lib.listToAttrs ( - lib.map ( - file: - lib.nameValuePair file { - source = "${cfg.passwordFilesLocation}/${file}"; - mode = "direct-symlink"; - } - ) passwordFiles - ) - ); + environment.etc = lib.mkMerge [ + (lib.mkIf cfg.static ( + # In static mode, statically drop the files into an immutable /etc. + lib.listToAttrs ( + lib.map ( + file: + lib.nameValuePair file { + source = "${userbornStaticFiles}/${file}"; + mode = if file == "shadow" then "0000" else "0644"; + } + ) passwordFiles + ) + )) + + (lib.mkIf (!cfg.static && cfg.passwordFilesLocation != "/etc") ( + # Statically create the symlinks to passwordFilesLocation when they're not + # inside /etc because we will not be able to do it at runtime in case of a + # (non-static) immutable /etc! + lib.listToAttrs ( + lib.map ( + file: + lib.nameValuePair file { + source = "${cfg.passwordFilesLocation}/${file}"; + mode = "direct-symlink"; + } + ) passwordFiles + ) + )) + ]; }; meta.maintainers = with lib.maintainers; [ nikstur ]; diff --git a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix index 880ae5f55994..597d4951a0db 100644 --- a/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix +++ b/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix @@ -17,7 +17,10 @@ let }; in { - meta.maintainers = teams.helsinki-systems.members; + meta.maintainers = with lib.maintainers; [ + das_j + helsinki-Jo + ]; options.services.icingaweb2 = with types; { enable = mkEnableOption "the icingaweb2 web interface"; diff --git a/nixos/modules/services/web-apps/part-db.nix b/nixos/modules/services/web-apps/part-db.nix index 6f713d905141..b4b128dfa03d 100644 --- a/nixos/modules/services/web-apps/part-db.nix +++ b/nixos/modules/services/web-apps/part-db.nix @@ -153,6 +153,9 @@ in // cfg.poolConfig; }; + # Required for symphony + part-db.settings.APP_SHARE_DIR = "/var/lib/part-db/share"; + postgresql = mkIf cfg.enablePostgresql { enable = true; ensureUsers = [ @@ -173,7 +176,7 @@ in root = "${pkg}/public"; locations = { "/" = { - tryFiles = "$uri $uri/ /index.php"; + tryFiles = "$uri $uri/ /index.php?$query_string"; index = "index.php"; extraConfig = '' sendfile off; diff --git a/nixos/modules/system/activation/switchable-system.nix b/nixos/modules/system/activation/switchable-system.nix index 0b840c978fb8..f6aeb70d7aa4 100644 --- a/nixos/modules/system/activation/switchable-system.nix +++ b/nixos/modules/system/activation/switchable-system.nix @@ -32,12 +32,12 @@ }; inhibitors = lib.mkOption { - type = lib.types.listOf lib.types.pathInStore; - default = [ ]; + type = lib.types.attrsOf lib.types.str; + default = { }; description = '' - List of derivations that will prevent switching into a configuration when + Attribute set of strings that will prevent switching into a configuration when they change. - This can be manually overridden on the command line if required. + The switch can be manually forced on the command line if required. ''; }; }; @@ -67,80 +67,86 @@ ln -s ${config.system.build.inhibitSwitch} $out/switch-inhibitors ''; - build.inhibitSwitch = pkgs.writeTextFile { - name = "switch-inhibitors"; - text = lib.concatMapStringsSep "\n" (drv: drv.outPath) config.system.switch.inhibitors; - }; + build.inhibitSwitch = pkgs.writers.writeJSON "switch-inhibitors" config.system.switch.inhibitors; preSwitchChecks.switchInhibitors = let realpath = lib.getExe' pkgs.coreutils "realpath"; - sha256sum = lib.getExe' pkgs.coreutils "sha256sum"; - diff = lib.getExe' pkgs.diffutils "diff"; + mktemp = lib.getExe' pkgs.coreutils "mktemp"; + rm = lib.getExe' pkgs.coreutils "rm"; + jq = lib.getExe' pkgs.jq "jq"; in - lib.mkIf (lib.length config.system.switch.inhibitors > 0) - # bash - '' - incoming="''${1-}" - action="''${2-}" - - if [ "$action" == "boot" ]; then - echo "Not checking switch inhibitors (action = $action)" - exit - fi - - echo -n "Checking switch inhibitors..." - - booted_inhibitors="$(${realpath} /run/booted-system)/switch-inhibitors" - booted_inhibitors_sha="$( - if [ -f "$booted_inhibitors" ]; then - ${sha256sum} - < "$booted_inhibitors" - else - echo 'none' - fi - )" - - if [ "$booted_inhibitors_sha" == "none" ]; then - echo - echo "The previous configuration did not specify switch inhibitors, nothing to check." - exit - fi - - new_inhibitors="$(${realpath} "$incoming")/switch-inhibitors" - new_inhibitors_sha="$( - if [ -f "$new_inhibitors" ]; then - ${sha256sum} - < "$new_inhibitors" - else - echo 'none' - fi - )" - - if [ "$new_inhibitors_sha" == "none" ]; then - echo - echo "The new configuration does not specify switch inhibitors, nothing to check." - exit - fi - - if [ "$new_inhibitors_sha" != "$booted_inhibitors_sha" ]; then - echo - echo "Found diff in switch inhibitors:" - echo - ${diff} --color "$booted_inhibitors" "$new_inhibitors" - echo - echo "The new configuration contains changes to packages that were" - echo "listed as switch inhibitors." - echo "You probably want to run 'nixos-rebuild boot' and reboot your system." - echo - echo "If you really want to switch into this configuration directly, then" - echo "you can set NIXOS_NO_CHECK=1 to ignore pre-switch checks." - echo - echo "WARNING: doing so might cause the switch to fail or your system to become unstable." - echo - exit 1 - else - echo " done" - fi - ''; + # bash + '' + incoming="''${1-}" + action="''${2-}" + + if [ "$action" == "boot" ]; then + echo "Not checking switch inhibitors (action = $action)" + exit + fi + + echo -n "Checking switch inhibitors..." + + # Create a temporary file that we use in case a generation does not have + # the switch-inhibitors file. + empty="$(${mktemp} -t switch_inhibit.XXXX)" + # shellcheck disable=SC2329 + clean_up() { + ${rm} -f "$empty" + } + trap clean_up EXIT + echo "{}" > "$empty" + + current_inhibitors="$(${realpath} /run/current-system)/switch-inhibitors" + if [ ! -f "$current_inhibitors" ]; then + current_inhibitors="$empty" + fi + + new_inhibitors="$(${realpath} "$incoming")/switch-inhibitors" + if [ ! -f "$new_inhibitors" ]; then + new_inhibitors="$empty" + fi + + diff="$( + ${jq} \ + --raw-output \ + --null-input \ + --rawfile current "$current_inhibitors" \ + --rawfile newgen "$new_inhibitors" \ + ' + $current | try fromjson catch {} as $old | + $newgen | try fromjson catch {} as $new | + $old | + to_entries | + map( + select(.key | in ($new)) | + select(.value != $new.[.key]) | + [ .key, ":", .value, "->", $new.[.key] ] | join(" ") + ) | + join("\n") + ' \ + )" + + if [ -n "$diff" ]; then + echo + echo "There are changes to critical components of the system:" + echo + echo "$diff" + echo + echo "Switching into this system is not recommended." + echo "You probably want to run 'nixos-rebuild boot' and reboot your system instead." + echo + echo "If you really want to switch into this configuration directly, then" + echo "you can set NIXOS_NO_CHECK=1 to ignore pre-switch checks." + echo + echo "WARNING: doing so might cause the switch to fail or your system to become unstable." + echo + exit 1 + else + echo " done" + fi + ''; }; security = diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix index b86e28f81a0a..cc7f1096e8b3 100644 --- a/nixos/modules/system/boot/resolved.nix +++ b/nixos/modules/system/boot/resolved.nix @@ -10,11 +10,13 @@ let inherit (utils.systemdUtils.unitOptions) unitOption; inherit (lib) + concatStringsSep + elem + isList literalExpression mkIf mkMerge mkOption - mkOptionDefault mkOrder mkRenamedOptionModule mkRemovedOptionModule @@ -26,7 +28,25 @@ let dnsmasqResolve = config.services.dnsmasq.enable && config.services.dnsmasq.resolveLocalQueries; - resolvedConf = settingsToSections cfg.settings; + transformSettings = + settings: + lib.mapAttrs ( + key: value: + # concat lists for options that should result in space-separated values + if + elem key [ + "DNS" + "Domains" + "FallbackDNS" + ] + && isList value + then + concatStringsSep " " value + else + value + ) settings; + + resolvedConf = settingsToSections (transformSettings cfg.settings); in { imports = [ @@ -60,22 +80,56 @@ in options = { services.resolved = { enable = lib.mkEnableOption "the Systemd DNS resolver daemon (systemd-resolved)"; + settings.Resolve = mkOption { description = '' Settings option for systemd-resolved. See {manpage}`resolved.conf(5)` for all available options. ''; - # Remember to keep this in sync to the actual settings at the bottom of the page. - defaultText = literalExpression '' - { - DNS = config.networking.nameservers; - DNSOverTLS = false; - DNSSEC = false; - Domains = config.networking.search; - LLMNR = true; - } - ''; - type = types.attrsOf unitOption; + default = { }; + type = types.submodule { + freeformType = types.attrsOf unitOption; + options = { + DNS = mkOption { + type = unitOption; + default = config.networking.nameservers; + defaultText = literalExpression "config.networking.nameservers"; + description = '' + List of IP addresses to query as recursive DNS resolvers. + ''; + }; + + DNSOverTLS = mkOption { + type = unitOption; + default = false; + description = '' + Whether to use TLS encryption for DNS queries. Requires + nameservers that support DNS-over-TLS. + ''; + }; + + DNSSEC = mkOption { + type = unitOption; + default = false; + description = '' + Whether to validate DNSSEC for DNS lookups. + ''; + }; + + Domains = mkOption { + type = unitOption; + default = config.networking.search; + defaultText = literalExpression "config.networking.search"; + example = [ + "scope.example.com" + "example.com" + ]; + description = '' + List of search domains used to complete unqualified name lookups. + ''; + }; + }; + }; }; }; @@ -101,15 +155,6 @@ in } ]; - # If updating any of these attrs, also update the defaultText above. - services.resolved.settings.Resolve = { - DNS = config.networking.nameservers; - DNSOverTLS = mkOptionDefault false; - DNSSEC = mkOptionDefault false; - Domains = mkOptionDefault config.networking.search; - LLMNR = mkOptionDefault true; - }; - users.users.systemd-resolve.group = "systemd-resolve"; # add resolve to nss hosts database if enabled and nscd enabled diff --git a/nixos/modules/system/boot/systemd/fido2.nix b/nixos/modules/system/boot/systemd/fido2.nix index c43089f4d7c3..02b4a1389fba 100644 --- a/nixos/modules/system/boot/systemd/fido2.nix +++ b/nixos/modules/system/boot/systemd/fido2.nix @@ -24,7 +24,7 @@ in '') ]; boot.initrd.systemd.storePaths = [ - "${pkgs.systemd}/lib/udev/fido_id" + "${cfg.package}/lib/udev/fido_id" "${cfg.package}/lib/cryptsetup/libcryptsetup-token-systemd-fido2.so" "${pkgs.libfido2}/lib/libfido2.so.1" ]; diff --git a/nixos/release-small.nix b/nixos/release-small.nix index 58f5d413feb7..461afb49d4db 100644 --- a/nixos/release-small.nix +++ b/nixos/release-small.nix @@ -110,8 +110,12 @@ rec { subversion tarball vim - tests-stdenv-gcc-stageCompare ; + tests.stdenv = { + inherit (nixpkgs'.tests.stdenv) + tests-stdenv-gcc-stageCompare + ; + }; }; tested = @@ -163,7 +167,7 @@ rec { "nixos.tests.proxy" "nixos.tests.simple" "nixpkgs.jdk" - "nixpkgs.tests-stdenv-gcc-stageCompare" + "nixpkgs.tests.stdenv.tests-stdenv-gcc-stageCompare" "nixpkgs.opensshTest" ]) ]; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 3c0547d4578c..3da2a4c24dc4 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1208,6 +1208,7 @@ in paperless = runTest ./paperless.nix; paretosecurity = runTest ./paretosecurity.nix; parsedmarc = handleTest ./parsedmarc { }; + part-db = runTest ./web-apps/part-db.nix; pass-secret-service = runTest ./pass-secret-service.nix; password-option-override-ordering = runTest ./password-option-override-ordering.nix; patroni = handleTestOn [ "x86_64-linux" ] ./patroni.nix { }; @@ -1652,6 +1653,7 @@ in userborn-immutable-users = runTest ./userborn-immutable-users.nix; userborn-mutable-etc = runTest ./userborn-mutable-etc.nix; userborn-mutable-users = runTest ./userborn-mutable-users.nix; + userborn-static = runTest ./userborn-static.nix; ustreamer = runTest ./ustreamer.nix; uwsgi = runTest ./uwsgi.nix; v2ray = runTest ./v2ray.nix; diff --git a/nixos/tests/dwl.nix b/nixos/tests/dwl.nix index 6398ebeba5cf..b46c0f98ee97 100644 --- a/nixos/tests/dwl.nix +++ b/nixos/tests/dwl.nix @@ -23,6 +23,9 @@ services.displayManager.defaultSession = lib.mkForce "dwl"; programs.dwl.enable = true; + + # Need to switch to a different GPU driver than the default one (-vga std) so that dwl works on aarch64-linux + virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ]; }; testScript = '' diff --git a/nixos/tests/i18n.nix b/nixos/tests/i18n.nix index a0493b7c62f5..77f0cc579d5d 100644 --- a/nixos/tests/i18n.nix +++ b/nixos/tests/i18n.nix @@ -38,6 +38,32 @@ }; }; }; + Csimple = { + i18n = { + defaultLocale = "C"; + }; + }; + CnonDefault = { + i18n = { + defaultLocale = "en_US.UTF-8"; + extraLocaleSettings = { + LC_COLLATE = "C"; + LC_MESSAGES = "C"; + LC_TIME = "C"; + }; + }; + }; }; - testScript = { nodes, ... }: ""; + testScript = + { nodes, ... }: + lib.pipe nodes [ + builtins.attrNames + (map (node: '' + ${node}.copy_from_vm( + ${node}.succeed("readlink -f /etc/locale.conf").strip(), + "${node}" + ) + '')) + (lib.concatStringsSep "\n") + ]; } diff --git a/nixos/tests/icingaweb2.nix b/nixos/tests/icingaweb2.nix index 08fc4f262c08..0103c14bbe2b 100644 --- a/nixos/tests/icingaweb2.nix +++ b/nixos/tests/icingaweb2.nix @@ -1,9 +1,10 @@ { pkgs, ... }: { name = "icingaweb2"; - meta = { - maintainers = pkgs.lib.teams.helsinki-systems.members; - }; + meta.maintainers = with pkgs.lib.maintainers; [ + das_j + helsinki-Jo + ]; nodes = { icingaweb2 = diff --git a/nixos/tests/iscsi-multipath-root.nix b/nixos/tests/iscsi-multipath-root.nix index 860faa0a32c1..ba17ac64058e 100644 --- a/nixos/tests/iscsi-multipath-root.nix +++ b/nixos/tests/iscsi-multipath-root.nix @@ -5,9 +5,6 @@ let in { name = "iscsi"; - meta = { - maintainers = pkgs.lib.teams.deshaw.members; - }; nodes = { target = diff --git a/nixos/tests/iscsi-root.nix b/nixos/tests/iscsi-root.nix index c279a0d7e49e..e8c98a39931c 100644 --- a/nixos/tests/iscsi-root.nix +++ b/nixos/tests/iscsi-root.nix @@ -5,9 +5,10 @@ let in { name = "iscsi"; - meta = { - maintainers = lib.teams.deshaw.members ++ lib.teams.helsinki-systems.members; - }; + meta.maintainers = with lib.maintainers; [ + das_j + helsinki-Jo + ]; nodes = { target = diff --git a/nixos/tests/lvm2/systemd-stage-1.nix b/nixos/tests/lvm2/systemd-stage-1.nix index 9eb7a6797e38..c6c68ae64c1c 100644 --- a/nixos/tests/lvm2/systemd-stage-1.nix +++ b/nixos/tests/lvm2/systemd-stage-1.nix @@ -70,7 +70,10 @@ import ../make-test-python.nix ( { pkgs, lib, ... }: { name = "lvm2-${flavour}-systemd-stage-1"; - meta.maintainers = lib.teams.helsinki-systems.members; + meta.maintainers = with lib.maintainers; [ + das_j + helsinki-Jo + ]; nodes.machine = { pkgs, lib, ... }: diff --git a/nixos/tests/lvm2/thinpool.nix b/nixos/tests/lvm2/thinpool.nix index bf9b7160abc2..8c7471d46f28 100644 --- a/nixos/tests/lvm2/thinpool.nix +++ b/nixos/tests/lvm2/thinpool.nix @@ -6,7 +6,10 @@ import ../make-test-python.nix ( { pkgs, lib, ... }: { name = "lvm2-thinpool"; - meta.maintainers = lib.teams.helsinki-systems.members; + meta.maintainers = with lib.maintainers; [ + das_j + helsinki-Jo + ]; nodes.machine = { pkgs, lib, ... }: diff --git a/nixos/tests/mysql/mariadb-galera.nix b/nixos/tests/mysql/mariadb-galera.nix index 1f08eb697504..b659f4647472 100644 --- a/nixos/tests/mysql/mariadb-galera.nix +++ b/nixos/tests/mysql/mariadb-galera.nix @@ -19,9 +19,12 @@ let }: makeTest { name = "${name}-galera-mariabackup"; - meta = { - maintainers = with lib.maintainers; [ izorkin ] ++ lib.teams.helsinki-systems.members; - }; + meta.maintainers = with lib.maintainers; [ + conni2461 + das_j + helsinki-Jo + izorkin + ]; # The test creates a Galera cluster with 3 nodes and is checking if mariabackup-based SST works. The cluster is tested by creating a DB and an empty table on one node, # and checking the table's presence on the other node. diff --git a/nixos/tests/mysql/mysql-replication.nix b/nixos/tests/mysql/mysql-replication.nix index d1ccb7c8c924..2cc541093a5b 100644 --- a/nixos/tests/mysql/mysql-replication.nix +++ b/nixos/tests/mysql/mysql-replication.nix @@ -20,9 +20,11 @@ let }: makeTest { name = "${name}-replication"; - meta = { - maintainers = lib.teams.helsinki-systems.members; - }; + meta.maintainers = with lib.maintainers; [ + conni2461 + das_j + helsinki-Jo + ]; nodes = { primary = { diff --git a/nixos/tests/mysql/mysql.nix b/nixos/tests/mysql/mysql.nix index 67ef87e99481..9175ef95f6fb 100644 --- a/nixos/tests/mysql/mysql.nix +++ b/nixos/tests/mysql/mysql.nix @@ -25,9 +25,11 @@ let }: makeTest { inherit name; - meta = { - maintainers = lib.teams.helsinki-systems.members; - }; + meta.maintainers = with lib.maintainers; [ + conni2461 + das_j + helsinki-Jo + ]; nodes = { ${name} = diff --git a/nixos/tests/redis.nix b/nixos/tests/redis.nix index cf3cd6c5b552..f878509bce35 100644 --- a/nixos/tests/redis.nix +++ b/nixos/tests/redis.nix @@ -20,9 +20,10 @@ let makeTest { inherit name; meta.maintainers = [ + lib.maintainers.das_j lib.maintainers.flokli - ] - ++ lib.teams.helsinki-systems.members; + lib.maintainers.helsinki-Jo + ]; nodes = { machine = diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix index 3ff6dcbc4e02..07e80cb86abd 100644 --- a/nixos/tests/switch-test.nix +++ b/nixos/tests/switch-test.nix @@ -646,6 +646,23 @@ in EOF ''; }; + + no_inhibitors.configuration.system.switch.inhibitors = lib.mkForce { }; + + inhibitors.configuration.system.switch.inhibitors = lib.mkForce { + foo = "bar"; + quz = "bor"; + }; + + inhibitors_changed.configuration.system.switch.inhibitors = lib.mkForce { + foo = "baz"; + quz = "boz"; + }; + + inhibitors_new.configuration.system.switch.inhibitors = lib.mkForce { + foo = "bar"; + qux = "baz"; + }; }; }; @@ -658,6 +675,7 @@ in echo "this should succeed (config: $config, action: $action)" [ "$action" == "check" ] || [ "$action" == "test" ] ''; + boot.loader.grub.enable = false; specialisation.failingCheck.configuration.system.preSwitchChecks.failEveryTime = '' echo this will fail false @@ -745,6 +763,24 @@ in out = switch_to_specialisation("${otherSystem}", "failingCheck", action="check", fail=True) assert_contains(out, "this will fail") + with subtest("switch inhibitors"): + # Start without any inhibitors + switch_to_specialisation("${machine}", "no_inhibitors", action="switch") + # Check that we can switch into a generation with inhibitors from one that doesn't have any + switch_to_specialisation("${machine}", "inhibitors", action="switch") + # Check that we cannot switch into a generation that has a different value for an existing inhibitor + out = switch_to_specialisation("${machine}", "inhibitors_changed", action="switch", fail=True) + assert_contains(out, "There are changes to critical components of the system") + assert_contains(out, "foo") + assert_contains(out, "bar") + assert_contains(out, "baz") + # Confirm that we can set that same generation as the new boot default + switch_to_specialisation("${machine}", "inhibitors_changed", action="boot") + # Check that we can switch into a new generation with new inhibitors, but same values for existing ones + switch_to_specialisation("${machine}", "inhibitors_new", action="switch") + # Check that we can switch back into a generation without inhibitors + switch_to_specialisation("${machine}", "no_inhibitors", action="switch") + with subtest("actions"): # boot action out = switch_to_specialisation("${machine}", "simpleService", action="boot") diff --git a/nixos/tests/tandoor-recipes-media.nix b/nixos/tests/tandoor-recipes-media.nix index 9384c9765efa..3465090b2357 100644 --- a/nixos/tests/tandoor-recipes-media.nix +++ b/nixos/tests/tandoor-recipes-media.nix @@ -66,7 +66,7 @@ machine.succeed(f"curl --head {db_path} | grep \"HTTP/1.1 404 Not Found\"") - # Switch to NixOS 24.11 to check if the setup still functions the same + # Switch to NixOS 25.11 to check if the setup still functions the same # as before. stop_and_rm() machine.succeed("${oldVersion}/bin/switch-to-configuration test") @@ -77,7 +77,7 @@ machine.succeed(f"curl --head {db_path} | grep \"HTTP/1.1 200 OK\"") - # Switch to NixOS 24.11 with the MEDIA_ROOT already set to + # Switch to NixOS 25.11 with the MEDIA_ROOT already set to # /var/lib/tandoor-recipes/media. stop_and_rm() machine.succeed("${oldVersionOverrideMedia}/bin/switch-to-configuration test") diff --git a/nixos/tests/userborn-static.nix b/nixos/tests/userborn-static.nix new file mode 100644 index 000000000000..e1d5cf259a7d --- /dev/null +++ b/nixos/tests/userborn-static.nix @@ -0,0 +1,57 @@ +{ lib, ... }: + +let + sysuserPassword = "$y$j9T$3aiOV/8CADAK22OK2QT3/0$67OKd50Z4qTaZ8c/eRWHLIM.o3ujtC1.n9ysmJfv639"; + + common = { + services.userborn = { + enable = true; + static = true; + }; + boot.initrd.systemd.enable = true; + networking.useNetworkd = true; + system.etc.overlay = { + enable = true; + mutable = false; + }; + }; +in + +{ + + name = "userborn-static"; + + meta.maintainers = with lib.maintainers; [ + mic92 + valpackett + ]; + + nodes.machine = + { ... }: + { + imports = [ common ]; + + users.users.sysuser = { + uid = 1337; + isSystemUser = true; + group = "wheel"; + home = "/var/empty"; + initialHashedPassword = sysuserPassword; + }; + }; + + testScript = '' + with subtest("Correct mode on the password files"): + assert machine.succeed("stat -c '%a' /etc/passwd") == "644\n" + assert machine.succeed("stat -c '%a' /etc/group") == "644\n" + assert machine.succeed("stat -c '%a' /etc/shadow") == "0\n" + + with subtest("Check files"): + print(machine.succeed("grpck -r")) + print(machine.succeed("pwck -r")) + + with subtest("sysuser user is created"): + print(machine.succeed("getent passwd sysuser")) + assert "${sysuserPassword}" in machine.succeed("getent shadow sysuser"), "sysuser user password is not correct" + ''; +} diff --git a/nixos/tests/web-apps/part-db.nix b/nixos/tests/web-apps/part-db.nix new file mode 100644 index 000000000000..66e43b09a50e --- /dev/null +++ b/nixos/tests/web-apps/part-db.nix @@ -0,0 +1,22 @@ +{ lib, ... }: +{ + name = "part-db"; + meta.maintainers = with lib.maintainers; [ oddlama ]; + + nodes = { + machine = { + services.part-db.enable = true; + }; + }; + + testScript = '' + start_all() + machine.wait_for_unit("postgresql.service") + machine.wait_for_unit("part-db-migrate.service") + machine.wait_for_unit("phpfpm-part-db.service") + machine.wait_for_unit("nginx.service") + machine.wait_for_open_port(80) + + machine.succeed("curl -L --fail http://localhost | grep 'Part-DB'", timeout=10) + ''; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elpaca/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elpaca/default.nix index 6c7883418d78..10d1bf24f45b 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elpaca/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elpaca/default.nix @@ -66,7 +66,6 @@ melpaBuild rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ abhisheksingh0x558 - normalcea ]; }; } diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix index b00baa3ab6ca..47d55e3042b6 100644 --- a/pkgs/applications/editors/neovim/utils.nix +++ b/pkgs/applications/editors/neovim/utils.nix @@ -60,7 +60,7 @@ let }; /** - * Builds a vim package (see ':h packages') with additionnal info: + * Builds a vim package (see ':h packages') with additional info: - the user lua configuration (specified by user) - the advised and advised by nixpkgs in passthru.initLua) - runtime dependencies (specified in plugins' "runtimeDeps") @@ -110,7 +110,7 @@ let # viml config set by the user along with the plugin inherit userPluginViml; - # recommanded configuration set in vim plugins ".passthru.initLua" + # recommended configuration set in vim plugins ".passthru.initLua" inherit pluginAdvisedLua; # A Vim "package", see ':h packages' @@ -135,8 +135,8 @@ let arguments (["-u" writeText "init.vim" GENERATEDRC)]). This makes it possible to write the config anywhere: on a per-project basis .nvimrc or in $XDG_CONFIG_HOME/nvim/init.vim to avoid sideeffects. - Indeed, note that wrapping with `-u init.vim` has sideeffects like .nvimrc wont be loaded - anymore, $MYVIMRC wont be set etc + Indeed, note that wrapping with `-u init.vim` has sideeffects like .nvimrc won't be loaded + anymore, $MYVIMRC won't be set etc */ makeNeovimConfig = { @@ -344,7 +344,9 @@ let nativeBuildInputs = [ toNvimTreesitterGrammar ]; - passthru = grammar.passthru or { }; + passthru = grammar.passthru or { } // { + isTreesitterGrammar = true; + }; meta = { platforms = lib.platforms.all; diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index c1c7fa4cdeba..0d8a0a94d4df 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -338,8 +338,7 @@ let unwrapped = neovim-unwrapped; initRc = neovimRcContent'; - tests = callPackage ./tests { - }; + tests = callPackage ./tests { }; }; meta = { diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 86decf313fdb..01e2eb329ffa 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -52,6 +52,9 @@ rev = "3bd2036e710f609ea08fcfca5a1eb1169ecc114f"; hash = "sha256-VdfPZ39AEjvl+9r/LZNRGNIQsiTB9S065AnUc4MeohU="; }; + passthru.requires = [ + "html" + ]; meta.homepage = "https://github.com/dlvandenberg/tree-sitter-angular"; }; apex = buildGrammar { @@ -75,6 +78,9 @@ rev = "53eb391da4c6c5857f8defa2c583c46c2594f565"; hash = "sha256-qQVUWCOZ4y9FTsIf0FI3vmYBhLYz4hcqRTo+5C2MYvc="; }; + passthru.requires = [ + "cpp" + ]; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-arduino"; }; asm = buildGrammar { @@ -97,6 +103,9 @@ rev = "213f6e6973d9b456c6e50e86f19f66877e7ef0ee"; hash = "sha256-TpXs3jbYn39EHxTdtSfR7wLA1L8v9uyK/ATPp5v4WqE="; }; + passthru.requires = [ + "html" + ]; meta.homepage = "https://github.com/virchau13/tree-sitter-astro"; }; authzed = buildGrammar { @@ -405,6 +414,9 @@ rev = "12bd6f7e96080d2e70ec51d4068f2f66120dde35"; hash = "sha256-vmXTv6Idf0Le5ZVa8Rc1DVefqzUxkGeLGsYcSDNBpQU="; }; + passthru.requires = [ + "c" + ]; meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp"; }; css = buildGrammar { @@ -428,6 +440,9 @@ hash = "sha256-9mW0kT4av/ULFqLXdMuyLrMPtQxrIOKY60GQ4QDB33o="; }; location = "csv"; + passthru.requires = [ + "tsv" + ]; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-csv"; }; cuda = buildGrammar { @@ -439,6 +454,9 @@ rev = "48b066f334f4cf2174e05a50218ce2ed98b6fd01"; hash = "sha256-sX9AOe8dJJsRbzGq20qakWBnLiwYQ90mQspAuYxQzoQ="; }; + passthru.requires = [ + "cpp" + ]; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-cuda"; }; cue = buildGrammar { @@ -882,6 +900,9 @@ rev = "69086d7627c03e1f4baf766bcef14c60d9e92331"; hash = "sha256-U0P9QoOZST1h6XI83CI0/6/CDTvqkv1Yiq62h6YdHpI="; }; + passthru.requires = [ + "gap" + ]; meta.homepage = "https://github.com/gap-system/tree-sitter-gaptst"; }; gdscript = buildGrammar { @@ -1003,6 +1024,9 @@ rev = "12d98944c1d5077b957cbdb90d663a7c4d50118c"; hash = "sha256-3cJI6vcbU62kUIhphprNeAl9RyY9TThrzVeArdLfxnI="; }; + passthru.requires = [ + "typescript" + ]; meta.homepage = "https://github.com/NullVoxPopuli/tree-sitter-glimmer-typescript"; }; glsl = buildGrammar { @@ -1014,6 +1038,9 @@ rev = "24a6c8ef698e4480fecf8340d771fbcb5de8fbb4"; hash = "sha256-TjF79WH3bX4nueYr8CbPptkNb2lNkHQNB0VZoMB35Nk="; }; + passthru.requires = [ + "c" + ]; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-glsl"; }; gn = buildGrammar { @@ -1268,6 +1295,9 @@ rev = "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"; hash = "sha256-NsTf3DR3gHVMYZDmTNvThB5bJcDwTcJ1+3eJhvsiDn8="; }; + passthru.requires = [ + "json" + ]; meta.homepage = "https://github.com/winston0410/tree-sitter-hjson"; }; hlsl = buildGrammar { @@ -1279,6 +1309,9 @@ rev = "bab9111922d53d43668fabb61869bec51bbcb915"; hash = "sha256-BWjgXtMN6y/0ahD44Cm8a+MxxVMpCNhkf33V/vsCBTU="; }; + passthru.requires = [ + "cpp" + ]; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-hlsl"; }; hlsplaylist = buildGrammar { @@ -1422,6 +1455,9 @@ rev = "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"; hash = "sha256-vxe+g7o0gXgB4GjhjkxqLqcLL2+8wqMB3tm1xQFSitI="; }; + passthru.requires = [ + "c" + ]; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-ispc"; }; janet_simple = buildGrammar { @@ -1478,6 +1514,9 @@ hash = "sha256-a4/+tsouuYkkVEStpOEUiIos9H4Hw7NhJOFaasylWUk="; }; location = "tree-sitter-jinja"; + passthru.requires = [ + "jinja_inline" + ]; meta.homepage = "https://github.com/cathaysia/tree-sitter-jinja"; }; jinja_inline = buildGrammar { @@ -1788,6 +1827,9 @@ rev = "a8914d6c1fc5131f8e1c13f769fa704c9f5eb02f"; hash = "sha256-5qbZA2mxTvrsfUrpgD+4y3oeJsifA91c/hfcVwQBRgI="; }; + passthru.requires = [ + "lua" + ]; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-luau"; }; m68k = buildGrammar { @@ -1822,6 +1864,9 @@ hash = "sha256-IYqh6JT74deu1UU4Nyls9Eg88BvQeYEta2UXZAbuZek="; }; location = "tree-sitter-markdown"; + passthru.requires = [ + "markdown_inline" + ]; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-markdown"; }; markdown_inline = buildGrammar { @@ -1945,6 +1990,9 @@ rev = "4ad352773688deb84a95eeaa9872acda5b466439"; hash = "sha256-dinMmbD36o1QkcLk2mgycgHZ9sW5Mg6lfnxssynaj58="; }; + passthru.requires = [ + "nim_format_string" + ]; meta.homepage = "https://github.com/alaviss/tree-sitter-nim"; }; nim_format_string = buildGrammar { @@ -2011,6 +2059,9 @@ rev = "181a81b8f23a2d593e7ab4259981f50122909fda"; hash = "sha256-7W8ozhQJL+f+tQYz61EZexk9NkMu1pCAP5IIy1m3qak="; }; + passthru.requires = [ + "c" + ]; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-objc"; }; objdump = buildGrammar { @@ -2046,6 +2097,9 @@ hash = "sha256-8u1jtUFMjykVG6aCDzqcb4vFCY401CZ2o+JPGMadg6o="; }; location = "grammars/interface"; + passthru.requires = [ + "ocaml" + ]; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; }; ocamllex = buildGrammar { @@ -2125,6 +2179,9 @@ hash = "sha256-XEKlsqC7HJ3mShmcwmfpezNP9DHE8f73f7/ru4MuxEo="; }; location = "php"; + passthru.requires = [ + "php_only" + ]; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; php_only = buildGrammar { @@ -2259,6 +2316,9 @@ hash = "sha256-SEqqmkfV/wsr1ObcBN5My29RY9TWfxnQlsnEEIZyR18="; }; location = "grammars/problog"; + passthru.requires = [ + "prolog" + ]; meta.homepage = "https://github.com/foxyseta/tree-sitter-prolog"; }; prolog = buildGrammar { @@ -2327,6 +2387,9 @@ hash = "sha256-9mW0kT4av/ULFqLXdMuyLrMPtQxrIOKY60GQ4QDB33o="; }; location = "psv"; + passthru.requires = [ + "tsv" + ]; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-csv"; }; pug = buildGrammar { @@ -2712,6 +2775,9 @@ rev = "c478c6868648eff49eb04a4df90d703dc45b312a"; hash = "sha256-BFtMT6eccBWUyq6b8UXRAbB1R1XD3CrrFf1DM3aUI5c="; }; + passthru.requires = [ + "css" + ]; meta.homepage = "https://github.com/serenadeai/tree-sitter-scss"; }; sflog = buildGrammar { @@ -3126,6 +3192,9 @@ hash = "sha256-Kq0KtkF6xtZcN2s8KzYGyguJH2iOTlA2WRytZ+KGTUE="; }; location = "dialects/terraform"; + passthru.requires = [ + "hcl" + ]; meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl"; }; textproto = buildGrammar { @@ -3227,6 +3296,9 @@ hash = "sha256-A0M6IBoY87ekSV4DfGHDU5zzFWdLjGqSyVr6VENgA+s="; }; location = "tsx"; + passthru.requires = [ + "typescript" + ]; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; }; turtle = buildGrammar { @@ -3528,6 +3600,9 @@ hash = "sha256-0ztP30xWqVWy5upWPp0JwhpQphOJufzlcYn+KvLejVs="; }; location = "xml"; + passthru.requires = [ + "dtd" + ]; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml"; }; xresources = buildGrammar { @@ -3642,18 +3717,29 @@ }; angular = buildQueries { language = "angular"; + requires = [ + "html" + "html_tags" + ]; }; apex = buildQueries { language = "apex"; }; arduino = buildQueries { language = "arduino"; + requires = [ + "cpp" + ]; }; asm = buildQueries { language = "asm"; }; astro = buildQueries { language = "astro"; + requires = [ + "html" + "html_tags" + ]; }; authzed = buildQueries { language = "authzed"; @@ -3738,15 +3824,24 @@ }; cpp = buildQueries { language = "cpp"; + requires = [ + "c" + ]; }; css = buildQueries { language = "css"; }; csv = buildQueries { language = "csv"; + requires = [ + "tsv" + ]; }; cuda = buildQueries { language = "cuda"; + requires = [ + "cpp" + ]; }; cue = buildQueries { language = "cue"; @@ -3870,6 +3965,9 @@ }; gaptst = buildQueries { language = "gaptst"; + requires = [ + "gap" + ]; }; gdscript = buildQueries { language = "gdscript"; @@ -3900,12 +3998,21 @@ }; glimmer_javascript = buildQueries { language = "glimmer_javascript"; + requires = [ + "ecma" + ]; }; glimmer_typescript = buildQueries { language = "glimmer_typescript"; + requires = [ + "typescript" + ]; }; glsl = buildQueries { language = "glsl"; + requires = [ + "c" + ]; }; gn = buildQueries { language = "gn"; @@ -3975,9 +4082,15 @@ }; hjson = buildQueries { language = "hjson"; + requires = [ + "json" + ]; }; hlsl = buildQueries { language = "hlsl"; + requires = [ + "cpp" + ]; }; hlsplaylist = buildQueries { language = "hlsplaylist"; @@ -3990,6 +4103,9 @@ }; html = buildQueries { language = "html"; + requires = [ + "html_tags" + ]; }; html_tags = buildQueries { language = "html_tags"; @@ -4020,6 +4136,9 @@ }; ispc = buildQueries { language = "ispc"; + requires = [ + "c" + ]; }; janet_simple = buildQueries { language = "janet_simple"; @@ -4032,9 +4151,16 @@ }; javascript = buildQueries { language = "javascript"; + requires = [ + "ecma" + "jsx" + ]; }; jinja = buildQueries { language = "jinja"; + requires = [ + "jinja_inline" + ]; }; jinja_inline = buildQueries { language = "jinja_inline"; @@ -4122,6 +4248,9 @@ }; luau = buildQueries { language = "luau"; + requires = [ + "lua" + ]; }; m68k = buildQueries { language = "m68k"; @@ -4131,6 +4260,9 @@ }; markdown = buildQueries { language = "markdown"; + requires = [ + "markdown_inline" + ]; }; markdown_inline = buildQueries { language = "markdown_inline"; @@ -4164,6 +4296,9 @@ }; nim = buildQueries { language = "nim"; + requires = [ + "nim_format_string" + ]; }; nim_format_string = buildQueries { language = "nim_format_string"; @@ -4182,6 +4317,9 @@ }; objc = buildQueries { language = "objc"; + requires = [ + "c" + ]; }; objdump = buildQueries { language = "objdump"; @@ -4191,6 +4329,9 @@ }; ocaml_interface = buildQueries { language = "ocaml_interface"; + requires = [ + "ocaml" + ]; }; ocamllex = buildQueries { language = "ocamllex"; @@ -4212,6 +4353,9 @@ }; php = buildQueries { language = "php"; + requires = [ + "php_only" + ]; }; php_only = buildQueries { language = "php_only"; @@ -4248,6 +4392,9 @@ }; problog = buildQueries { language = "problog"; + requires = [ + "prolog" + ]; }; prolog = buildQueries { language = "prolog"; @@ -4266,6 +4413,9 @@ }; psv = buildQueries { language = "psv"; + requires = [ + "tsv" + ]; }; pug = buildQueries { language = "pug"; @@ -4290,6 +4440,9 @@ }; qmljs = buildQueries { language = "qmljs"; + requires = [ + "ecma" + ]; }; query = buildQueries { language = "query"; @@ -4371,6 +4524,9 @@ }; scss = buildQueries { language = "scss"; + requires = [ + "css" + ]; }; sflog = buildQueries { language = "sflog"; @@ -4443,6 +4599,9 @@ }; svelte = buildQueries { language = "svelte"; + requires = [ + "html_tags" + ]; }; sway = buildQueries { language = "sway"; @@ -4482,6 +4641,9 @@ }; terraform = buildQueries { language = "terraform"; + requires = [ + "hcl" + ]; }; textproto = buildQueries { language = "textproto"; @@ -4509,6 +4671,11 @@ }; tsx = buildQueries { language = "tsx"; + requires = [ + "ecma" + "jsx" + "typescript" + ]; }; turtle = buildQueries { language = "turtle"; @@ -4518,6 +4685,9 @@ }; typescript = buildQueries { language = "typescript"; + requires = [ + "ecma" + ]; }; typespec = buildQueries { language = "typespec"; @@ -4569,6 +4739,9 @@ }; vue = buildQueries { language = "vue"; + requires = [ + "html_tags" + ]; }; wgsl = buildQueries { language = "wgsl"; @@ -4590,6 +4763,9 @@ }; xml = buildQueries { language = "xml"; + requires = [ + "dtd" + ]; }; xresources = buildQueries { language = "xresources"; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix index bc2fdb75a2fd..3e6ed03ace08 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix @@ -17,11 +17,17 @@ let inherit (neovimUtils) grammarToPlugin; buildQueries = - { language }: + { + language, + requires ? [ ], + }: vimUtils.toVimPlugin ( runCommand "nvim-treesitter-queries-${language}" { - passthru = { inherit language; }; + passthru = { + inherit language requires; + isTreesitterQuery = true; + }; meta.description = "Queries for ${language} from nvim-treesitter"; } '' @@ -42,18 +48,50 @@ let inherit (generated) parsers queries; - parsersWithMeta = lib.mapAttrs ( + queriesWithDeps = lib.mapAttrs ( + lang: query: + let + requires = query.requires or [ ]; + dependencies = map (req: queries.${req}) requires; + in + if dependencies != [ ] then + query.overrideAttrs (old: { + passthru = old.passthru or { } // { + inherit dependencies; + }; + }) + else + query + ) queries; + + parsersWithQueries = lib.mapAttrs ( lang: parser: - if lib.hasAttr lang queries then + if lib.hasAttr lang queriesWithDeps then parser.overrideAttrs (old: { - passthru = (old.passthru or { }) // { - associatedQuery = queries.${lang}; + passthru = old.passthru or { } // { + associatedQuery = queriesWithDeps.${lang}; }; }) else parser ) parsers; + parsersWithMeta = lib.mapAttrs ( + lang: parser: + let + requires = parser.requires or [ ]; + dependencies = map (req: grammarToPlugin parsersWithQueries.${req}) requires; + in + if dependencies != [ ] then + parser.overrideAttrs (old: { + passthru = old.passthru or { } // { + inherit dependencies; + }; + }) + else + parser + ) parsersWithQueries; + # add aliases so grammars from `tree-sitter` are overwritten in `withPlugins` # for example, for ocaml_interface, the following aliases will be added # ocaml-interface @@ -89,17 +127,12 @@ let grammarPlugins = map grammarToPlugin selectedGrammars; queryPlugins = lib.pipe selectedGrammars [ - (map (g: g.passthru.associatedQuery or null)) + (map (g: g.associatedQuery or null)) (lib.filter (q: q != null)) ]; in self.nvim-treesitter.overrideAttrs { - passthru.dependencies = [ - (symlinkJoin { - name = "nvim-treesitter-grammars"; - paths = grammarPlugins ++ queryPlugins; - }) - ]; + passthru.dependencies = grammarPlugins ++ queryPlugins; }; withAllGrammars = withPlugins (_: allGrammars); @@ -117,9 +150,9 @@ in grammarToPlugin withPlugins withAllGrammars - queries ; + queries = queriesWithDeps; parsers = grammarPlugins; tests = { diff --git a/pkgs/applications/editors/vim/plugins/utils/nvim-treesitter/update.py b/pkgs/applications/editors/vim/plugins/utils/nvim-treesitter/update.py index cc71c9495dc4..ce1ff9bdef87 100755 --- a/pkgs/applications/editors/vim/plugins/utils/nvim-treesitter/update.py +++ b/pkgs/applications/editors/vim/plugins/utils/nvim-treesitter/update.py @@ -15,12 +15,10 @@ log = logging.getLogger("vim-updater") NURR_JSON_URL = ( "https://raw.githubusercontent.com/lumen-oss/nurr/main/tree-sitter-parsers.json" ) -NVIM_TREESITTER_QUERIES_URL = ( - "https://api.github.com/repos/nvim-treesitter/nvim-treesitter/contents/runtime/queries" -) +NVIM_TREESITTER_QUERIES_URL = "https://api.github.com/repos/nvim-treesitter/nvim-treesitter/contents/runtime/queries" -def generate_grammar(lang, parser_info): +def generate_grammar(lang, parser_info, parsers_map): """Generate grammar for a language based on the parser info""" if "install_info" not in parser_info: log.warning(f"Parser {lang} does not have install_info, skipping") @@ -36,9 +34,7 @@ def generate_grammar(lang, parser_info): version = "0.0.0+rev={rev[:7]}"; src = """ - generated += subprocess.check_output( - ["nurl", url, rev, "--indent=6"], text=True - ) + generated += subprocess.check_output(["nurl", url, rev, "--indent=6"], text=True) generated += ";" location = install_info.get("location", "") @@ -50,6 +46,23 @@ def generate_grammar(lang, parser_info): generated += """ generate = true;""" + # Add requires field - only include parsers + requires = parser_info.get("requires", []) + if requires: + # Filter to only include parser dependencies (those with install_info) + parser_requires = [ + req + for req in requires + if req in parsers_map and "install_info" in parsers_map[req] + ] + if parser_requires: + generated += """ + passthru.requires = [ +""" + for req in parser_requires: + generated += f' "{req}"\n' + generated += " ];" + generated += f""" meta.homepage = "{url}"; }}; @@ -58,12 +71,28 @@ def generate_grammar(lang, parser_info): return generated -def generate_query(lang): +def generate_query(lang: str, parser_info: dict | None, queries_set: set[str]): """Generate query derivation for a language""" - return f""" {lang} = buildQueries {{ - language = "{lang}"; - }}; + generated = f""" {lang} = buildQueries {{ + language = "{lang}";""" + + # Add requires field for queries - include everything that has queries + if parser_info and "requires" in parser_info: + requires = parser_info["requires"] + # Filter to only include langs that have queries + query_requires = [req for req in requires if queries_set and req in queries_set] + if query_requires: + generated += """ + requires = [ """ + for req in query_requires: + generated += f' "{req}"\n' + generated += " ];" + + generated += """ + }; +""" + return generated def fetch_nurr_parsers(): @@ -111,9 +140,9 @@ def fetch_available_queries(): return languages -def process_parser_info(parser_info): +def process_parser_info(parser_info, parsers_map): """Process a single parser info entry and generate grammar for it""" - return generate_grammar(parser_info["lang"], parser_info) + return generate_grammar(parser_info["lang"], parser_info, parsers_map) def update_grammars(): @@ -121,6 +150,9 @@ def update_grammars(): parsers_info = fetch_nurr_parsers() queries_list = fetch_available_queries() + # Create a mapping of lang -> parser_info for quick lookup + parsers_map = {p["lang"]: p for p in parsers_info} + generated_file = """# generated by pkgs/applications/editors/vim/plugins/utils/nvim-treesitter/update.py # Using parser data from https://github.com/nvim-neorocks/nurr/blob/main/tree-sitter-parsers.json @@ -141,7 +173,9 @@ def update_grammars(): # Process parsers in parallel for better performance with ThreadPoolExecutor(max_workers=5) as executor: - for generated in executor.map(process_parser_info, parsers_info): + for generated in executor.map( + lambda p: process_parser_info(p, parsers_map), parsers_info + ): generated_file += generated generated_file += """ }; @@ -149,9 +183,13 @@ def update_grammars(): queries = { """ - # Process queries + # Convert queries list to a set for fast lookup + queries_set = set(queries_list) + + # Process queries - include parser info if available for requires field for lang in queries_list: - generated_file += generate_query(lang) + parser_info = parsers_map.get(lang) + generated_file += generate_query(lang, parser_info, queries_set) generated_file += " };\n}\n" return generated_file diff --git a/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix b/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix index 6fd6c0f87413..c635fead45c6 100644 --- a/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix +++ b/pkgs/applications/editors/vim/plugins/utils/vim-utils.nix @@ -5,6 +5,7 @@ vim, vimPlugins, buildEnv, + symlinkJoin, writeText, runCommand, makeWrapper, @@ -200,12 +201,26 @@ let # and can simply pass `null`. depsOfOptionalPlugins = lib.subtractLists opt (findDependenciesRecursively opt); startWithDeps = findDependenciesRecursively start; - allPlugins = lib.unique (startWithDeps ++ depsOfOptionalPlugins); + allPluginsAndGrammars = lib.unique (startWithDeps ++ depsOfOptionalPlugins); + allPython3Dependencies = ps: lib.flatten (map (plugin: (plugin.python3Dependencies or (_: [ ])) ps) allPlugins); python3Env = python3.withPackages allPython3Dependencies; - packdirStart = vimFarm "pack/${packageName}/start" "packdir-start" allPlugins; + partitionGrammars = lib.partition ( + p: p.isTreesitterGrammar or false || p.isTreesitterQuery or false + ); + allPluginsAndGrammarsPartitioned = partitionGrammars allPluginsAndGrammars; + allPlugins = allPluginsAndGrammarsPartitioned.wrong; + allGrammars = allPluginsAndGrammarsPartitioned.right; + allGrammarsSymlinked = symlinkJoin { + name = "nvim-treesitter-grammars"; + paths = allGrammars; + }; + + packdirStart = vimFarm "pack/${packageName}/start" "packdir-start" ( + if allGrammars != [ ] then allPlugins ++ [ allGrammarsSymlinked ] else allPlugins + ); packdirOpt = vimFarm "pack/${packageName}/opt" "packdir-opt" opt; # Assemble all python3 dependencies into a single `site-packages` to avoid doing recursive dependency collection # for each plugin. diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix index 6961354854fe..423c440f280c 100644 --- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix +++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "claude-code"; publisher = "anthropic"; - version = "2.1.9"; - hash = "sha256-1zrXLaTilKY11FVBGnP4ezRT5LAefGH1UKwqz+E/sFY="; + version = "2.1.11"; + hash = "sha256-zqCILYNwBudsEv7+7ZV1YQoPJi30kj5w8suXqAPKORo="; }; postInstall = '' diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 143e3df6020a..af66d232e6e1 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4765,8 +4765,8 @@ let mktplcRef = { name = "opa"; publisher = "tsandall"; - version = "0.20.0"; - hash = "sha256-1o7v9lncnmYWr9FPEjQmamfNW/Lui9A0V+l7bCjn/hw="; + version = "0.21.0"; + hash = "sha256-1k+yq8QYTpiePX4Q8o+iUmpqcWONCOZkMrNZjp2Rlss="; }; meta = { changelog = "https://github.com/open-policy-agent/vscode-opa/blob/master/CHANGELOG.md"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 74c73e273a56..97158b30c964 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -27,12 +27,12 @@ let hash = { - x86_64-linux = "sha256-gqBxdd6Ww1nIXovixgsuIivLXn1LoZXN5NhK4bLmSng="; - x86_64-darwin = "sha256-al2RcKJ3KrNywnMYbhd493kyR6I0JUbCJHy1iTk4N4s="; - aarch64-linux = "sha256-32WP74IJYVIKuhmsMi0EFqjTlWAO4DgC24ptm3BqSpg="; - aarch64-darwin = "sha256-2hYTrkCNzVy6wXT+cGWkDEAy+g/KSkWsLltMSuSSBTk="; - armv7l-linux = "sha256-bNjc91zjVXnQ763GHmlVTNDD5ynlJhrtGR7Xzciq7tA="; - loongarch64-linux = "sha256-RaxzbawVYT1V0u+RU0gaWTrn2X3uRxEO9T8IAmPJTds="; + x86_64-linux = "sha256-NvICNng069Z6qvL3TnjLu82wyfGyjH8wK9aNw2YR2Jk="; + x86_64-darwin = "sha256-Ukms3L0tIw7tDfMqFctLjIzkUdr9rvXomKwhrGswMXk="; + aarch64-linux = "sha256-+6G7coqgPSOA3xFMKSOpZCDzb9Ssc7wqJnnlaW54e/I="; + aarch64-darwin = "sha256-49Zf51yiozdY9V5sPGnECXTUpNIO3OC2c//G2FQcCy0="; + armv7l-linux = "sha256-6l75xTqeUkDJW6/WTtkGrAsnmlcQPiVTmiEDRXDI/QA="; + loongarch64-linux = "sha256-PNPVAf6jh20jpFVhDGDgT5wo5xPZDQ2xdm4LO0/Vlzk="; } .${system} or throwSystem; @@ -43,7 +43,7 @@ callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.107.18627"; + version = "1.108.10359"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix index 4e994394f762..8230f8c72f3a 100644 --- a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix +++ b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mednafen-pce-fast"; - version = "0-unstable-2025-11-14"; + version = "0-unstable-2026-01-16"; src = fetchFromGitHub { owner = "libretro"; repo = "beetle-pce-fast-libretro"; - rev = "7e9b257b8a591cb7e00f9e55371edba19db9799c"; - hash = "sha256-LBx4bSnE3XeQw/Bc5EID8U6Dxj7uc6JBrV8vSwO/jEM="; + rev = "6d182b22f6b9430c76ea71579ffb2eee0e2e9521"; + hash = "sha256-QHkG5CSZgaakblOgp5HxGvtWg8K4Nbag481nhG4UjoY="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/beetle-saturn.nix b/pkgs/applications/emulators/libretro/cores/beetle-saturn.nix index 8c63c7922519..614fc85fa385 100644 --- a/pkgs/applications/emulators/libretro/cores/beetle-saturn.nix +++ b/pkgs/applications/emulators/libretro/cores/beetle-saturn.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mednafen-saturn"; - version = "0-unstable-2025-07-01"; + version = "0-unstable-2026-01-12"; src = fetchFromGitHub { owner = "libretro"; repo = "beetle-saturn-libretro"; - rev = "ccba5265f60f8e64a1984c9d14d383606193ea6a"; - hash = "sha256-Ixjduv67sPJmf0BH8GaJyyTdpDV/e1UCWCeOb7vLggo="; + rev = "b4df47a9f0f30d09eb95b07a4435d0f435a2e95d"; + hash = "sha256-IIjJdw7u/AaqnKCp6LXc4U0GehwrvEukTC54odCFYkU="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix index ba6f3c6c58c8..e3260d8b3d00 100644 --- a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix +++ b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mame2003-plus"; - version = "0-unstable-2026-01-05"; + version = "0-unstable-2026-01-16"; src = fetchFromGitHub { owner = "libretro"; repo = "mame2003-plus-libretro"; - rev = "9e119625ae7aab771c6f12e6e5ffccfd24b3bd4d"; - hash = "sha256-Zso1EmJ+JH+eynV87tBUWGq9sPqhMwSHmc4gbF94btE="; + rev = "b9b7bfaa2d9e40ca5b94af1f6e9ec77332e4f6c3"; + hash = "sha256-92lHdfYlITWPO4uVzVf3l+rm3RPyUu7/dO6h9t/+A4Q="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/ppsspp.nix b/pkgs/applications/emulators/libretro/cores/ppsspp.nix index a0eb9af8c041..c0b389a35945 100644 --- a/pkgs/applications/emulators/libretro/cores/ppsspp.nix +++ b/pkgs/applications/emulators/libretro/cores/ppsspp.nix @@ -13,13 +13,13 @@ }: mkLibretroCore { core = "ppsspp"; - version = "0-unstable-2026-01-10"; + version = "0-unstable-2026-01-18"; src = fetchFromGitHub { owner = "hrydgard"; repo = "ppsspp"; - rev = "3f3b353350aae4f9584070c793bf19983886d910"; - hash = "sha256-VFAs6bmMWRn737nfRd98vcFJkVQ6Z580COUmgl2aOY0="; + rev = "3c3de9ce6b93dc718ad7487ee249dea560a791ed"; + hash = "sha256-ZzOrK0ccYew91bZLMp5B4r5wC/4e6N5SaDled0fskcI="; fetchSubmodules = true; }; diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 3e97de6cfee9..e93bba704943 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -68,6 +68,7 @@ alsa-lib, desktopToDarwinBundle, fetchpatch, + qoi, }: let @@ -192,6 +193,7 @@ stdenv.mkDerivation (finalAttrs: { glib-networking libmypaint mypaint-brushes1 + qoi # New file dialogue crashes with “Icon 'image-missing' not present in theme Symbolic” without an icon theme. adwaita-icon-theme diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix index 3e9d0e569275..0abe97282fad 100644 --- a/pkgs/applications/misc/opentx/default.nix +++ b/pkgs/applications/misc/opentx/default.nix @@ -84,7 +84,6 @@ mkDerivation rec { "aarch64-linux" ]; maintainers = with lib.maintainers; [ - elitak lopsided98 ]; }; diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 99d0f4bd1a68..2c88fd184cfa 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -62,19 +62,20 @@ mkChromiumDerivation (base: rec { $out/share/applications/chromium-browser.desktop substituteInPlace $out/share/applications/chromium-browser.desktop \ - --replace "@@MENUNAME@@" "Chromium" \ - --replace "@@PACKAGE@@" "chromium" \ - --replace "Exec=/usr/bin/@@USR_BIN_SYMLINK_NAME@@" "Exec=chromium" - - # Append more mime types to the end - sed -i '/^MimeType=/ s,$,x-scheme-handler/webcal;x-scheme-handler/mailto;x-scheme-handler/about;x-scheme-handler/unknown,' \ - $out/share/applications/chromium-browser.desktop + --replace-fail "@@MENUNAME@@" "Chromium" \ + --replace-fail "@@PACKAGE@@" "chromium" \ + --replace-fail "/usr/bin/@@USR_BIN_SYMLINK_NAME@@" "chromium" \ + --replace-fail "@@URI_SCHEME@@" "x-scheme-handler/chromium;" \ + --replace-fail "@@EXTRA_DESKTOP_ENTRIES@@" "" # See https://github.com/NixOS/nixpkgs/issues/12433 - sed -i \ - -e '/\[Desktop Entry\]/a\' \ - -e 'StartupWMClass=chromium-browser' \ - $out/share/applications/chromium-browser.desktop + substituteInPlace $out/share/applications/chromium-browser.desktop \ + --replace-fail "[Desktop Entry]" "[Desktop Entry]''\nStartupWMClass=chromium-browser" + + if grep -F '@@' $out/share/applications/chromium-browser.desktop ; then + echo "error: chromium-browser.desktop contains unsubstituted placeholders" >&2 + exit 1 + fi ''; passthru = { inherit sandboxExecutableName; }; diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix index 20b7886b74d5..39d066451db5 100644 --- a/pkgs/applications/networking/charles/default.nix +++ b/pkgs/applications/networking/charles/default.nix @@ -31,7 +31,7 @@ let desktopName = "Charles"; exec = "charles %F"; genericName = "Web Debugging Proxy"; - icon = "charles-proxy"; + icon = "charles-proxy" + lib.optionalString (lib.versionAtLeast version "5.0") "5"; mimeTypes = [ "application/x-charles-savedsession" "application/x-charles-savedsession+xml" @@ -73,8 +73,24 @@ let mkdir -p $out/share/applications ln -s ${desktopItem}/share/applications/* $out/share/applications/ - mkdir -p $out/share/icons - cp -r icon $out/share/icons/hicolor + ${ + if lib.versionOlder version "4.0" then + '' + for size in 16 32 48 64 128 256 512; do + install -Dm644 icon/charles_icon$size.png $out/share/icons/hicolor/''${size}x''${size}/apps/charles-proxy.png + done + install -Dm644 icon/charles_icon.svg $out/share/icons/hicolor/scalable/apps/charles-proxy.svg + '' + else + '' + mkdir -p $out/share/icons + cp -r icon $out/share/icons/hicolor + if [ -d "etc/mime" ]; then + mkdir -p $out/share/mime/packages + cp etc/mime/*.xml $out/share/mime/packages/ + fi + '' + } runHook postInstall ''; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 62e1125ef9ba..58895241493e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -110,11 +110,11 @@ "vendorHash": null }, "bpg_proxmox": { - "hash": "sha256-d0v0a4t0sPkGQ9LGK7p5XZmuZBuBeLcWHBoslFu9Qs8=", + "hash": "sha256-eRed1lShDIpQRCC/JvqT5uYbDU+mgpMfEPiSQFoV1QA=", "homepage": "https://registry.terraform.io/providers/bpg/proxmox", "owner": "bpg", "repo": "terraform-provider-proxmox", - "rev": "v0.92.0", + "rev": "v0.93.0", "spdx": "MPL-2.0", "vendorHash": "sha256-+UWPbNHoV3TdeMZdY0ZOLBe1/Dej37hHORatC9Kol58=" }, @@ -310,11 +310,11 @@ "vendorHash": null }, "digitalocean_digitalocean": { - "hash": "sha256-A6LxX2zMZAd/Db1VdAVqMplCW2qZx4MNyIpLwTBXkxU=", + "hash": "sha256-SmpbPDlJxsXT63d4KnUSzbPLSG5c2mPy6SCA8TCpxe4=", "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean", "owner": "digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.72.0", + "rev": "v2.73.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -842,13 +842,13 @@ "vendorHash": "sha256-Y1L1nIOubhBN5vNIXY7miQgR9OzoTCS7QA55DEMwDSA=" }, "linode_linode": { - "hash": "sha256-gsRrEsR2+2AadSPhY6hwP3iqjNQyCqhxmnsFL2iMbcw=", + "hash": "sha256-/igrYgWTM4vujH2PFzXijVhHw0gQzLUwFZJd+RM0hSQ=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v3.7.0", + "rev": "v3.8.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-03uqpurO11HMMxwZRIaD7iuOYk6TuGbztIwE5SPwemU=" + "vendorHash": "sha256-TxfiOKANocV96TiN60QpA1wVLucXNpmJm1FmVavOlQg=" }, "loafoe_htpasswd": { "hash": "sha256-ALTyTTVyS2HHenmk8HVwtQenCmJX05kyXifJTzzmnHE=", @@ -959,13 +959,13 @@ "vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0=" }, "newrelic_newrelic": { - "hash": "sha256-P0lxCwEBhkShLE3xJX7V1wxI+xjpgjepuTWYiXbRYBE=", + "hash": "sha256-SfUTt9Ag6pBC9a8rJERBCbccKgJYdNiI1UXoptZoYdw=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.76.7", + "rev": "v3.78.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-xTlalKIWvU2MDBvwNjl3cWFVH26EyDthwrnXVmbK+rc=" + "vendorHash": "sha256-RyGnUzRkIR0XoEPc/cc+40QACAJhvOMENzJc1T0Yz40=" }, "ns1-terraform_ns1": { "hash": "sha256-pKdybFzTuuD6D76Uhuz+fLN+EmpDxUwjIWXYK6DRKOY=", @@ -1175,13 +1175,13 @@ "vendorHash": "sha256-f3b4NULINH8XworCn46fiz4GmBM31ROdAJy1j4GKkx4=" }, "scaleway_scaleway": { - "hash": "sha256-TekcGTYzpqFUVv0NYRGi71rgMD0okQpMPiPI8869cog=", + "hash": "sha256-3p/g43WkVI3T2e2xSm/hwzu9aFqivszUtVcPsFSsx1o=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.66.0", + "rev": "v2.67.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-2uqoiUdU8hVHm8Mc0dkS/qAuqZkhVVTKwf++CobRGtw=" + "vendorHash": "sha256-rT8ScPPnrbUBviiK03U96K5vvVEbcLra3MGSJ8+SYyE=" }, "scottwinkler_shell": { "hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=", diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index 0ecbd3d277fe..451162118522 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -14,7 +14,14 @@ wrapQtAppsHook, }: -python3Packages.buildPythonApplication rec { +let + pythonPackages = python3Packages.overrideScope ( + final: prev: { + pyqt5 = prev.pyqt5.override { withWebSockets = true; }; + } + ); +in +pythonPackages.buildPythonApplication rec { pname = "gns3-gui"; inherit version; format = "setuptools"; @@ -28,20 +35,20 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ wrapQtAppsHook ]; - build-system = with python3Packages; [ setuptools ]; + build-system = with pythonPackages; [ setuptools ]; propagatedBuildInputs = [ qt5.qtwayland ]; dependencies = - with python3Packages; + with pythonPackages; [ distro jsonschema psutil + pyqt5 sentry-sdk setuptools sip - (pyqt5.override { withWebSockets = true; }) truststore ] ++ lib.optionals (pythonOlder "3.9") [ @@ -56,7 +63,7 @@ python3Packages.buildPythonApplication rec { doCheck = true; - checkInputs = with python3Packages; [ pytestCheckHook ]; + checkInputs = with pythonPackages; [ pytestCheckHook ]; preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index de04bfb202a0..088527fe930a 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,797 +1,797 @@ { - version = "146.0.1"; + version = "147.0"; sources = [ { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/af/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/af/thunderbird-147.0.tar.xz"; locale = "af"; arch = "linux-x86_64"; - sha256 = "d981a255991badddf6267838c55682cb1591c74be50db34e9e0d56b2058dd4c6"; + sha256 = "c5e28d2c01738c629f1abad0069eddf168a15583131177b5c596a3212a043b85"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/ar/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/ar/thunderbird-147.0.tar.xz"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "90837a1812d292d4262c98003829d3f3dbe5ffa56f3e337c055512ac8ec33f8d"; + sha256 = "f767b82448c053fba33cc2096eeb21cb8cddd63f3162fc1a5a67dbd956dc964a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/ast/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/ast/thunderbird-147.0.tar.xz"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "b519195555b63aa6ddccbd63ae1128ff24972a757e41f4f249ba86048101aaf6"; + sha256 = "007e2607dc1646a5d93a19c7243d9c1f3f2b700469c044bca070e0eaeb078b6f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/be/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/be/thunderbird-147.0.tar.xz"; locale = "be"; arch = "linux-x86_64"; - sha256 = "71a07d58c038f38bbba3a112bdc817b57a23480db9d4bbcae84cc4dc14ed4771"; + sha256 = "512593c97a6f0fe1a3f15bdf88736561f17f7723d4e5d30e14131ac6300ef0a6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/bg/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/bg/thunderbird-147.0.tar.xz"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "c998ab09d84d07127858cecf6c6fc7c33576311d5da08b4588258ab987df70f8"; + sha256 = "d014bfec61719c830dd7803a6c10b030fe29810c116b6182424fda092bef74af"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/br/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/br/thunderbird-147.0.tar.xz"; locale = "br"; arch = "linux-x86_64"; - sha256 = "5a0ef28c481e58cd3eabfa76dc99096ba7a0fb9f78c3a46e99b8f83dde485350"; + sha256 = "3e8985ba97fa461f233dc42d4b14651e54766812cd493e46bc836c8c2cf46b6b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/ca/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/ca/thunderbird-147.0.tar.xz"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "3cc8bd57ee7b5d1868a792bf0a251343fdf023350a5733cb33230585f150cb51"; + sha256 = "c00626b73ce72d97f041b4c891e6dea93ed0a239535ab68846232ce9774f416f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/cak/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/cak/thunderbird-147.0.tar.xz"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "7acef4083bb55b48f7d8b4e1d8b15012f57d03ed932836e8d84fb890c95faf78"; + sha256 = "59de7b316917205570044f312427d763c4fd5c31cbbf65e640ae9775962ff489"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/cs/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/cs/thunderbird-147.0.tar.xz"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "e9f17a07dabc286859d2647e688b295678c867f558dce96fbb7582797b05d31c"; + sha256 = "059f76cfbbd7c181196544611acc94fc413ed3295d699f7f0092061cd5db05e0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/cy/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/cy/thunderbird-147.0.tar.xz"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "f8d2c3b43e1e5d4c3811886c644c38dd14cf9a12a4c2fc11634731b098c5fb07"; + sha256 = "8794fcce1ff291d0d77076bb8fcaca196b5cb1af57d6a41d09cda6c205da09af"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/da/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/da/thunderbird-147.0.tar.xz"; locale = "da"; arch = "linux-x86_64"; - sha256 = "bb4af11735a021a8d643103d6ae467b9b97e08cd9ed5ee955db595c53b68aa7c"; + sha256 = "36c9522c106b9e2133adc3c44f1208e094a732d7c026976e14f0abd44cb696cb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/de/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/de/thunderbird-147.0.tar.xz"; locale = "de"; arch = "linux-x86_64"; - sha256 = "77e4b6254773701e84d72e6a3d551068838b020dbfbb094509ca0e8fa757ec5e"; + sha256 = "b2e28316fba510bebbfe2cd62838a631ae8faa79b79132bdb1e715e3dd3f5c22"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/dsb/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/dsb/thunderbird-147.0.tar.xz"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "27ac6a7d2979c90ed7c9136ed26a04c2e79f9dcdf6e10e526b0bd01e80654a68"; + sha256 = "38d3256d0fea27e5d0eacfa4bd9d1eeabc35f8ea4c6595907219259fa078a586"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/el/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/el/thunderbird-147.0.tar.xz"; locale = "el"; arch = "linux-x86_64"; - sha256 = "393b5336fbe551f562bf57f098dc366ef9c0681f295a22a525776a9f9f7f24f9"; + sha256 = "e5dc3e6ea1bcdaa1dde21894fa786f28f4785805b873dc6a08c7387df56c1ec7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/en-CA/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/en-CA/thunderbird-147.0.tar.xz"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "46aa073e1cafcd9cdec1d0ccba174e855d99e172f90e005b00bea6f6cd4023cc"; + sha256 = "2a092524ec4fc702bfe05323f5316fb3670a8df20db770f60bdf973300ba514b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/en-GB/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/en-GB/thunderbird-147.0.tar.xz"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "016f6d485ae7af4c2c408fdc347f2c90b07bb6e43f5d3f683b1ced5a45c9752a"; + sha256 = "0ba2f01e772759955b4e0768b060c49f9bf08076a3826d6030060b6e7051cae6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/en-US/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/en-US/thunderbird-147.0.tar.xz"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "d2e49bba5f275e016c4ff775b7405165178e045ab30a721ae041882108a87e33"; + sha256 = "ce101064e7d9fcdd3c3e41cc212c00384fd714accf51adfb228aa2b24dd98bd7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/es-AR/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/es-AR/thunderbird-147.0.tar.xz"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "2dbb5884243e97a78debb25ec2bc7d4821b17d369c92458607a1939940670599"; + sha256 = "fb368f360e65b5b4085876bedbb285e97a2d588f960587e18c27d7d1e37bb90a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/es-ES/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/es-ES/thunderbird-147.0.tar.xz"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "b0d5c2b5574a131bb2e7859204d4765202d82e0b46bffdedd803b6c1246e52b7"; + sha256 = "e695f9e66cbedb6d34bda83e42c62375d87e027cd54aec049ab42f615379717b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/es-MX/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/es-MX/thunderbird-147.0.tar.xz"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "5ace903ffacfe0c99307a7257a84ce125a46ef2d59d51637a9f48ae966b006c7"; + sha256 = "79c76d110dd44a3643dddefe077d8c58b6a87809adacad3750bfbe7d84ae6e8b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/et/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/et/thunderbird-147.0.tar.xz"; locale = "et"; arch = "linux-x86_64"; - sha256 = "975432c045351d6946876cab0bef4ec97fe469b484f913ddc6c379d673436f1f"; + sha256 = "1497c1190df4344e3fc4ee48cf884196eedbba3f1de79cbb6878a1c838c93927"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/eu/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/eu/thunderbird-147.0.tar.xz"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "e91c8c99a617df62e1d3f2fb0063375d28297be8884f4f783c939e55e22d7db3"; + sha256 = "7c5c734bd3d3f354141dd15a355d2083ee917539e9f838126a2fd12389019a91"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/fi/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/fi/thunderbird-147.0.tar.xz"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "bc852f61463e4eea4bc8a85c53eb77b5f995bfa6c6f8008b7e68590742a9935c"; + sha256 = "e5bcb84aea395e6ecb32529aad2fefb2d7a7faaaecae2d8815b6ea734c0d47d5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/fr/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/fr/thunderbird-147.0.tar.xz"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "efa5c8415081538a0d1b5fdb703db855a5f0d498ac4d5dd016cfd4d17d66ffaf"; + sha256 = "1124070f96aa06e411ef0eb7ed1552bdd792f75265efe8360dada5170dd9b59f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/fy-NL/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/fy-NL/thunderbird-147.0.tar.xz"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "5f0ba65fe99db544dd61359e48843f6d1900ba891fbd1bab3d60060ff9164c3d"; + sha256 = "6308776f611afeb0de28ad6efdd7ae0880903f442795bbd4342aee60b80e9d2f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/ga-IE/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/ga-IE/thunderbird-147.0.tar.xz"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "6b8a39a6b5344ce667a06186280615ec93ad16675dd0cc93b073113b4508a274"; + sha256 = "971b4d23079d0e6cf7c03a79e09a5bd465c207e8e0975b55befe9deca1986a63"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/gd/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/gd/thunderbird-147.0.tar.xz"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "3c337f9609041e97436fd9bb96eb9b0119ebd2c667745064f30a2db1c4bdcb8a"; + sha256 = "bb70aac1fad09c30f581be8ecef53667f292cdcb9d8898020eef8e6a6c348a18"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/gl/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/gl/thunderbird-147.0.tar.xz"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "c0855f94bab373ba33d46546a8b15768b8f81c660bbb76a83416059795af02ff"; + sha256 = "1921d44187358810e76c19a146e6e568b34d6c4e328c3ee8eb6db0d08dd4ac9d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/he/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/he/thunderbird-147.0.tar.xz"; locale = "he"; arch = "linux-x86_64"; - sha256 = "d5c458dfa6fd8ff986188a6fcd88c425c8a605b4876401148bc2fb1a461ca4a3"; + sha256 = "4e3fb7273a6cf8d3e36b1c483640c2ab7de5227f6ccf763338994da94fb5ecb5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/hr/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/hr/thunderbird-147.0.tar.xz"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "092edaaff1fb539743ce5d17814f64fefb01f94398a47c1c0fa570a6affa707c"; + sha256 = "624549be1a5d6a8bebc2fd99ce4ce0d0ce24e324445373a108a47c3280eb7a35"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/hsb/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/hsb/thunderbird-147.0.tar.xz"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "21638543d1da61e943d88de501c6553de596d7599a9212a4c8b10c446ec61443"; + sha256 = "12d542934568eb0c7d64acf5ae0eef5abc488742b169837bae3499a7b7930358"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/hu/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/hu/thunderbird-147.0.tar.xz"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "d4575a6b46fce80568bf53330f16b035f3f467eea976499f672777b791644af7"; + sha256 = "9529fbe37377a95ca6713ccd6601766a9a793f68b3acd802854f811a9a1965b0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/hy-AM/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/hy-AM/thunderbird-147.0.tar.xz"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "6a8bf0444f480c708bc193394c51a90b91b3bea9e59abd0a7b15c44c82afb7fd"; + sha256 = "0835a6c07e8c2284f692a835f290c64185e2b8e6c232b4dccf690da509bc43a9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/id/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/id/thunderbird-147.0.tar.xz"; locale = "id"; arch = "linux-x86_64"; - sha256 = "49a9f95cd9f7a511ef65e1094e6893d16e1f35af98398357a0f8a56ec60cd538"; + sha256 = "e4bea4075153dc47d12b4313e166cc814d1af170b47a569bda323a1b94d0dc86"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/is/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/is/thunderbird-147.0.tar.xz"; locale = "is"; arch = "linux-x86_64"; - sha256 = "6f83c77c77c1a140ada9e38b7f1e6db8e58f48d77a943b3590ac8aa95d1955aa"; + sha256 = "a48fe1303a6ac147889c3e2c8728e55a794f4ec6ee86a9a1f9e17299fabd3731"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/it/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/it/thunderbird-147.0.tar.xz"; locale = "it"; arch = "linux-x86_64"; - sha256 = "f1fce770ce0dacfe003b2c812044b16cd0d819e1eeb5e18cf4346248af08afb5"; + sha256 = "1d25410525f2b884871db0d530639c9b355f00eec9526abbb5108834310b2420"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/ja/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/ja/thunderbird-147.0.tar.xz"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "5909215ac5239cd223e4b032ae44e41da6d19c162f377bae9bcddf2489f5f742"; + sha256 = "50c1555c46c4c44599be7dd811ae391328df2a02150fb02a39c265c47784ed07"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/ka/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/ka/thunderbird-147.0.tar.xz"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "06b0e91bd58599081569927830c8d63ab74bd2545925111a47d47b4cd5987490"; + sha256 = "e7c4f9ea538476dc1d964e9e689a784b9c5484965ad8db2fabfdf0394d7ed7f2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/kab/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/kab/thunderbird-147.0.tar.xz"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "3c784c1cd6755fdd232b6ae04f43668dd48aa7d7ea25deeb735f62520247306f"; + sha256 = "0261eb97ff4d5d6feda3c15ae0b5d191deb0966dd88be39552a791b54c1096a3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/kk/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/kk/thunderbird-147.0.tar.xz"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "912eedc1f49264dfd7994984a50606b750c89c8056e2967790a4c66d45ce578c"; + sha256 = "79eaacbe2f1b885e1f5bd3eb513b2e379223ff5a3ca86fc2ea88f703c3285393"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/ko/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/ko/thunderbird-147.0.tar.xz"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "c7242bccdf8cc25a137e7939c78cade8bfc9f6c2851860c34e2422d9eab4c321"; + sha256 = "b12e403aecc3ffb2867cf6d4a9ee1b94364721c75a7524ccf71aa6d7a40de424"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/lt/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/lt/thunderbird-147.0.tar.xz"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "781b88157bfc9faddcfdc4b25735acfee2660c2b666eb26d238e6cde778de9b1"; + sha256 = "d921112fcffebe0f6c4ed5ecdbf5fad2f2a1d1389f5a34153b1dc7c2a0494e71"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/lv/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/lv/thunderbird-147.0.tar.xz"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "ce966bd83eb6849e74d2dd653a5980232cb7e704128da78f6a55ece2ccbb1b9d"; + sha256 = "cd3db4c0f7c0255bcdf26e253b9eddbb7f3a3704c55a2d3f5e6921832c75b8d3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/ms/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/ms/thunderbird-147.0.tar.xz"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "99f7d4b58d0d473c49ba3c387cd9b24b452688acf77386f49531eea51e131550"; + sha256 = "a2358e11e54328f140afa751e8760e312718634cb0c145369a1aa1d2506ffa2f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/nb-NO/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/nb-NO/thunderbird-147.0.tar.xz"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "b8dd3b1cd37865d368a0cf26ae36855351b6bcd6f7f0d7461d66486a05601105"; + sha256 = "a9b66e68fa3fb648ca99c2a0a7e58b97749e7af56c463879ded73ac1f8a258d0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/nl/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/nl/thunderbird-147.0.tar.xz"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "95e42e1e6931ce6fb3b4ffb09e3af2be57a2439408962bf59fc176a5aaa794f1"; + sha256 = "59d3fd1bc61a84b95c0a3ea8b169c32b87eb465ec698081eff4246b307717ac4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/nn-NO/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/nn-NO/thunderbird-147.0.tar.xz"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "b70f5a3a62f91c32e517b94f68473b41c3ddf1a7e981fef193b76654a17969b5"; + sha256 = "d97f96dddf2390513a2cdcace20af4e5ec63c8c6f963df15cf4c5de85061acd1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/pa-IN/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/pa-IN/thunderbird-147.0.tar.xz"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "adda59ed9422f89e2a5fc4f086342ff298d3c4cf99b0cb7c8aa1d3b8a0b2ce4e"; + sha256 = "6c59d93a3ef44124e37688e2c6cb7497aa7f87cf5b15052ba3d28aa5927a520b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/pl/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/pl/thunderbird-147.0.tar.xz"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "9facc84ad65bee162be8342da0fba929071b2791c531b61562f86e2c65278a0a"; + sha256 = "4e4f51bc72af14578d6b4f25bd5d052fb7dd1015a5394067bbab16f777bac4e0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/pt-BR/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/pt-BR/thunderbird-147.0.tar.xz"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "2930e7484e905354e07365368fd6857b217a91207160ad266201c2f5616fc67a"; + sha256 = "c4d8078b60ea6e9623d3d7196213732f957acb8bc2fadf1355fa1be32d066057"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/pt-PT/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/pt-PT/thunderbird-147.0.tar.xz"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "9560275197fc4f65f576b73c3df213dfda369beb87031c1577a6f68d6ae5b649"; + sha256 = "33c64b4b3094e15de33a7a6452e04a44c04a5e18ecdfc6dcba5f766c12d296df"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/rm/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/rm/thunderbird-147.0.tar.xz"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "ba4ce786cc17539e994428c40424e524633143f6f2dce340a733365b8a056bd4"; + sha256 = "09ea23f4310d2fc3a2daf9c1420c7250f47cd01418609562de2ef5ebf5bcb77d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/ro/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/ro/thunderbird-147.0.tar.xz"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "995cb37f220dc8c9a637e381c5a9f6e5e62d1f50bf257ed3210770b3502695b6"; + sha256 = "36b4073e1c1336f613d6293174003a03057bc5195c1125c95cb042bea1b095e4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/ru/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/ru/thunderbird-147.0.tar.xz"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "226ed314e80e49e3081d956a953127d30701123e3c630a2b84944d394fe355da"; + sha256 = "f755ce54db6b7b3c92575670d12a7af3d885a51da8b455757efd9341f3f0da52"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/sk/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/sk/thunderbird-147.0.tar.xz"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "11951db352dce08007ef625c93bf4f4f51f79cfd28650884495b50b4ef48d399"; + sha256 = "e2326ed8a243ec894858980536e25ff39c399aed32e9998e400a9cc81ae1f24c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/sl/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/sl/thunderbird-147.0.tar.xz"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "b4ccccb91ff4929b69e6ed6479518f44fb2c8b346e989c96e29740584ddef3f0"; + sha256 = "8526086855d974c1775f353193900fcc86178acb5ab5fc8d1085cdc559edef89"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/sq/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/sq/thunderbird-147.0.tar.xz"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "38cefa80ed52e818b64dc9050bf007a4b1976aed7773a704563d8e1efc7726c2"; + sha256 = "d9f284f71dd7cad63fea09b6234e2002c65d0130350ab1452a3a282859b6822c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/sr/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/sr/thunderbird-147.0.tar.xz"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "4c6c2638d6b81290ccd041df3fc442228eb13d9a9c03d6b3acc4c8afbd6d85a2"; + sha256 = "8ec3b1d7de26f60bdd5801faa26542e2b42467432d3180db5a0d85d415dc70fd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/sv-SE/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/sv-SE/thunderbird-147.0.tar.xz"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "41735d81059ead10a333ede3144127542d5c72f0b6b1f48a29ba7e846595cb67"; + sha256 = "c59ccab9f8ee78f417ceb8ab2fff985eb41dc45d923dab294c540f8f14425aec"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/th/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/th/thunderbird-147.0.tar.xz"; locale = "th"; arch = "linux-x86_64"; - sha256 = "75511f9814d4b37fa8c832a95ea509b1fec0b1767119754db81acd53553b9207"; + sha256 = "0cd157dd80e062f2465143595fe4f4898d20c83b9033a6c287e34111055817f5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/tr/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/tr/thunderbird-147.0.tar.xz"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "25a85741204a036692f409a3dca1a98dacf710af86c802d7345a653d35822760"; + sha256 = "395677017a8b043bb8d7291f4acc01736937da439566cd76ade19316ba107154"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/uk/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/uk/thunderbird-147.0.tar.xz"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "8d06173389422e607338aa3a22815f2431e59f5e7cb77ca20af9d2d2348af41d"; + sha256 = "00f771462f62b48f2125b327b36d1a41939431c062ae79e6303d155232bac6c2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/uz/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/uz/thunderbird-147.0.tar.xz"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "18c29c959a5c3a1cde540bde24235810367d9ac596085bd04cfdd101c39f9332"; + sha256 = "31f134e6553bc18596bffd6ce255f577e65bb5eedda0f078fde0633c2bdc85b1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/vi/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/vi/thunderbird-147.0.tar.xz"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "155d9b185772b3d1d08be4d7c88aa03eb6ba1df625b00e16605269a8f4c68d75"; + sha256 = "4873941e95a75b48ed1ac7bbd98b527c49850c04d6553365df75dc366097c6f0"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/zh-CN/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/zh-CN/thunderbird-147.0.tar.xz"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "98a2e8be7f9dc3ae8873b12b87374dcd033c3d498c78cb8d0668b4afc246fd72"; + sha256 = "1f90d4e44683117664355e72f4daa2d91b06ae5dfd8e1942bd5538730769d952"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/zh-TW/thunderbird-146.0.1.tar.xz"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/linux-x86_64/zh-TW/thunderbird-147.0.tar.xz"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "b7806eafd1734260e233fb9dd1144a105739d746a0d998e7517adecf3fe7f373"; + sha256 = "99d130307577a236982a07082d909377ed1a2e54b9b0c9d85d6cc5842443d572"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/af/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/af/Thunderbird%20147.0.dmg"; locale = "af"; arch = "mac"; - sha256 = "15ff5f058d558e50a55022a59ff10b06587b09e98e951a4d574260f3ad95b72b"; + sha256 = "bd378636f4010ab2d5c3546da9b21dd4d193f514ac167d647153491e37a04027"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/ar/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/ar/Thunderbird%20147.0.dmg"; locale = "ar"; arch = "mac"; - sha256 = "a6b94457a01e227af02b57fc009e2d43145b4899f0d45cecda4927afd5bd9dab"; + sha256 = "39d65c43e394e3df8f91c766fb4b0fc752ee7f9a7e4762e0bf6dc38689bfbc85"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/ast/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/ast/Thunderbird%20147.0.dmg"; locale = "ast"; arch = "mac"; - sha256 = "e37201f38f611b9662a29694a10d8f15e58cde752a19e766bd87dfda535f9df0"; + sha256 = "bbc7d5bbf0491c6e2519854577c3c6477c594a592ba740ce5f4d83521e451729"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/be/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/be/Thunderbird%20147.0.dmg"; locale = "be"; arch = "mac"; - sha256 = "a032af69c46654cfd22484a62f25e0ad089fa140b1002389ded4eb35efc93fb4"; + sha256 = "1b4f81b55eaebc2392f75c543787019855158a9173bc433fc0b90141bd3ed677"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/bg/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/bg/Thunderbird%20147.0.dmg"; locale = "bg"; arch = "mac"; - sha256 = "1a052dfb4e89787d8173a6f7dfa4154ea3bba962f03655bc534c8880ba97fd99"; + sha256 = "1cf0ccdd615f3aab381d8d0e6bf37ca04770e33121f3aedaeb84d9486043b1c7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/br/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/br/Thunderbird%20147.0.dmg"; locale = "br"; arch = "mac"; - sha256 = "e1bc0aa08a50dd8c6c6c2ea1eebd228854bac1a39f5b67f4a1b97f45c2431348"; + sha256 = "b08df726cf401e61361b586fdd910714251f0415a270456369d979b0b5551388"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/ca/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/ca/Thunderbird%20147.0.dmg"; locale = "ca"; arch = "mac"; - sha256 = "018136e573c9bef83166794f590042d9fd3de2c6ade075e1671f432ba15ebd56"; + sha256 = "59fc5ef92c4767d4a67fe847b6e11e8dee7654a31fb47feb23e5018347e2dac8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/cak/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/cak/Thunderbird%20147.0.dmg"; locale = "cak"; arch = "mac"; - sha256 = "30da57420e4ef8d32d351df490b324b5fd2c53139ae025713fe80ec89772ed84"; + sha256 = "f8651fb91909443daf8aafab04255453a6b0bc13f361345eb23d341242861fcb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/cs/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/cs/Thunderbird%20147.0.dmg"; locale = "cs"; arch = "mac"; - sha256 = "38e776c6f0dda6d0e6955c2f9044d7b17141152568d1c08f5641bce015ad9425"; + sha256 = "a47e3c2c0a742018731ba20c358764fe9607bf2c514a5b7ba9ee2fee1c19cc34"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/cy/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/cy/Thunderbird%20147.0.dmg"; locale = "cy"; arch = "mac"; - sha256 = "d11f1326db344c8f738c9c8e582276ad3a037adc97e1848876d6066096e9d939"; + sha256 = "844158eaf25963b1ec80b951d78865669c7748a24181932e6a85a8d800b23cdc"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/da/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/da/Thunderbird%20147.0.dmg"; locale = "da"; arch = "mac"; - sha256 = "4a4c49fc3f494921878b0e7761a2f1918089978d535a86395a212a439e6a9567"; + sha256 = "2d36261c374e9083f35dc547c3c0150e32bf360b7465d7bc5d3b32a0e8723b70"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/de/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/de/Thunderbird%20147.0.dmg"; locale = "de"; arch = "mac"; - sha256 = "39e18093e3473a10564bd79bc3235808258dcdab16107942248b09ee20668342"; + sha256 = "9caf0b895e1952c041d1a19adb051d4e5794b137a5b641ae7c4b2662aef00040"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/dsb/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/dsb/Thunderbird%20147.0.dmg"; locale = "dsb"; arch = "mac"; - sha256 = "632b8da6324713d7b2f90e3b562c6694da012e09681573adba2166601f0254fe"; + sha256 = "dbe872700d81195f4241bfda3d59f37639f212144d6e9464a96387f9ab14a5f6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/el/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/el/Thunderbird%20147.0.dmg"; locale = "el"; arch = "mac"; - sha256 = "65209e444344103e70f00bd8be9322fad56d59cca75d79eb41d49cd1a523fac0"; + sha256 = "1b3329a3ab07731203155a00a594c533c84be2b161d4c766d52c78f32a69b9c7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/en-CA/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/en-CA/Thunderbird%20147.0.dmg"; locale = "en-CA"; arch = "mac"; - sha256 = "d579ba962027732a6f81475e01702a57796d20fa943f6f504e8c55afcde99dbc"; + sha256 = "de80ac7f670542e674bcd488726e0f613e80898dd94d3b742b6696506176a7a3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/en-GB/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/en-GB/Thunderbird%20147.0.dmg"; locale = "en-GB"; arch = "mac"; - sha256 = "e5ee344258ef6d439fb4e7f0ebf205e35011455fc10c7838f0e7d27bee4ce49e"; + sha256 = "dc0b45304e5a29f39d1343e958dbc458563d9cf6da47aba040619b32ea84cb90"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/en-US/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/en-US/Thunderbird%20147.0.dmg"; locale = "en-US"; arch = "mac"; - sha256 = "5b729073f032a77589b88f69a032066233a6e0f862b66005de81cee0f2adc601"; + sha256 = "75a5aef901fdfac2e078442f50e9eb31475c821823ae78659aa3f1013fbb4c51"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/es-AR/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/es-AR/Thunderbird%20147.0.dmg"; locale = "es-AR"; arch = "mac"; - sha256 = "fb905803e5f6ed0b6dfa0de701c35bebce1a9e2f8028fb13fcd5d23844a3286c"; + sha256 = "c0cb0574039dfaa299da2b1762f79dd39004b493f99f2baf473be3698ecb8890"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/es-ES/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/es-ES/Thunderbird%20147.0.dmg"; locale = "es-ES"; arch = "mac"; - sha256 = "5a492a1703348ab4d7bb7fcd41d4e2ec4f491c6cbc9d26c4d67036174b2aa239"; + sha256 = "86f2b87eaba9827c490b4d3f923a990f4a5616c23f7b140c6328a1d0d5affd2a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/es-MX/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/es-MX/Thunderbird%20147.0.dmg"; locale = "es-MX"; arch = "mac"; - sha256 = "82447f466a9e7c54ce4d6b4efcbed1b1a20f61f0000b97776bfca343dec7c516"; + sha256 = "bbc2d0a8ddff7d92b07006d006a7c69069ce9a65df12e2d5442c686b4118230c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/et/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/et/Thunderbird%20147.0.dmg"; locale = "et"; arch = "mac"; - sha256 = "33fd3e0f50c75c6444fdf5b2b4cd63b644646b3fd5f8c39c99b40db9c85e2695"; + sha256 = "c3bfb4bd7c71d28403ad521d7d1cecdd489a411241cb233d8e437a772c22a55e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/eu/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/eu/Thunderbird%20147.0.dmg"; locale = "eu"; arch = "mac"; - sha256 = "67708d850bcd4573dc45980ffe079e33aae02026b36bd9ce60e3cd94e83364cc"; + sha256 = "ddd8f87ee2a5369aa5b428ae2db559466c882b59d95513f6288f5fcb6a67d21d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/fi/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/fi/Thunderbird%20147.0.dmg"; locale = "fi"; arch = "mac"; - sha256 = "f18913bd86180a97782614e6af7bd96a8debd25146feb2de321c797416b452c2"; + sha256 = "04c419c046d91782a1f5be537efd576be9cc6490bfb14cad13c6b4448cdc4471"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/fr/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/fr/Thunderbird%20147.0.dmg"; locale = "fr"; arch = "mac"; - sha256 = "e99e5b9bf8ded3d36540b16a5b14d10c5e216388da7126454515c242e0ba66a6"; + sha256 = "dbf89c9b21fcc131bebff511dc5b6555f45f5ad1c6abb7ebc2db1533510549a7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/fy-NL/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/fy-NL/Thunderbird%20147.0.dmg"; locale = "fy-NL"; arch = "mac"; - sha256 = "0ee6cfbf3668646d8247de610644b2a9f728f9a18cb916f16fb83c767c4e152c"; + sha256 = "0f4e9d4ba0ed985f714131302c28636e9190de43c11e1bef604886f8a2ca3b39"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/ga-IE/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/ga-IE/Thunderbird%20147.0.dmg"; locale = "ga-IE"; arch = "mac"; - sha256 = "800c2d3c36289a5b8e05dda9414d7e852b429b9a04f5c75cb8278284beb6d353"; + sha256 = "8cd58b183a846cc3c18cf5ee05f583594ae1c18380c2493d9d436b6ce44f69d6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/gd/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/gd/Thunderbird%20147.0.dmg"; locale = "gd"; arch = "mac"; - sha256 = "ae0b8ec336917f1c90aeb910004079298f9c544c27c354abc8573f2224f39260"; + sha256 = "dd169e09a7528c4501c0bff9a367fe668a9667e116a7daf3bb05ac9b44e414e1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/gl/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/gl/Thunderbird%20147.0.dmg"; locale = "gl"; arch = "mac"; - sha256 = "41fdce45c6b91975d42cacd60a76b40d817a2e900428ef94a6160ae571300817"; + sha256 = "e9f18781c50a39027771cd4caa590337d199b489c1b2f52dd6802209df2b5c59"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/he/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/he/Thunderbird%20147.0.dmg"; locale = "he"; arch = "mac"; - sha256 = "77b284018f5410c89e995a0c0521e67ebe1d212229e1011eeb58e7d4e26a2177"; + sha256 = "0e4203b50ab8f3b3fcc3ec166b56c6bd792f43ffe530c9dd4d61f816aa66c1c2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/hr/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/hr/Thunderbird%20147.0.dmg"; locale = "hr"; arch = "mac"; - sha256 = "5cf82129d579badc50a69367c1c5087a97ae010076a3d9cd2ca8569236899252"; + sha256 = "db6ff7111358360765c5dab0b8e0a266547c865ab4060d00559b8c4832997e61"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/hsb/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/hsb/Thunderbird%20147.0.dmg"; locale = "hsb"; arch = "mac"; - sha256 = "24bb71861c845ae5c5b50d8120d0cb1e6a4b31ff680da12ff7d1248c6df9ec57"; + sha256 = "bb9c1c500146740476248fb718231bbd1e6d5e9d449760c93b62734052d501b2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/hu/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/hu/Thunderbird%20147.0.dmg"; locale = "hu"; arch = "mac"; - sha256 = "5e74a2fb88cee5b4a85c65e9e2253a3ced22e282ec717981d927c929ea623c7d"; + sha256 = "0c60a8458d0ce13a66afb365ba698512389b2b8d73d1405b3166d39a29d10c9c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/hy-AM/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/hy-AM/Thunderbird%20147.0.dmg"; locale = "hy-AM"; arch = "mac"; - sha256 = "1fa695c7852c0d5ebd032e8525b78ecf4a6b3c607374b7db01adc523ead8c552"; + sha256 = "3cb3be913cf48707024bccb578f063e9875a4dfda5cc324bfc87fe0ec03e1e30"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/id/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/id/Thunderbird%20147.0.dmg"; locale = "id"; arch = "mac"; - sha256 = "1e2ab777080bb5c86ab40d6b615edad87837f7cf5abe9ca7e568e2497d07615a"; + sha256 = "d2e073a4e4ac0e205d11036483640c83a81200a9721c26349875fbdb31d77a00"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/is/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/is/Thunderbird%20147.0.dmg"; locale = "is"; arch = "mac"; - sha256 = "b16053dee6f778fafc16f77a1e754721b0ade6e457c3372c5d30ed2d2e983f65"; + sha256 = "dee951bdd684e1cb1c96baef26aab12dc30d6183e9a0bd56591c4052252783a4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/it/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/it/Thunderbird%20147.0.dmg"; locale = "it"; arch = "mac"; - sha256 = "9f248ad96934cdb30c9910cff199d59b1947ccdb77352e9e955d7413dff3af89"; + sha256 = "ff7c81a32361a77eb3e566b48782f54a968d48e159ea3213620a6146d037d2ef"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/ja-JP-mac/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/ja-JP-mac/Thunderbird%20147.0.dmg"; locale = "ja-JP-mac"; arch = "mac"; - sha256 = "25ca0bc952a9c4bf88e67358d1e54ba33960376e65a2adbb0ac3b798e5e835b9"; + sha256 = "3ece823e89a424a9d5f3c5c1a10dbc3962f371f3c65236dfad641d61cabc2499"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/ka/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/ka/Thunderbird%20147.0.dmg"; locale = "ka"; arch = "mac"; - sha256 = "3c4d61128e3fd194a686db70e0a5ff18afdc5e0e46f35c1c48d948a049f09259"; + sha256 = "5b54f2f0cd08e2bac8615b398e820e6904bfc3f4649419965c3932fa04ea7389"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/kab/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/kab/Thunderbird%20147.0.dmg"; locale = "kab"; arch = "mac"; - sha256 = "8dc7ce6bfa706b6108d87859154b21ef93a8c22a4aa22930560b50259b29d6b7"; + sha256 = "047461cafc5987f93f3dec2d19199949c6aaec87f2007c8b53fbaa212fc429e9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/kk/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/kk/Thunderbird%20147.0.dmg"; locale = "kk"; arch = "mac"; - sha256 = "86178c30d913830680f7405a0fdcb77a6f98f67a857b6a78fa74331fb81e1deb"; + sha256 = "85ff7a9957fcdae87951c444ee7655b841f91db810874f23cae53a87b5eef894"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/ko/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/ko/Thunderbird%20147.0.dmg"; locale = "ko"; arch = "mac"; - sha256 = "ea97b2efcd71481be2bd4851952a18227cfa389fa1bfddb9231cdcdabd5cfb70"; + sha256 = "34866282a5d5561ccc567a462ac5969ab829d19dba0fb6315369f011d94740a2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/lt/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/lt/Thunderbird%20147.0.dmg"; locale = "lt"; arch = "mac"; - sha256 = "f5eebc6e2e9e281282519944144de083a05ea9a4c48c026a239578455875cfed"; + sha256 = "95c51d54e412eeda41fa740544bd131df7788639a961997b05b0a7ded3cc7838"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/lv/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/lv/Thunderbird%20147.0.dmg"; locale = "lv"; arch = "mac"; - sha256 = "a80176d6c847e5c3ef6758b62b7c75d3d221f7dead3715f629bdfc9f8193a26d"; + sha256 = "16532de67ca9d74ef268ebec1ffb59797a0c170abdf9e107420948dadeb512d8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/ms/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/ms/Thunderbird%20147.0.dmg"; locale = "ms"; arch = "mac"; - sha256 = "72b01a9a3120dcd44b88ac472a64f97e187a49dd7afb5f125f8582e47481a176"; + sha256 = "ba6979fdb50302c9ee41b57bbb324c465a4accd4cf20c97dec2c531c807f806c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/nb-NO/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/nb-NO/Thunderbird%20147.0.dmg"; locale = "nb-NO"; arch = "mac"; - sha256 = "f4bb767fcae023e475ef9c3335b494bfc6ac586d2773e586da941fc53d4890cb"; + sha256 = "81cffc99a6915b323151cf9fab92acc9ebb7f8787391f1db6ace731c2ca448ea"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/nl/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/nl/Thunderbird%20147.0.dmg"; locale = "nl"; arch = "mac"; - sha256 = "3fffcf1624fd39242b2538c5a317cdbe164b863fd3814d25fc2983a8a106f0ef"; + sha256 = "61acd7eb3cb5f1e2fdaf90bae8b4e153a94737ccfa7b23daf098b45d55459e49"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/nn-NO/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/nn-NO/Thunderbird%20147.0.dmg"; locale = "nn-NO"; arch = "mac"; - sha256 = "06c2e547367b08a80629d49ce7a9e7bef6d6121d90a0b03fc06960c90f1fb3d5"; + sha256 = "e933271484c6a3898abb4f019a70fb2c70ebcb3b9618c087920ceeb8d84cf2cd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/pa-IN/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/pa-IN/Thunderbird%20147.0.dmg"; locale = "pa-IN"; arch = "mac"; - sha256 = "de82f8e7303170951fef3fdcc807b80ba41b94b5026293147dac6a5a928b746d"; + sha256 = "f1a93e1ca89267214ea7679be16260237114afbf4849e43253791446a1e23fcb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/pl/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/pl/Thunderbird%20147.0.dmg"; locale = "pl"; arch = "mac"; - sha256 = "03ec55112877dc9e34a79fa708a29a957e27b2a5d3e22e1a7f15701f8eacf5be"; + sha256 = "ed3817f815035fb9d0dd958d910687de29a29c229739c1454fe705370645aed5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/pt-BR/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/pt-BR/Thunderbird%20147.0.dmg"; locale = "pt-BR"; arch = "mac"; - sha256 = "64549f1a6f26ba880d52e5e540f0bded8cbae1b72cb6bd70709db695dc4f6484"; + sha256 = "4d2702599b9e4931310d625985fcc3c50b5511071c3eeb483e6898d21c65168b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/pt-PT/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/pt-PT/Thunderbird%20147.0.dmg"; locale = "pt-PT"; arch = "mac"; - sha256 = "5498cad57f286dfbaed62f3eb494c08763f9c97127283ee8e3a5a4e1517db38e"; + sha256 = "32ab431fa2ce9d372a3c7d50e6530c36368e270e72d4af0b69e84f4482400177"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/rm/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/rm/Thunderbird%20147.0.dmg"; locale = "rm"; arch = "mac"; - sha256 = "0f7a511c06d197d3699e4d23cc663150c1e117c22521a314f5f61c5907794a66"; + sha256 = "d958b82cb798b99a3c3bb51f4c8346326c27f4b7b3e8874d99cfdf8073da8aae"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/ro/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/ro/Thunderbird%20147.0.dmg"; locale = "ro"; arch = "mac"; - sha256 = "7d9c8b56618afad54372e5d44a0df5e9a47a022c45d004cf34126c621bd85535"; + sha256 = "7f2c8aa5e42ebbaf87ee25e2740e62d0f459e3cc6965929d121f6d84cd352c09"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/ru/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/ru/Thunderbird%20147.0.dmg"; locale = "ru"; arch = "mac"; - sha256 = "a8b065cbcb95a693e939678aff081259d2a073c6fa1c5ff6fd42f3b1209f5bf2"; + sha256 = "10ea40caf6a17e1be9691d4bb0b8b87438d307077977587b3ed7e414849a39bf"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/sk/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/sk/Thunderbird%20147.0.dmg"; locale = "sk"; arch = "mac"; - sha256 = "2c7d31645950e128e8447bdb268df96f1c47092ee7dbab444381c46eb4bb4715"; + sha256 = "9e32c5bc58dae4f88155e310871a4c3355ea3e398d45d457cbdc37954eaba772"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/sl/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/sl/Thunderbird%20147.0.dmg"; locale = "sl"; arch = "mac"; - sha256 = "3cc4956ac2ce6448656cc0f3377486c0fbbcf20b7e3f39623875a7c7051b56f6"; + sha256 = "5b15b5490487d21941d7f245f2278ad6ad92b39e20bed63286a29ba82d10f9ed"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/sq/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/sq/Thunderbird%20147.0.dmg"; locale = "sq"; arch = "mac"; - sha256 = "8eca9081aafd084cf7b1923cf08062c043664d63edf6136d7274f42eb4a72dcb"; + sha256 = "69d20766ea74e8824586e67334b4ba30c30e12a551cc4f302a49caf24285341b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/sr/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/sr/Thunderbird%20147.0.dmg"; locale = "sr"; arch = "mac"; - sha256 = "75105432189c496ba5199ca55c98ad4f0a6deba73e356bc967d2c91a66d1d810"; + sha256 = "115b325c5e42edc6bb871e16dee6b84721b7f04f3909ac180852151039a27ebb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/sv-SE/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/sv-SE/Thunderbird%20147.0.dmg"; locale = "sv-SE"; arch = "mac"; - sha256 = "914037bc2c5f19669f90641d2146cdff64f10c23d977295f5bfd48fb66b77192"; + sha256 = "465114b36ca6cc68d2277903703c2ba3a218b9fe4d3bfde425a79fd942edbd18"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/th/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/th/Thunderbird%20147.0.dmg"; locale = "th"; arch = "mac"; - sha256 = "e4690f6f55d56f0bffb471ff609574e6dfdcc9492f6dd79f2475d9e132f07102"; + sha256 = "5c3e3091c0e20c42c6c665aff8314d8a58be4efc1b2eb794c76a2803d3661a29"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/tr/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/tr/Thunderbird%20147.0.dmg"; locale = "tr"; arch = "mac"; - sha256 = "76f878fb5b1175a88a0c3148226c3f21065e3ec7b8fcd6d8614a3ccd0427212d"; + sha256 = "b26cde83b1c1022615ea80f1ef161a9548fb00ee48bf54b4fb97e475a533c055"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/uk/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/uk/Thunderbird%20147.0.dmg"; locale = "uk"; arch = "mac"; - sha256 = "1162a9d25cca14d7e198b4dc88d34934397378205511ddc761df9077f0c3946f"; + sha256 = "a649e588d15fd0a93c4aeadcfd252d09747d96a4f1882fb9568f4a941d85d7a5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/uz/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/uz/Thunderbird%20147.0.dmg"; locale = "uz"; arch = "mac"; - sha256 = "a00e616bab7f670e58a402e113f949ddbe6de7c4a003b0f2b3dbf76e66e53b4b"; + sha256 = "38b50caaa35e7bcd28d2554e455dcedc5f22160167a143474f22c2784a5e67b4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/vi/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/vi/Thunderbird%20147.0.dmg"; locale = "vi"; arch = "mac"; - sha256 = "71b5df9e7cba580acb587db61a3f49a8c6d25c08a0567988e589ded079c3f44d"; + sha256 = "0073fe0cd504c3d8f92fba73bed048777284e87d6a419403aed1bac8023a2a5d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/zh-CN/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/zh-CN/Thunderbird%20147.0.dmg"; locale = "zh-CN"; arch = "mac"; - sha256 = "19635085e3961a365d472d8c1cb82ea5c2cbe2c3df2ce135717951a79bf29836"; + sha256 = "bf57df284f8df5e042cb49ba616575227dc2c292f233e7981fc627f8d9be63a8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/zh-TW/Thunderbird%20146.0.1.dmg"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/147.0/mac/zh-TW/Thunderbird%20147.0.dmg"; locale = "zh-TW"; arch = "mac"; - sha256 = "e01eaa89e888af9d942504707551fe45c923d00f7be5fa8cbaf64f5bcb775581"; + sha256 = "a685df930a69b56d41fd04fa379e8a55e1d60d50482ab74aa40bbfa2afc5b7ca"; } ]; } diff --git a/pkgs/build-support/make-impure-test.nix b/pkgs/build-support/make-impure-test.nix index 3a462964b3d2..10dd7ef1867e 100644 --- a/pkgs/build-support/make-impure-test.nix +++ b/pkgs/build-support/make-impure-test.nix @@ -92,7 +92,7 @@ let ${prepareRunCommands} - sudo nix-build --option extra-sandbox-paths '${sandboxPathsList}' ${lib.escapeShellArgs nixFlags} -A ${testPath} "$@" + sudo --preserve-env=NIXPKGS_ALLOW_UNFREE nix-build --option extra-sandbox-paths '${sandboxPathsList}' ${lib.escapeShellArgs nixFlags} -A ${testPath} "$@" ''; in # The main output is the run script, inject the derivation for the actual test diff --git a/pkgs/by-name/ad/adms/package.nix b/pkgs/by-name/ad/adms/package.nix index 5119f16e97a8..405c1f510d82 100644 --- a/pkgs/by-name/ad/adms/package.nix +++ b/pkgs/by-name/ad/adms/package.nix @@ -49,7 +49,6 @@ stdenv.mkDerivation rec { description = "Automatic device model synthesizer"; homepage = "https://github.com/Qucs/adms"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ disassembler ]; platforms = with lib.platforms; unix; }; } diff --git a/pkgs/by-name/ad/adw-gtk3/package.nix b/pkgs/by-name/ad/adw-gtk3/package.nix index 0f1c8ff30d4e..9f98e43f17a6 100644 --- a/pkgs/by-name/ad/adw-gtk3/package.nix +++ b/pkgs/by-name/ad/adw-gtk3/package.nix @@ -35,7 +35,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ ciferkey Gliczy - normalcea ]; }; }) diff --git a/pkgs/by-name/ai/airsonic/package.nix b/pkgs/by-name/ai/airsonic/package.nix index 1fc5177be36d..d34667a32f9c 100644 --- a/pkgs/by-name/ai/airsonic/package.nix +++ b/pkgs/by-name/ai/airsonic/package.nix @@ -29,6 +29,5 @@ stdenv.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.gpl3; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ disassembler ]; }; } diff --git a/pkgs/by-name/al/alsa-ucm-conf-asahi/package.nix b/pkgs/by-name/al/alsa-ucm-conf-asahi/package.nix index 416ce1b568f9..ba4df31df4ea 100644 --- a/pkgs/by-name/al/alsa-ucm-conf-asahi/package.nix +++ b/pkgs/by-name/al/alsa-ucm-conf-asahi/package.nix @@ -35,7 +35,7 @@ let homepage = "https://github.com/AsahiLinux/alsa-ucm-conf-asahi"; changelog = "https://github.com/AsahiLinux/alsa-ucm-conf-asahi/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ normalcea ]; + maintainers = [ ]; platforms = [ "aarch64-linux" ]; }; }); diff --git a/pkgs/by-name/am/amazon-ssm-agent/package.nix b/pkgs/by-name/am/amazon-ssm-agent/package.nix index ff6861a29cdc..98c81a4ddbc1 100644 --- a/pkgs/by-name/am/amazon-ssm-agent/package.nix +++ b/pkgs/by-name/am/amazon-ssm-agent/package.nix @@ -174,7 +174,6 @@ buildGoModule rec { license = lib.licenses.asl20; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ - manveru anthonyroussel arianvp ]; diff --git a/pkgs/by-name/am/amp-cli/package-lock.json b/pkgs/by-name/am/amp-cli/package-lock.json index 0cd60f0c6c0a..fbef1fd7a31c 100644 --- a/pkgs/by-name/am/amp-cli/package-lock.json +++ b/pkgs/by-name/am/amp-cli/package-lock.json @@ -5,7 +5,7 @@ "packages": { "": { "dependencies": { - "@sourcegraph/amp": "^0.0.1768219292-g8af118" + "@sourcegraph/amp": "^0.0.1768760544-gf06f5a" } }, "node_modules/@napi-rs/keyring": { @@ -228,9 +228,9 @@ } }, "node_modules/@sourcegraph/amp": { - "version": "0.0.1768219292-g8af118", - "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1768219292-g8af118.tgz", - "integrity": "sha512-GW5MyNOiTu4G4cY29UI/0ttXu4b2QRwjmz4I9pvZqvIFrMmotBKC4wQinj8Dt6jD0ey7284Rhm8xHJ1iRtMoxA==", + "version": "0.0.1768760544-gf06f5a", + "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1768760544-gf06f5a.tgz", + "integrity": "sha512-ECw/n1n3aKERHW8qo5KaFgKgLDj4zJElFsyHnAS10BRv3ON0T6BPbboMvqvtYq1NEeX00QGpBDO2u0Q1+k3oGQ==", "license": "Amp Commercial License", "dependencies": { "@napi-rs/keyring": "1.1.9" diff --git a/pkgs/by-name/am/amp-cli/package.nix b/pkgs/by-name/am/amp-cli/package.nix index 126cb68a80a5..a774b7822597 100644 --- a/pkgs/by-name/am/amp-cli/package.nix +++ b/pkgs/by-name/am/amp-cli/package.nix @@ -9,11 +9,11 @@ buildNpmPackage (finalAttrs: { pname = "amp-cli"; - version = "0.0.1768219292-g8af118"; + version = "0.0.1768760544-gf06f5a"; src = fetchzip { url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz"; - hash = "sha256-DstiWCfox5CuHKfy3EgLk7N8KK67txuMG/flriiDH3I="; + hash = "sha256-URgYg3SZXeHrw+xXiXC1BDe0/ZUFRu9mDmqtTIA9ObU="; }; postPatch = '' @@ -45,7 +45,7 @@ buildNpmPackage (finalAttrs: { chmod +x bin/amp-wrapper.js ''; - npmDepsHash = "sha256-oB8YPiKoCG6+oNGlE6YdZ6F/6FEq96qJq/tdC164nrM="; + npmDepsHash = "sha256-7r522RT+38rjv1YqjhR9XIhWYoxVHmRUKeYfToCbsHA="; propagatedBuildInputs = [ ripgrep diff --git a/pkgs/by-name/an/antigravity/information.json b/pkgs/by-name/an/antigravity/information.json index c812d387d292..b2c0be116043 100644 --- a/pkgs/by-name/an/antigravity/information.json +++ b/pkgs/by-name/an/antigravity/information.json @@ -1,22 +1,22 @@ { - "version": "1.13.3", + "version": "1.14.2", "vscodeVersion": "1.104.0", "sources": { "x86_64-linux": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.13.3-4533425205018624/linux-x64/Antigravity.tar.gz", - "sha256": "084dfbedf1049b363aa3ad7ba679eec8b80feaf29585accb90b5910ebb270048" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.14.2-6046590149459968/linux-x64/Antigravity.tar.gz", + "sha256": "dffb040c1efc67a1f6952c24dd71cffefa16094ceb35b3a7a4d0131e518ea449" }, "aarch64-linux": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.13.3-4533425205018624/linux-arm/Antigravity.tar.gz", - "sha256": "0f71bce4d81fc02271e2bcaf2b57820e20762b149ef791720406817c6d189184" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.14.2-6046590149459968/linux-arm/Antigravity.tar.gz", + "sha256": "7911d56c9e3525256dbf92f661f03f272b4bce73dfcc3f053113d5dae46fac53" }, "x86_64-darwin": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.13.3-4533425205018624/darwin-x64/Antigravity.zip", - "sha256": "8e6ba418883dccd8a4a70fd5d6882f8a919630d3166d83327180165ff7b4eb55" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.14.2-6046590149459968/darwin-x64/Antigravity.zip", + "sha256": "f516b8ea7d3566140d70dd6825cd5a07b0c899370c08acfdc9b133c6d0ef5ded" }, "aarch64-darwin": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.13.3-4533425205018624/darwin-arm/Antigravity.zip", - "sha256": "ed95de92e852cac9ef1b264a0a304cf755a803129b54c1618682ec7bae1893dc" + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.14.2-6046590149459968/darwin-arm/Antigravity.zip", + "sha256": "014f5eeb231bf5e00837abbc45c47be5d68b542dad3cd969444becbd0bf12860" } } } diff --git a/pkgs/by-name/ar/argo-workflows/package.nix b/pkgs/by-name/ar/argo-workflows/package.nix index 3bb18cd36d0e..235ea7a9ecbf 100644 --- a/pkgs/by-name/ar/argo-workflows/package.nix +++ b/pkgs/by-name/ar/argo-workflows/package.nix @@ -13,7 +13,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "argoproj"; - repo = "argo"; + repo = "argo-workflows"; tag = "v${version}"; hash = "sha256-TM/eK8biMxKV4SFJ1Lys+NPPeaHVjbBo83k2RH1Xi40="; }; @@ -55,7 +55,7 @@ buildGoModule rec { meta = { description = "Container native workflow engine for Kubernetes"; mainProgram = "argo"; - homepage = "https://github.com/argoproj/argo"; + homepage = "https://github.com/argoproj/argo-workflows"; changelog = "https://github.com/argoproj/argo-workflows/blob/v${version}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ groodt ]; diff --git a/pkgs/by-name/as/asahi-audio/package.nix b/pkgs/by-name/as/asahi-audio/package.nix index 88b923dba3b1..edfe3364b1ba 100644 --- a/pkgs/by-name/as/asahi-audio/package.nix +++ b/pkgs/by-name/as/asahi-audio/package.nix @@ -72,7 +72,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://github.com/AsahiLinux/asahi-audio"; changelog = "https://github.com/AsahiLinux/asahi-audio/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ normalcea ]; + maintainers = [ ]; platforms = [ "aarch64-linux" ]; }; }) diff --git a/pkgs/by-name/as/asahi-fwextract/package.nix b/pkgs/by-name/as/asahi-fwextract/package.nix index 0db932bcaf0c..9276c5e12684 100644 --- a/pkgs/by-name/as/asahi-fwextract/package.nix +++ b/pkgs/by-name/as/asahi-fwextract/package.nix @@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication rec { description = "Asahi firmware extraction script"; homepage = "https://github.com/AsahiLinux/asahi-installer"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ normalcea ]; + maintainers = [ ]; mainProgram = "asahi-fwextract"; platforms = [ "aarch64-linux" ]; }; diff --git a/pkgs/by-name/as/astro-language-server/package.nix b/pkgs/by-name/as/astro-language-server/package.nix index 3799d76dcf01..5960a8515639 100644 --- a/pkgs/by-name/as/astro-language-server/package.nix +++ b/pkgs/by-name/as/astro-language-server/package.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "astro-language-server"; - version = "2.16.2"; + version = "2.16.3"; src = fetchFromGitHub { owner = "withastro"; repo = "astro"; rev = "@astrojs/language-server@${finalAttrs.version}"; - hash = "sha256-ZH+g1pnasVvbNVg3Id6/rlwqjIr7qRgitqOSilgpX64="; + hash = "sha256-ONpSW6VMoiW1Q0Aa5Dp1pZx3LAQ2Kzv5YHKxHOxbXdo="; }; # https://pnpm.io/filtering#--filter-package_name-1 @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { ; pnpm = pnpm_10; fetcherVersion = 2; - hash = "sha256-M2Xef5yTEQCLPzzx7WGQYplTrND+DPMy1hyEuahK+kM="; + hash = "sha256-Kqw4W3ZWRHWNnJYLGks9IHjCYAYEIigskwb//yKvb6c="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/at/atmos/package.nix b/pkgs/by-name/at/atmos/package.nix index b63eeef11134..78e6c6c27e68 100644 --- a/pkgs/by-name/at/atmos/package.nix +++ b/pkgs/by-name/at/atmos/package.nix @@ -54,6 +54,5 @@ buildGoModule (finalAttrs: { description = "Universal Tool for DevOps and Cloud Automation (works with terraform, helm, helmfile, etc)"; mainProgram = "atmos"; license = lib.licenses.asl20; - teams = [ lib.teams.cloudposse ]; }; }) diff --git a/pkgs/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix index d88476a32a9a..adc0aa587bc7 100644 --- a/pkgs/by-name/au/authentik/package.nix +++ b/pkgs/by-name/au/authentik/package.nix @@ -206,7 +206,7 @@ let self = python; packageOverrides = final: prev: { # https://github.com/goauthentik/authentik/pull/16324 - django = final.django_5_2; + django = final.django_5; django-channels-postgres = final.buildPythonPackage { pname = "django-channels-postgres"; diff --git a/pkgs/by-name/ba/bankstown-lv2/package.nix b/pkgs/by-name/ba/bankstown-lv2/package.nix index d3b86fd70a30..91326d39e635 100644 --- a/pkgs/by-name/ba/bankstown-lv2/package.nix +++ b/pkgs/by-name/ba/bankstown-lv2/package.nix @@ -41,7 +41,6 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Lightweight psychoacoustic bass enhancement plugin"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ - normalcea yuka ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/ba/bazaar/package.nix b/pkgs/by-name/ba/bazaar/package.nix index e54eee945a52..ac2d8b37cb26 100644 --- a/pkgs/by-name/ba/bazaar/package.nix +++ b/pkgs/by-name/ba/bazaar/package.nix @@ -22,18 +22,20 @@ libxmlb, libyaml, md4c, + webkitgtk_6_0, + libsecret, nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "bazaar"; - version = "0.6.3"; + version = "0.7.3"; src = fetchFromGitHub { owner = "kolunmi"; repo = "bazaar"; tag = "v${finalAttrs.version}"; - hash = "sha256-fiSCRBbS6vNyLWRnaeyQE48NO/LYCk5OdAX8f85H2YM="; + hash = "sha256-T0HQ1bjH2nd9+BJAvhSNcpYp25Jt0sNZxKeTY7EfsSw="; }; nativeBuildInputs = [ @@ -58,6 +60,8 @@ stdenv.mkDerivation (finalAttrs: { libxmlb libyaml md4c + webkitgtk_6_0 + libsecret ]; preFixup = '' @@ -78,7 +82,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ dtomvan - normalcea ]; mainProgram = "bazaar"; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix index 7bfa38964b59..9ff5b574e67e 100644 --- a/pkgs/by-name/bc/bcachefs-tools/package.nix +++ b/pkgs/by-name/bc/bcachefs-tools/package.nix @@ -28,18 +28,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "bcachefs-tools"; - version = "1.35.0"; + version = "1.35.1"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; tag = "v${finalAttrs.version}"; - hash = "sha256-mKyoV92+VJESHDRENXLFU+Ug2fFr+xJrleckvxfZ6sY="; + hash = "sha256-1p2zbzQLza8w+hu+5OjPr+Lh6q6Kh9HdVxFkuCl2x8o="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-5z86H/LGI5aSg3vBoXlvm0f2DmumsKu3EN7Bn5UHbr4="; + hash = "sha256-OlXkshfEXtY6fDBqhEJQhWhPjwQ5ofDIZ9IuchchKxk="; }; postPatch = '' diff --git a/pkgs/by-name/bl/blender/hiprt-3-compat.patch b/pkgs/by-name/bl/blender/hiprt-3-compat.patch new file mode 100644 index 000000000000..b3f410128507 --- /dev/null +++ b/pkgs/by-name/bl/blender/hiprt-3-compat.patch @@ -0,0 +1,72 @@ +diff --git a/extern/hipew/include/hiprtew.h b/extern/hipew/include/hiprtew.h +index d245cb76..952ed805 100644 +--- a/extern/hipew/include/hiprtew.h ++++ b/extern/hipew/include/hiprtew.h +@@ -157,7 +157,7 @@ typedef hiprtError (thiprtDestroyGlobalStackBuffer)( hiprtContext context, hiprt + + typedef hiprtError(thiprtDestroyFuncTable)(hiprtContext context, + hiprtFuncTable funcTable); +-typedef void(thiprtSetLogLevel)( hiprtLogLevel level ); ++typedef hiprtError(thiprtSetLogLevel)( hiprtContext context, hiprtLogLevel level ); + + /* Function declarations. */ + extern thiprtCreateContext *hiprtCreateContext; +diff --git a/extern/hipew/src/hipew.c b/extern/hipew/src/hipew.c +index e72ccde6..138e1efc 100644 +--- a/extern/hipew/src/hipew.c ++++ b/extern/hipew/src/hipew.c +@@ -241,13 +241,13 @@ static int hipewHipInit(void) { + /* ROCm 6 changes paths from /opt/rocm/hip/lib to /opt/rocm/lib, so + * search for libraries there. */ + +- const char* hip_paths[] = { "libamdhip64.so", ++ const char* hip_paths[] = { "libamdhip64.so.7", ++ "/opt/rocm/lib/libamdhip64.so.7", ++ "/opt/rocm/hip/lib/libamdhip64.so.7", + "libamdhip64.so.6", + "/opt/rocm/lib/libamdhip64.so.6", + "/opt/rocm/hip/lib/libamdhip64.so.6", +- "libamdhip64.so.7", +- "/opt/rocm/lib/libamdhip64.so.7", +- "/opt/rocm/hip/lib/libamdhip64.so.7", ++ "libamdhip64.so", + NULL }; + #endif + static int initialized = 0; +diff --git a/intern/cycles/device/hiprt/device_impl.cpp b/intern/cycles/device/hiprt/device_impl.cpp +index c251a8d0..b54bc36c 100644 +--- a/intern/cycles/device/hiprt/device_impl.cpp ++++ b/intern/cycles/device/hiprt/device_impl.cpp +@@ -104,10 +104,10 @@ HIPRTDevice::HIPRTDevice(const DeviceInfo &info, + } + + if (LOG_IS_ON(LOG_LEVEL_TRACE)) { +- hiprtSetLogLevel(hiprtLogLevelInfo | hiprtLogLevelWarn | hiprtLogLevelError); ++ hiprtSetLogLevel(hiprt_context, hiprtLogLevelInfo | hiprtLogLevelWarn | hiprtLogLevelError); + } + else { +- hiprtSetLogLevel(hiprtLogLevelNone); ++ hiprtSetLogLevel(hiprt_context, hiprtLogLevelNone); + } + } + +diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt +index bcaf4e16..aa6a3d17 100644 +--- a/intern/cycles/kernel/CMakeLists.txt ++++ b/intern/cycles/kernel/CMakeLists.txt +@@ -93,13 +93,13 @@ set(SRC_KERNEL_DEVICE_HIPRT_HEADERS + set(SRC_KERNEL_DEVICE_HIPRT_SDK + hiprt/impl/Aabb.h + hiprt/impl/BvhNode.h +- hiprt/impl/Geometry.h ++ hiprt/impl/Header.h + hiprt/impl/hiprt_device_impl.h + hiprt/impl/hiprt_kernels_bitcode.h + hiprt/impl/Instance.h ++ hiprt/impl/Obb.h + hiprt/impl/QrDecomposition.h + hiprt/impl/Quaternion.h +- hiprt/impl/Scene.h + hiprt/impl/Transform.h + hiprt/impl/Triangle.h + ) diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix index f4cec841f317..33630f2a2b26 100644 --- a/pkgs/by-name/bl/blender/package.nix +++ b/pkgs/by-name/bl/blender/package.nix @@ -126,6 +126,9 @@ stdenv'.mkDerivation (finalAttrs: { hash = "sha256-fNnQRfGfNc7rbk8npkcYtoAqRjJc6MaV4mqtSJxd0EM="; }; + # Minimal backport of hiprt 3.x support from https://projects.blender.org/blender/blender/pulls/144889 + patches = lib.optional rocmSupport ./hiprt-3-compat.patch; + postPatch = (lib.optionalString stdenv.hostPlatform.isDarwin '' : > build_files/cmake/platform/platform_apple_xcode.cmake diff --git a/pkgs/by-name/bo/book-summary/package.nix b/pkgs/by-name/bo/book-summary/package.nix index 4d21bcc3e673..af508d86bee9 100644 --- a/pkgs/by-name/bo/book-summary/package.nix +++ b/pkgs/by-name/bo/book-summary/package.nix @@ -20,6 +20,5 @@ rustPlatform.buildRustPackage rec { mainProgram = "book-summary"; homepage = "https://github.com/dvogt23/book-summary"; license = lib.licenses.mit; - teams = with lib.teams; [ iog ]; }; } diff --git a/pkgs/by-name/bu/bundix/package.nix b/pkgs/by-name/bu/bundix/package.nix index 5be47b5a0fb0..f313b40e899c 100644 --- a/pkgs/by-name/bu/bundix/package.nix +++ b/pkgs/by-name/bu/bundix/package.nix @@ -48,7 +48,6 @@ buildRubyGem rec { homepage = "https://github.com/nix-community/bundix"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ - manveru zimbatm ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/bu/burpsuite/package.nix b/pkgs/by-name/bu/burpsuite/package.nix index b3c1cb7f7210..b2c1f16def59 100644 --- a/pkgs/by-name/bu/burpsuite/package.nix +++ b/pkgs/by-name/bu/burpsuite/package.nix @@ -9,20 +9,20 @@ }: let - version = "2025.12"; + version = "2026.1"; product = if proEdition then { productName = "pro"; productDesktop = "Burp Suite Professional Edition"; - hash = "sha256-6firazY0uyDBjdw8Qvs48xVXwy3MfCULtitb1gvGHQM="; + hash = "sha256-4GvB1K4UZnZMor0jBWXvzgy0qfh234TZmtu6eSR4/jk="; } else { productName = "community"; productDesktop = "Burp Suite Community Edition"; - hash = "sha256-hvhS6JKISPeDp0L7ElI/BojitUp93TvuPgO4zKBJjnI="; + hash = "sha256-q0vKBEIzO18mNX7bn1vhnstnGr1pwjMnHXq6HdtpJy0="; }; src = fetchurl { diff --git a/pkgs/by-name/c-/c-intro-and-ref/package.nix b/pkgs/by-name/c-/c-intro-and-ref/package.nix index 184bf3caa5c4..a0ecd2f9fb8a 100644 --- a/pkgs/by-name/c-/c-intro-and-ref/package.nix +++ b/pkgs/by-name/c-/c-intro-and-ref/package.nix @@ -60,7 +60,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.gnu.org/software/c-intro-and-ref/"; license = lib.licenses.fdl13Plus; maintainers = with lib.maintainers; [ - normalcea rc-zb ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/ca/calamares/package.nix b/pkgs/by-name/ca/calamares/package.nix index c1f63380483a..7c55735d5acb 100644 --- a/pkgs/by-name/ca/calamares/package.nix +++ b/pkgs/by-name/ca/calamares/package.nix @@ -126,7 +126,6 @@ stdenv.mkDerivation (finalAttrs: { cc0 ]; maintainers = with lib.maintainers; [ - manveru vlinkz ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/cb/cbonsai/package.nix b/pkgs/by-name/cb/cbonsai/package.nix index 5d53d43de2f0..15a527cf33a2 100644 --- a/pkgs/by-name/cb/cbonsai/package.nix +++ b/pkgs/by-name/cb/cbonsai/package.nix @@ -35,7 +35,6 @@ stdenv.mkDerivation rec { mainProgram = "cbonsai"; homepage = "https://gitlab.com/jallbrit/cbonsai"; license = with lib.licenses; [ gpl3Only ]; - maintainers = with lib.maintainers; [ manveru ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix index 7af21f996747..433d1e8a039e 100644 --- a/pkgs/by-name/cd/cdncheck/package.nix +++ b/pkgs/by-name/cd/cdncheck/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "cdncheck"; - version = "1.2.18"; + version = "1.2.19"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "cdncheck"; tag = "v${finalAttrs.version}"; - hash = "sha256-RFA/5fCh9csa6nYoVmuZ5vs6JCaTVFUuEz0E8w7Rb/s="; + hash = "sha256-gb+M/y1MADwCR9gz1+mSXbvE3sSV8FKTDSz+Y9U2gfU="; }; vendorHash = "sha256-Tc8qrML7u5qE0zVe7JCL1BM0KbhJSwnjhnd2gX5YUaA="; diff --git a/pkgs/by-name/ch/changedetection-io/package.nix b/pkgs/by-name/ch/changedetection-io/package.nix index 1ce916a303b6..2754c888a9a9 100644 --- a/pkgs/by-name/ch/changedetection-io/package.nix +++ b/pkgs/by-name/ch/changedetection-io/package.nix @@ -91,7 +91,7 @@ python3.pkgs.buildPythonApplication rec { description = "Self-hosted free open source website change detection tracking, monitoring and notification service"; homepage = "https://github.com/dgtlmoon/changedetection.io"; changelog = "https://github.com/dgtlmoon/changedetection.io/releases/tag/${src.tag}"; - license = lib.licenses.asl20; + license = lib.licenses.unfree; maintainers = with lib.maintainers; [ mikaelfangel thanegill diff --git a/pkgs/by-name/cl/clashmi/package.nix b/pkgs/by-name/cl/clashmi/package.nix index 810d3a302eff..dfb5d0a28d68 100644 --- a/pkgs/by-name/cl/clashmi/package.nix +++ b/pkgs/by-name/cl/clashmi/package.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "clashmi"; - version = "1.0.15.191"; + version = "1.0.16.204"; src = fetchurl { url = "https://github.com/KaringX/clashmi/releases/download/v${finalAttrs.version}/clashmi_${finalAttrs.version}_linux_amd64.deb"; - hash = "sha256-P23H3OUIcDhVQ7dOLbB2uyZnbxh+6zurGeg0/wpPeHk="; + hash = "sha256-IOCrk4dl9BYf8rzhgXmRAaFP4pzsJMx6i2zTg/NpOCQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index 5317603933df..4a301e9ab5f1 100644 --- a/pkgs/by-name/cl/claude-code/package-lock.json +++ b/pkgs/by-name/cl/claude-code/package-lock.json @@ -1,12 +1,12 @@ { "name": "@anthropic-ai/claude-code", - "version": "2.1.9", + "version": "2.1.12", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@anthropic-ai/claude-code", - "version": "2.1.9", + "version": "2.1.12", "license": "SEE LICENSE IN README.md", "bin": { "claude": "cli.js" diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index 6f8272aab60f..970dd7338502 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -15,14 +15,14 @@ }: buildNpmPackage (finalAttrs: { pname = "claude-code"; - version = "2.1.9"; + version = "2.1.12"; src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz"; - hash = "sha256-TU+54QVtcFaUErv8YB0NxmgP+0eUqa2JEjAVRHKPICs="; + hash = "sha256-JX72YEM2fXY7qKVkuk+UFeef0OhBffljpFBjIECHMXw="; }; - npmDepsHash = "sha256-yZ5hFIqdKh6VYPGtdIaUq7CW9mnCyeFflr02laU8K0A="; + npmDepsHash = "sha256-FxyNCFlsgjXAGCGqro+VRwkarif9SzqmrMz0xgmvBco="; strictDeps = true; diff --git a/pkgs/by-name/cl/clickhouse/package.nix b/pkgs/by-name/cl/clickhouse/package.nix index 5e82a1161402..d2bbfcbea610 100644 --- a/pkgs/by-name/cl/clickhouse/package.nix +++ b/pkgs/by-name/cl/clickhouse/package.nix @@ -1,6 +1,6 @@ import ./generic.nix { - version = "25.12.2.54-stable"; - rev = "e06d8a2be22920e4c146389bbde5358b78aa8ef6"; - hash = "sha256-F9v+qwjnqsp9At5h41gNWP8cD6C7nnI0AjuOU2mRfPs="; + version = "25.12.3.21-stable"; + rev = "7c3f65751609dab4f2f66de305cbc96dbeb1c4f2"; + hash = "sha256-1cPAEh8CuKGLcQhUSAMXE8sR3pStzVEtPpgUTj2z0cw="; lts = false; } diff --git a/pkgs/by-name/co/colobot/package.nix b/pkgs/by-name/co/colobot/package.nix index 48614012bea0..41c95d105890 100644 --- a/pkgs/by-name/co/colobot/package.nix +++ b/pkgs/by-name/co/colobot/package.nix @@ -19,6 +19,7 @@ doxygen, python3, callPackage, + fetchpatch, }: let @@ -37,6 +38,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-QhNHtAG+hKq7qJhKWCJcP4ejm5YDOU8pyYtitJppVlU="; }; + patches = [ + (fetchpatch { + url = "https://github.com/colobot/colobot/commit/1561854b03500d39955c66971c9c98de1937d7e6.patch"; + relative = "colobot-app/src"; + extraPrefix = "src/app/"; + hash = "sha256-TVd/TsmFb1qQILUJr6E1zdFl/bQkREYKC/cm2I3M/iw="; + }) + ]; + nativeBuildInputs = [ cmake xmlstarlet diff --git a/pkgs/by-name/co/confy/package.nix b/pkgs/by-name/co/confy/package.nix index b144a1a366d0..0f2f448d8b69 100644 --- a/pkgs/by-name/co/confy/package.nix +++ b/pkgs/by-name/co/confy/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "confy"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromSourcehut { owner = "~fabrixxm"; repo = "confy"; rev = finalAttrs.version; - hash = "sha256-rkVem9bPjp68Pk8fVPMDZLFFQsqeeRsynWciCk6xWhU="; + hash = "sha256-dcQ0ynEqrrGjAqQoWXtLMpvBVzpilXGpGWVNaVHp3CY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/cook-cli/package.nix b/pkgs/by-name/co/cook-cli/package.nix index 180a539a1a34..c9fdc2b3b86d 100644 --- a/pkgs/by-name/co/cook-cli/package.nix +++ b/pkgs/by-name/co/cook-cli/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage rec { pname = "cook-cli"; - version = "0.19.3"; + version = "0.20.0"; src = fetchFromGitHub { owner = "cooklang"; repo = "cookcli"; rev = "v${version}"; - hash = "sha256-qfsyEHQnOfJYqgZi5QxiGJX1pbXx7oR7qzBEwTYH7oY="; + hash = "sha256-kGjeyw3E6hYcEOcGugW+mgvXGJ38pFp+z9vAMJqPTVE="; }; - cargoHash = "sha256-xQTMxas5gO17DvNXvxdJ03Rhd4kaJPBf+GikbCE1fWI="; + cargoHash = "sha256-SUnpv53UQiawGNdQLJCjpxzmbMV8eZq2ycRMnWJxVLc="; # Build without the self-updating feature buildNoDefaultFeatures = true; diff --git a/pkgs/by-name/co/cosmic-applets/package.nix b/pkgs/by-name/co/cosmic-applets/package.nix index 0ae09c3f6e20..bfc8bc235283 100644 --- a/pkgs/by-name/co/cosmic-applets/package.nix +++ b/pkgs/by-name/co/cosmic-applets/package.nix @@ -20,17 +20,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-applets"; - version = "1.0.1"; + version = "1.0.2"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-applets"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-GhH3bM/mj1fx6cxxtZXZvODJZoSszkBCE8lcq42sZbA="; + hash = "sha256-o64sXCWuEIRV1KCRvKeN6iZBZfUyDYtft5yeag4jBNc="; }; - cargoHash = "sha256-Eq0RSA8TYHKNRx5mg010iyrONigKR0GgGZ3fXnWOmG8="; + cargoHash = "sha256-uMMrLd3s0SqYCkSA82wWUxMfiTUzuDdsmyxy/MCYIWY="; nativeBuildInputs = [ just diff --git a/pkgs/by-name/co/cosmic-applibrary/package.nix b/pkgs/by-name/co/cosmic-applibrary/package.nix index 3d5f4b731a1a..cef431b4a68d 100644 --- a/pkgs/by-name/co/cosmic-applibrary/package.nix +++ b/pkgs/by-name/co/cosmic-applibrary/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-applibrary"; - version = "1.0.1"; + version = "1.0.2"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-applibrary"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-BNOHYciE+/HGNJRvRK6imB4mx4B4Vqz9kVEqWP/DXvE="; + hash = "sha256-uQaTSt0sgUQYopEFVmaeDCnejSc1gyGLHeHM2bGzStQ="; }; - cargoHash = "sha256-M3zyBsNFUQ5dwzJRlaC8m6o5U4teIgwl6jTDYSqW8qw="; + cargoHash = "sha256-I6C5PrIymU8vZ7LvmnSlFFIp0cvlP1umiFMyrAyYf4A="; nativeBuildInputs = [ just diff --git a/pkgs/by-name/co/cosmic-bg/package.nix b/pkgs/by-name/co/cosmic-bg/package.nix index 8cc258500684..e2731285a3e8 100644 --- a/pkgs/by-name/co/cosmic-bg/package.nix +++ b/pkgs/by-name/co/cosmic-bg/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-bg"; - version = "1.0.1"; + version = "1.0.2"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-comp/package.nix b/pkgs/by-name/co/cosmic-comp/package.nix index 469e1cbb82c8..b7e4cf54972b 100644 --- a/pkgs/by-name/co/cosmic-comp/package.nix +++ b/pkgs/by-name/co/cosmic-comp/package.nix @@ -20,17 +20,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-comp"; - version = "1.0.1"; + version = "1.0.2"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-comp"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-xvvaRuYbUDNORCoBQ9FKIpGROoDoyg3k5CdUl2gjd0s="; + hash = "sha256-PBobAoXi3p1xUbs4XmmPkQ93QlMsULEYUoTDqOlJozg="; }; - cargoHash = "sha256-1j99crcOUGocmdCsKCN0gKRUd4s0YOJyHskiR/SqA7A="; + cargoHash = "sha256-A0d00GdspoYI1fUic8TK9UzaQn39wbnvevD8IiPKC7w="; separateDebugInfo = true; diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix index d03122633487..1ba7ac72a79d 100644 --- a/pkgs/by-name/co/cosmic-edit/package.nix +++ b/pkgs/by-name/co/cosmic-edit/package.nix @@ -16,14 +16,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-edit"; - version = "1.0.1"; + version = "1.0.2"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-edit"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-TWFTHbkYlZh4yPBnTbVgB9Ld05mVbUTF6yIN3HJbhdo="; + hash = "sha256-ZqyaCryXNljJ00qD3ZksfKszANke3HqYgHoGNCHOUqI="; }; cargoHash = "sha256-ydI/DTbGlgwc9l/XsW1SbTOfSyTdcjM0i0jXLua4+f8="; diff --git a/pkgs/by-name/co/cosmic-ext-applet-weather/package.nix b/pkgs/by-name/co/cosmic-ext-applet-weather/package.nix index 2e346a8f15b9..5ad79d16caf4 100644 --- a/pkgs/by-name/co/cosmic-ext-applet-weather/package.nix +++ b/pkgs/by-name/co/cosmic-ext-applet-weather/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage { pname = "cosmic-ext-applet-weather"; - version = "0-unstable-2025-12-03"; + version = "0-unstable-2026-01-17"; src = fetchFromGitHub { owner = "cosmic-utils"; repo = "cosmic-ext-applet-weather"; - rev = "289d866abaaeaf51e9b7074b7731bcd6e5ea4b55"; - hash = "sha256-LeUzDjUiDt3lQiQQvDB9RlSC1F4IyXTE4lc17eQd+Sw="; + rev = "142666f73c702036438408758ea86ec22d63611b"; + hash = "sha256-K4flguR6pknhFCpwHQ+4OtSAtPBjUag1g/uUnCNM3Pw="; }; - cargoHash = "sha256-1lIWzCqpIxk+FWA/84yN/x10Se2xRTZ7KEqAWVgfFgU="; + cargoHash = "sha256-LcTUIhAWitLFz23TasfSJt6tOAAAJDiHxfTcxBX2/Bg="; nativeBuildInputs = [ libcosmicAppHook diff --git a/pkgs/by-name/co/cosmic-files/package.nix b/pkgs/by-name/co/cosmic-files/package.nix index 40317ee61bc6..c96b17ccd1a1 100644 --- a/pkgs/by-name/co/cosmic-files/package.nix +++ b/pkgs/by-name/co/cosmic-files/package.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-files"; - version = "1.0.1"; + version = "1.0.2"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-files"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-gGURDSKOIroYGeZJrKayNMCC8GzB8OstkDl2jz/rm5A="; + hash = "sha256-ZX7eRSrQXgc4oitjugvRicng87zVK41ecSUE80tl0Y0="; }; cargoHash = "sha256-CGFBvOWu9ZA8kYDYDBVur5uWW8Cs7fT5T96UnKMkvEo="; diff --git a/pkgs/by-name/co/cosmic-greeter/package.nix b/pkgs/by-name/co/cosmic-greeter/package.nix index af13ac9e2a1d..2dd5577ffbc8 100644 --- a/pkgs/by-name/co/cosmic-greeter/package.nix +++ b/pkgs/by-name/co/cosmic-greeter/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-greeter"; - version = "1.0.1"; + version = "1.0.2"; # nixpkgs-update: no auto update src = fetchFromGitHub { @@ -31,10 +31,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-4yRBgFrH4RBpuvChTED+ynx+PyFumoT2Z+R1gXxF4Xc="; - env = { - VERGEN_GIT_COMMIT_DATE = "2025-12-31"; - VERGEN_GIT_SHA = finalAttrs.src.tag; - }; + env.VERGEN_GIT_SHA = finalAttrs.src.tag; cargoBuildFlags = [ "--all" ]; diff --git a/pkgs/by-name/co/cosmic-icons/package.nix b/pkgs/by-name/co/cosmic-icons/package.nix index 164ed907c55e..b570a9335547 100644 --- a/pkgs/by-name/co/cosmic-icons/package.nix +++ b/pkgs/by-name/co/cosmic-icons/package.nix @@ -9,7 +9,7 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "cosmic-icons"; - version = "1.0.1"; + version = "1.0.2"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-idle/package.nix b/pkgs/by-name/co/cosmic-idle/package.nix index 0520f43486b0..04f8881af359 100644 --- a/pkgs/by-name/co/cosmic-idle/package.nix +++ b/pkgs/by-name/co/cosmic-idle/package.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-idle"; - version = "1.0.1"; + version = "1.0.2"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-initial-setup/package.nix b/pkgs/by-name/co/cosmic-initial-setup/package.nix index c30773c00ae4..7808c5e82634 100644 --- a/pkgs/by-name/co/cosmic-initial-setup/package.nix +++ b/pkgs/by-name/co/cosmic-initial-setup/package.nix @@ -14,17 +14,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-initial-setup"; - version = "1.0.1"; + version = "1.0.2"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-initial-setup"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-VO8r2r7zzFZU5gYBTxUpS/829QQvlVGsG798XfqqXR0="; + hash = "sha256-g1FJiJSyPZTJ1G8cW8A0sxbIUeG3JcjJYo6qHp639d4="; }; - cargoHash = "sha256-fjcYPA+kuhD9JLjoZkzAziJK8qF/a/gdSafmckLD8n0="; + cargoHash = "sha256-co7fOPjNLi32XRXKdmCWC+bWhEljsdSc/scasghG4/8="; buildFeatures = [ "nixos" ]; diff --git a/pkgs/by-name/co/cosmic-launcher/package.nix b/pkgs/by-name/co/cosmic-launcher/package.nix index e8ac09949b00..fc3f0112c9ef 100644 --- a/pkgs/by-name/co/cosmic-launcher/package.nix +++ b/pkgs/by-name/co/cosmic-launcher/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-launcher"; - version = "1.0.1"; + version = "1.0.2"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-notifications/package.nix b/pkgs/by-name/co/cosmic-notifications/package.nix index cb9ef98aa6e6..309c2b9b3fb1 100644 --- a/pkgs/by-name/co/cosmic-notifications/package.nix +++ b/pkgs/by-name/co/cosmic-notifications/package.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-notifications"; - version = "1.0.1"; + version = "1.0.2"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-notifications"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-8wYX3KCWXHwTb7NHg0wXxmxtVG+jOFU3EidIomPYY0s="; + hash = "sha256-lvqqeY/FPv+LFTmZoBUuKWCjAGZozGj/yUCphlFuk/g="; }; cargoHash = "sha256-zyM4iMJs2wPIKIEdji1uJF3WYpPGihFswIK5Wyf6Mns="; diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix index e77bf17b629d..445992943b8b 100644 --- a/pkgs/by-name/co/cosmic-osd/package.nix +++ b/pkgs/by-name/co/cosmic-osd/package.nix @@ -15,14 +15,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-osd"; - version = "1.0.1"; + version = "1.0.2"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-osd"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-pcuTKKXt4qrs48hKfA4Pzjgx+4wNHgggbWW+yZ/1Sck="; + hash = "sha256-PNFwlxAdbQpFFIe54AEteWG2YRHGRgjDDUpgDwCxXns="; }; cargoHash = "sha256-DNQvmE/2swrDybjcQfCAjMRkAttjl+ibbLG0HSlcZwU="; diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix index 8dab461b53d7..946990275f93 100644 --- a/pkgs/by-name/co/cosmic-panel/package.nix +++ b/pkgs/by-name/co/cosmic-panel/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-panel"; - version = "1.0.1"; + version = "1.0.2"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-player/package.nix b/pkgs/by-name/co/cosmic-player/package.nix index e77d40e95762..69ae94316b23 100644 --- a/pkgs/by-name/co/cosmic-player/package.nix +++ b/pkgs/by-name/co/cosmic-player/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-player"; - version = "1.0.1"; + version = "1.0.2"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-randr/package.nix b/pkgs/by-name/co/cosmic-randr/package.nix index 9d0cbfc390f0..299d3404bdb0 100644 --- a/pkgs/by-name/co/cosmic-randr/package.nix +++ b/pkgs/by-name/co/cosmic-randr/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-randr"; - version = "1.0.1"; + version = "1.0.2"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-screenshot/package.nix b/pkgs/by-name/co/cosmic-screenshot/package.nix index f6578bdf555f..6b2c0c45713e 100644 --- a/pkgs/by-name/co/cosmic-screenshot/package.nix +++ b/pkgs/by-name/co/cosmic-screenshot/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-screenshot"; - version = "1.0.1"; + version = "1.0.2"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-session/package.nix b/pkgs/by-name/co/cosmic-session/package.nix index c4a0d4569ef0..79ab5c4c3851 100644 --- a/pkgs/by-name/co/cosmic-session/package.nix +++ b/pkgs/by-name/co/cosmic-session/package.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-session"; - version = "1.0.1"; + version = "1.0.2"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-session"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-6pGMk0p3Ry97z8NLtECpFgY2GHecj+6A4bcR3AMSV88="; + hash = "sha256-JlRGK3uac94r81MBaOZZ4hRcKD4fh/vgJBxic0BSWnY="; }; cargoHash = "sha256-wFh9AYQRZB9qK0vCrhW9Zk61Yg+VY3VPAqJRD47NbK4="; diff --git a/pkgs/by-name/co/cosmic-settings-daemon/package.nix b/pkgs/by-name/co/cosmic-settings-daemon/package.nix index 46bce01259d9..eda52dd48000 100644 --- a/pkgs/by-name/co/cosmic-settings-daemon/package.nix +++ b/pkgs/by-name/co/cosmic-settings-daemon/package.nix @@ -16,14 +16,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-settings-daemon"; - version = "1.0.1"; + version = "1.0.2"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-settings-daemon"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-eDpwJRRX6RjOEtSOCGYpeJQldnwZ9gsqfkycHrP5w6c="; + hash = "sha256-4BXsjcAzu4twwIGqHQ4jvewO5oUns6yqY1n26KbIygQ="; }; postPatch = '' diff --git a/pkgs/by-name/co/cosmic-settings/package.nix b/pkgs/by-name/co/cosmic-settings/package.nix index 2304caf3a862..e0e32d1f8669 100644 --- a/pkgs/by-name/co/cosmic-settings/package.nix +++ b/pkgs/by-name/co/cosmic-settings/package.nix @@ -27,17 +27,17 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-settings"; - version = "1.0.1"; + version = "1.0.2"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-settings"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-gn8Nxo5pwJciva34pSsSz2iSVT8ieS54MVPdC1kbrvs="; + hash = "sha256-IYuQlXkdakAbchOH2vje02eWCJMBEp7ONtls4Hm/iCo="; }; - cargoHash = "sha256-xsVQyb9tki/bNV9wMavx8PYIimB7ZoOtwKL3gNPGuIM="; + cargoHash = "sha256-XY1ovI73O2jJdx1a5pUk/n6TUazklq7PA+bgva3xslo="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/co/cosmic-store/package.nix b/pkgs/by-name/co/cosmic-store/package.nix index 4abd60446ee6..45836f850eda 100644 --- a/pkgs/by-name/co/cosmic-store/package.nix +++ b/pkgs/by-name/co/cosmic-store/package.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-store"; - version = "1.0.1"; + version = "1.0.2"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix index 5fa535e855cf..400b632aaa07 100644 --- a/pkgs/by-name/co/cosmic-term/package.nix +++ b/pkgs/by-name/co/cosmic-term/package.nix @@ -15,14 +15,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-term"; - version = "1.0.1"; + version = "1.0.2"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-term"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-7Iebf/AffJPeIJYVhaGW5GpgUGbkWDTz7A31Y0EPGqc="; + hash = "sha256-SmwXRgYgFelVQhx03GaIRWHCm7x/9eXMdVxH06TLxLE="; }; cargoHash = "sha256-ImWHjEKgu9FQR52A3GjnAkxlPduKuzSUAOANYr0DzMA="; diff --git a/pkgs/by-name/co/cosmic-wallpapers/package.nix b/pkgs/by-name/co/cosmic-wallpapers/package.nix index dcc044b5f2c9..0a99261a8d49 100644 --- a/pkgs/by-name/co/cosmic-wallpapers/package.nix +++ b/pkgs/by-name/co/cosmic-wallpapers/package.nix @@ -7,7 +7,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "cosmic-wallpapers"; - version = "1.0.1"; + version = "1.0.2"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix index e00566e094eb..44225233d0d3 100644 --- a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix +++ b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-workspaces-epoch"; - version = "1.0.1"; + version = "1.0.2"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/cr/crystal2nix/package.nix b/pkgs/by-name/cr/crystal2nix/package.nix index 99db99cd5259..18c23623e85e 100644 --- a/pkgs/by-name/cr/crystal2nix/package.nix +++ b/pkgs/by-name/cr/crystal2nix/package.nix @@ -40,7 +40,6 @@ crystal.buildCrystalPackage rec { mainProgram = "crystal2nix"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ - manveru peterhoeg ]; }; diff --git a/pkgs/by-name/cu/cucumber/package.nix b/pkgs/by-name/cu/cucumber/package.nix index 1e7c84e49c10..40f0fa8eb029 100644 --- a/pkgs/by-name/cu/cucumber/package.nix +++ b/pkgs/by-name/cu/cucumber/package.nix @@ -18,7 +18,6 @@ bundlerApp { license = lib.licenses.mit; mainProgram = "cucumber"; maintainers = with lib.maintainers; [ - manveru nicknovitski anthonyroussel ]; diff --git a/pkgs/by-name/cu/cups-zj-58/package.nix b/pkgs/by-name/cu/cups-zj-58/package.nix index 6fa17f917d15..73d0cd229104 100644 --- a/pkgs/by-name/cu/cups-zj-58/package.nix +++ b/pkgs/by-name/cu/cups-zj-58/package.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation { --replace-fail "cmake_minimum_required ( VERSION 3.0 )" "cmake_minimum_required ( VERSION 3.10 )" ''; + env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + installPhase = '' install -D ppd/zj80.ppd $out/share/cups/model/zjiang/zj80.ppd install -D ppd/zj58.ppd $out/share/cups/model/zjiang/zj58.ppd diff --git a/pkgs/by-name/cu/cursor-cli/package.nix b/pkgs/by-name/cu/cursor-cli/package.nix index 45d0652c2974..abe3e2a3cc3c 100644 --- a/pkgs/by-name/cu/cursor-cli/package.nix +++ b/pkgs/by-name/cu/cursor-cli/package.nix @@ -9,26 +9,26 @@ let inherit (stdenv) hostPlatform; sources = { x86_64-linux = fetchurl { - url = "https://downloads.cursor.com/lab/2026.01.09-231024f/linux/x64/agent-cli-package.tar.gz"; - hash = "sha256-FT4dPRYXWVLnl02KevhiMuh6F3P9Bu+YJXiWrQtH2vo="; + url = "https://downloads.cursor.com/lab/2026.01.17-d239e66/linux/x64/agent-cli-package.tar.gz"; + hash = "sha256-gZPjmxJxppni1tBL+4KNzP7It8vN0qG0e+xG42Cu/tM="; }; aarch64-linux = fetchurl { - url = "https://downloads.cursor.com/lab/2026.01.09-231024f/linux/arm64/agent-cli-package.tar.gz"; - hash = "sha256-23P7GxKzb66HNYasW87wgSFvL7PseXrZJ29Gewqx1O0="; + url = "https://downloads.cursor.com/lab/2026.01.17-d239e66/linux/arm64/agent-cli-package.tar.gz"; + hash = "sha256-+ZTHbrRzte79MPrgCBb+Yj8GZaPCcDjc0v9vLI8wmoI="; }; x86_64-darwin = fetchurl { - url = "https://downloads.cursor.com/lab/2026.01.09-231024f/darwin/x64/agent-cli-package.tar.gz"; - hash = "sha256-kYXTaddjTkuz+tzWJHU4Bk80jABTbQdVKLjEKvSBgX8="; + url = "https://downloads.cursor.com/lab/2026.01.17-d239e66/darwin/x64/agent-cli-package.tar.gz"; + hash = "sha256-6LNXzVh7hpAFZWCZUECJKIv9RzuWih3G/+9cFjof2zM="; }; aarch64-darwin = fetchurl { - url = "https://downloads.cursor.com/lab/2026.01.09-231024f/darwin/arm64/agent-cli-package.tar.gz"; - hash = "sha256-wOPvhIOkg8NQch5GLe5JbK2Xl2vTboVCPPMa+aMV+MI="; + url = "https://downloads.cursor.com/lab/2026.01.17-d239e66/darwin/arm64/agent-cli-package.tar.gz"; + hash = "sha256-mUjH/9ADFgsCdCvUmSUMbepJUHA/4bz7I01c51tlAM8="; }; }; in stdenv.mkDerivation { pname = "cursor-cli"; - version = "0-unstable-2026-01-09"; + version = "0-unstable-2026-01-17"; src = sources.${hostPlatform.system}; diff --git a/pkgs/by-name/cu/curv/package.nix b/pkgs/by-name/cu/curv/package.nix index afc56199ca7e..865b021bf54e 100644 --- a/pkgs/by-name/cu/curv/package.nix +++ b/pkgs/by-name/cu/curv/package.nix @@ -6,10 +6,12 @@ git, pkg-config, boost, - eigen_3_4_0, + eigen_5, glm, + gcc, libGL, libpng, + makeWrapper, openexr, onetbb, xorg, @@ -20,14 +22,14 @@ stdenv.mkDerivation { pname = "curv"; - version = "0.5-unstable-2025-01-20"; + version = "0.5-unstable-2026-01-17"; src = fetchFromGitea { domain = "codeberg.org"; owner = "doug-moen"; repo = "curv"; - rev = "ef082c6612407dd8abce06015f9a16b1ebf661b8"; - hash = "sha256-BGL07ZBA+ao3fg3qp56sVTe+3tM2SOp8TGu/jF7SVlM="; + rev = "1c2eb68e47e3c61a98e39cd3c50f90691c5a268d"; + hash = "sha256-PuRBnJswrg+PjtU6ize+PjoBpQSSEzO2CeCx9mQF+3w="; fetchSubmodules = true; }; @@ -36,11 +38,12 @@ stdenv.mkDerivation { cmake git pkg-config + makeWrapper ]; buildInputs = [ boost - eigen_3_4_0 + eigen_5 glm libGL libpng @@ -75,6 +78,18 @@ stdenv.mkDerivation { --replace-fail "cmake_minimum_required(VERSION 2.6.2)" "cmake_minimum_required(VERSION 3.10)" ''; + ## support runtime compilation with -Ojit + fixupPhase = '' + wrapProgram $out/bin/curv \ + --set NIX_CFLAGS_COMPILE_${gcc.suffixSalt} "$NIX_CFLAGS_COMPILE" \ + --set NIX_LDFLAGS_${gcc.suffixSalt} "$NIX_LDFLAGS" \ + --prefix PATH : "${ + lib.makeBinPath [ + gcc + ] + }" + ''; + passthru.updateScript = unstableGitUpdater { }; meta = { diff --git a/pkgs/by-name/cw/cwe-client-cli/package.nix b/pkgs/by-name/cw/cwe-client-cli/package.nix deleted file mode 100644 index a9f12ce76e4c..000000000000 --- a/pkgs/by-name/cw/cwe-client-cli/package.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - pkg-config, - glib, - dbus, - openssl_3, -}: -rustPlatform.buildRustPackage rec { - pname = "cwe-client-cli"; - version = "0.3.3"; - src = fetchFromGitHub { - owner = "NotBalds"; - repo = "cwe-client-cli"; - rev = "v${version}"; - hash = "sha256-3ehzERWV0/hV0Suy9LtCcp+xmaD13Chgu4a0gPT7cHs="; - }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - glib - dbus - openssl_3 - ]; - - cargoHash = "sha256-ml6anuAJru2zVIHNf/z4gdQjplRrXL4FO44cxfaDRns="; - - meta = { - description = "Simple command line client for CWE"; - homepage = "https://github.com/NotBalds/cwe-client-cli"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ tbwanderer ]; - mainProgram = "cwe-client-cli"; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/by-name/da/damon/package.nix b/pkgs/by-name/da/damon/package.nix index 1b3eddea5e89..2e59ca9977e0 100644 --- a/pkgs/by-name/da/damon/package.nix +++ b/pkgs/by-name/da/damon/package.nix @@ -21,7 +21,6 @@ buildGoModule { homepage = "https://github.com/hashicorp/damon"; license = lib.licenses.mpl20; description = "Terminal UI (TUI) for HashiCorp Nomad"; - teams = [ lib.teams.iog ]; mainProgram = "damon"; }; } diff --git a/pkgs/by-name/db/dbmate/package.nix b/pkgs/by-name/db/dbmate/package.nix index e1768599cfc0..bf1f125f3e39 100644 --- a/pkgs/by-name/db/dbmate/package.nix +++ b/pkgs/by-name/db/dbmate/package.nix @@ -25,6 +25,5 @@ buildGoModule rec { homepage = "https://github.com/amacneil/dbmate"; changelog = "https://github.com/amacneil/dbmate/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ manveru ]; }; } diff --git a/pkgs/by-name/dc/dcgm/package.nix b/pkgs/by-name/dc/dcgm/package.nix index 7fd5dde85ccf..de95cb179d48 100644 --- a/pkgs/by-name/dc/dcgm/package.nix +++ b/pkgs/by-name/dc/dcgm/package.nix @@ -170,7 +170,10 @@ stdenv.mkDerivation { description = "Data Center GPU Manager (DCGM) is a daemon that allows users to monitor NVIDIA data-center GPUs"; homepage = "https://developer.nvidia.com/dcgm"; license = lib.licenses.asl20; - teams = [ lib.teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; mainProgram = "dcgmi"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/de/debian-devscripts/package.nix b/pkgs/by-name/de/debian-devscripts/package.nix index f6872dd63f2b..391cbfea9f00 100644 --- a/pkgs/by-name/de/debian-devscripts/package.nix +++ b/pkgs/by-name/de/debian-devscripts/package.nix @@ -30,14 +30,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "debian-devscripts"; - version = "2.26.3"; + version = "2.26.4"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "devscripts"; tag = "v${finalAttrs.version}"; - hash = "sha256-LJZ1pt36KccnA/fimZsOzEjXvqVE2eSww1Wkq5+siJk="; + hash = "sha256-QGveq9PZfy/m+ah4gBvZDMkVWS50oj1f4SJsKcCKGug="; }; patches = [ diff --git a/pkgs/by-name/de/deface/package.nix b/pkgs/by-name/de/deface/package.nix index dc40f47ecf93..2194ec221124 100644 --- a/pkgs/by-name/de/deface/package.nix +++ b/pkgs/by-name/de/deface/package.nix @@ -11,8 +11,6 @@ python3.pkgs.buildPythonApplication rec { version = "1.5.0"; pyproject = true; - disabled = python3.pythonOlder "3.8"; - src = fetchFromGitHub { owner = "ORB-HD"; repo = "deface"; diff --git a/pkgs/by-name/dg/dgop/package.nix b/pkgs/by-name/dg/dgop/package.nix index edd9051e24bd..c1afaeaee9f3 100644 --- a/pkgs/by-name/dg/dgop/package.nix +++ b/pkgs/by-name/dg/dgop/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "dgop"; - version = "0.1.12"; + version = "0.1.13"; src = fetchFromGitHub { owner = "AvengeMedia"; repo = "dgop"; tag = "v${finalAttrs.version}"; - hash = "sha256-ei6JMAai5azTy4iYLGp6vDd+ADMej+ysrZhlRv491g4="; + hash = "sha256-Frp1/AE5jznFWS52FgN9daI6Kgi0yPx7bZVoFuEIylw="; }; - vendorHash = "sha256-MssJTtlKWzn+toNmE+QkXvLXtR7pR21cknXj89CSbwI="; + vendorHash = "sha256-NycCRxav1S/DW4fRlcLG5r5NsQQHbAE4zoOiF6Ut/bE="; ldflags = [ "-w" diff --git a/pkgs/by-name/di/di/package.nix b/pkgs/by-name/di/di/package.nix index bded009283a0..0e37012325dd 100644 --- a/pkgs/by-name/di/di/package.nix +++ b/pkgs/by-name/di/di/package.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { description = "Disk information utility; displays everything 'df' does and more"; homepage = "https://diskinfo-di.sourceforge.io/"; license = lib.licenses.zlib; - maintainers = with lib.maintainers; [ manveru ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/di/dioxus-cli/package.nix b/pkgs/by-name/di/dioxus-cli/package.nix index d3be3f661a3d..4e6c1d5ac365 100644 --- a/pkgs/by-name/di/dioxus-cli/package.nix +++ b/pkgs/by-name/di/dioxus-cli/package.nix @@ -7,7 +7,7 @@ openssl, rustfmt, makeWrapper, - wasm-bindgen-cli_0_2_106, + wasm-bindgen-cli_0_2_108, testers, dioxus-cli, withTelemetry ? false, @@ -15,15 +15,15 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "dioxus-cli"; - version = "0.7.2"; + version = "0.7.3"; src = fetchCrate { pname = "dioxus-cli"; version = finalAttrs.version; - hash = "sha256-VCoTxZKFYkGBCu1X/9US/OCFpp6zc5ojmXWJfzozCxc="; + hash = "sha256-6uG737MNk+wTKqNWgFEd8MsOOvllZLDnIrJPAn5Wjuw="; }; - cargoHash = "sha256-de8z68uXnrzyxTJY53saJ6hT7rvYbSdsSA/WWQa6nl4="; + cargoHash = "sha256-BdPsdWah/f2pveQViPikIV2riSwjSo+qGOFoP+hHaiM="; buildFeatures = [ "no-downloads" ] @@ -68,7 +68,7 @@ rustPlatform.buildRustPackage (finalAttrs: { postInstall = '' wrapProgram $out/bin/dx \ - --prefix PATH : ${lib.makeBinPath [ wasm-bindgen-cli_0_2_106 ]} + --prefix PATH : ${lib.makeBinPath [ wasm-bindgen-cli_0_2_108 ]} ''; meta = { diff --git a/pkgs/by-name/di/dislocker/package.nix b/pkgs/by-name/di/dislocker/package.nix index a0f844006471..5b69c53d45ae 100644 --- a/pkgs/by-name/di/dislocker/package.nix +++ b/pkgs/by-name/di/dislocker/package.nix @@ -35,7 +35,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/Aorimn/dislocker/raw/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ - elitak yuannan ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/dm/dms-shell/package.nix b/pkgs/by-name/dm/dms-shell/package.nix index a919c04c453a..d47a14fadd38 100644 --- a/pkgs/by-name/dm/dms-shell/package.nix +++ b/pkgs/by-name/dm/dms-shell/package.nix @@ -26,13 +26,13 @@ buildGoModule ( in { pname = "dms-shell"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "AvengeMedia"; repo = "DankMaterialShell"; tag = "v${finalAttrs.version}"; - hash = "sha256-OUduJ6EcH91C8A5Jt2ZHgJiZg9k5ZKipKPbuHzbQGaI="; + hash = "sha256-P//moH3z9r4PXirTzXVsccQINsK5AIlF9RWOBwK3vLc="; }; sourceRoot = "${finalAttrs.src.name}/core"; diff --git a/pkgs/by-name/do/dovecot/package.nix b/pkgs/by-name/do/dovecot/package.nix index 52cd9b4b1e05..219b00fe48b5 100644 --- a/pkgs/by-name/do/dovecot/package.nix +++ b/pkgs/by-name/do/dovecot/package.nix @@ -192,9 +192,10 @@ stdenv.mkDerivation rec { ]; mainProgram = "dovecot"; maintainers = with lib.maintainers; [ + das_j fpletz + helsinki-Jo ]; - teams = [ lib.teams.helsinki-systems ]; platforms = lib.platforms.unix; }; passthru.tests = { diff --git a/pkgs/by-name/do/dovecot_pigeonhole/package.nix b/pkgs/by-name/do/dovecot_pigeonhole/package.nix index d28c342e8614..9c8f2387f0ad 100644 --- a/pkgs/by-name/do/dovecot_pigeonhole/package.nix +++ b/pkgs/by-name/do/dovecot_pigeonhole/package.nix @@ -43,8 +43,10 @@ stdenv.mkDerivation rec { homepage = "https://pigeonhole.dovecot.org/"; description = "Sieve plugin for the Dovecot IMAP server"; license = lib.licenses.lgpl21Only; - maintainers = [ ]; - teams = [ lib.teams.helsinki-systems ]; + maintainers = with lib.maintainers; [ + das_j + helsinki-Jo + ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/dt/dt-schema/package.nix b/pkgs/by-name/dt/dt-schema/package.nix index 446e47f7b9ef..6aacd1306435 100644 --- a/pkgs/by-name/dt/dt-schema/package.nix +++ b/pkgs/by-name/dt/dt-schema/package.nix @@ -1,5 +1,4 @@ { - lib, python3, }: @@ -16,22 +15,10 @@ let hash = "sha256-D4ZEN6uLYHa6ZwdFPvj5imoNUSqA6T+KvbZ29zfstg0="; }; - propagatedBuildInputs = - with self; - ( - [ - attrs - pyrsistent - ] - ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata - typing-extensions - ] - ++ lib.optionals (pythonOlder "3.9") [ - importlib-resources - pkgutil-resolve-name - ] - ); + propagatedBuildInputs = with self; [ + attrs + pyrsistent + ]; }); }; }; diff --git a/pkgs/by-name/du/duckstation/package.nix b/pkgs/by-name/du/duckstation/package.nix index 78bcb84cbf50..0944f6591a3b 100644 --- a/pkgs/by-name/du/duckstation/package.nix +++ b/pkgs/by-name/du/duckstation/package.nix @@ -52,7 +52,6 @@ let homepage = "https://duckstation.org"; license = lib.licenses.cc-by-nc-nd-40; maintainers = with lib.maintainers; [ - normalcea matteopacini ]; }; diff --git a/pkgs/by-name/ed/edgetx/package.nix b/pkgs/by-name/ed/edgetx/package.nix index 02d6fd045f38..9be1dbd82716 100644 --- a/pkgs/by-name/ed/edgetx/package.nix +++ b/pkgs/by-name/ed/edgetx/package.nix @@ -183,7 +183,6 @@ stdenv.mkDerivation (finalAttrs: { "aarch64-linux" ]; maintainers = with lib.maintainers; [ - elitak lopsided98 wucke13 xokdvium diff --git a/pkgs/by-name/eg/ego/package.nix b/pkgs/by-name/eg/ego/package.nix index cdf162f1f23a..ee135f7ff9c1 100644 --- a/pkgs/by-name/eg/ego/package.nix +++ b/pkgs/by-name/eg/ego/package.nix @@ -37,7 +37,10 @@ rustPlatform.buildRustPackage rec { description = "Run Linux desktop applications under a different local user"; homepage = "https://github.com/intgr/ego"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ dit7ya ]; + maintainers = with lib.maintainers; [ + dit7ya + mio + ]; mainProgram = "ego"; }; } diff --git a/pkgs/by-name/ej/ejson/package.nix b/pkgs/by-name/ej/ejson/package.nix index 9c5179dee2e1..29907e535b92 100644 --- a/pkgs/by-name/ej/ejson/package.nix +++ b/pkgs/by-name/ej/ejson/package.nix @@ -27,6 +27,5 @@ buildGoModule rec { mainProgram = "ejson"; license = lib.licenses.mit; homepage = "https://github.com/Shopify/ejson"; - maintainers = [ lib.maintainers.manveru ]; }; } diff --git a/pkgs/by-name/em/email/package.nix b/pkgs/by-name/em/email/package.nix index 2b168ad5d111..9aba58c1d25f 100644 --- a/pkgs/by-name/em/email/package.nix +++ b/pkgs/by-name/em/email/package.nix @@ -40,6 +40,10 @@ stdenv.mkDerivation { }) ]; + # opt out of GCC 15's stricter C standards + # https://github.com/NixOS/nixpkgs/issues/475479 + env.NIX_CFLAGS_COMPILE = toString [ "-std=gnu17" ]; + buildInputs = [ openssl ]; unpackPhase = '' diff --git a/pkgs/by-name/em/embellish/package.nix b/pkgs/by-name/em/embellish/package.nix index 6911f0fb0595..127a7613f9d0 100644 --- a/pkgs/by-name/em/embellish/package.nix +++ b/pkgs/by-name/em/embellish/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/getnf/embellish"; changelog = "https://github.com/getnf/embellish/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ normalcea ]; + maintainers = [ ]; mainProgram = "io.github.getnf.embellish"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/en/enter-tex/package.nix b/pkgs/by-name/en/enter-tex/package.nix index 21dddbf74cf0..6f1e211e5e04 100644 --- a/pkgs/by-name/en/enter-tex/package.nix +++ b/pkgs/by-name/en/enter-tex/package.nix @@ -76,7 +76,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.gnome.org/World/gedit/enter-tex"; description = "LaTeX editor for the GNOME desktop"; maintainers = with lib.maintainers; [ - manveru bobby285271 ]; license = lib.licenses.gpl3Plus; diff --git a/pkgs/by-name/eq/equicord/package.nix b/pkgs/by-name/eq/equicord/package.nix index ec8b144b022b..60947666ec93 100644 --- a/pkgs/by-name/eq/equicord/package.nix +++ b/pkgs/by-name/eq/equicord/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { # the Equicord repository. Dates as tags (and automatic releases) were the compromise # we came to with upstream. Please do not change the version schema (e.g., to semver) # unless upstream changes the tag schema from dates. - version = "2025-12-25"; + version = "2026-01-19"; src = fetchFromGitHub { owner = "Equicord"; repo = "Equicord"; tag = finalAttrs.version; - hash = "sha256-ce5n7E+eJLPnj/dUnaaDi4R8kKO4+iOcQgdtOin4NcM="; + hash = "sha256-pEFU1E+BqAAAz2ywPrS1MejhZ/g47iG/4BBey+2F7Hw="; }; pnpmDeps = fetchPnpmDeps { diff --git a/pkgs/by-name/ex/exim/package.nix b/pkgs/by-name/ex/exim/package.nix index b7774c1925a9..e42b1a480b74 100644 --- a/pkgs/by-name/ex/exim/package.nix +++ b/pkgs/by-name/ex/exim/package.nix @@ -200,8 +200,11 @@ stdenv.mkDerivation rec { ]; mainProgram = "exim"; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ tv ]; - teams = [ lib.teams.helsinki-systems ]; + maintainers = with lib.maintainers; [ + das_j + helsinki-Jo + tv + ]; changelog = "https://github.com/Exim/exim/blob/exim-${version}/doc/doc-txt/ChangeLog"; }; } diff --git a/pkgs/by-name/ex/exo/inject-dashboard-path.patch b/pkgs/by-name/ex/exo/inject-dashboard-path.patch new file mode 100644 index 000000000000..29f964446dbb --- /dev/null +++ b/pkgs/by-name/ex/exo/inject-dashboard-path.patch @@ -0,0 +1,17 @@ +diff --git a/src/exo/utils/dashboard_path.py b/src/exo/utils/dashboard_path.py +index b5ce9c04..ec60ef4a 100644 +--- a/src/exo/utils/dashboard_path.py ++++ b/src/exo/utils/dashboard_path.py +@@ -5,11 +5,7 @@ from typing import cast + + + def find_dashboard() -> Path: +- dashboard = ( +- _find_dashboard_in_env() +- or _find_dashboard_in_repo() +- or _find_dashboard_in_bundle() +- ) ++ dashboard = "@dashboard@" + if not dashboard: + raise FileNotFoundError( + "Unable to locate dashboard assets - make sure the dashboard has been built, or export DASHBOARD_DIR if you've built the dashboard elsewhere." diff --git a/pkgs/by-name/ex/exo/make-encoding-init-lazy.patch b/pkgs/by-name/ex/exo/make-encoding-init-lazy.patch new file mode 100644 index 000000000000..7a51317853ca --- /dev/null +++ b/pkgs/by-name/ex/exo/make-encoding-init-lazy.patch @@ -0,0 +1,29 @@ +diff --git a/src/exo/master/api.py b/src/exo/master/api.py +index 30f87e2a..4aac51fe 100644 +--- a/src/exo/master/api.py ++++ b/src/exo/master/api.py +@@ -67,7 +67,14 @@ from exo.utils.channels import Receiver, Sender, channel + from exo.utils.dashboard_path import find_dashboard + from exo.utils.event_buffer import OrderedBuffer + +-encoding = load_harmony_encoding(HarmonyEncodingName.HARMONY_GPT_OSS) ++_encoding: object = None ++ ++ ++def get_encoding(): ++ global _encoding ++ if _encoding is None: ++ _encoding = load_harmony_encoding(HarmonyEncodingName.HARMONY_GPT_OSS) ++ return _encoding + + + def chunk_to_response( +@@ -382,7 +389,7 @@ class API: + ) + + async def _process_gpt_oss(self, token_chunks: Receiver[TokenChunk]): +- stream = StreamableParser(encoding, role=Role.ASSISTANT) ++ stream = StreamableParser(_encoding, role=Role.ASSISTANT) + thinking = False + + async for chunk in token_chunks: diff --git a/pkgs/by-name/ex/exo/package.nix b/pkgs/by-name/ex/exo/package.nix index 919815c9ec61..fae8710e96ad 100644 --- a/pkgs/by-name/ex/exo/package.nix +++ b/pkgs/by-name/ex/exo/package.nix @@ -3,80 +3,201 @@ stdenv, fetchFromGitHub, python3Packages, - gitUpdater, -}: -python3Packages.buildPythonApplication rec { - pname = "exo"; - version = "0.0.14-alpha"; - pyproject = true; + replaceVars, + macmon, + + # pyo3-bindings + rustPlatform, + + # dashboard + buildNpmPackage, + fetchNpmDeps, + writableTmpDirAsHomeHook, + + nix-update-script, +}: +let + version = "1.0.63"; src = fetchFromGitHub { + name = "exo"; owner = "exo-explore"; repo = "exo"; tag = "v${version}"; - hash = "sha256-GoYfpr6oFpreWQtSomOwgfzSoBAbjqGZ1mcc0u9TBl4="; + hash = "sha256-aQ3rGLtT/zvIVdKQcwqODulzEHBKg7KMkBg3KJEscho="; }; - build-system = with python3Packages; [ setuptools ]; + pyo3-bindings = python3Packages.buildPythonPackage (finalAttrs: { + pname = "exo-pyo3-bindings"; + inherit version src; + pyproject = true; + + buildAndTestSubdir = "rust/exo_pyo3_bindings"; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) pname src version; + hash = "sha256-N7B1WFqPdqeNPZe9hXGyX7F3EbB1spzeKc19BFDDwls="; + }; + + # Bypass rust nightly features not being available on rust stable + env.RUSTC_BOOTSTRAP = 1; + + nativeBuildInputs = [ + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + ]; + + nativeCheckInputs = with python3Packages; [ + pytest-asyncio + pytestCheckHook + ]; + + enabledTestPaths = [ + "rust/exo_pyo3_bindings/tests/" + ]; + }); + + dashboard = buildNpmPackage (finalAttrs: { + pname = "exo-dashboard"; + inherit src version; + + sourceRoot = "${finalAttrs.src.name}/dashboard"; + + npmDeps = fetchNpmDeps { + inherit (finalAttrs) + pname + version + src + sourceRoot + ; + fetcherVersion = 2; + hash = "sha256-w3FZL/yy8R+SWCQF7+v21sKyizvZMmipG6IfhJeSjyQ="; + }; + }); +in +python3Packages.buildPythonApplication (finalAttrs: { + pname = "exo"; + pyproject = true; + + inherit version src; + + patches = [ + (replaceVars ./inject-dashboard-path.patch { + dashboard = "${dashboard}/lib/node_modules/${dashboard.pname}/build"; + }) + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "uv_build>=0.8.9,<0.9.0" "uv_build" + '' + # MemoryObjectStreamState was renamed in + # https://github.com/agronholm/anyio/pull/1009/changes/bdc945a826d0d5917aea3517ceb9fe335b468094 + + '' + substituteInPlace src/exo/utils/channels.py \ + --replace-fail \ + "MemoryObjectStreamState as AnyioState," \ + "_MemoryObjectStreamState as AnyioState," + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace src/exo/worker/utils/macmon.py \ + --replace-fail \ + 'path = shutil.which("macmon")' \ + 'path = "${lib.getExe macmon}"' + + substituteInPlace src/exo/worker/utils/tests/test_macmon.py \ + --replace-fail \ + 'cmd=["macmon"' \ + 'cmd=["${lib.getExe macmon}"' + ''; + + build-system = with python3Packages; [ + uv-build + ]; pythonRelaxDeps = true; - pythonRemoveDeps = [ "uuid" ]; - - dependencies = with python3Packages; [ - aiohttp - aiohttp-cors - aiofiles - grpcio - grpcio-tools - jinja2 - numpy - nuitka - nvidia-ml-py - opencv-python - pillow - prometheus-client - protobuf - psutil - pydantic - requests - rich - scapy - tqdm - transformers - tinygrad - uvloop + pythonRemoveDeps = [ + "types-aiofiles" + "uuid" ]; + dependencies = + with python3Packages; + [ + aiofiles + aiohttp + aiohttp-cors + anyio + fastapi + filelock + grpcio + grpcio-tools + httpx + huggingface-hub + hypercorn + jinja2 + loguru + mlx + mlx-lm + nvidia-ml-py + openai + openai-harmony + opencv-python + pillow + prometheus-client + psutil + pydantic + pyo3-bindings + rustworkx + scapy + tiktoken + tinygrad + transformers + uvloop + ] + ++ sqlalchemy.optional-dependencies.asyncio; pythonImportsCheck = [ "exo" - "exo.inference.tinygrad.models" + "exo.main" ]; - nativeCheckInputs = with python3Packages; [ - mlx - pytestCheckHook + nativeCheckInputs = [ + python3Packages.pytest-asyncio + python3Packages.pytestCheckHook + writableTmpDirAsHomeHook ]; - disabledTestPaths = [ - "test/test_tokenizers.py" + # Otherwise fails with 'import file mismatch' + preCheck = '' + rm src/exo/__init__.py + ''; + + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + # AssertionError: assert "MacMon not found in PATH" in str(exc_info.value) + "test_macmon_not_found_raises_macmon_error" + + # ValueError: zip() argument 2 is longer than argument 1 + "test_events_processed_in_correct_order" ]; - # Tests require `mlx` which is not supported on linux. - doCheck = stdenv.hostPlatform.isDarwin; + disabledTestPaths = [ + # All tests hang indefinitely + "src/exo/worker/tests/unittests/test_mlx/test_tokenizers.py" + ]; passthru = { - updateScript = gitUpdater { - rev-prefix = "v-"; - }; + updateScript = nix-update-script { }; + exo-pyo3-bindings = pyo3-bindings; + exo-dashboard = dashboard; }; meta = { description = "Run your own AI cluster at home with everyday devices"; homepage = "https://github.com/exo-explore/exo"; - changelog = "https://github.com/exo-explore/exo/releases/tag/v${version}"; + changelog = "https://github.com/exo-explore/exo/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ GaetanLepage ]; mainProgram = "exo"; }; -} +}) diff --git a/pkgs/by-name/fa/factorio/package.nix b/pkgs/by-name/fa/factorio/package.nix index b0d5072db3a8..3de81b7191f8 100644 --- a/pkgs/by-name/fa/factorio/package.nix +++ b/pkgs/by-name/fa/factorio/package.nix @@ -224,7 +224,6 @@ let license = lib.licenses.unfree; maintainers = with lib.maintainers; [ Baughn - elitak priegger lukegb ]; diff --git a/pkgs/by-name/fi/firejail/package.nix b/pkgs/by-name/fi/firejail/package.nix index 4fdde82d3778..1975d2a676e0 100644 --- a/pkgs/by-name/fi/firejail/package.nix +++ b/pkgs/by-name/fi/firejail/package.nix @@ -99,5 +99,6 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.raskin ]; platforms = lib.platforms.linux; homepage = "https://firejail.wordpress.com/"; + mainProgram = "firejail"; }; } diff --git a/pkgs/by-name/fl/flake-edit/package.nix b/pkgs/by-name/fl/flake-edit/package.nix index f330a6f182dc..c1332555a5b1 100644 --- a/pkgs/by-name/fl/flake-edit/package.nix +++ b/pkgs/by-name/fl/flake-edit/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "flake-edit"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "a-kenji"; repo = "flake-edit"; rev = "v${version}"; - hash = "sha256-cBW2UH25MRSqqQ1930xxIydg+sSf62NFvbjqfkK0vnI="; + hash = "sha256-Ptg/Wt8H6vOvk/V6juDmFd6Vzu/F3LzxDIGObuwySLA="; }; - cargoHash = "sha256-VhDN9Wq6O5lB78zEE/vjO7uzr5de0jKWfd2nRlyLtu8="; + cargoHash = "sha256-5i3wll3CdrRbwN8zsD4MQg62hvsMPESMW4YrtjPeySw="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/fl/flexoptix-app/package.nix b/pkgs/by-name/fl/flexoptix-app/package.nix index d59ee205e14a..d10bf8ef1db7 100644 --- a/pkgs/by-name/fl/flexoptix-app/package.nix +++ b/pkgs/by-name/fl/flexoptix-app/package.nix @@ -70,7 +70,10 @@ appimageTools.wrapAppImage { homepage = "https://www.flexoptix.net"; changelog = "https://www.flexoptix.net/en/flexoptix-app/?os=linux#flexapp__modal__changelog"; license = lib.licenses.unfree; - teams = [ lib.teams.helsinki-systems ]; + maintainers = with lib.maintainers; [ + das_j + helsinki-Jo + ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index 293be60a958a..8f65d52bb8ce 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -49,17 +49,17 @@ let in buildGoModule rec { pname = "forgejo-runner"; - version = "12.5.2"; + version = "12.5.3"; src = fetchFromGitea { domain = "code.forgejo.org"; owner = "forgejo"; repo = "runner"; rev = "v${version}"; - hash = "sha256-aL79wMzoqt1rqaOQyV28HSeZwjL3k60AyQOhOT/+BRY="; + hash = "sha256-qCk2GvPWKIQfEjYtx2Uc7GcVDehUu0/u4LP88FxoA9A="; }; - vendorHash = "sha256-XNUhlGkW8bZ1cjODD6QIyRmmNdQ4Tq/hP2FToYfTq2k="; + vendorHash = "sha256-pGLZmSW7MKEy/K+njgcPv5a+7Qtf8mqUI4OwKhfEZXY="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/fr/fresh-editor/package.nix b/pkgs/by-name/fr/fresh-editor/package.nix index 915529cef0e6..697c6035bd16 100644 --- a/pkgs/by-name/fr/fresh-editor/package.nix +++ b/pkgs/by-name/fr/fresh-editor/package.nix @@ -11,16 +11,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "fresh"; - version = "0.1.75"; + version = "0.1.77"; src = fetchFromGitHub { owner = "sinelaw"; repo = "fresh"; tag = "v${finalAttrs.version}"; - hash = "sha256-c/zpPvPOlbZvmSGb+DqPV9HA+ic8/9TYv9MgI8d4Bgs="; + hash = "sha256-+ESguKlMUB2gm9zNee35wKdZmKLhLcPFa3Z7n4KNpVQ="; }; - cargoHash = "sha256-o6/ER521tpmn8hkMDEw1ykgYuFpG1DTkFbw95NGYqGo="; + cargoHash = "sha256-MrFVolkqGRESPNPsQPDZGvHNVYyB9+ok4GANgIfBbZU="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/fu/fusesoc/package.nix b/pkgs/by-name/fu/fusesoc/package.nix index 364bb8de030e..ad40fb5665d4 100644 --- a/pkgs/by-name/fu/fusesoc/package.nix +++ b/pkgs/by-name/fu/fusesoc/package.nix @@ -5,30 +5,55 @@ iverilog, verilator, gnumake, + gitMinimal, + openssh, + writableTmpDirAsHomeHook, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonApplication rec { pname = "fusesoc"; - version = "2.2.1"; - format = "setuptools"; + version = "2.4.5"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-M36bXBgY8hR33AVDlHoH8PZJG2Bi0KOEI07IMns7R4w="; + hash = "sha256-VBjJ7wiEz441iVquLMGabtdYbK07+dtHY05x8QzdSL8="; }; - nativeBuildInputs = with python3Packages; [ setuptools-scm ]; + build-system = with python3Packages; [ + setuptools + setuptools-scm + ]; dependencies = with python3Packages; [ edalize - fastjsonschema pyparsing pyyaml simplesat - ipyxact + fastjsonschema + argcomplete + ]; + + nativeCheckInputs = [ + gitMinimal + openssh + python3Packages.pytestCheckHook + writableTmpDirAsHomeHook ]; pythonImportsCheck = [ "fusesoc" ]; + disabledTestPaths = [ + # These tests require network access + "tests/test_coremanager.py::test_export" + "tests/test_libraries.py::test_library_add" + "tests/test_libraries.py::test_library_update_with_initialize" + "tests/test_provider.py::test_git_provider" + "tests/test_provider.py::test_github_provider" + "tests/test_provider.py::test_url_provider" + "tests/test_usecases.py::test_git_library_with_default_branch_is_added_and_updated" + "tests/test_usecases.py::test_update_git_library_with_fixed_version" + ]; + makeWrapperArgs = [ "--suffix PATH : ${ lib.makeBinPath [ diff --git a/pkgs/by-name/fz/fzf-zsh/package.nix b/pkgs/by-name/fz/fzf-zsh/package.nix deleted file mode 100644 index 0982dfe30f85..000000000000 --- a/pkgs/by-name/fz/fzf-zsh/package.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fzf, -}: - -stdenv.mkDerivation { - pname = "fzf-zsh-unstable"; - version = "2019-09-09"; - - src = fetchFromGitHub { - owner = "Wyntau"; - repo = "fzf-zsh"; - rev = "829d7e40cc437dce8a6e234e259bbd4065e87124"; - sha256 = "1irjmxhcg1fm4g8p3psjqk7sz5qhj5kw73pyhv91njvpdhn9l26z"; - }; - - strictDeps = true; - postPatch = '' - substituteInPlace fzf-zsh.plugin.zsh \ - --replace \ - 'fzf_path="$( cd "$fzf_zsh_path/../fzf/" && pwd )"' \ - "fzf_path=${fzf}" \ - --replace \ - '$fzf_path/shell' \ - '${fzf}/share/fzf' - ''; - - dontBuild = true; - - installPhase = '' - install -Dm0644 fzf-zsh.plugin.zsh $out/share/zsh/plugins/fzf-zsh/fzf-zsh.plugin.zsh - ''; - - meta = { - homepage = "https://github.com/wyntau/fzf-zsh"; - description = "Wrap fzf to use in oh-my-zsh"; - license = lib.licenses.mit; - maintainers = [ ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/by-name/ga/gancio/package.nix b/pkgs/by-name/ga/gancio/package.nix index a3aa4f975ca3..26447e7ca255 100644 --- a/pkgs/by-name/ga/gancio/package.nix +++ b/pkgs/by-name/ga/gancio/package.nix @@ -4,10 +4,11 @@ fetchFromGitLab, fetchYarnDeps, + yarn, yarnConfigHook, yarnBuildHook, yarnInstallHook, - nodejs, + nodejs_22, pkg-config, vips, @@ -17,6 +18,15 @@ nix-update-script, }: +let + # The latest nodejs is always used in yarn, leading to build issues when it's + # different from the pinned one. + nodejs = nodejs_22; + yarnConfigHook' = yarnConfigHook.override { + yarn = yarn.override { inherit nodejs; }; + }; +in + stdenv.mkDerivation (finalAttrs: { pname = "gancio"; version = "1.28.2"; @@ -35,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - yarnConfigHook + yarnConfigHook' yarnBuildHook yarnInstallHook nodejs diff --git a/pkgs/by-name/ga/gancio/plugin-telegram-bridge/default.nix b/pkgs/by-name/ga/gancio/plugin-telegram-bridge/default.nix index 3ec2fc9fab2d..52e4c876d4ba 100644 --- a/pkgs/by-name/ga/gancio/plugin-telegram-bridge/default.nix +++ b/pkgs/by-name/ga/gancio/plugin-telegram-bridge/default.nix @@ -3,12 +3,22 @@ stdenv, fetchFromGitLab, fetchYarnDeps, + yarn, yarnConfigHook, yarnInstallHook, - nodejs, + nodejs_22, nix-update-script, }: +let + # The latest nodejs is always used in yarn, leading to build issues when it's + # different from the pinned one. + nodejs = nodejs_22; + yarnConfigHook' = yarnConfigHook.override { + yarn = yarn.override { inherit nodejs; }; + }; +in + stdenv.mkDerivation rec { pname = "gancio-plugin-telegram-bridge"; version = "1.0.6"; @@ -32,7 +42,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - yarnConfigHook + yarnConfigHook' yarnInstallHook nodejs ]; diff --git a/pkgs/by-name/ga/gancio/plugins.nix b/pkgs/by-name/ga/gancio/plugins.nix index c3816f7e2a5e..cdecfdd0be21 100644 --- a/pkgs/by-name/ga/gancio/plugins.nix +++ b/pkgs/by-name/ga/gancio/plugins.nix @@ -1,4 +1,4 @@ -{ callPackage, nodejs }: +{ callPackage }: { - telegram-bridge = callPackage ./plugin-telegram-bridge { inherit nodejs; }; + telegram-bridge = callPackage ./plugin-telegram-bridge { }; } diff --git a/pkgs/by-name/ga/gaphor/package.nix b/pkgs/by-name/ga/gaphor/package.nix index 22db18b93e29..3c3ddf4afd66 100644 --- a/pkgs/by-name/ga/gaphor/package.nix +++ b/pkgs/by-name/ga/gaphor/package.nix @@ -137,7 +137,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://gaphor.org/"; changelog = "https://github.com/gaphor/gaphor/releases/tag/${version}"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ normalcea ]; + maintainers = [ ]; teams = [ lib.teams.gnome-circle ]; mainProgram = "gaphor"; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/ge/geoipupdate/package.nix b/pkgs/by-name/ge/geoipupdate/package.nix index 79411ae7efc6..af7e5d1d715f 100644 --- a/pkgs/by-name/ge/geoipupdate/package.nix +++ b/pkgs/by-name/ge/geoipupdate/package.nix @@ -25,7 +25,10 @@ buildGoModule rec { description = "Automatic GeoIP database updater"; homepage = "https://github.com/maxmind/geoipupdate"; license = with lib.licenses; [ asl20 ]; - teams = [ lib.teams.helsinki-systems ]; + maintainers = with lib.maintainers; [ + das_j + helsinki-Jo + ]; mainProgram = "geoipupdate"; }; } diff --git a/pkgs/by-name/gf/gforth/boot-forth.nix b/pkgs/by-name/gf/gforth/boot-forth.nix index 13c0cd5955e2..5451e7d56382 100644 --- a/pkgs/by-name/gf/gforth/boot-forth.nix +++ b/pkgs/by-name/gf/gforth/boot-forth.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation { sha256 = "1c1bahc9ypmca8rv2dijiqbangm1d9av286904yw48ph7ciz4qig"; }; + patches = [ + # Newer GCC rejects casting between function pointers omitting parameters + ./function-pointers.patch + ]; + buildInputs = [ m4 ]; configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--build=x86_64-apple-darwin" ]; diff --git a/pkgs/by-name/gf/gforth/function-pointers.patch b/pkgs/by-name/gf/gforth/function-pointers.patch new file mode 100644 index 000000000000..77311c0514f8 --- /dev/null +++ b/pkgs/by-name/gf/gforth/function-pointers.patch @@ -0,0 +1,26 @@ +diff --git a/engine/signals.c b/engine/signals.c +index b522f19..7f89bcd 100644 +--- a/engine/signals.c ++++ b/engine/signals.c +@@ -399,7 +399,7 @@ void install_signal_handlers(void) + #endif + }; + int i; +- void (*throw_handler)() = die_on_signal ? graceful_exit : signal_throw; ++ void (*throw_handler)(int) = die_on_signal ? graceful_exit : signal_throw; + #ifdef SIGSTKSZ + stack_t sigstack; + int sas_retval=-1; +diff --git a/engine/support.c b/engine/support.c +index 021fa22..069c32f 100644 +--- a/engine/support.c ++++ b/engine/support.c +@@ -79,7 +79,7 @@ char *tilde_cstr(Char *from, UCell size, int clear) + { + char *s1,*s2; + int s1_len, s2_len; +- struct passwd *getpwnam (), *user_entry; ++ struct passwd *getpwnam (const char *), *user_entry; + + if (size<1 || from[0]!='~') + return cstr(from, size, clear); diff --git a/pkgs/by-name/gf/gforth/package.nix b/pkgs/by-name/gf/gforth/package.nix index 6259606c5cce..54cdecf7fcf1 100644 --- a/pkgs/by-name/gf/gforth/package.nix +++ b/pkgs/by-name/gf/gforth/package.nix @@ -17,13 +17,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gforth"; - version = "0.7.9_20251001"; + version = "0.7.9_20251203"; src = fetchFromGitHub { owner = "forthy42"; repo = "gforth"; rev = finalAttrs.version; - hash = "sha256-u9snXcFa/YYvITgMBY8FRYyyLFhHCP6hWA5ljwdKGLk="; + hash = "sha256-d1LU6FGnGOzL5Tdl0VLkYzHH+pUevGNCNwIqudS8emg="; }; patches = [ ./use-nproc-instead-of-fhs.patch ]; diff --git a/pkgs/by-name/gl/glitchtip/package.nix b/pkgs/by-name/gl/glitchtip/package.nix index 89aecb2f3bb8..5d3296e72f88 100644 --- a/pkgs/by-name/gl/glitchtip/package.nix +++ b/pkgs/by-name/gl/glitchtip/package.nix @@ -13,7 +13,7 @@ let python = python313.override { self = python; packageOverrides = final: prev: { - django = final.django_5_2; + django = final.django_5; django-csp = prev.django-csp.overridePythonAttrs rec { version = "4.0"; src = fetchPypi { diff --git a/pkgs/by-name/gn/gn/package.nix b/pkgs/by-name/gn/gn/package.nix index 4aee8936d8fa..6f3d6a89d784 100644 --- a/pkgs/by-name/gn/gn/package.nix +++ b/pkgs/by-name/gn/gn/package.nix @@ -93,7 +93,6 @@ stdenv.mkDerivation { license = lib.licenses.bsd3; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ - stesie marcin-serwin emilylange ]; diff --git a/pkgs/by-name/gn/gnu-cim/package.nix b/pkgs/by-name/gn/gnu-cim/package.nix index cdf0583d5bf6..fe2339f27a1a 100644 --- a/pkgs/by-name/gn/gnu-cim/package.nix +++ b/pkgs/by-name/gn/gnu-cim/package.nix @@ -29,13 +29,7 @@ stdenv.mkDerivation rec { done ''; - # lib.escapeShellArgs does not work - env.CFLAGS = lib.concatStringsSep " " [ - "-Wno-error=implicit-function-declaration" - "-Wno-error=implicit-int" - "-Wno-error=return-mismatch" - "-Wno-error=incompatible-pointer-types" - ]; + env.CFLAGS = "-std=gnu89"; doCheck = true; diff --git a/pkgs/by-name/go/godspeed/package.nix b/pkgs/by-name/go/godspeed/package.nix index f07e8209dcd7..a56c0ca52524 100644 --- a/pkgs/by-name/go/godspeed/package.nix +++ b/pkgs/by-name/go/godspeed/package.nix @@ -31,7 +31,6 @@ buildGoModule rec { changelog = "https://github.com/redcode-labs/GodSpeed/releases/tag/${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; - teams = [ lib.teams.redcodelabs ]; mainProgram = "godspeed"; broken = stdenv.hostPlatform.isDarwin; }; diff --git a/pkgs/by-name/go/gogdl/package.nix b/pkgs/by-name/go/gogdl/package.nix index 5545eedc7434..114abc7584e4 100644 --- a/pkgs/by-name/go/gogdl/package.nix +++ b/pkgs/by-name/go/gogdl/package.nix @@ -18,8 +18,6 @@ python3Packages.buildPythonApplication rec { hash = "sha256-pK6JeTJeBq9qVfflNSYs3s4HuD0Kz6k9DDUVHL81FV0="; }; - disabled = python3Packages.pythonOlder "3.8"; - propagatedBuildInputs = with python3Packages; [ setuptools requests diff --git a/pkgs/by-name/go/gogh/package.nix b/pkgs/by-name/go/gogh/package.nix index dff132dd444d..a51792f20d0c 100644 --- a/pkgs/by-name/go/gogh/package.nix +++ b/pkgs/by-name/go/gogh/package.nix @@ -25,13 +25,13 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "gogh"; - version = "362"; + version = "364"; src = fetchFromGitHub { owner = "Gogh-Co"; repo = "Gogh"; tag = "v${finalAttrs.version}"; - hash = "sha256-FlMf7CzdGcGor+wi293CW2PT14O1VRzQbbxnNMmwFqk="; + hash = "sha256-DVaUmpXWGb+bIdGZqXbiAsiuGTrwvPJdxCyA4g82LFA="; }; postPatch = '' diff --git a/pkgs/by-name/go/gokrazy/package.nix b/pkgs/by-name/go/gokrazy/package.nix index 6d5b45bebfcf..a64fb74fba6a 100644 --- a/pkgs/by-name/go/gokrazy/package.nix +++ b/pkgs/by-name/go/gokrazy/package.nix @@ -2,6 +2,7 @@ lib, buildGoModule, fetchFromGitHub, + installShellFiles, }: buildGoModule rec { @@ -25,6 +26,15 @@ buildGoModule rec { subPackages = [ "cmd/gok" ]; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd gok \ + --bash <($out/bin/gok completion bash) \ + --fish <($out/bin/gok completion fish) \ + --zsh <($out/bin/gok completion zsh) + ''; + meta = { description = "Turn your Go program(s) into an appliance running on the Raspberry Pi 3, Pi 4, Pi Zero 2 W, or amd64 PCs"; homepage = "https://github.com/gokrazy/gokrazy"; diff --git a/pkgs/by-name/go/google-fonts/package.nix b/pkgs/by-name/go/google-fonts/package.nix index 7d84384f2b7c..b5c10f794636 100644 --- a/pkgs/by-name/go/google-fonts/package.nix +++ b/pkgs/by-name/go/google-fonts/package.nix @@ -78,7 +78,6 @@ stdenvNoCC.mkDerivation { ]; platforms = lib.platforms.all; hydraPlatforms = [ ]; - maintainers = with lib.maintainers; [ manveru ]; sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; }; } diff --git a/pkgs/by-name/go/gosh/package.nix b/pkgs/by-name/go/gosh/package.nix index fe30e145947e..047eae776bf7 100644 --- a/pkgs/by-name/go/gosh/package.nix +++ b/pkgs/by-name/go/gosh/package.nix @@ -24,7 +24,6 @@ buildGoModule rec { homepage = "https://github.com/redcode-labs/GoSH"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; - teams = [ lib.teams.redcodelabs ]; mainProgram = "GoSH"; }; } diff --git a/pkgs/by-name/gp/gprolog/package.nix b/pkgs/by-name/gp/gprolog/package.nix index f1bd79a2d17f..759bf35a104b 100644 --- a/pkgs/by-name/gp/gprolog/package.nix +++ b/pkgs/by-name/gp/gprolog/package.nix @@ -4,44 +4,52 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gprolog"; version = "1.5.0"; src = fetchurl { urls = [ - "mirror://gnu/gprolog/gprolog-${version}.tar.gz" - "http://www.gprolog.org/gprolog-${version}.tar.gz" + "mirror://gnu/gprolog/gprolog-${finalAttrs.version}.tar.gz" + "http://www.gprolog.org/gprolog-${finalAttrs.version}.tar.gz" + "https://github.com/didoudiaz/gprolog/archive/refs/tags/v${finalAttrs.version}.tar.gz" ]; - sha256 = "sha256-ZwZCtDwPqifr1olh77F+vnB2iPkbaAlWbd1gYTlRLAE="; + hash = "sha256-ZwZCtDwPqifr1olh77F+vnB2iPkbaAlWbd1gYTlRLAE="; }; + __structuredAttrs = true; + enableParallelBuilding = true; + hardeningDisable = lib.optional stdenv.hostPlatform.isi686 "pic"; patchPhase = '' - sed -i -e "s|/tmp/make.log|$TMPDIR/make.log|g" src/Pl2Wam/check_boot + sed -i -e "s|/tmp/make.log|$TMPDIR/make.log|g" Pl2Wam/check_boot ''; - preConfigure = '' - cd src - configureFlagsArray=( - "--with-install-dir=$out" - "--without-links-dir" - "--with-examples-dir=$out/share/gprolog-${version}/examples" - "--with-doc-dir=$out/share/gprolog-${version}/doc" - ) - ''; + sourceRoot = "gprolog-${finalAttrs.version}/src"; - postInstall = '' - mv -v $out/[A-Z]* $out/gprolog.ico $out/share/gprolog-${version}/ - ''; + configureFlags = [ + "--without-links-dir" + "--with-install-dir=${placeholder "out"}" + "--with-examples-dir=${placeholder "out"}/share/gprolog-${finalAttrs.version}/examples" + "--with-doc-dir=${placeholder "out"}/share/gprolog-${finalAttrs.version}/doc" + "--htmldir=${placeholder "out"}/share/gprolog-${finalAttrs.version}/doc" + "--with-c-flags=-std=gnu17" + ]; doCheck = true; + postInstall = '' + mv -v $out/[A-Z]* $out/gprolog.ico $out/share/gprolog-${finalAttrs.version} + ''; + meta = { homepage = "https://www.gnu.org/software/gprolog/"; description = "GNU Prolog, a free Prolog compiler with constraint solving over finite domains"; - license = lib.licenses.lgpl3Plus; + license = with lib.licenses; [ + lgpl3Plus # and/or + gpl2Plus + ]; longDescription = '' GNU Prolog is a free Prolog compiler with constraint solving @@ -67,6 +75,6 @@ stdenv.mkDerivation rec { declarativity of logic programming. ''; - platforms = lib.platforms.unix; + platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/gr/grafana-reporter/package.nix b/pkgs/by-name/gr/grafana-reporter/package.nix index 04a740d1bddb..25e16107600c 100644 --- a/pkgs/by-name/gr/grafana-reporter/package.nix +++ b/pkgs/by-name/gr/grafana-reporter/package.nix @@ -39,6 +39,5 @@ buildGoModule rec { mainProgram = "grafana-reporter"; homepage = "https://github.com/IzakMarais/reporter"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.disassembler ]; }; } diff --git a/pkgs/by-name/gr/grimblast/package.nix b/pkgs/by-name/gr/grimblast/package.nix index dddf243a7053..0e6ccfd3552f 100644 --- a/pkgs/by-name/gr/grimblast/package.nix +++ b/pkgs/by-name/gr/grimblast/package.nix @@ -19,13 +19,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "grimblast"; - version = "0.1-unstable-2025-12-18"; + version = "0.1-unstable-2026-01-14"; src = fetchFromGitHub { owner = "hyprwm"; repo = "contrib"; - rev = "41dbcac8183bb1b3a4ade0d8276b2f2df6ae4690"; - hash = "sha256-d3HmUbmfTDIt9mXEHszqyo2byqQMoyJtUJCZ9U1IqHQ="; + rev = "541628cebe42792ddf5063c4abd6402c2f1bd68f"; + hash = "sha256-CopNx3j//gZ2mE0ggEK9dZ474UcbDhpTw+KMor8mSxI="; }; strictDeps = true; diff --git a/pkgs/by-name/gr/gruvbox-plus-icons/package.nix b/pkgs/by-name/gr/gruvbox-plus-icons/package.nix index b0b8591bca1b..8dcf786dc094 100644 --- a/pkgs/by-name/gr/gruvbox-plus-icons/package.nix +++ b/pkgs/by-name/gr/gruvbox-plus-icons/package.nix @@ -36,9 +36,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { mkdir -p $out/share/icons cp -r Gruvbox-Plus-Dark $out/share/icons/ + cp -r Gruvbox-Plus-Light $out/share/icons/ patchShebangs scripts/folders-color-chooser ./scripts/folders-color-chooser -c ${folder-color} gtk-update-icon-cache $out/share/icons/Gruvbox-Plus-Dark + gtk-update-icon-cache $out/share/icons/Gruvbox-Plus-Light runHook postInstall ''; diff --git a/pkgs/development/compilers/halide/default.nix b/pkgs/by-name/ha/halide/package.nix index ccd585f1ce4e..adb1918eefc4 100644 --- a/pkgs/development/compilers/halide/default.nix +++ b/pkgs/by-name/ha/halide/package.nix @@ -1,10 +1,9 @@ { + lib, stdenv, llvmPackages, - lib, fetchFromGitHub, cmake, - fetchpatch2, flatbuffers, libffi, libpng, @@ -29,29 +28,15 @@ assert blas.implementation == "openblas" && lapack.implementation == "openblas"; stdenv.mkDerivation (finalAttrs: { pname = "halide"; - version = "19.0.0"; + version = "21.0.0"; src = fetchFromGitHub { owner = "halide"; repo = "Halide"; tag = "v${finalAttrs.version}"; - hash = "sha256-0SFGX4G6UR8NS4UsdFOb99IBq2/hEkr/Cm2p6zkIh/8="; + hash = "sha256-A5EnZgXc9+L+bzWHftaL74nHmP8Jf0rnT5KJAAWvKis="; }; - patches = [ - # The following two patches fix cmake/HalidePackageConfigHelpers.cmake to - # support specifying an absolute library install path (which is what Nix - # does when "lib" is included as a separate output) - (fetchpatch2 { - url = "https://github.com/halide/Halide/commit/ac2cd23951aff9ac3b765e51938f1e576f1f0ee9.diff?full_index=1"; - hash = "sha256-JTktOTSyReDUEHTaPPMoi+/K/Gzg39i6MI97cO3654k="; - }) - (fetchpatch2 { - url = "https://github.com/halide/Halide/commit/59f4fff30f4ab628da9aa7e5f77a7f1bb218a779.diff?full_index=1"; - hash = "sha256-yOzE+1jai1w1GQisLYfu8F9pbTE/bYg0MTLq8rPXdGk="; - }) - ]; - postPatch = '' substituteInPlace src/runtime/CMakeLists.txt --replace-fail \ '-isystem "''${VulkanHeaders_INCLUDE_DIR}"' \ @@ -69,18 +54,18 @@ stdenv.mkDerivation (finalAttrs: { ''; cmakeFlags = [ - "-DWITH_PYTHON_BINDINGS=${if pythonSupport then "ON" else "OFF"}" + (lib.cmakeBool "WITH_PYTHON_BINDINGS" pythonSupport) (lib.cmakeBool "WITH_TESTS" doCheck) (lib.cmakeBool "WITH_TUTORIALS" doCheck) # Disable performance tests since they may fail on busy machines - "-DWITH_TEST_PERFORMANCE=OFF" + (lib.cmakeBool "WITH_TEST_PERFORMANCE" false) # Disable fuzzing tests -- this has become the default upstream after the # v16 release (See https://github.com/halide/Halide/commit/09c5d1d19ec8e6280ccbc01a8a12decfb27226ba) # These tests also fail to compile on Darwin because of some missing command line options... - "-DWITH_TEST_FUZZ=OFF" + (lib.cmakeBool "WITH_TEST_FUZZ" false) # Disable FetchContent and use versions from nixpkgs instead - "-DHalide_USE_FETCHCONTENT=OFF" - "-DHalide_WASM_BACKEND=${if wasmSupport then "wabt" else "OFF"}" + (lib.cmakeBool "Halide_USE_FETCHCONTENT" false) + (lib.cmakeFeature "Halide_WASM_BACKEND" (if wasmSupport then "wabt" else "OFF")) (lib.cmakeBool "Halide_LLVM_SHARED_LIBS" wasmSupport) ]; @@ -101,6 +86,10 @@ stdenv.mkDerivation (finalAttrs: { "anderson2021_test_apps_autoscheduler" "correctness_cross_compilation" "correctness_simd_op_check_hvx" + ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + # Failed Required regular expression not found + "mullapudi2016_histogram" ]; dontUseNinjaCheck = true; @@ -158,6 +147,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "C++ based language for image processing and computational photography"; homepage = "https://halide-lang.org"; + changelog = "https://github.com/halide/Halide/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ @@ -166,5 +156,10 @@ stdenv.mkDerivation (finalAttrs: { twesterhout ]; broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; + badPlatforms = [ + # Build fails on darwin: + # FAILED: [code=133] test/autoschedulers/anderson2021/anderson2021_demo.h + lib.systems.inspect.patterns.isDarwin + ]; }; }) diff --git a/pkgs/by-name/ha/hardinfo2/package.nix b/pkgs/by-name/ha/hardinfo2/package.nix index 63c8658cdc9f..d28c1dd8dfff 100644 --- a/pkgs/by-name/ha/hardinfo2/package.nix +++ b/pkgs/by-name/ha/hardinfo2/package.nix @@ -51,13 +51,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hardinfo2"; - version = "2.2.13"; + version = "2.2.16"; src = fetchFromGitHub { owner = "hardinfo2"; repo = "hardinfo2"; tag = "release-${finalAttrs.version}"; - hash = "sha256-HRP8xjiwhlNHjW4D8y74Pshpn7bksmN5j4jhfF6KOYo="; + hash = "sha256-n/Rf/XKsATx3OEzYSjl+2Yzk7WSiaBkbOveA9+xR6fc="; }; patches = [ diff --git a/pkgs/by-name/ha/haunt/package.nix b/pkgs/by-name/ha/haunt/package.nix index 01a956b279c1..65b745a957e8 100644 --- a/pkgs/by-name/ha/haunt/package.nix +++ b/pkgs/by-name/ha/haunt/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { to do things that aren't provided out-of-the-box. ''; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ normalcea ]; + maintainers = [ ]; inherit (guile.meta) platforms; }; }) diff --git a/pkgs/by-name/hd/hdapsd/package.nix b/pkgs/by-name/hd/hdapsd/package.nix index cb4f82bd6d34..7239e9b3d5d1 100644 --- a/pkgs/by-name/hd/hdapsd/package.nix +++ b/pkgs/by-name/hd/hdapsd/package.nix @@ -2,19 +2,21 @@ lib, stdenv, fetchurl, + pkg-config, udevCheckHook, }: stdenv.mkDerivation rec { pname = "hdapsd"; - version = "20141203"; + version = "20250908"; src = fetchurl { - url = "https://github.com/evgeni/hdapsd/releases/download/${version}/hdapsd-${version}.tar.gz"; - sha256 = "0ppgrfabd0ivx9hyny3c3rv4rphjyxcdsd5svx5pgfai49mxnl36"; + url = "https://github.com/linux-thinkpad/hdapsd/releases/download/${version}/hdapsd-${version}.tar.gz"; + hash = "sha256-qENcOFJ9x5CkN72ZkTx/OL+gpwAYJlJomKvAjTklDYQ="; }; nativeBuildInputs = [ + pkg-config udevCheckHook ]; @@ -25,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Hard Drive Active Protection System Daemon"; mainProgram = "hdapsd"; - homepage = "http://hdaps.sf.net/"; + homepage = "https://github.com/linux-thinkpad/hdapsd"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/he/herbstluftwm/package.nix b/pkgs/by-name/he/herbstluftwm/package.nix index 44c6d9e08e14..1e569ae5645f 100644 --- a/pkgs/by-name/he/herbstluftwm/package.nix +++ b/pkgs/by-name/he/herbstluftwm/package.nix @@ -78,7 +78,11 @@ stdenv.mkDerivation rec { url = "https://github.com/herbstluftwm/herbstluftwm/commit/1a6e8ee24eac671569f54bfec22ab47ff285a52c.patch"; hash = "sha256-srulWJQ9zTR4Kdxo40AdHND4nexDe2PDSR69yWsOpVA="; }) - + # Fix build with GCC 15 (missing #include <stdint.h>), can be removed with the next release (>0.9.5) + (fetchpatch { + url = "https://github.com/herbstluftwm/herbstluftwm/commit/8ff75588a750704ae06ad59b843eb88138c95653.patch"; + hash = "sha256-mrViVcW3jZes1QMn5It0t2WfLfwl/WNF6k9yz1fm/Gs="; + }) ]; postPatch = '' diff --git a/pkgs/by-name/hl/hl-log-viewer/package.nix b/pkgs/by-name/hl/hl-log-viewer/package.nix index 91d44c50b048..6577bf30f363 100644 --- a/pkgs/by-name/hl/hl-log-viewer/package.nix +++ b/pkgs/by-name/hl/hl-log-viewer/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "hl-log-viewer"; - version = "0.34.1"; + version = "0.35.1"; src = fetchFromGitHub { owner = "pamburus"; repo = "hl"; tag = "v${finalAttrs.version}"; - hash = "sha256-WUapXgmgshoziNviaKMGs+uKw6E8/sWCIJkleygfACk="; + hash = "sha256-gkUZHepuPOzFi0oWFBzqXPFfWaxlKr5+VCkZwawz+/Q="; }; - cargoHash = "sha256-DtYGGe0ot54q2A/W3sUigNoYwf2LiDwxj+AI5VovOTE="; + cargoHash = "sha256-jon7nDdK2bYDIh/zqJV7em87se9XBXV6+c2HlMBzJnA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ho/honeycomb-refinery/package.nix b/pkgs/by-name/ho/honeycomb-refinery/package.nix index 596b7fbc8c4a..b6c806815f0c 100644 --- a/pkgs/by-name/ho/honeycomb-refinery/package.nix +++ b/pkgs/by-name/ho/honeycomb-refinery/package.nix @@ -52,6 +52,9 @@ buildGoModule (finalAttrs: { description = "Tail-sampling proxy for OpenTelemetry"; mainProgram = "refinery"; license = lib.licenses.asl20; - teams = [ lib.teams.mercury ]; + maintainers = with lib.maintainers; [ + jkachmar + lf- + ]; }; }) diff --git a/pkgs/by-name/ht/htgettoken/package.nix b/pkgs/by-name/ht/htgettoken/package.nix index 684dc0994ee8..a6251f1f4fb0 100644 --- a/pkgs/by-name/ht/htgettoken/package.nix +++ b/pkgs/by-name/ht/htgettoken/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "htgettoken"; - version = "2.5"; + version = "2.6"; format = "setuptools"; src = fetchFromGitHub { owner = "fermitools"; repo = "htgettoken"; tag = "v${version}"; - hash = "sha256-CUzkivrkvMr8EE00tjHswyK5WidQjmki5nLYpeb8jjU="; + hash = "sha256-jHKKTnFZ+6LHaB61wi5+Ht6ZHrE4dDqADIMfGWI47oM="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/hu/hue-cli/package.nix b/pkgs/by-name/hu/hue-cli/package.nix index 20c24f6178d6..d3c41878d401 100644 --- a/pkgs/by-name/hu/hue-cli/package.nix +++ b/pkgs/by-name/hu/hue-cli/package.nix @@ -17,7 +17,6 @@ bundlerApp { license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ - manveru nicknovitski ]; mainProgram = "hue"; diff --git a/pkgs/by-name/hu/hugin/package.nix b/pkgs/by-name/hu/hugin/package.nix index 1e9f0c735191..1303b917cac8 100644 --- a/pkgs/by-name/hu/hugin/package.nix +++ b/pkgs/by-name/hu/hugin/package.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { pname = "hugin"; - version = "2025.0.0"; + version = "2025.0.1"; src = fetchurl { url = "mirror://sourceforge/hugin/hugin-${version}.tar.bz2"; - hash = "sha256-DeJ6XVQy421OXTisJde8r8e33VQqqwMWQKYe1mdnB2w"; + hash = "sha256-fPjrM6aohIzH+Bb69LyIOJIoiD1VExNtzLXLJDkSq3k="; }; buildInputs = [ diff --git a/pkgs/by-name/hy/hydra/package.nix b/pkgs/by-name/hy/hydra/package.nix index 0732c6deff0a..7856f5f43204 100644 --- a/pkgs/by-name/hy/hydra/package.nix +++ b/pkgs/by-name/hy/hydra/package.nix @@ -264,7 +264,11 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://nixos.org/hydra"; license = lib.licenses.gpl3; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ mindavi ]; - teams = [ lib.teams.helsinki-systems ]; + maintainers = with lib.maintainers; [ + conni2461 + das_j + helsinki-Jo + mindavi + ]; }; }) diff --git a/pkgs/by-name/hy/hydralauncher/package.nix b/pkgs/by-name/hy/hydralauncher/package.nix index 1c98d0bed83d..e57161c3d9f6 100644 --- a/pkgs/by-name/hy/hydralauncher/package.nix +++ b/pkgs/by-name/hy/hydralauncher/package.nix @@ -6,10 +6,10 @@ }: let pname = "hydralauncher"; - version = "3.8.0"; + version = "3.8.1"; src = fetchurl { url = "https://github.com/hydralauncher/hydra/releases/download/v${version}/hydralauncher-${version}.AppImage"; - hash = "sha256-8dRnGr9nVu+GNIVcH90iPDF0VoMibiKqL6dGRdmZl94="; + hash = "sha256-GLoGdZ/UWtkWt4WjjhmupQzPQTMuQI+7jb7IjSCcvo0="; }; appimageContents = appimageTools.extractType2 { inherit pname src version; }; diff --git a/pkgs/by-name/ik/iksemel/package.nix b/pkgs/by-name/ik/iksemel/package.nix index fe124d3f729d..3fc9bf9e1794 100644 --- a/pkgs/by-name/ik/iksemel/package.nix +++ b/pkgs/by-name/ik/iksemel/package.nix @@ -37,7 +37,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/timothytylee/iksemel-1.4"; license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ disassembler ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/im/imgp/package.nix b/pkgs/by-name/im/imgp/package.nix index e06fcf19c7bb..ed0a272b2241 100644 --- a/pkgs/by-name/im/imgp/package.nix +++ b/pkgs/by-name/im/imgp/package.nix @@ -8,7 +8,6 @@ python3Packages.buildPythonApplication rec { pname = "imgp"; version = "2.9"; pyproject = true; - disabled = python3Packages.pythonOlder "3.8"; src = fetchFromGitHub { owner = "jarun"; diff --git a/pkgs/by-name/in/inlyne/package.nix b/pkgs/by-name/in/inlyne/package.nix index 632b8deb8370..d703194effe9 100644 --- a/pkgs/by-name/in/inlyne/package.nix +++ b/pkgs/by-name/in/inlyne/package.nix @@ -11,6 +11,7 @@ wayland, libGL, openssl, + oniguruma, }: rustPlatform.buildRustPackage rec { @@ -42,8 +43,12 @@ rustPlatform.buildRustPackage rec { wayland libxkbcommon openssl + oniguruma ]; + # use system oniguruma since the bundled one fails to build with gcc15 + env.RUSTONIG_SYSTEM_LIBONIG = 1; + checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ # time out on darwin "--skip=interpreter::tests::centered_image_with_size_align_and_link" diff --git a/pkgs/by-name/in/insomnia/package.nix b/pkgs/by-name/in/insomnia/package.nix index 53cae238c982..3b2eea97dcf5 100644 --- a/pkgs/by-name/in/insomnia/package.nix +++ b/pkgs/by-name/in/insomnia/package.nix @@ -7,22 +7,22 @@ }: let pname = "insomnia"; - version = "11.6.0"; + version = "12.2.0"; src = fetchurl { aarch64-darwin = { url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.dmg"; - hash = "sha256-9/Xkwgwyi/CqqmrroxhJ9IhvVK83qKROfCEF5IS5r+w="; + hash = "sha256-ISQVIhR5TWY/Xk6sXeL89/srxppqBS7wdoRINwuoQqg="; }; x86_64-darwin = { url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.dmg"; - hash = "sha256-9/Xkwgwyi/CqqmrroxhJ9IhvVK83qKROfCEF5IS5r+w="; + hash = "sha256-ISQVIhR5TWY/Xk6sXeL89/srxppqBS7wdoRINwuoQqg="; }; x86_64-linux = { url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.AppImage"; - hash = "sha256-xHqRCR6D1ahqTyWA9icVK5oykABMp5qcgk35w1jzB2s="; + hash = "sha256-/0fJmbXhjrcVVSFvxd847mSKrzrZRK3Sqi6rjyaBOUw="; }; } .${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); diff --git a/pkgs/by-name/ja/jabref/deps.json b/pkgs/by-name/ja/jabref/deps.json index 3cbe63ff7857..cf671cd8725e 100644 --- a/pkgs/by-name/ja/jabref/deps.json +++ b/pkgs/by-name/ja/jabref/deps.json @@ -6,30 +6,10 @@ "jar": "sha256-lCG/tJqgorl3a7E7I0tU2uJ54twh5GW26r/l4SgUzwQ=", "pom": "sha256-wy8tTwK/IzXbLQH9Gwz/teUyhGO0lDZmvqwaH/ijpRs=" }, - "koppor#wiremock-slf4j-shim/main-4c871b2e09-1/SNAPSHOT": { - "jar": "sha256-hYimLyaTZemhJDtmEe7bXPgd6NyKqTlEmUNmppuGRMQ=", - "module": "sha256-0hRsMRKmvd7NpykFlfy09yR+mB1dRC1BJ9ZXJMHT3mg=", - "pom": "sha256-8zEeXekVsvcVpndak1CfKytwdn66tWZ1P/LMn7AghiM=" - }, - "koppor#wiremock-slf4j-spi-shim/main-baf2359720-1/SNAPSHOT": { - "jar": "sha256-pMFZcWqiV+eoEWvos2DcosgjcISVkIRJd/frIot7wtY=", - "module": "sha256-X/cJ7GFDbk5yxaoKRBL+2WNQaou3AtGjdJ3guAZ5e+I=", - "pom": "sha256-eN40hwyeJ7TzUBS5QkTROKe8dU47/PKV5MWGKFgV2pM=" - }, "koppor/jbang-gradle-plugin#build/8a85836163": { "jar": "sha256-EV18C7JMsORCV1SsIU0OAN0RGXwNSxVqHvUUagoFibM=", "pom": "sha256-/UAMODCKxj6CvtciTIXCQDvzZlYH4L3iPe+aI2csWMg=" }, - "koppor/wiremock-slf4j-shim/main-SNAPSHOT/maven-metadata": { - "xml": { - "groupId": "com.github.koppor" - } - }, - "koppor/wiremock-slf4j-spi-shim/main-SNAPSHOT/maven-metadata": { - "xml": { - "groupId": "com.github.koppor" - } - }, "sialcasa/mvvmFX#mvvmfx-parent/f195849ca9": { "pom": "sha256-5nTE66pGjgRswUpwK3guGpZb5iI4/2kmYy+wtGIsSz0=" }, @@ -38,27 +18,6 @@ "pom": "sha256-MplYnkdrZQ8ptd0PuUqUcWe6SwKaoM4VdOOV1KMAPvs=" } }, - "https://maven-central.storage-download.googleapis.com": { - "repos/central/data/com/google/code/gson/gson/maven-metadata": { - "xml": { - "groupId": "com.google.code.gson", - "lastUpdated": "20191004190047", - "release": "2.8.6" - } - } - }, - "https://oss.sonatype.org/content/groups/public/com/google/code": { - "gson#gson/2.13.1": { - "pom": "sha256-wPZXItdcDljNGDWzBGBG9ga12mmZBBYfjba3j+ubQBo=" - }, - "gson/gson/maven-metadata": { - "xml": { - "groupId": "com.google.code.gson", - "lastUpdated": "20250424011321", - "release": "2.13.1" - } - } - }, "https://plugins.gradle.org/m2": { "aopalliance#aopalliance/1.0": { "jar": "sha256-Ct3sZw/tzT8RPFyAkdeDKA0j9146y4QbYanNsHk3agg=", @@ -79,10 +38,10 @@ "module": "sha256-49Y3GBZP75e4crP94UvWCedF5nN3CRI5B2dD71Umino=", "pom": "sha256-/+1G4g7Y+U21B6Am4PcD3GYEiA9bDhwmq7flVq7mFSM=" }, - "com/autonomousapps#dependency-analysis-gradle-plugin/3.3.0": { - "jar": "sha256-czStTpOfjq99QgOYUgcKiCi80Vz5qTSvCRpIrosUb4g=", - "module": "sha256-a7FFF9qhCdcqgO9yeOE5+KaIBs6Ee6Ors7HfJ+pdoo4=", - "pom": "sha256-YKDf6jxhBxClvOTaQ/0llWWjwHSWdZBUfveZ36jOU+w=" + "com/autonomousapps#dependency-analysis-gradle-plugin/3.5.1": { + "jar": "sha256-jlXMuCOCKMkeeSCCYjmrjsI38llXokViln2oeyQetFo=", + "module": "sha256-fQoho8g9jqe9+07AT77Dm4fZvEQgkY0oLcgfXvBU85k=", + "pom": "sha256-FTlnlpXM5EdIs9U1FumQktMkui9Zs/cFmWYzEBZ5oC8=" }, "com/autonomousapps#graph-support/0.9.0": { "jar": "sha256-1ec9azC/6AT3g1FWOusgRFBPGYTe+0lAE6d8kbxGkwA=", @@ -106,9 +65,6 @@ "com/fasterxml#oss-parent/55": { "pom": "sha256-D14Y8rNev22Dn3/VSZcog/aWwhD5rjIwr9LCC6iGwE0=" }, - "com/fasterxml#oss-parent/58": { - "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA=" - }, "com/fasterxml#oss-parent/61": { "pom": "sha256-NklRPPWX6RhtoIVZhqjFQ+Er29gF7e75wSTbVt0DZUQ=" }, @@ -118,26 +74,20 @@ "com/fasterxml#oss-parent/70": { "pom": "sha256-JsqO1vgsnS7XzTIpgQW7ZcD52JnbYXV6CXQVhvqTpjk=" }, - "com/fasterxml/jackson#jackson-base/2.17.1": { - "pom": "sha256-4K78YdOPzd2VX/7sAbt1EE8bv/+jpuy1jb50r7cV4yI=" + "com/fasterxml#oss-parent/73": { + "pom": "sha256-SG2NomL0LJwA8+fP/xRxRzNHz8ae3X8GT8lxlN4p1m4=" }, "com/fasterxml/jackson#jackson-base/2.18.3": { "pom": "sha256-1bv9PIRFIw5Ji2CS3oCa/WXPUE0BOTLat7Pf1unzpP0=" }, - "com/fasterxml/jackson#jackson-base/2.20.0": { - "pom": "sha256-/IgCjRnuqjftpZbmuY03SfIs/IrdGeoZdFq+g2iDzmY=" - }, - "com/fasterxml/jackson#jackson-bom/2.17.1": { - "pom": "sha256-n0RhIo4SkQPu16MC3BABqy5Mgt086pFcKn27jMYe/SU=" + "com/fasterxml/jackson#jackson-base/2.20.1": { + "pom": "sha256-C3SKsMx/KH21tgGMYUz+Z+fh9NgJQc4vQdMXzMO1tcU=" }, "com/fasterxml/jackson#jackson-bom/2.18.3": { "pom": "sha256-8dTGrrMhGGUMgF/pu8XulA+o8s19DwT6Q2BVHponspA=" }, - "com/fasterxml/jackson#jackson-bom/2.20.0": { - "pom": "sha256-9ig2R+cB/aHNMS3MIcsTKkD3mPGejkL6/D/jR8WlG7s=" - }, - "com/fasterxml/jackson#jackson-parent/2.17": { - "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0=" + "com/fasterxml/jackson#jackson-bom/2.20.1": { + "pom": "sha256-DGRn7UyMc5JSTOcDymzj7YhZbuw5DxOwwmTy+WEwilQ=" }, "com/fasterxml/jackson#jackson-parent/2.18.1": { "pom": "sha256-0IIvrBoCJoRLitRFySDEmk9hkWnQmxAQp9/u0ZkQmYw=" @@ -145,55 +95,40 @@ "com/fasterxml/jackson#jackson-parent/2.20": { "pom": "sha256-tDt/XGLoaxZPrnCuF9aRHF22B5mvAQVzYK/aguSEW+U=" }, - "com/fasterxml/jackson/core#jackson-annotations/2.17.1": { - "jar": "sha256-/MrYLhMXLA5DhNtxV3IZybhjHAgg9LGNqqVwFvtmHHY=", - "module": "sha256-VNTVHaATppa+CeH0gDH39At3cYB4qpNuZMAjpP2blZM=", - "pom": "sha256-c1XzdEX12vUPUMdfLrzXG6LE+86ktiVBSAWexjVkTnc=" - }, "com/fasterxml/jackson/core#jackson-annotations/2.20": { "jar": "sha256-lZov+y1ZFDb1Hxg8alIfyJNHkS9xG/DK4AjN8EXZUxk=", "module": "sha256-wHDxTsg1jQlcAurootZcsAzLoOXFqnOwASlDM/5GiXE=", "pom": "sha256-TXQMRHjdCNCJ7NxtBjIopVoRp+jkl9pDOPhy+BFXlKQ=" }, - "com/fasterxml/jackson/core#jackson-core/2.17.1": { - "jar": "sha256-3bJsih8ahFNeghPEizWyUzcENOMoezzxV3eFb8TljOY=", - "module": "sha256-iowJZP38Js7bso2CXfRiGBf7jNIrnnpZ2cdKOl8b3R0=", - "pom": "sha256-2UiDEgmgTAE5G5Oq7nrTShyelIY/nnaFwvW2FJoqs50=" - }, - "com/fasterxml/jackson/core#jackson-core/2.20.0": { - "jar": "sha256-vAz0YHWHcgH4QG7n3idBrn32wGb18EV72AYypxjAbnI=", - "module": "sha256-2oWNOW9/pritA4zVzLkDj7ORq3o2rmKWI+N6UyR537w=", - "pom": "sha256-XxZVisIjBzpvJHRA8wX1nwXv9QqvHurguq1BKAABb2g=" - }, - "com/fasterxml/jackson/core#jackson-databind/2.17.1": { - "jar": "sha256-tsovfVsaskXOxUlewzl3PS2QVUxIWSWQZz+xj0QAqUg=", - "module": "sha256-C6vGRqBi8NnTWEQCpQJxiE7cPhekGULB4x4OENcdvuY=", - "pom": "sha256-YKCKmGrDE60+MmiKTjJ6YSg6ioAa1vphV5+MS+bcj2w=" + "com/fasterxml/jackson/core#jackson-core/2.20.1": { + "jar": "sha256-/6tNlX2qJ5bPJMtm0LeKcJDxvL4Xw6RXjwmv+q8TcIk=", + "module": "sha256-GalAQ0Ic2ahuFUkSnDjBjgs1exQUWuT3Ns2gL4Bch8k=", + "pom": "sha256-FuBJqySPgqpssEjwTVLvPuH1TIDaHSY68k++UM9ueX4=" }, - "com/fasterxml/jackson/core#jackson-databind/2.20.0": { - "jar": "sha256-pw4Uamvyy6T5zTZxaXh/UK3Pu1cSK8LpyDkM0LOXrDA=", - "module": "sha256-oSgvNhZKyQG66p7bULqYE3L/7hjCz7F75CW5s/dYeuI=", - "pom": "sha256-zv7+0B3SwNlqiOEBuz4GX8FQBjtJjjAak4xpCwK8884=" + "com/fasterxml/jackson/core#jackson-databind/2.20.1": { + "jar": "sha256-NLvrRSb/9PhWWxIQa/haavy66FiWbUibVCFKxGsuJug=", + "module": "sha256-S1M7Mu5wZfVaSnsNbuTYn9WDdxSr83YUyJkRT7EhWHo=", + "pom": "sha256-vP3yeCUyMraDq1HeLcvI+Y8g9Hc4wRHs/SyFxBsTHOw=" }, - "com/fasterxml/jackson/dataformat#jackson-dataformat-xml/2.20.0": { - "jar": "sha256-DU67TVg92pGAHTfHVl1GKiX+kp8NdsNHZ+xLgEExEMA=", - "module": "sha256-+Vo/xxi+i/IaLVkpokZpblRMLigfA9yPrPaQhiusUCI=", - "pom": "sha256-SSZxpqcwB8Xq7YZ9luLJfKVtGzfSpYx0Zx99V4Aav6w=" + "com/fasterxml/jackson/dataformat#jackson-dataformat-xml/2.20.1": { + "jar": "sha256-GQrU66NdidujUX2ieeBpBoHEdFF0uUsJ6nj4HOrhQPA=", + "module": "sha256-hUEEQQ13F89ArnJvmWoK2aACxiaV23QHvjm+NlNJmW8=", + "pom": "sha256-QTj0W/qeyxDsefm/3JLfYos5yLpScTk2tq9eBioP9ck=" }, "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.18.3": { "module": "sha256-v2AjrStgVyCsbaJ6K16Y7bGjJs0L9jfDpAtiH+jgk80=", "pom": "sha256-a056nStXQq6hOMFcDJ3gRjLxotjebnYe3vizYJK0hko=" }, - "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.20.0": { - "jar": "sha256-zD3sn7i1ZXR5e/72JkEyVQjw5byWi9JoVoQCgY1Vuq4=", - "module": "sha256-ZA8QhiTO8o1t6jJ+KC6eyC9lEhVY5gkcqPuJlfkUpac=", - "pom": "sha256-rpwz0EFZBkwZsuq0FIiU+jHxVjW7/lMYzjIp+OFHCcU=" + "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.20.1": { + "jar": "sha256-Aw8dkfffJ46G4bo+Ep+1IIcawWzlMBfHNfcIgjvpcNs=", + "module": "sha256-At0WoElpdLY7sgrszAK2fpeuQ6Uc5H1JSbyAUiLHQxI=", + "pom": "sha256-JrotoAFsKiNbPccCc5xm3O6xjKBURirhVE2srfnguSU=" }, "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.18.3": { "pom": "sha256-VnParMboVZdt7O3rRtxjOVprGsmkg+Zy8IMc9G/gbiU=" }, - "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.20.0": { - "pom": "sha256-RH4cfT+o2Skn3L2DjSRGOAXohi9yPM7VENUNrrhPgLQ=" + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.20.1": { + "pom": "sha256-bIZ3yvUcuerYfbYmiPNR3MxDrPkAqONHcuQQ0TOPaqs=" }, "com/fasterxml/woodstox#woodstox-core/7.1.1": { "jar": "sha256-ArnQIunUdwT/inqFmg2/07KIKoMR63/x4YD3YMzaJxI=", @@ -204,10 +139,10 @@ "module": "sha256-HJZopxNuP0KJnDB4Gj/BlEwmOt+JxD/9Wjq4CyLJWys=", "pom": "sha256-BWin12bwYR/dbcGzCa+cFTQdt60LwDDeymXm7OTeWQo=" }, - "com/github/ben-manes/caffeine#caffeine/3.2.2": { - "jar": "sha256-x0psciId+3brkvK7QBCOpWGn2i8xXcOx5kr6jwd/IQw=", - "module": "sha256-oD7s/Xs/XQSmZSw4yT1xFDCnSfx/+OwKpN7janRJwDE=", - "pom": "sha256-OQTfB3fF2aYILhfKOiaSseoGGtTpOjomkAIRbrGsq2I=" + "com/github/ben-manes/caffeine#caffeine/3.2.3": { + "jar": "sha256-ynDJCl0c4VEYgM6ck9StIhCPYREdPa+R61J2K1cb0Xk=", + "module": "sha256-jZo7mA6b1wQS7jObJFYxNhezuK4uhon5s8vwZAzVjzw=", + "pom": "sha256-n3BPkIN5e099DB1chV00zSaNVEzwa0KD1c5CiKz8nuA=" }, "com/github/package-url#packageurl-java/1.5.0": { "jar": "sha256-5FVRcncHrMDFasYtVpZDMuoPE41sw2VtmIuTaRUPUkc=", @@ -227,21 +162,21 @@ "jar": "sha256-JMkjNyxY410LnxagKJKbua7cd1IYZ8J08r0HNd9bofU=", "pom": "sha256-TKWjXWEjXhZUmsNG0eNFUc3w/ifoSqV+A8vrJV6k5do=" }, - "com/google/errorprone#error_prone_annotations/2.36.0": { - "pom": "sha256-15z9N8hfdta3VMdQHuHchEe3smQsI4LXeCUhZr0zHpw=" + "com/google/errorprone#error_prone_annotations/2.41.0": { + "pom": "sha256-oVHfHi4LSGGNiwahgHSKKbOrs5sbI5b2och5pydIjG4=" }, - "com/google/errorprone#error_prone_annotations/2.40.0": { - "jar": "sha256-v6d+SSJum9KsesG8SjxwQwB48ubNMMjgYV1sJdiugY0=", - "pom": "sha256-GI+AyOrAS0CvdrRdA90dCjk5IOP6DEglL05u8YcojK4=" + "com/google/errorprone#error_prone_annotations/2.43.0": { + "jar": "sha256-SCcudcFuH3vce9GVKcys1e4XBARwHX9aI0QbtYR5V/U=", + "pom": "sha256-T2uIia+o3r2+Hj/ipfjmbiIWygtWPya05UE4cw7s3IA=" }, "com/google/errorprone#error_prone_parent/2.27.0": { "pom": "sha256-+oGCnQSVWd9pJ/nJpv1rvQn4tQ5tRzaucsgwC2w9dlQ=" }, - "com/google/errorprone#error_prone_parent/2.36.0": { - "pom": "sha256-Okz8imvtYetI6Wl5b8MeoNJwtj5nBZmUamGIOttwlNw=" + "com/google/errorprone#error_prone_parent/2.41.0": { + "pom": "sha256-xTg4jXYKXByY3PBvbtPP5fEaZRgn21y9LtgojHlcrUI=" }, - "com/google/errorprone#error_prone_parent/2.40.0": { - "pom": "sha256-HGt0MRxgFPj9aMjdHl9h3bVEz/LHQ8JyTbf4LXLd5Is=" + "com/google/errorprone#error_prone_parent/2.43.0": { + "pom": "sha256-u5LEWE0CEb1ZvspPsnYXD13FD+NGFG6TV40tqyYDPhA=" }, "com/google/guava#failureaccess/1.0.3": { "jar": "sha256-y/w5BrGbj1XdfP1t/gqkUy6DQlDX8IC9jSEaPiRrWcs=", @@ -256,11 +191,19 @@ "com/google/guava#guava-parent/33.4.8-jre": { "pom": "sha256-oDxRmaG+FEQ99/1AuoZzscaq4E3u9miM59Vz6kieOiA=" }, + "com/google/guava#guava-parent/33.5.0-jre": { + "pom": "sha256-aHGeaHxuTJ/z4P7L73vSCJbw9PezFHQ+0zxy+WJWghU=" + }, "com/google/guava#guava/33.4.8-jre": { "jar": "sha256-89f1f2f9Yi9NRo391pKzpeOQkkbCgBesMmNAXw/mF+0=", "module": "sha256-WKM1cwMGmiGTDnuf6bhk3ov7i9RgdDPb5IJjRZYgz/w=", "pom": "sha256-BDZdS27yLIz5NJ/mKAafw+gaLIODUUAu9OlfnnV77rw=" }, + "com/google/guava#guava/33.5.0-jre": { + "jar": "sha256-HjAfDFKsJIsLFP3D0SKDx3JS1Nb0hSHVcufYxMLMSsc=", + "module": "sha256-d+1CyMiyzru5OsngdUP/ZBiqJL24UXWAz1Mk6aZRCVY=", + "pom": "sha256-BHj6eKkIs8Mf5td76ZeKqmIeKhgduEAH49OzdCSirGE=" + }, "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" @@ -274,13 +217,13 @@ "com/google/inject#guice/5.1.0/classes": { "jar": "sha256-FCrUR14ZUk0v46yZWz98vJYvxyby7bnb3Mxh/qubK/k=" }, - "com/google/j2objc#j2objc-annotations/3.0.0": { - "jar": "sha256-iCQVc0Z93KRP/U10qgTCu/0Rv3wX4MNCyUyd56cKfGQ=", - "pom": "sha256-I7PQOeForYndEUaY5t1744P0osV3uId9gsc6ZRXnShc=" + "com/google/j2objc#j2objc-annotations/3.1": { + "jar": "sha256-hNOhUFGEhfgUDqmbiphWVnSWKfZDPJK4DHWzaro7CZs=", + "pom": "sha256-FFcIOFAANPwbR8ggXOHJ1rJVwczdLRr9zcv3XomySjM=" }, - "com/h2database#h2/2.2.224": { - "jar": "sha256-udjxk1itqCpPbrWxdMbP4yCjdbWpy1pP5FbWI+blVJc=", - "pom": "sha256-DUUDoBpMemL5GuGmJxM5z4BvKkYt7+C+/17/1aYR45g=" + "com/h2database#h2/2.4.240": { + "jar": "sha256-KbcOQnzBxAzcN2KDrbsMxihTBzeXu1/ldh+B/nPVfOA=", + "pom": "sha256-J69LeAWFazFw1YfgoCyqyT1CH4dc/JSX2/X/1/Mkeko=" }, "com/networknt#json-schema-validator/1.5.9": { "jar": "sha256-4Li663j9G6AnRU7jl02KAvVER+qlENMFKCCn0hYNmuQ=", @@ -310,59 +253,62 @@ "module": "sha256-2VLG3ZGntCbD8KUe3D986zSQrAH/GDAVJ63+x6eDfdk=", "pom": "sha256-MXodP7cFQDG/6QzKibECSQH9m5/MqZFmws54U7X8e9k=" }, - "com/squareup/okhttp3#okhttp-jvm/5.1.0": { - "jar": "sha256-pqrH8V08LDy9Kvfs9W+XQHFkpgSy24eVKZUOMc6mmbI=", - "module": "sha256-sulz7WEYTDMNpU5+YuW6STQLZkh1x8PiLfjvSWB8TXA=", - "pom": "sha256-aNCp1oSYz/jQM+gJUKihDamZiE6Y07RMiNDpsAUd4nA=" + "com/squareup/okhttp3#okhttp/3.14.9": { + "jar": "sha256-JXD6tVUVy/iB16TO70n8UVSQvAJwV+Zmd2ooMkZa7KA=", + "pom": "sha256-Ye3zxHZOqV8SEsot+8bqXUEzxxxOjEC9JH7IPnxrfOc=" }, - "com/squareup/okhttp3#okhttp/5.1.0": { - "module": "sha256-9Lg+E7Rr8Q9cccDL82M54X4ttXZwDaNElfulX063g24=", - "pom": "sha256-hwO2W8qKgsj6H3DHt4FTtAx5FrKQUS/PmA5/IaZQpzc=" + "com/squareup/okhttp3#parent/3.14.9": { + "pom": "sha256-tfEB3PLMfzLsPXtovcB4536sGXm7hmTo+H92IojD3OU=" }, - "com/squareup/okio#okio-bom/3.15.0": { - "module": "sha256-x3W4IzK61AlhIt5sVUqd2PlLgvJUxwr7Cnw9lkxN8GY=", - "pom": "sha256-d91HMYPYt/8tpJVLSsYCBj7mMnhk/nYpxYgwj18l4Eo=" + "com/squareup/okio#okio-bom/3.16.4": { + "module": "sha256-dJ52meyyZXzaGsemojjaSsTbCBXPJL38gOXMnxB/jos=", + "pom": "sha256-Z1oFMqkhyPOLkw2SMOYhLFqtaNiDUED2ouLluudzbyE=" }, - "com/squareup/okio#okio-jvm/3.15.0": { - "jar": "sha256-SD3Dg7EEnSIIkjIqDWpDCEJfCbsFtIxD1Oqp/4KxzRY=", - "module": "sha256-mJRUqUrvvClwMoiPE1rNoUqf+0aWDn2EYDkl0mkkHuc=", - "pom": "sha256-B45C9oykYT/yWX+8VUHFzleM3MSIOdqJ2nynYFGL+3k=" + "com/squareup/okio#okio-jvm/3.16.4": { + "jar": "sha256-IZa5k800272Rnn4B9XpHgbWL7oD4YQYWPih8IDQ6lqc=", + "module": "sha256-kAjVopVKBoxoSCdPbuvf9IsUpw28aT0zAuCMVwzKAy8=", + "pom": "sha256-ZnePTQWXvOY/kewADFdcwCmzIB990JLLgIh1FVs+hqE=" }, "com/squareup/okio#okio-jvm/3.7.0": { "jar": "sha256-2LNa3Ch2j0OuWv5qfRqiqHi6UeC5ak8wiBHzsfWxPlU=", "module": "sha256-b64CAbCuSKGWBt4Ab/6YQtjQ/CoeQ04Hhc7Ni3Wr5HQ=", "pom": "sha256-d07LnSsHlLT7J+eeCHYMpWC39U+qlRm5GDxn/rRfLJc=" }, - "com/squareup/okio#okio/3.15.0": { - "module": "sha256-EWgmBmzrTTM2p05xcqM3UWF+w0S8UKNPmbDSSVmko50=", - "pom": "sha256-LXN4VBFATurDLwRzouB6sVFrmFCpKAzGGgi0eXkMzPg=" + "com/squareup/okio#okio/3.16.4": { + "module": "sha256-yEQahybbGk+dTzngaOu0LfalnWR+MqnGHBW1OQ7VklI=", + "pom": "sha256-CPvpfh4ugVoUyvFv9ayHCFEb713ec51gwHE5UYdtomM=" }, "com/squareup/okio#okio/3.7.0": { "module": "sha256-88rgCfC2yEL7vFLOd1QsGdGdVu6ZpeVVZH8Lr8nVDPo=", "pom": "sha256-H2KMRSg726uM4DwHps+3akeLjdrhgL2PNKusJz5Id24=" }, - "com/squareup/retrofit2#converter-scalars/3.0.0": { - "jar": "sha256-uXzwaSmoDUm8Yy5E8hnPCnGF/Ezuhh7JCtHQ5IIIQCM=", - "module": "sha256-gECNEiZVQbMCRDuw++YUb0BqglP+fDdudWulhAujnKQ=", - "pom": "sha256-B42x+Kgsb48K0vzzn7ia4bfUf1XQIlGEksToSN1QL8c=" + "com/squareup/retrofit2#converter-moshi/2.12.0": { + "jar": "sha256-GbejX6FkCTYH+aY+2BC0scH76cfUXjGWJ3wea+Exfy4=", + "module": "sha256-1FNRun8nTshOXqsvdrPOfGPduLpL+KzTHiix0D3Jmu0=", + "pom": "sha256-FHYD65pzlqUrotJq/brZw8i0kR9B1MKMV782mtDwYYU=" }, - "com/squareup/retrofit2#retrofit/3.0.0": { - "jar": "sha256-acai00UbbflUmpP6t0QJTr8HpLDOT0U9bI9XXvD+yaE=", - "module": "sha256-PeUoKbiYIVU06G7aJo2kSf/L+VsYcD2lKdmYgyd0hPc=", - "pom": "sha256-/BaPqJcZiIc331OurA9JgLP07z5hIeMww2YGHJlrBoA=" + "com/squareup/retrofit2#converter-scalars/2.12.0": { + "jar": "sha256-EV60l+rtabOFSyeico6fDzAB/xU0DxXEackw/1lhDHM=", + "module": "sha256-vXPboF8M9vxG6Tbq205zOKpgDNs8UDW6k6NypSrk3Hs=", + "pom": "sha256-P0n83lXvfTADVn2UYOZ8yjtm3TlSdCbBuUROq4dQJOI=" + }, + "com/squareup/retrofit2#retrofit/2.12.0": { + "jar": "sha256-Oy37gruZzTPfldkq1vzXi6fxesgeZ5BOuZH+QEAV0dg=", + "module": "sha256-Og+cjvwUlYqFoThkgj+UBCc41gF72euPvGH3EXTM2B8=", + "pom": "sha256-pPj7y8g4IBNWfzPnDLCJ7wxl7TJ+DV4EIx99hDTQ8wA=" }, - "com/vanniktech#central-portal/0.34.0": { - "jar": "sha256-9HyW3152+uQ1H46O8qAFTtTKvvfzNzJgwPVv7yY9ITY=", - "module": "sha256-ff8P01naUujxJk8f49eVPQD9LrwCSq+a6rvdfnULjj8=", - "pom": "sha256-BNzoESg1rimFmZ1hLZ0YfKfBqj0z1Noqx4KBnFie+ow=" + "com/vanniktech#central-portal/0.35.0": { + "jar": "sha256-mJ3cc+/lNAB+Be/yx8MU3ru9OLEgfTOwdBoNmMrcoFA=", + "module": "sha256-3ICG1mWG0LrcSgP85vv0IMyZJnz0QZ/Wwwe++UIEvXM=", + "pom": "sha256-YVVZa2TixqHcpFMfJMBrqCzsrfF/HNG/iIg9DOYqYYw=" }, - "com/vanniktech#gradle-maven-publish-plugin/0.34.0": { - "jar": "sha256-GzBK4yfXA03hlRH3etInulnXNY6LUdGLCdp6JT/sTAU=", - "module": "sha256-3b3ll8lZPBTqNerTPKC1nMP9W50241Q1j/ZvYwSYHHE=", - "pom": "sha256-yBLl8DxlILOqJxkOEn8SXCubWDWVWLfPPf09daGQnYE=" + "com/vanniktech#gradle-maven-publish-plugin/0.35.0": { + "jar": "sha256-9TrJP++0RWm06G+XlW5ggFj9VSIrCuXUS82tFHThF+A=", + "module": "sha256-R6IkODDchPwQ9/ZWbb3+7zqpvDWgMIBGpBEFs/5sdp0=", + "pom": "sha256-Bqupfg8WGjoZN2P78jvEb/MYQ0ejYKtMqlcUPbyeFIM=" }, - "com/vanniktech/maven/publish#com.vanniktech.maven.publish.gradle.plugin/0.34.0": { - "pom": "sha256-yvlwLHCOE0teBeL1lb16yBsMYdEGC0Kat3Y5aLa5epY=" + "com/vanniktech/maven/publish#com.vanniktech.maven.publish.gradle.plugin/0.35.0": { + "pom": "sha256-iAGpAS3B+PqnKUcEDWYVpQFg6ftXoHwA9JspwjQ1gZ4=" }, "commons-codec#commons-codec/1.16.0": { "pom": "sha256-bLWVeBnfOTlW/TEaOgw/XuwevEm6Wy0J8/ROYWf6PnQ=" @@ -371,17 +317,13 @@ "jar": "sha256-+fbLED8t3DyZqdgK2irnvwaFER/Wv/zLcgM9HaTm/yM=", "pom": "sha256-f6DbTYFQ2vkylYuK6onuJKu00Y4jFqXeU1J4/BMVEqA=" }, - "commons-codec#commons-codec/1.18.0": { - "jar": "sha256-ugBfMEzvkqPe3iSjitWsm4r8zw2PdYOdbBM4Y0z39uQ=", - "pom": "sha256-dLkW2ksDhMYZ5t1MGN7+iqQ4f3lSBSU8+0u7L0WM3c4=" - }, "commons-codec#commons-codec/1.19.0": { "jar": "sha256-XDiB5PVWhV6cUykn7gyd/elMxmdg1YBcAxpZiHBwr18=", "pom": "sha256-4PMmn6I94MgxMMVln1+VFMxUIsC830Xy6uAEp4ufyjQ=" }, - "commons-io#commons-io/2.18.0": { - "jar": "sha256-88oPjWPEDiOlbVQQHGDV7e4Ta0LYS/uFvHljCTEJz4s=", - "pom": "sha256-Y9lpQetE35yQ0q2yrYw/aZwuBl5wcEXF2vcT/KUrz8o=" + "commons-codec#commons-codec/1.20.0": { + "jar": "sha256-avZllfn2p7tYzmZRjWiI1AtUfDZtImLwZnbu4ZUo/2Y=", + "pom": "sha256-r/ZFxYzUGsUYTZds6O443laU2Zq4dk1u5/FPcOrV+Ys=" }, "commons-io#commons-io/2.19.0": { "jar": "sha256-gkJokZtLYvn0DwjFQ4HeWZOwePWGZ+My0XNIrgGdcrk=", @@ -391,6 +333,10 @@ "jar": "sha256-35C7oP48tYa38WTnj+j49No/LdXCf6ZF+IgQDMwl3XI=", "pom": "sha256-vb34EHLBkO6aixgaXFj1vZF6dQ+xOiVt679T9dvTOio=" }, + "commons-io#commons-io/2.21.0": { + "jar": "sha256-fWQ6Kv6osFi3YqpvuQ5bJW9scpc5+LN4TDNw3cYJ6I0=", + "pom": "sha256-rkd5XnIYA+yP8d7tdL4oqBGgJxO9WjqwrGfCtYy2Nas=" + }, "dev/zacsweers/moshix#moshi-sealed-reflect/0.30.0": { "jar": "sha256-vP2qMkmcYojqi201i2ZknAXaif9mHENj1D0z1n5gp7k=", "module": "sha256-aZsM1QFQTeLsZSbovXgSLNXUf7K6Zj8h8QEnmoIQ3+A=", @@ -474,9 +420,9 @@ "jar": "sha256-KT2A9UtTa3QJXc1+o88KKbv8NAJRkoEzJJX0Qg03DRY=", "pom": "sha256-34zBqDh9TOhCNjtyCf3G0135djg5/T/KtVig+D+dhBw=" }, - "org/apache/commons#commons-csv/1.14.0": { - "jar": "sha256-LzTWn4nclNYG4lDV6yYgWSPl28LDiR01dfhshJ9/hyY=", - "pom": "sha256-k7VTRtiuqBQAS5x8wq7ZWwidOLMTiTZkNCuOA2mRJWU=" + "org/apache/commons#commons-csv/1.14.1": { + "jar": "sha256-Mr4OHnZnMJL10Sy3kL0qy2wqsExOpu/GnqXuF5EcJP4=", + "pom": "sha256-ld9zUwLAq5LOwForUeInB1jhXwpkGG3mVmLrFI69l/0=" }, "org/apache/commons#commons-lang3/3.16.0": { "jar": "sha256-CHCd101gK3Bc5AF9JlRCEAVqS6WD1bIMCTc0Bv56APg=", @@ -502,12 +448,6 @@ "org/apache/commons#commons-parent/72": { "pom": "sha256-Q0Xev8dnsa6saKvdcvxn0YtSHUs5A3KhG2P/DFhrIyA=" }, - "org/apache/commons#commons-parent/78": { - "pom": "sha256-Ai0gLmVe3QTyoQ7L5FPZKXeSTTg4Ckyow1nxgXqAMg4=" - }, - "org/apache/commons#commons-parent/79": { - "pom": "sha256-Yo3zAUis08SRz8trc8euS1mJ5VJqsTovQo3qXUrRDXo=" - }, "org/apache/commons#commons-parent/81": { "pom": "sha256-NI1OfBMb5hFMhUpxnOekQwenw5vTZghJd7JP0prQ7bQ=" }, @@ -517,6 +457,9 @@ "org/apache/commons#commons-parent/88": { "pom": "sha256-i/cmFQ0dakO6CqkgYOVSkzyvKHOqGTlS2dSWRw+p+9g=" }, + "org/apache/commons#commons-parent/91": { + "pom": "sha256-0vi2/UgAtqrxIPWjgibV+dX8bbg3r5ni+bMwZ4aLmHI=" + }, "org/apache/maven#maven-artifact/3.8.8": { "jar": "sha256-gTIzqEhcuvl7H5osF873I7Bo9yYKQxnPSVjyIdBLmTc=", "pom": "sha256-PGKRS2E++Q+BwFaN7kCNIlVrTZmoHnqk1yqlxO4r96U=" @@ -672,17 +615,17 @@ "jar": "sha256-phxI1VPvrXi8Af/8SsUovruuZMuuwXCypeOc9h61Gr4=", "pom": "sha256-TpAuxVb8ZZi0HClS7BVz7cgVA35zMOxJIuq2GUImhuI=" }, - "org/cyclonedx#cyclonedx-core-java/11.0.0": { - "jar": "sha256-3oQazoSm6GTV0FaNgX7B5NEZcyWHKGr14aL9VmW5S4Y=", - "pom": "sha256-2GHp/nFKoPukYKNkp5tkKm8ZWrAdVuttzFf3pBEGT+8=" + "org/cyclonedx#cyclonedx-core-java/11.0.1": { + "jar": "sha256-mJNIzG04VimjzLc11FCw8PAiFny3AsL8sObyvdmJ3ec=", + "pom": "sha256-7CoPqkYkAWvfNEvI4fItXgv793Q8DxWnUhMUBhLQw7E=" }, - "org/cyclonedx#cyclonedx-gradle-plugin/3.0.1": { - "jar": "sha256-NykXVNJpBdoPeyf5I107ir4WazI4wuzqTjIjjRvMjks=", - "module": "sha256-ERVsrays+tt40MWkgB7TwmImovG3uTiDJ7xPUra3Gj8=", - "pom": "sha256-ZUi5/PCURQCRtZnJ85fCbjm3ZFTBku0oDOxjYFDE+Rs=" + "org/cyclonedx#cyclonedx-gradle-plugin/3.1.0": { + "jar": "sha256-OTJUHCikD2bqsO/zc0GFVsn1+cSeUx/FPq3p1omxUzs=", + "module": "sha256-cwK7mMFmJIdyH2JUWThMsSwY9sQlg2Lr+G+XqNTfcpI=", + "pom": "sha256-JxJ5LudnqlkYFEuKnzuZCig3v5h9oAZj1tmi8yWApns=" }, - "org/cyclonedx/bom#org.cyclonedx.bom.gradle.plugin/3.0.1": { - "pom": "sha256-M3mVlmdlvhj6qnYnIC23PibiYE7kBZAFEFsC5j2XBMo=" + "org/cyclonedx/bom#org.cyclonedx.bom.gradle.plugin/3.1.0": { + "pom": "sha256-gS6ychNdCtFa6/ehS3ydwMYD+kxnLR+C62Mq/olOcvk=" }, "org/eclipse/sisu#org.eclipse.sisu.inject/0.3.5": { "jar": "sha256-xZlAELzc4dK9YDpNUMRxkd29eHXRFXsjqqJtM8gv2hM=", @@ -732,20 +675,20 @@ "module": "sha256-fhNlSHgJgj3QsW1doKyZf9PmtrTephg58fHm8x/4D7A=", "pom": "sha256-N/yzpQhcQ/1cjVNvUU1LPju4WQtv0HNKcUL4i4NpWOA=" }, - "org/gradlex#java-module-packaging/1.1": { - "jar": "sha256-tG4desVuo/RmoviGeVclIuaFoV/mblWlKhSlDL1ZG/4=", - "module": "sha256-CilLazbgRJ4PllkhFCxED+ZW6OiWk0xdpYeDM3J0284=", - "pom": "sha256-NJEVgtmX9kIcxlBzUReESqL4SND5UPZCLscdp1Hg9Wo=" + "org/gradlex#java-module-packaging/1.2": { + "jar": "sha256-OYhi3QQLcnd1LnptEgug8mHIG2gQ352+wiSQLsyJABs=", + "module": "sha256-shcObdBLh6Jc2FPHPbMUPknQWsTxsNwXj/AIc+1qfyo=", + "pom": "sha256-oIxyBX9Jmj68iOVJaCcC430yJZpcuQM8EbTrLebfr00=" }, - "org/gradlex#java-module-testing/1.7": { - "jar": "sha256-SuAfIlj54DFcfEqHVxpN73LUZHfDO/HnZwpnSGCgMMM=", - "module": "sha256-fF35H4l02PrGF8J5/V6SlaN/Xqq4RRc6F7PCFoqDuJo=", - "pom": "sha256-2xMRTEoSN6SknNX5a2N99tfDxQeIwc3F9rU+qWXfvuY=" + "org/gradlex#java-module-testing/1.8": { + "jar": "sha256-VGnTdoQTLIykKPjhCa0cyuKFqRe+7VtIBqO7zyQxHh8=", + "module": "sha256-YzjMz5Q6yRPtywfwD6LBCmb/0dTjBFI9TK52iA3sUO4=", + "pom": "sha256-oQB1HIxCz13s7vaVQ/rNEY7eC3O/zf1kydIvPuJoPMA=" }, - "org/gradlex#jvm-dependency-conflict-resolution/2.4": { - "jar": "sha256-07ysXNC5ZGAo2eT4s1iP+r9UGwPmEzgAQQZ/g/QlRCY=", - "module": "sha256-9rh4lX2yRAgFK8q0lyZiVlznCC2hiD5C8fsU24GIlRo=", - "pom": "sha256-uacve85Giz5v2SwEXDdN6mMskIRE6tdzc0vfdDBMjnU=" + "org/gradlex#jvm-dependency-conflict-resolution/2.5": { + "jar": "sha256-ZTyhRdbI9h4nbrIw3yr3htxWZaCqyXOi3tdd4gw6170=", + "module": "sha256-wbliVk8tJ7IJc4FOQbiw8FT9nJ02tDZRaEHjLGYQuog=", + "pom": "sha256-x/+x9Yt+AWImYiG5T75j1jb1NciBIO8QnjOMgWJ/0uA=" }, "org/itsallcode#openfasttrace-gradle/3.1.0": { "jar": "sha256-+HhFKm0fhNF7qz+Kw7tlqTcsICHWIqvFneXWLdSgtYM=", @@ -1005,9 +948,9 @@ "module": "sha256-/2oi2kAECTh1HbCuIRd+dlF9vxJqdnlvVCZye/dsEig=", "pom": "sha256-pWM6vVNGfOuRYi2B8umCCAh3FF4LduG3V4hxVDSIXQs=" }, - "org/jooq#jool/0.9.14": { - "jar": "sha256-EO13VqAFaYQJsWqteXqnZgCaZhD29r7GZ7NbFwl7o0s=", - "pom": "sha256-L4ndA8dhMAqVuGSecX63t1j1SOz8q8hHkb0kVzslv/c=" + "org/jooq#jool/0.9.15": { + "jar": "sha256-ow2WcZCZ603oewgVL5etsLo8/vmX2tys6LLk3NwZf4Q=", + "pom": "sha256-/mCqsovG1YbUq0u/zSPc9KFXa/gzK2lEwhxaehS8x4M=" }, "org/jspecify#jspecify/1.0.0": { "jar": "sha256-H61ua+dVd4Hk0zcp1Jrhzcj92m/kd7sMxozjUer9+6s=", @@ -1030,10 +973,6 @@ "module": "sha256-42L7gWcgLW8NSlsWcHxTJFEP0pA9U2SYiMRJasgcM34=", "pom": "sha256-xyEkqcmnmRDBhYdmtyw1Dho5JEy/tLB2NI+/4HgoGWU=" }, - "org/junit#junit-bom/5.11.2": { - "module": "sha256-iDoFuJLxGFnzg23nm3IH4kfhQSVYPMuKO+9Ni8D1jyw=", - "pom": "sha256-9I6IU4qsFF6zrgNFqevQVbKPMpo13OjR6SgTJcqbDqI=" - }, "org/junit#junit-bom/5.11.4": { "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=", "pom": "sha256-GdS3R7IEgFMltjNFUylvmGViJ3pKwcteWTpeTE9eQRU=" @@ -1072,16 +1011,16 @@ "org/openjfx#javafx/25": { "pom": "sha256-55IzCPyt1/LGiwcgQfR9jnNVIj2EZVnutceA3EuivxM=" }, - "org/openrewrite#plugin/7.19.0": { - "jar": "sha256-0Q7hjPsBdtkJPK1XOudOT71gdrnRlLdUFx/Hz55svEQ=", - "module": "sha256-O34NiVkjs7Kkluv2/TjvNRLruzaUJ8aqWtH28zxoeW0=", - "pom": "sha256-ZoGHq63frzP4dlvYpmb2ZFWefpPS6+l2pGjLXAjIjoE=" + "org/openrewrite#plugin/7.23.0": { + "jar": "sha256-FVTJaML4Qf/TyPQSYzueRB3hsIcUt1lKr7O6VsK3y8o=", + "module": "sha256-zMwRRR/4rKPfwRVYPfbUtN6n7hrOkMKL1BC/Uw18GRk=", + "pom": "sha256-1iJirMbYonNt/uYcEsdLRophOntSLZC1KZDT7INDCq8=" }, - "org/openrewrite#rewrite-bom/8.64.0": { - "pom": "sha256-TUbuSNSXKl011/ufBiQhwFVY0Z2+KtuoRso5rb45OWs=" + "org/openrewrite#rewrite-bom/8.69.0": { + "pom": "sha256-qB0qP51WQTq/xDVb7rWgmX0HbsCiwktZqWNy6ZG1/YM=" }, - "org/openrewrite/rewrite#org.openrewrite.rewrite.gradle.plugin/7.19.0": { - "pom": "sha256-IhGb4mgJ1Ht6ijckmt2mm0q6kDJ/pgyKUuE24UAaHso=" + "org/openrewrite/rewrite#org.openrewrite.rewrite.gradle.plugin/7.23.0": { + "pom": "sha256-DPyIx0N8YHljfQckzwRhwEorLJ2ouhBsbXBnvN4y2Z8=" }, "org/ow2#ow2/1.5.1": { "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" @@ -1094,42 +1033,26 @@ "jar": "sha256-A9madK0e5ccTNO9nQ39O9P40iMqnyW2GRavHPI4gF9Q=", "pom": "sha256-z4Ye8edF1XFUr3muFN80DtU0Hl3NAVfO/NLrfxqgXFc=" }, - "org/slf4j#slf4j-api/1.7.2": { - "jar": "sha256-O654m0ATM7Kh0WA7f6Vz4ZkIYoGRcHID9utwjN7iwFI=", - "pom": "sha256-LqynGv4KFRb0q9jp/5B4ONJo84yBw6VCzOjX87h8XUw=" - }, "org/slf4j#slf4j-api/1.7.36": { + "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=", "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ=" }, - "org/slf4j#slf4j-api/2.0.13": { - "jar": "sha256-58KkjoUVuh9J+mN9V7Ti9ZCz9b2XQHrGmcOqXvsSBKk=", - "pom": "sha256-UYBc/agMoqyCBBuQbZhl056YI+NYoO62I3nf7UdcFXE=" - }, "org/slf4j#slf4j-api/2.0.17": { "jar": "sha256-e3UdlSBhlU1av+1xgcH2RdM2CRtnmJFZHWMynGIuuDI=", "pom": "sha256-FQxAKH987NwhuTgMqsmOkoxPM8Aj22s0jfHFrJdwJr8=" }, - "org/slf4j#slf4j-bom/2.0.13": { - "pom": "sha256-evJy16c44rmHY3kf/diWBA6L6ymKiP1gYhRAeXbNMQo=" - }, "org/slf4j#slf4j-bom/2.0.17": { "pom": "sha256-940ntkK0uIbrg5/BArXNn+fzDzdZn/5oGFvk4WCQMek=" }, - "org/slf4j#slf4j-parent/1.7.2": { - "pom": "sha256-HY4ISm8jhK3kJoUzK1Kg7OCQR4ZB3BTA+oxS4eKYRCU=" - }, "org/slf4j#slf4j-parent/1.7.36": { "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI=" }, - "org/slf4j#slf4j-parent/2.0.13": { - "pom": "sha256-Z/rP1R8Gk1zqhWFaBHddcNgL/QOtDzdnA1H5IO0LtYo=" - }, "org/slf4j#slf4j-parent/2.0.17": { "pom": "sha256-lc1x6FLf2ykSbli3uTnVfsKy5gJDkYUuC1Rd7ggrvzs=" }, - "org/slf4j#slf4j-simple/2.0.13": { - "jar": "sha256-MVP+HWic/7lPFTC1hHDDBmhbpohE3ohXEW47bruB2fc=", - "pom": "sha256-Sk1Lskz4q+LLh0qDb150PTSFt9sE/P9vwHFJUlO1z6g=" + "org/slf4j#slf4j-simple/2.0.17": { + "jar": "sha256-3f6lmsB0xtPiSsLDhiLS2WOJXhf3CzjtS9rk14C+aWQ=", + "pom": "sha256-+zDo4vauotKYQnmGd+1FQbmyJVcVwVg1DKLF9ce4ZLA=" }, "org/sonatype/oss#oss-parent/7": { "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" @@ -1144,32 +1067,52 @@ "org/zeroturnaround#zt-exec/1.12": { "jar": "sha256-9ROvOZj9QCT5k+iyWe/TazSgzxx5PpO0olrcNJjQEf0=", "pom": "sha256-aYxGAAk6FF9lEYVGJfSVKPBOFqLESAiFKP2Oi0JsTFQ=" + }, + "tools/jackson#jackson-base/3.0.3": { + "pom": "sha256-kvfF8WaH7WtSwOgm76sON5s3rkkYFc8tQ3ySPUJodbQ=" + }, + "tools/jackson#jackson-bom/3.0.3": { + "pom": "sha256-hOPOTqXFbXvqiGH+HEOayaGd1UqaPem4oIhL8LvHUPI=" + }, + "tools/jackson/core#jackson-core/3.0.3": { + "jar": "sha256-QUm7Kzu/+1M5CJF04m9FQIHmoBoQTSSyL3iha5SHmes=", + "module": "sha256-tJO1FTrvaKzJwyEsOa3fbYi7yDO4h1LhVjLgwoEAdjU=", + "pom": "sha256-Z4lSP9lndVN7lriKwAyQ5CQ+lkYVXLE1/OjzE6GiH9g=" + }, + "tools/jackson/core#jackson-databind/3.0.3": { + "jar": "sha256-37t5EwkQ3s8GMSXB5pOjnF7I+4tHjX85ZxkB1Hzn9qI=", + "module": "sha256-tpz6mbeuIssVcLSJ7RUprnUluaGrP57zXR9PPT5HGHs=", + "pom": "sha256-9EpMrUeqwuQkLk31NoJ7WP7fKCkFbJUX9E51raYHF2g=" } }, "https://repo.maven.apache.org/maven2": { - "ai/djl#api/0.34.0": { - "jar": "sha256-fTJPadhpvbRg0n0PegUu0LxVFNq4gBTYmk4BKa2ZYM4=", - "pom": "sha256-8aXphfBTdbhovv8377sA4eemn7LKjFff8QnXAGAkXCo=" + "ai/djl#api/0.35.1": { + "jar": "sha256-EpXJunxbDil0pjiVPtEjFUvMCsoNvEEGkR3GyaXYzPU=", + "pom": "sha256-vuzCtZfq/v79VQOau6bjrKEhxvO6+kpO79hLn8DqrJc=" }, - "ai/djl#bom/0.34.0": { - "pom": "sha256-/mUHucQxaWENPHsxS9NBD8koaBn8iz/94fJpzBfqM3E=" + "ai/djl#bom/0.35.1": { + "pom": "sha256-T8VC15hK8PPvGwIPd9+v3ZCYWDzGN7BVz8fznimOQHs=" }, - "ai/djl/huggingface#tokenizers/0.34.0": { - "jar": "sha256-zDVisUKNQIDqjEQ+xG844XjfYafvtr7c1coeM1CmflI=", - "pom": "sha256-ODxC90MPpmbgG932pPdt1d1XHGkDhOn24SqyH6xaWZs=" + "ai/djl/huggingface#tokenizers/0.35.1": { + "jar": "sha256-7R2M9g8BhuQpO2wKVR6R+DSxjfeyNmoWuA6sJFWutUI=", + "pom": "sha256-ZA0rZaYZFnbWHvbk5WDojA583fl3sGsRNN5lGx9tVHA=" }, - "ai/djl/pytorch#pytorch-engine/0.34.0": { - "jar": "sha256-Y498d7lSd0TEbxz5IvdrviicSdM58B1LuTKcRen7ZsM=", - "pom": "sha256-JEGTooNdo/aI8pNl+qgxa5ra0TLFK/1bfA7h0PkuBqo=" + "ai/djl/pytorch#pytorch-engine/0.35.1": { + "jar": "sha256-n4s4o4IPrLve8JtOaRkA2lhgu3178uBo2b4gXEca4C8=", + "pom": "sha256-KNmLmRj+KFMUVNstmg6x6gcFI5eVeWJokNWYGctykjc=" }, - "ai/djl/pytorch#pytorch-model-zoo/0.34.0": { - "jar": "sha256-gqb4Xdubnzgmj63lEM5G5YhPB57CzkN8ezur2+VhySg=", - "pom": "sha256-8bXJCIW2cS0Xnk3bQPIutJczhWJ59KcFI0UmzlwqCpI=" + "ai/djl/pytorch#pytorch-model-zoo/0.35.1": { + "jar": "sha256-xF+2zouU+bT5gn80EkEe1oPWg3emv2KJEcd1SmMGato=", + "pom": "sha256-m6bKSOEbokXqHCGVrK1NlBjjCm+XjW3tfnusVo2PCn8=" }, "at/favre/lib#hkdf/1.1.0": { "jar": "sha256-gexMVudA1EC8lCb6YAyu5Ku26fTO/1dunOznw4F8WgY=", "pom": "sha256-HCRX381QzRlXEdO38sd7YLFf+8YukrOvxTujzKawfHg=" }, + "cc/jilt#jilt/1.9": { + "module": "sha256-gGgkCvNxRtdHYhuiKcHpl1Ac6+t5UrK58KMj1oglvKc=", + "pom": "sha256-bfLSAjd4+Rljn71PVxUEPFc9oiyzh6Wmf/jg49BZwDk=" + }, "com/dlsc#dlsc-maven-parent/1.0.0": { "pom": "sha256-6aQJT1Kt8lihN2bcHAh0Xk3D0hkL60SvIMalCLeg28w=" }, @@ -1179,19 +1122,19 @@ "com/dlsc#dlsc-maven-parent/1.6.0": { "pom": "sha256-4ZbQC5GiVEwBEy/ZZXg5MWci0OzPYKn7tqFQbBxr4lE=" }, - "com/dlsc/gemsfx#gemsfx/3.5.7": { - "jar": "sha256-Y+dETxXXBI8h/0esdUtXFR+Vk3fw7rIltmU6bZNQvRs=", - "pom": "sha256-4Cb6VQcdX6hIkxDVgRBgGr+NGjlTM8xNSatkkH0RNwI=" + "com/dlsc/gemsfx#gemsfx/3.6.2": { + "jar": "sha256-1U/XOBMiFpDnyDiaAV5cpk45QAJzFxwyMmDQwA0GuxM=", + "pom": "sha256-unp6nKC/WVT/J8qtR2kUtwGEWr615SfKXweAFOL4DQk=" }, - "com/dlsc/gemsfx#parent/3.5.7": { - "pom": "sha256-ORawbydR4eGFsBL7XJkwe+OFRtlTI2/N515p01GIvH8=" + "com/dlsc/gemsfx#parent/3.6.2": { + "pom": "sha256-cqDCKTd0AXAiLe4KquYeC0ZIzzeR3mMZHekt94KZR1Y=" }, - "com/dlsc/pdfviewfx#parent/3.3.2": { - "pom": "sha256-o6yhZ7+ceSphXd39Q4pr+OnTfM1WyARtsgfNCb6gVaQ=" + "com/dlsc/pdfviewfx#parent/3.4.1": { + "pom": "sha256-x2WzdVKrEG81YjepLD+gldo/wPD4+casNMsBtFwgqHA=" }, - "com/dlsc/pdfviewfx#pdfviewfx/3.3.2": { - "jar": "sha256-HmWihBRyah4PHs4xE574h7ubCmi1xEs48BzIjpLEoA4=", - "pom": "sha256-DDn3/qcYMDIhxeoVoOrXcxJbmH+k/IF+V/1zlj+5kkI=" + "com/dlsc/pdfviewfx#pdfviewfx/3.4.1": { + "jar": "sha256-0K6aX7Ej1rvwQR9nWJN28aaqBoPB9dJB5uX+4ouRE1g=", + "pom": "sha256-StvaJfplK4cTwkMRqKQVP7UvC1pf6SiJOSrefdcCshs=" }, "com/dlsc/pickerfx#parent/1.3.1": { "pom": "sha256-aUrDFyy6O9PUh4XN3UBHsi++Qk9Kd3G+bK9RwP2/3Wc=" @@ -1207,29 +1150,20 @@ "jar": "sha256-Sxhrmeu47j3uesKeevLS+/dkeQQ8cj+q1Zaad+WhnBg=", "pom": "sha256-6v50YYv2uOH3NAVfC75ayZ7hfLkWxfW8AJppE0uCOb8=" }, - "com/ethlo/time#itu/1.10.3": { - "pom": "sha256-shihqWmXfQEerG6Ttzo6uwuIQGMK0aHxbr//JOWIbXQ=" - }, - "com/fasterxml#aalto-xml/1.3.3": { - "jar": "sha256-KIKe67NoY7BYEI+hubi1z7lMGHE0bkpPc+aeH+Cl8PY=", - "pom": "sha256-lXWPfdZUKR9D0cEJvBwm4lQYe61NyAAuhje/fiMUr9c=" + "com/fasterxml#aalto-xml/1.3.4": { + "jar": "sha256-9Kxo2RGEootCBM72sSS4qvQ5sj0/E/WCG1znpnVPXyA=", + "pom": "sha256-klKG9TV8CCLMl5lWME+Ly8pvvTE7V3j+4m38BBmIL9c=" }, - "com/fasterxml#classmate/1.7.0": { - "jar": "sha256-y4aPIxxczrideV6gDm4bepO49Kwc4di+dt3jIt/0oEY=", - "pom": "sha256-ZHEa3vDskvH2zap7LqwGsuVmekppkez7i/rEZoHVuTE=" + "com/fasterxml#classmate/1.7.1": { + "jar": "sha256-zDKZ5d9PwkGA5pR3yJDQfTjbed0t7MDvIOdKmGiXwKE=", + "pom": "sha256-z4m9p/hn2IUOK5Ma8VEcCXX2obhVB6oL/0F5ZQHHpkI=" }, "com/fasterxml#oss-parent/55": { "pom": "sha256-D14Y8rNev22Dn3/VSZcog/aWwhD5rjIwr9LCC6iGwE0=" }, - "com/fasterxml#oss-parent/56": { - "pom": "sha256-/UkfeIV0JBBtLj1gW815m1PTGlZc3IaEY8p+h120WlA=" - }, "com/fasterxml#oss-parent/58": { "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA=" }, - "com/fasterxml#oss-parent/61": { - "pom": "sha256-NklRPPWX6RhtoIVZhqjFQ+Er29gF7e75wSTbVt0DZUQ=" - }, "com/fasterxml#oss-parent/68": { "pom": "sha256-Jer9ltriQra1pxCPVbLBQBW4KNqlq+I0KJ/W53Shzlc=" }, @@ -1239,36 +1173,27 @@ "com/fasterxml#oss-parent/70": { "pom": "sha256-JsqO1vgsnS7XzTIpgQW7ZcD52JnbYXV6CXQVhvqTpjk=" }, + "com/fasterxml#oss-parent/73": { + "pom": "sha256-SG2NomL0LJwA8+fP/xRxRzNHz8ae3X8GT8lxlN4p1m4=" + }, "com/fasterxml/jackson#jackson-base/2.17.2": { "pom": "sha256-fPnFn70UyQVnRxN7kNcKleh3YN/huCRWufAjF9W1b68=" }, "com/fasterxml/jackson#jackson-base/2.19.2": { "pom": "sha256-/779Z5U5lKd12QJsscFvkrqB0cHBMX7oorma4AnSYUM=" }, - "com/fasterxml/jackson#jackson-base/2.20.0": { - "pom": "sha256-/IgCjRnuqjftpZbmuY03SfIs/IrdGeoZdFq+g2iDzmY=" - }, "com/fasterxml/jackson#jackson-bom/2.17.2": { "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI=" }, - "com/fasterxml/jackson#jackson-bom/2.18.3": { - "pom": "sha256-8dTGrrMhGGUMgF/pu8XulA+o8s19DwT6Q2BVHponspA=" - }, "com/fasterxml/jackson#jackson-bom/2.19.1": { "pom": "sha256-um1o7qs6HME6d6it4hl/+aMqoc/+rHKEfUm63YLhuc4=" }, "com/fasterxml/jackson#jackson-bom/2.19.2": { "pom": "sha256-IgBr5w/QGAmemcbCesCYIyDzoPPCzgU8VXA1eaXuowM=" }, - "com/fasterxml/jackson#jackson-bom/2.20.0": { - "pom": "sha256-9ig2R+cB/aHNMS3MIcsTKkD3mPGejkL6/D/jR8WlG7s=" - }, "com/fasterxml/jackson#jackson-parent/2.17": { "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0=" }, - "com/fasterxml/jackson#jackson-parent/2.18.1": { - "pom": "sha256-0IIvrBoCJoRLitRFySDEmk9hkWnQmxAQp9/u0ZkQmYw=" - }, "com/fasterxml/jackson#jackson-parent/2.19.2": { "pom": "sha256-Y5orY90F2k44EIEwOYXKrfu3rZ+FsdIyBjj2sR8gg2U=" }, @@ -1278,11 +1203,6 @@ "com/fasterxml/jackson#jackson-parent/2.20": { "pom": "sha256-tDt/XGLoaxZPrnCuF9aRHF22B5mvAQVzYK/aguSEW+U=" }, - "com/fasterxml/jackson/core#jackson-annotations/2.19.2": { - "jar": "sha256-5RZ0OjFtz4PFcv/Jy26MXowTSIDIxRVbAvezTpxdw88=", - "module": "sha256-MZtf0wd2wFk8yNxajX4ITkuQcJpDUGQYQqu9WfyByBU=", - "pom": "sha256-SVAWGuCtZsaze8Ku0S0hxleeF3ltv86Yixm40MIjpck=" - }, "com/fasterxml/jackson/core#jackson-annotations/2.20": { "jar": "sha256-lZov+y1ZFDb1Hxg8alIfyJNHkS9xG/DK4AjN8EXZUxk=", "module": "sha256-wHDxTsg1jQlcAurootZcsAzLoOXFqnOwASlDM/5GiXE=", @@ -1293,53 +1213,34 @@ "module": "sha256-Ua8uZ3g6XXJETeajB8jj7ZMAklbNJ+ghkVVZohZcCUI=", "pom": "sha256-gfatIwlG88U9gYwZ/l7hEcH6MxuRXEvajQGC5rT/1lA=" }, - "com/fasterxml/jackson/core#jackson-core/2.20.0": { - "jar": "sha256-vAz0YHWHcgH4QG7n3idBrn32wGb18EV72AYypxjAbnI=", - "module": "sha256-2oWNOW9/pritA4zVzLkDj7ORq3o2rmKWI+N6UyR537w=", - "pom": "sha256-XxZVisIjBzpvJHRA8wX1nwXv9QqvHurguq1BKAABb2g=" + "com/fasterxml/jackson/core#jackson-databind/2.17.2": { + "module": "sha256-9HC96JRNV9axUMqov1O7mCqZ6x1lkecxr8uXKrPddx8=", + "pom": "sha256-0kUGmLrpC+M48rmfrtppTNRQrbUhJCE+elO0Ehm1QGI=" }, "com/fasterxml/jackson/core#jackson-databind/2.19.2": { "jar": "sha256-ChvU6bDWcOYy1A7oxiWtN2IzUC8DwvWIm66pXQJbR6c=", "module": "sha256-xgFVg0SRj0CDS7bVg4EepsiDvwaigXmkx04voYswbGg=", "pom": "sha256-2KebdQK2m/JQaEwZCpiCOJImaG1dlikGdW2BzVskO4I=" }, - "com/fasterxml/jackson/core#jackson-databind/2.20.0": { - "jar": "sha256-pw4Uamvyy6T5zTZxaXh/UK3Pu1cSK8LpyDkM0LOXrDA=", - "module": "sha256-oSgvNhZKyQG66p7bULqYE3L/7hjCz7F75CW5s/dYeuI=", - "pom": "sha256-zv7+0B3SwNlqiOEBuz4GX8FQBjtJjjAak4xpCwK8884=" - }, - "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.20.0": { - "jar": "sha256-zD3sn7i1ZXR5e/72JkEyVQjw5byWi9JoVoQCgY1Vuq4=", - "module": "sha256-ZA8QhiTO8o1t6jJ+KC6eyC9lEhVY5gkcqPuJlfkUpac=", - "pom": "sha256-rpwz0EFZBkwZsuq0FIiU+jHxVjW7/lMYzjIp+OFHCcU=" - }, - "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.20.0": { - "pom": "sha256-RH4cfT+o2Skn3L2DjSRGOAXohi9yPM7VENUNrrhPgLQ=" - }, "com/fasterxml/jackson/datatype#jackson-datatype-jdk8/2.17.2": { "module": "sha256-eG+CJvp0Tkyw3/M7pt+MLv8kd2PixpwhkP1SesSrrmw=", "pom": "sha256-3fwpGHlF2jpkLCK4cP1keg30smJYIK/DXLeldGkWjsQ=" }, - "com/fasterxml/jackson/datatype#jackson-datatype-jdk8/2.20.0": { - "jar": "sha256-Pq6dtKTruBwzBnq2aDobEpZzF5V/QzxdzsKoWSN8SHc=", - "module": "sha256-2gH0D0MTgHgHN4crpPKPY9nySFLjLWXg+kJPtY2KFgI=", - "pom": "sha256-n2YSsgn9bSeizmJPneGWtK/jQuakfx1OeXDG23fwmXk=" - }, - "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.20.0": { - "jar": "sha256-jDIVWXWpNbH3v9Z3ZHvVyM3uErFEuE5EkqRHteoulNU=", - "module": "sha256-GLsOOniabs0DmHNhBUEU3jf6hrB98wzeKuEO2L3LFgw=", - "pom": "sha256-DPgn58+QwbLF/C2PIXWgKO5ylG1rWN4YL7/ZDlTO1Zk=" + "com/fasterxml/jackson/datatype#jackson-datatype-jdk8/2.19.2": { + "jar": "sha256-YFX+8QdW6L0bDogHqh2IEzjGPKldWSceHaSSK5oXWB4=", + "module": "sha256-cJMXXvltnjxoFL59n5uQeZzGsd/JDqi8ZUVP9byleEo=", + "pom": "sha256-u2kaYgtZPgNo7zrOifnc1dY3VtXlvAXdyay3ih/Ny+c=" }, "com/fasterxml/jackson/module#jackson-modules-java8/2.17.2": { "pom": "sha256-PznFUQn1GiKIF7SxheQ1G57wUBwJ/B4aMHWulUfMLQM=" }, - "com/fasterxml/jackson/module#jackson-modules-java8/2.20.0": { - "pom": "sha256-jhXY4aWgLsdHIj8j4OSkmv5vZVUERDysO47pkvqWxSU=" + "com/fasterxml/jackson/module#jackson-modules-java8/2.19.2": { + "pom": "sha256-o8wywUW5Yr45UE+FNsrGISTry1rVAy2TC8ck/flOgqQ=" }, - "com/github/ben-manes/caffeine#caffeine/3.0.5": { - "jar": "sha256-iptU01BqO5LuRrIXvO55GWshym1S3ClnxoaiBfsvnBU=", - "module": "sha256-MNqUAgRzgsSZ0djzcgH8Ead8mTTSxYa8WkKvrEr6wrI=", - "pom": "sha256-vM/bJH7Xa1K7sUMMIoLEO61BjtPGl7TiqVrQmbvyXPg=" + "com/github/ben-manes/caffeine#caffeine/3.2.3": { + "jar": "sha256-ynDJCl0c4VEYgM6ck9StIhCPYREdPa+R61J2K1cb0Xk=", + "module": "sha256-jZo7mA6b1wQS7jObJFYxNhezuK4uhon5s8vwZAzVjzw=", + "pom": "sha256-n3BPkIN5e099DB1chV00zSaNVEzwa0KD1c5CiKz8nuA=" }, "com/github/hypfvieh#dbus-java-core/4.2.1": { "jar": "sha256-Onuf1UOhvpTemQCcNqwYA/CNbRI1dwbI9QQIVTFUadE=", @@ -1368,17 +1269,6 @@ "com/github/javaparser#javaparser-symbol-solver-core/3.27.1": { "pom": "sha256-pc/rihPH9G7kilI87mX+9KJHrG2ivpnoFKC42ooovVg=" }, - "com/github/jknack#handlebars-helpers/4.3.1": { - "jar": "sha256-VvCtTe+0RLA4pwio4NADaS3xuRK5EhlzanZN6I/3hnw=", - "pom": "sha256-AYv9plPb9sQZG3sF/k7+2KPY1w495wp77RsYim3ibNI=" - }, - "com/github/jknack#handlebars.java/4.3.1": { - "pom": "sha256-UECkDYFTRzveednE1O+4cSChaQ+uWFtYKAcH1DdCCZk=" - }, - "com/github/jknack#handlebars/4.3.1": { - "jar": "sha256-VCT9EukRzxW+/RY0G0bg4bxoGqYePLHAcMV+aNzNW70=", - "pom": "sha256-/DAp8kYk6YvWC1pGmSEPP1YKOUiTQpzQbMrYROj41BU=" - }, "com/github/kevinstern#software-and-algorithms/1.0": { "jar": "sha256-YauCQ5zvNzQ7FPUxVMRhYZN1NzpWuTOOiVcJ+1Tghkw=", "pom": "sha256-7ZcfAJNU5owJQUyWT74aLIXCyLvUYBIrdJenuMXU84g=" @@ -1413,23 +1303,9 @@ "com/google/auto/value#auto-value-parent/1.9": { "pom": "sha256-Lj2d/2OWAcq4gdfhcIBry9jgMffr/yWcu0W+V7TL14c=" }, - "com/google/code/gson#gson-parent/2.13.0": { - "pom": "sha256-bNRgu0Rf977gqbtmJwJkh0RXgCxUGJlFY4IYSvNNFqI=" - }, - "com/google/code/gson#gson-parent/2.13.1": { - "pom": "sha256-+IEKzlDd/j/ag9ESbeZdmdXSUVoUo2uIvrG5mkdpeDY=" - }, "com/google/code/gson#gson-parent/2.13.2": { "pom": "sha256-g6tSip1Q/XauuK1vcns+6ct2ZYYlV3TtFsqMTHbZ2s0=" }, - "com/google/code/gson#gson/2.13.0": { - "jar": "sha256-jGp0K3T4aaefOfXHjMCZmfmfO2r/YwT87db1Q+J++ng=", - "pom": "sha256-AuRJJF3rSlZG8BXOzxEk7lvTe1Ue7YHf0JAVG0Vu/0w=" - }, - "com/google/code/gson#gson/2.13.1": { - "jar": "sha256-lIVZQtSZLxEpRtPeHDNOcJI3uBJtgTC/B4B8AYpKISA=", - "pom": "sha256-wPZXItdcDljNGDWzBGBG9ga12mmZBBYfjba3j+ubQBo=" - }, "com/google/code/gson#gson/2.13.2": { "jar": "sha256-3QzhtVo+0ggMtw+cZVhQzahsIGhiMQAJ3LXlyVJlpeA=", "pom": "sha256-OqBqp8D5rwkpYaQtCVeOQyS+FGNIoO5u1HhX98Jne3Y=" @@ -1441,13 +1317,9 @@ "release": "2.13.2" } }, - "com/google/errorprone#error_prone_annotation/2.42.0": { - "jar": "sha256-6O9uAxS9CrVZXkJ0t894lkxSVoWCeuX089D+/7TaXxE=", - "pom": "sha256-MEn5AqmV9qu6xJm5Q4wv0lS99A7QpzPSqvBEIh3agCA=" - }, - "com/google/errorprone#error_prone_annotations/2.37.0": { - "jar": "sha256-0ppiY7SNRtTHwotkcXptEFs+Kj5kJWCS+EXo53T8pro=", - "pom": "sha256-nBm0OV6yKL6yEJXdMdVa2V+bcnKYNpuShL0jMOi2LaI=" + "com/google/errorprone#error_prone_annotation/2.44.0": { + "jar": "sha256-zWlNRVWHQMkFSQAs/z6PjP+q//Ai9TigS7jQook+EV8=", + "pom": "sha256-GPtw0vTOH/dgIV2HIXe4OvqaALTIYPCiMKaMVP55Y6g=" }, "com/google/errorprone#error_prone_annotations/2.38.0": { "jar": "sha256-ZmHVM1CQpfxh3YadIJW8bB4hVuOqR6bkq6vfZMmaeIk=", @@ -1457,20 +1329,21 @@ "jar": "sha256-pW54K1tQgRrCBAc6NVoh2RWiEH/OE+xxEzGtA29mD8w=", "pom": "sha256-oVHfHi4LSGGNiwahgHSKKbOrs5sbI5b2och5pydIjG4=" }, - "com/google/errorprone#error_prone_annotations/2.42.0": { - "jar": "sha256-8oKmSIg4mGuAM71RiIkoz/alnBBQQmR2VT7SYiuJ5RA=", - "pom": "sha256-r9/wIhQuSJ7lRS6KSgiOLdPndkBWSyMj6e+EeHLwbP0=" + "com/google/errorprone#error_prone_annotations/2.43.0": { + "jar": "sha256-SCcudcFuH3vce9GVKcys1e4XBARwHX9aI0QbtYR5V/U=", + "pom": "sha256-T2uIia+o3r2+Hj/ipfjmbiIWygtWPya05UE4cw7s3IA=" }, - "com/google/errorprone#error_prone_check_api/2.42.0": { - "jar": "sha256-d9z8e4mqHwlBREJ9Mw1SAo6Fc/V038kYHBOsmtjRqTU=", - "pom": "sha256-E4cgJOTwd9ZEAu6vuZk+auW9GGPDhDJ3MyLj3teUSX8=" + "com/google/errorprone#error_prone_annotations/2.44.0": { + "jar": "sha256-vPc4pSXlRskmojPQoWnPfq/PcD/oGsnWmU9yRO2ikFI=", + "pom": "sha256-fmGVkFEuhKKOAjWK3qvn3kureQr2FOhAtAQTlRbeFlc=" }, - "com/google/errorprone#error_prone_core/2.42.0": { - "jar": "sha256-Ofv13fwqr88MnEfgZNS0MmqZU/PtGX/N1SD3e01k7TE=", - "pom": "sha256-B+TX1Nuy8gvyK+ZFOy/aVETo9RQaBTkj7rkcTlEN/rU=" + "com/google/errorprone#error_prone_check_api/2.44.0": { + "jar": "sha256-rFRNsezoAFm1NJU93Ipa/PZUfCCrnBtQC5kHGQOQDL8=", + "pom": "sha256-Nl9VFHNSFSwr9syl+uNdspsxDqR4A/neWuRL/k1d+jo=" }, - "com/google/errorprone#error_prone_parent/2.37.0": { - "pom": "sha256-SmWUVg9cwGyJ2vzEn4spHxJ83bon1CYFliKhmrjWzkc=" + "com/google/errorprone#error_prone_core/2.44.0": { + "jar": "sha256-3K8Higb7HPuj5dRkRIrTDwERB6OdaSQg2YetU8jlnew=", + "pom": "sha256-GSe9Wd9Xlv2pXW2z/4rT/y2ioGUmYSGtgLG0mjyS3+0=" }, "com/google/errorprone#error_prone_parent/2.38.0": { "pom": "sha256-5iRYpqPmMIG8fFezwPrJ8E92zjL2BlMttp/is9R7k0w=" @@ -1478,11 +1351,11 @@ "com/google/errorprone#error_prone_parent/2.41.0": { "pom": "sha256-xTg4jXYKXByY3PBvbtPP5fEaZRgn21y9LtgojHlcrUI=" }, - "com/google/errorprone#error_prone_parent/2.42.0": { - "pom": "sha256-YolCpNYTZBj92nOUhBcOY4B250E/zJ6E9xutJUvWICA=" + "com/google/errorprone#error_prone_parent/2.43.0": { + "pom": "sha256-u5LEWE0CEb1ZvspPsnYXD13FD+NGFG6TV40tqyYDPhA=" }, - "com/google/errorprone#error_prone_type_annotations/2.37.0": { - "pom": "sha256-69Fv9A5HxZg71f1iL0ym71cWPowYU+OilsOtKUYnUdY=" + "com/google/errorprone#error_prone_parent/2.44.0": { + "pom": "sha256-9v3+0f+Ubr0B9HgCSux5CBz16XbMDY6MmL+GMXOxY10=" }, "com/google/googlejavaformat#google-java-format-parent/1.27.0": { "pom": "sha256-rOuKJTTBnTBcBY8iq0ffOaDhm3QIWx5MWwfTukXYQlA=" @@ -1532,25 +1405,21 @@ "jar": "sha256-LIIlzXOyOUOCudABbZJ4oAKRViIkpZTu8AwApqxQvAQ=", "pom": "sha256-fqc4xbuppSWxP3KDW9aBOFPZgHMf9Kuiy4uo4OWA7Zg=" }, - "com/jayway/jsonpath#json-path/2.9.0": { - "module": "sha256-5ikAQ9rpOnDZqz+hvrh56M9e1ajgqQGD+5bCUVqXCD4=", - "pom": "sha256-DCU33em/ncKix5ZzAPwTvFIp0ZJnf8uItv2Jlmk2ZD8=" - }, "com/knuddels#jtokkit/1.1.0": { "jar": "sha256-FQHOAlmriXxnRsz6+h0gis1AT7F+GsYuFXFy8meLEYM=", "module": "sha256-QxxAPs80ROw72ZNJIvNpOf1vCClXmpolySdBmSzVjC8=", "pom": "sha256-cfjoMOMzqx9I5NAy7FSiu4J6Zk+crtGlo8h815W+8eA=" }, - "com/konghq#unirest-java-core/4.5.1": { - "jar": "sha256-hzS58uio16ATB/9TLutw7rPwRFvPimeY2u6fRSjF9uM=", - "pom": "sha256-G8IxK1eWPVaavo0VZdyYmXkvsWGaiahuLncZTfBegc0=" + "com/konghq#unirest-java-core/4.7.0": { + "jar": "sha256-vrG2r47OzMOXs83OhvWcLIeSzQmO7mllaYY6bl10l8Q=", + "pom": "sha256-HMU/jIc5+Wgzi9DOQU++WbDGc6fB06JQfY+CQizHW+M=" }, - "com/konghq#unirest-java-parent/4.5.1": { - "pom": "sha256-Op85yzb/PrKGx4BNG2tAW9QdBTlA3mcL6LQuEPfLGIE=" + "com/konghq#unirest-java-parent/4.7.0": { + "pom": "sha256-hflUAkAOOKwySYOxi/sQtwuZQt1V6SpONXiUx4tbw3s=" }, - "com/konghq#unirest-modules-gson/4.5.1": { - "jar": "sha256-vCLl5VY1vvywEjMmOCqao27fw5+Y2smBloskQ8Myy3E=", - "pom": "sha256-2oBvnNCenHShoeLh1IJ9qItegtH8BPzvS1VpU/6oHdE=" + "com/konghq#unirest-modules-gson/4.7.0": { + "jar": "sha256-Vkqs1zMxmn0BtQ/Pg5cvAdhFCFU3JwzX91agvVpOpzY=", + "pom": "sha256-5Lh7puKpRzeyuJi+yk9RFgES7LyVRZpLzeXgH8BIzmM=" }, "com/lihaoyi#fastparse_2.13/2.3.3": { "jar": "sha256-dXipnwkfW7pdj+2IFhn8rZraeU0/N4dWBwrViUPxBVE=", @@ -1564,9 +1433,6 @@ "jar": "sha256-B5T8EGEH001xEB6tCzGyxIJzc32JGXu/mxusb/MqtXY=", "pom": "sha256-oiq0AqkyzobUAcU3A01FPzeuq1nlJMKIalwgeVB92jU=" }, - "com/networknt#json-schema-validator/1.5.6": { - "pom": "sha256-e/wlpTWWxa1g1qLRQ+BPC1weA9u2IGjnpl9q3YiCl5w=" - }, "com/pixelduke#fxthemes/1.6.0": { "jar": "sha256-Lw53pVtUPDjUlpYEFr40sRZzLeNYvG7mtg6ANY9MD9s=", "pom": "sha256-srTnPug05l3LuE0XByfksEyI7KemxjIibujuqt0i2vQ=" @@ -1589,10 +1455,10 @@ "module": "sha256-9Lg+E7Rr8Q9cccDL82M54X4ttXZwDaNElfulX063g24=", "pom": "sha256-hwO2W8qKgsj6H3DHt4FTtAx5FrKQUS/PmA5/IaZQpzc=" }, - "com/squareup/okio#okio-jvm/3.16.0": { - "jar": "sha256-xzfANcpnUYe/EaZ925WBlUvw1cqfPgSOg4syZ88ytcM=", - "module": "sha256-h5N9uN2s/m54G1UOVcRgEvRtuvEggD2phbshf0eXWJA=", - "pom": "sha256-UZpRemxp4bmF6BsNm3XT3kWjg4aI46CUjnpTYeVHOPM=" + "com/squareup/okio#okio-jvm/3.16.4": { + "jar": "sha256-IZa5k800272Rnn4B9XpHgbWL7oD4YQYWPih8IDQ6lqc=", + "module": "sha256-kAjVopVKBoxoSCdPbuvf9IsUpw28aT0zAuCMVwzKAy8=", + "pom": "sha256-ZnePTQWXvOY/kewADFdcwCmzIB990JLLgIh1FVs+hqE=" }, "com/squareup/okio#okio/3.15.0": { "module": "sha256-EWgmBmzrTTM2p05xcqM3UWF+w0S8UKNPmbDSSVmko50=", @@ -1741,9 +1607,12 @@ "pom": "sha256-f6DbTYFQ2vkylYuK6onuJKu00Y4jFqXeU1J4/BMVEqA=" }, "commons-codec#commons-codec/1.18.0": { - "jar": "sha256-ugBfMEzvkqPe3iSjitWsm4r8zw2PdYOdbBM4Y0z39uQ=", "pom": "sha256-dLkW2ksDhMYZ5t1MGN7+iqQ4f3lSBSU8+0u7L0WM3c4=" }, + "commons-codec#commons-codec/1.20.0": { + "jar": "sha256-avZllfn2p7tYzmZRjWiI1AtUfDZtImLwZnbu4ZUo/2Y=", + "pom": "sha256-r/ZFxYzUGsUYTZds6O443laU2Zq4dk1u5/FPcOrV+Ys=" + }, "commons-collections#commons-collections/3.2.2": { "jar": "sha256-7urpF5FxRKaKdB1MDf9mqlxcX9hVk/8he87T/Iyng7g=", "pom": "sha256-1dgfzCiMDYxxHDAgB8raSqmiJu0aES1LqmTLHWMiFws=" @@ -1752,12 +1621,9 @@ "jar": "sha256-4LK5gKhPxlM8XOKR8ZF7MsUH9ivK1kGY//RDaMIZaj0=", "pom": "sha256-FaWcDnV8bAfD0baJ1zXI46nsVpXWzrapQdQGKrIpAbc=" }, - "commons-fileupload#commons-fileupload/1.5": { - "pom": "sha256-zHIPHgWDV52f5Tk8iE7kbQ10+Z0fm6AXsXKzHqGJ4rE=" - }, - "commons-io#commons-io/2.20.0": { - "jar": "sha256-35C7oP48tYa38WTnj+j49No/LdXCf6ZF+IgQDMwl3XI=", - "pom": "sha256-vb34EHLBkO6aixgaXFj1vZF6dQ+xOiVt679T9dvTOio=" + "commons-io#commons-io/2.21.0": { + "jar": "sha256-fWQ6Kv6osFi3YqpvuQ5bJW9scpc5+LN4TDNw3cYJ6I0=", + "pom": "sha256-rkd5XnIYA+yP8d7tdL4oqBGgJxO9WjqwrGfCtYy2Nas=" }, "commons-logging#commons-logging/1.3.5": { "jar": "sha256-bXp0TkAnZJ+7UIld+Ul9EJ+Yx2amNwYv6NLqu7MUC6Q=", @@ -1857,81 +1723,85 @@ "module": "sha256-hYXA4tg94OvQdHoIYgHVFkocGMac7CNkOzKInK+nplc=", "pom": "sha256-usoMboDZwvbgb1ZjNVPJL+gECIGhPJ1jCdOtCbHFQAI=" }, - "io/github/classgraph#classgraph/4.8.181": { - "pom": "sha256-kj4br0msZAeQ30WHuMz0AfYG8L/HBZZh9xhVG2Jw8Ug=" + "io/github/classgraph#classgraph/4.8.184": { + "pom": "sha256-N7I1NJqAx1rokS+gCO3unouINL52mortCLp0xbCvgeA=" }, - "io/github/darvil82#terminal-text-formatter/2.2.0": { - "jar": "sha256-MfiZaC/y+NgogMWn41JR2fxoLJ5ZDbJcJyD/U0sTz1Q=", - "module": "sha256-283Z1+Tg06hSf1y3YdrCOyoQsdyf9gjUVFSSW/t2mk4=", - "pom": "sha256-f0eR6KhW9qojX3wmNptBqcAqOQUWBmsc9jF+wqH6L1o=" + "io/github/darvil82#terminal-text-formatter/2.3.0c": { + "jar": "sha256-fmV4AIRX4Ztj+ovcIdMX+KNjTawswCGqVWgYr/zWjqg=", + "module": "sha256-QQEFGQh1NP7lkfhnQsF9n68nrICcbAPTE8qC8vTsAy8=", + "pom": "sha256-CGo8cNJRD5xXify/nwO9t9VclCv54BfuLrbSp8d5Dnc=" }, - "io/github/darvil82#utils/0.7.1": { - "jar": "sha256-ifcK6Ss6PJLm27m+PJHCjJSfSjmhfEvmbMJmPMl2GHM=", - "module": "sha256-Xv+x8FagR3nDzKTzrDi+rGqugjUyK+IF5nE44j0ccsQ=", - "pom": "sha256-/fFozhF1Mtmmu/IbpLr6kUuCc3Yhs/ACfdsIrDrXPR0=" + "io/github/darvil82#utils/0.8.0b": { + "jar": "sha256-fjFIIzSX3MQMq/r+/NbWS9OQQQTQ74PwfIXMZiqmJHA=", + "module": "sha256-yQ3Zxs48wjBo4u23xXMR2wEZMOn/kDWABuf5cXHBAzw=", + "pom": "sha256-6T3YGIOl4gLoGhBjyGTrUBVajl6tT6a295eorLSR7wg=" }, "io/github/eisop#dataflow-errorprone/3.41.0-eisop1": { "jar": "sha256-EENPuk5T9V+px2kEzeQUuRiTJUjJ38Ti1jSsBf96fRA=", "pom": "sha256-I/HN+kYTwAzG6lyfU2DhRxtEn4JjPxPPX/bNs0+jHr0=" }, - "io/github/java-diff-utils#java-diff-utils-parent/4.15": { - "pom": "sha256-CefUSnz6GbxrI8rRTsCkHzKuC1l/Dias6RkW/cK7XII=" + "io/github/java-diff-utils#java-diff-utils-parent/4.16": { + "pom": "sha256-pDRNpY5TqOjFe+Gekjut8ksn3UKwfebURtKmWaRWUJo=" }, - "io/github/java-diff-utils#java-diff-utils/4.15": { - "jar": "sha256-lkxp46I6iS2yd4rmgGqh1C+BIwAyvY5JgtyGIFgu5rc=", - "pom": "sha256-Gt8qYOhitxqmlKPo5qiIqjU/r/UFlHfrv9yrzTo/+S4=" + "io/github/java-diff-utils#java-diff-utils/4.16": { + "jar": "sha256-YgQDAw1nakon94CjrOx0ON7hsWUaHIBPprsRuwc5mm8=", + "pom": "sha256-Q01Zih4YExEThSNRYWJ6TE69YhNPcFRCjT4gKzLPOd4=" }, "io/github/stefanbratanov#jvm-openai/0.11.0": { "jar": "sha256-xPzxC/BQ198fJ6UNBE+H3nDEmbt7MTDJeoWkuhAPDy4=", "module": "sha256-ZGQms3XvHPIxNpJDGVsdgcBV5OKcG+BDMGjYAZ1RLAc=", "pom": "sha256-NU6HjGIom9LFsjtidmUGBJESMU+mFS7J+XpTuzOb1n0=" }, - "io/github/thibaultmeyer#cuid/2.0.3": { - "jar": "sha256-qk6RPsJ+ucuZkXcx/LeZ57WueMDcPz6QOPBwf1pasrY=", - "pom": "sha256-AF9eKRgpy68hc7p2BUcJWRMo4uhHGES+6oayyu8DDwI=" + "io/github/thibaultmeyer#cuid/2.0.4": { + "jar": "sha256-ThsaAKO3aVlMjY9dp61WmqhnqBuHWo54b6wEqBnriAc=", + "pom": "sha256-PLCprpRMOMgu60mgVm+2lxpBWnmaOgjUKeACNxoAdH8=" }, "io/zonky/test#embedded-postgres/2.1.1": { "jar": "sha256-txrgUlEpZ+o6CuOJgIkvgFdza67C96nrhRaQrUlAzis=", "pom": "sha256-utspdh18ivb3Gkl0tpY9mgocG51daf3oFjfGsfZGjGs=" }, - "io/zonky/test/postgres#embedded-postgres-binaries-bom/17.6.0": { - "pom": "sha256-n0HACqk5C+WZYlGnbZ9XwV5ZqY0ETc9XUNdjfm3105Q=" + "io/zonky/test/postgres#embedded-postgres-binaries-bom/18.1.0": { + "pom": "sha256-rM8WPQuBWwALzewhj8l/OTN4RS+Xcyfwcr1BQ2CYmeE=" }, "io/zonky/test/postgres#embedded-postgres-binaries-darwin-amd64/14.19.0": { "pom": "sha256-FLhurgoE1tG4h5+5GjsmGGM7HiwfDBwapJq/RZijHX4=" }, - "io/zonky/test/postgres#embedded-postgres-binaries-darwin-amd64/17.6.0": { - "jar": "sha256-8dbTmJbKSOZdbby0ktgJ3w1JUsZSmd6K9uCNIgjq4+A=", - "pom": "sha256-7gS39XfUDVoOTtm3sANATtRSX3TKCszZT7gRS5O4i5U=" + "io/zonky/test/postgres#embedded-postgres-binaries-darwin-amd64/18.1.0": { + "jar": "sha256-O08W3PVyUNj5xeknCn38OSG2bWZTTQD482boJj6GLRE=", + "pom": "sha256-rBkS1B68++ESgiKFkkG7ELadGDhPfgBPaLTILr+mHxY=" }, - "io/zonky/test/postgres#embedded-postgres-binaries-darwin-arm64v8/17.6.0": { - "jar": "sha256-6H7jZ2fe5PAPgp16UuSiFuL96+WTTFaDcwlAqr5XByE=", - "pom": "sha256-ATLl5guk2rgiPRTwMx81pCjI/w+iJCGUBCqtE55zpQE=" + "io/zonky/test/postgres#embedded-postgres-binaries-darwin-arm64v8/18.1.0": { + "jar": "sha256-c5jGwZ0RWUqUTcDdx5/bthEWQxLh9QmoyGsJckAnQB4=", + "pom": "sha256-ser0IOUIpYaYvlHyg49iL9tTi/n8t1HAkFFbosX7K8s=" }, "io/zonky/test/postgres#embedded-postgres-binaries-linux-amd64-alpine/14.19.0": { "pom": "sha256-iljFNphFYXpVHn0f2erjjceSL6agTBunS7j7m2SafjM=" }, - "io/zonky/test/postgres#embedded-postgres-binaries-linux-amd64-alpine/17.6.0": { - "jar": "sha256-hYS8angY6WNE0pFzNGCh/suY8TPf1766lfxX5LAvBGI=", - "pom": "sha256-O2TRvK6S2WwNHULK+x+GtpLPaHx6GTRQKzT3PJQAmG0=" + "io/zonky/test/postgres#embedded-postgres-binaries-linux-amd64-alpine/18.1.0": { + "jar": "sha256-hF5IIlr+QE1RVhCCM/7qdGJTIy8cLiF/7RYoYmgCEgk=", + "pom": "sha256-ZQaVEGjghW12eNoDjSw3FTeUBSpqYH9mF9Yy6r3XINs=" }, "io/zonky/test/postgres#embedded-postgres-binaries-linux-amd64/14.19.0": { "pom": "sha256-JNywnlVuwoQ7x7bTR7U11r3Q80xqu8Rjq9fu9cIeJP0=" }, - "io/zonky/test/postgres#embedded-postgres-binaries-linux-amd64/17.6.0": { - "jar": "sha256-I9paBEtPt6WggaRQCMlXSchzMFMo1z+Grv1Wkizh0p0=", - "pom": "sha256-DLyVzA+fPMGdkjprqaHcN9RKcRl4nzaeBlYdyb3K2dU=" + "io/zonky/test/postgres#embedded-postgres-binaries-linux-amd64/18.1.0": { + "jar": "sha256-ZdByPgJ0rT7GIw3L3+A0r27glvzhWnew+bi+cdJwKTQ=", + "pom": "sha256-md4tr9pbBzQ5vbmv6tSUyGaFDBAsYNBxsmXsNJymCVk=" }, - "io/zonky/test/postgres#embedded-postgres-binaries-linux-arm64v8/17.6.0": { - "jar": "sha256-hEJ+pUpSOCR5JO87D5QOfQJ+WHYPGdcyUkLlDSL6AUo=", - "pom": "sha256-pI2qmGIcvwgtc+61g0GRW73K8g/m92m1qzGo6QCsecc=" + "io/zonky/test/postgres#embedded-postgres-binaries-linux-arm64v8/18.1.0": { + "jar": "sha256-6g8Wt1T8ChDZ2Jk7vUJsIPjHCbMYso5JtC2crByVi48=", + "pom": "sha256-5GI/jei/YOFy1FXK3cMcEeaCI/KAQWoctUCQoApBsJE=" }, "io/zonky/test/postgres#embedded-postgres-binaries-windows-amd64/14.19.0": { "pom": "sha256-MeCJzI5PDPreCd3t6paoqbUi1wuGudsEzs3iAy504To=" }, - "io/zonky/test/postgres#embedded-postgres-binaries-windows-amd64/17.6.0": { - "jar": "sha256-yR05ttuRz4gR47INlB50oDluJ3Nghzgh2qtHzbTBKCw=", - "pom": "sha256-rdf2XFadF1hvicGy2AbRpU0Ma0agSxWNEW+gvrpOirI=" + "io/zonky/test/postgres#embedded-postgres-binaries-windows-amd64/18.1.0": { + "jar": "sha256-Cn6VFmDLvuPzgvi0Syw64mxKF4F8Opct7jN4yA/Jsjs=", + "pom": "sha256-3N1luh4SY3a714teD9HrmjETd0M32Xcm1R+xUHnABiA=" + }, + "jakarta/activation#jakarta.activation-api/2.1.3": { + "jar": "sha256-AbF21xihaSY+eCkGkfxHmXcYa8xrMzSHMlCE1lhvRic=", + "pom": "sha256-slSZQMF7aGWjT2E1t3Iu2Mv+9tC2wNs3LDDwNGvIzVg=" }, "jakarta/activation#jakarta.activation-api/2.1.4": { "jar": "sha256-ydtSEAzmyKrJXMOQdflXINLlYbEfgFG4HBIa1O/9cAQ=", @@ -1951,8 +1821,9 @@ "jakarta/platform#jakartaee-api-parent/9.1.0": { "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA=" }, - "jakarta/servlet#jakarta.servlet-api/6.0.0": { - "pom": "sha256-PVolnfvSuUDklcMFy6K2BhWSPcgXjgMrfvYMuyQThDk=" + "jakarta/servlet#jakarta.servlet-api/6.1.0": { + "jar": "sha256-ijH0ZfNZO/I1FTGlyVIBTrg52pamBbWCW5PdVHFMSMQ=", + "pom": "sha256-G6+Lb6bQIYAwINCXDqQ/sH32beZskNKZohZ3Dwsz5K4=" }, "jakarta/validation#jakarta.validation-api/3.1.1": { "jar": "sha256-Y84AFWOIw2XzrBvnH8+vEUaC/AxFICC1325+wjbhQqs=", @@ -1972,6 +1843,7 @@ "pom": "sha256-T2Jvmnj4adPssUuUOjXlmas8psJZx1SxDwbfvKXWwGk=" }, "jakarta/xml/bind#jakarta.xml.bind-api/4.0.2": { + "jar": "sha256-DWvP5Hdj6FBHrPfDmDNtyE/4XrytCny287nT6YEkVAY=", "pom": "sha256-q3Jz4mpUgks7czPUlW5uzSbeE6XrPZDuYwIxk6ktcr4=" }, "jakarta/xml/bind#jakarta.xml.bind-api/4.0.4": { @@ -1997,22 +1869,19 @@ "jar": "sha256-qbqIfcolKtYbfVFTKU805vO99LJzawQ3PRNhWmlfwP8=", "pom": "sha256-gU7kLWsBF/S40etrHWLBbbTAtZfYOzrY2qV4HrFF19w=" }, - "net/bytebuddy#byte-buddy-parent/1.17.6": { - "pom": "sha256-3RX5X9VgUmPwZdncuOzuzEjr5NZmw3KY/0RgAUlCQL0=" - }, "net/bytebuddy#byte-buddy-parent/1.17.7": { "pom": "sha256-ilfiDczgDaccM+8+GdndhY/p0gQsouK8onhxcA1SaYw=" }, - "net/bytebuddy#byte-buddy/1.17.6": { - "pom": "sha256-UExH3b8VsOc8ymO52woBwSp83n+LM6DF2dW1BtGUaz4=" + "net/bytebuddy#byte-buddy-parent/1.18.2": { + "pom": "sha256-1Ar3bB/A//KEcLWpG9FXIq0zBre6H525Z6ZfkEgBmXM=" }, - "net/bytebuddy#byte-buddy/1.17.7": { - "jar": "sha256-NXXcuKmPr5Q9PBWVxHoWBHxPzoqD67smJi8aL2dUY1c=", - "pom": "sha256-7n+6hWnDu1wekeWBL9n0oPMb4n5WjVNU4a39GRGfl7M=" + "net/bytebuddy#byte-buddy/1.18.2": { + "jar": "sha256-9VsUX0yq2pspQ+SXYuoxcbAlmcTH4jD7qK/GakpRNd4=", + "pom": "sha256-jdLkoXMfilQMRQsvHpHMKJ3SDHL7BYvcI77Gk6i3Ao0=" }, - "net/harawata#appdirs/1.4.0": { - "jar": "sha256-5ImfxeiiZ9P4LUl+4BtIEKSxUCPnqBrwqlR5HFe8bBE=", - "pom": "sha256-CRqldjaf1HheU2S2BqFS3Mp4x/e3hMuMxwyWwzDk44s=" + "net/harawata#appdirs/1.5.0": { + "jar": "sha256-Zf7OLgUQObfTnWpQmq3LE2qahtmH3YRHN5Eog7NXeOs=", + "pom": "sha256-2Yn1w5+5rAGUFVYdGkIIfHpeL3dY7gHm4S0YJ6FaRWk=" }, "net/java#jvnet-parent/4": { "pom": "sha256-RxOVc1VJSVKXyP+Tm5oy4IuRMCAg/3c1htJ+SXq7j7s=" @@ -2035,12 +1904,6 @@ "jar": "sha256-JgxLHiKx254RDuRBxPE84RX4QfpIxB14dQmGIUs5VVc=", "pom": "sha256-mLYq5v8oDXR/s1n8QuSP7RE9Rbw3Kagj3DC4MIqAZkU=" }, - "net/javacrumbs/json-unit#json-unit-core/2.40.1": { - "pom": "sha256-fQRVja+97tYnCxaDBh2k+nj76qhlAgQ9IeRldagofhE=" - }, - "net/javacrumbs/json-unit#json-unit-parent/2.40.1": { - "pom": "sha256-GgCNCnykEDwm/lGk3ott86W5KGQZHNGLGfEBumF3yZQ=" - }, "net/jcip#jcip-annotations/1.0": { "jar": "sha256-vlgFOSBgxxR0v2yaZ6CZRxJ00wuD7vhL/E4IiaTx3MA=", "pom": "sha256-XBnmhIzFUKlWZPsIIwS8X5/Pe2cvrwOvFjXw6TwmgXc=" @@ -2049,12 +1912,6 @@ "jar": "sha256-7+iqots4OhUeMYgQQAgEw5kr3lQ+dKTXLeon7VR0yvo=", "pom": "sha256-HxvbdkwDDZ3Q3MGAxHfDKgtwRuK6GDmAsSJXVeLegZ8=" }, - "net/minidev#accessors-smart/2.5.0": { - "pom": "sha256-VJelxIYeWCxm5xyHzFppgtauiz4hSUersbl7l70+HAc=" - }, - "net/minidev#json-smart/2.5.0": { - "pom": "sha256-wyo2YQmypaNuoA4SGqolfa5W7jqbl9JEI+YzteIUVGY=" - }, "net/sf/jopt-simple#jopt-simple/5.0.4": { "pom": "sha256-amd2O3avzZyAuV5cXiR4LRjMGw49m0VK0/h1THa3aBU=" }, @@ -2106,9 +1963,6 @@ "org/apache#apache/27": { "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk=" }, - "org/apache#apache/29": { - "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c=" - }, "org/apache#apache/31": { "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" }, @@ -2157,9 +2011,6 @@ "org/apache/commons#commons-parent/47": { "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc=" }, - "org/apache/commons#commons-parent/56": { - "pom": "sha256-VgxwUd3HaOE3LkCHlwdk5MATkDxdxutSwph3Nw2uJpQ=" - }, "org/apache/commons#commons-parent/65": { "pom": "sha256-bPNJX8LmrJE6K38uA/tZCPs/Ip+wbTNY3EVnjVrz424=" }, @@ -2184,6 +2035,9 @@ "org/apache/commons#commons-parent/88": { "pom": "sha256-i/cmFQ0dakO6CqkgYOVSkzyvKHOqGTlS2dSWRw+p+9g=" }, + "org/apache/commons#commons-parent/91": { + "pom": "sha256-0vi2/UgAtqrxIPWjgibV+dX8bbg3r5ni+bMwZ4aLmHI=" + }, "org/apache/commons#commons-text/1.14.0": { "jar": "sha256-Eh/OIoKRDI8MO6eTpUNrMb63EEI8vi1XSj+3pzxQjpI=", "pom": "sha256-XIDoFE8iu0fay2QvZEYEGOslPwsboD6xQTwvNvChiAU=" @@ -2232,37 +2086,37 @@ "org/apache/logging/log4j#log4j/2.25.2": { "pom": "sha256-HYBXBY0LBcj3clyhrbpoc5y+rHWJjsoGpIymEVRsA+w=" }, - "org/apache/lucene#lucene-analysis-common/10.3.1": { - "jar": "sha256-NrXrYms/FsUG407H0UNjuEF9Jjm+XArrtZD7F1guihw=", - "pom": "sha256-hQC5/Dm/I3gfomccaDWh63wbz+cn4KsE68wVnExYDYY=" + "org/apache/lucene#lucene-analysis-common/10.3.2": { + "jar": "sha256-FAPg3yA6kDdigBW82cpGz6iZQwvfuTk3TM7MNM3N9Gs=", + "pom": "sha256-RFxi6t+4yBF2WvOJW10AjOHEGV8A0k14fb5rBAmUXQI=" }, - "org/apache/lucene#lucene-core/10.3.1": { - "jar": "sha256-z2tig+D5vZL55NSapzr7cNvQd0L0U6lalk10XGtbJF8=", - "pom": "sha256-VTfn4AA0Bv+5TeeDrlPsm3tuMDrPL0uTrsR99zewnYE=" + "org/apache/lucene#lucene-core/10.3.2": { + "jar": "sha256-yDWjzCfNVywsjZN3HFOt/pe8EeGrzDU7h6XSkPigGgg=", + "pom": "sha256-td+QeIHDN+zTDEne3DXsQKbhFB9vxXZj40xTZltRHC0=" }, - "org/apache/lucene#lucene-facet/10.3.1": { - "jar": "sha256-zzcjGJ04LUUVwh9XZAmLq9lz1gsOj1LTfUq7cUc+hlU=", - "pom": "sha256-n+hhDvAqWMllXfF2Ggpu2R5Ir2qr5aBr+WXEY3QGOsQ=" + "org/apache/lucene#lucene-facet/10.3.2": { + "jar": "sha256-nOtAGQ517KUKJ9+AxdEG1/J/EfyfljMbGJO+AX0SPSA=", + "pom": "sha256-3cTnSs8dvN6VjuE2JpYmlPz5mp3sroB0hn+wDxgCQnc=" }, - "org/apache/lucene#lucene-highlighter/10.3.1": { - "jar": "sha256-vfimmf9u/v+uQ5OpmKw4swRCXQ2ADTCyUUXaeG7IyUs=", - "pom": "sha256-6SadgF00HhRa3ct7vehKeZanjdRAcsv/lQGhNpdCch0=" + "org/apache/lucene#lucene-highlighter/10.3.2": { + "jar": "sha256-2cQ1TowJtGXl+eEbEF+ZvSdIHw2G7F4j4dMhS7KkPAk=", + "pom": "sha256-6ldRQrgiuKeH86mdBUt/LuGB1W/SnbkEU7xsfP95ee0=" }, - "org/apache/lucene#lucene-memory/10.3.1": { - "jar": "sha256-5D3dFNUJrAZGrRAzPoyKHz8FiBA+U02lL+B7tVS+1BQ=", - "pom": "sha256-b3eFyDk4wNjZZcr74rD2a7bzUDGNhFh2Bflk79JcLYQ=" + "org/apache/lucene#lucene-memory/10.3.2": { + "jar": "sha256-Z9BTRXkdAS4dchiXM6dsl4hwKzVRBk4eqs5nU6olW6g=", + "pom": "sha256-9LnJkx+9O668bBANGZHnr4RG+CN5uxxpxYvZGZ9VW+M=" }, - "org/apache/lucene#lucene-queries/10.3.1": { - "jar": "sha256-K+r6yPjuQ7V2bc+tussZrS8UyKoqLgcq7RuaGCGcigc=", - "pom": "sha256-OYgGHbKmpAnKDF5tdOI20g4f0753G6nULyiym6K5ylg=" + "org/apache/lucene#lucene-queries/10.3.2": { + "jar": "sha256-RfmJTSqj0UOnmpgPqUHXL3M7Tr1L5mwLGnnUKOag21c=", + "pom": "sha256-qzsGG2eHRGEvrp+NBv4Nkv8a82eQsxa6vnoZUkcwa8Y=" }, - "org/apache/lucene#lucene-queryparser/10.3.1": { - "jar": "sha256-YbJ79QsAqz8WvlKdEUIbgc/XxY1HVrHhMIxhpE0TynQ=", - "pom": "sha256-sNvV4DfnjLElQMV/LxlMZODm5yDb1bPRiVnHktCNVAc=" + "org/apache/lucene#lucene-queryparser/10.3.2": { + "jar": "sha256-drlQ7T09TTlFYYoL5238XZ7pDiT483SK4Hdcjb3z1rg=", + "pom": "sha256-7ccAzTciiDsJdedvqmXEv15FmPG5xDUKbK7YEZrMKFA=" }, - "org/apache/lucene#lucene-sandbox/10.3.1": { - "jar": "sha256-CNvR32RMJaGoZ94GMQEKDV260bRyzTiRhNQ6diWF02E=", - "pom": "sha256-irB7zsHTwL9NfQU7yIS3+gupQPwqe8p+TqPuNNCMQ20=" + "org/apache/lucene#lucene-sandbox/10.3.2": { + "jar": "sha256-ZwtxPSCWFemSBsQZ0Zu1pTMCXWf8tuQOJgBrKgnmIFE=", + "pom": "sha256-LCHL5A4z1/md9scSZepoqd+rO61+kjcxynggTmB+2xk=" }, "org/apache/opennlp#opennlp-tools/2.5.4": { "jar": "sha256-Xv7bJtDpflNweo0vDi4o8F/PZU/OKjP4v+EcLUwqT+k=", @@ -2271,24 +2125,24 @@ "org/apache/opennlp#opennlp/2.5.4": { "pom": "sha256-Qz0Ic+wnz+Gxog6mQ3c6LymkCh/eobtdGCiy81NQwps=" }, - "org/apache/pdfbox#fontbox/3.0.5": { - "jar": "sha256-6KYr4t8noNRBkbZmnAsY327+UnEjLbjcuHRdXZd0dVs=", - "pom": "sha256-I/bas9ldDvUDM8n3ZZp0ChCwYZ3eEXbqYtyLSTU4jr4=" + "org/apache/pdfbox#fontbox/3.0.6": { + "jar": "sha256-egn8sMYw5HGsJrNHykWg2K71qWnMWa6/8cV/6SKT4rE=", + "pom": "sha256-RP18HBKL1r/1Kj9kvHiIcQD6zS5J8rJoGGMHfGdoFa4=" }, - "org/apache/pdfbox#pdfbox-io/3.0.5": { - "jar": "sha256-bfPztNtP1V71AoR+pOTrxY4okIgA6G6rAxNF7+IZtwU=", - "pom": "sha256-NVvL5DdA/CEouNwRUQsTutOrPcet1Cnjt0q72WA3iVc=" + "org/apache/pdfbox#pdfbox-io/3.0.6": { + "jar": "sha256-GR6sY3Vv8NvIQeOX6Xz6DL39JRWXLWDvVjmgqohKfkc=", + "pom": "sha256-EClai3kj970whlODleHVo/XLQ/503tNMsHwy97P0X4U=" }, - "org/apache/pdfbox#pdfbox-parent/3.0.5": { - "pom": "sha256-HKnfIMk56uhgJQonn+oCoRzdK0DkJa2Q0M5Ma3d8gpY=" + "org/apache/pdfbox#pdfbox-parent/3.0.6": { + "pom": "sha256-EdzNtSovFEpIui+89npGrcTaN5JZQ/xNkhLfiSMxqN4=" }, - "org/apache/pdfbox#pdfbox/3.0.5": { - "jar": "sha256-8OXToeVzxwfk+8wu6OQuqModUmG9yzoFoI0hGFU8Hlo=", - "pom": "sha256-oFmNxJdGm9W/HEjFubAmcqJlaQG435sfG6pJy3huZYM=" + "org/apache/pdfbox#pdfbox/3.0.6": { + "jar": "sha256-h7kSK3j1If74PigG2Y5+SD4Enwh+piZ7ctMZ9nIBkQE=", + "pom": "sha256-PkOO4NLXVJ0IVPDy5LJnWK699Ocv1JMTSafHLzPI1S8=" }, - "org/apache/pdfbox#xmpbox/3.0.5": { - "jar": "sha256-AXiZsvtcKvcU0wxSzKks3o8SmZq/MUDU8NXxEzT2L90=", - "pom": "sha256-E6MTEo+lkzyjcj8gwYKO5oJUHRRqX7BK5JtXoqYFC4s=" + "org/apache/pdfbox#xmpbox/3.0.6": { + "jar": "sha256-ATRBZTxgKBTu5Bo82DBeBlCHQN5/u/dRxTR/o8TSJ/g=", + "pom": "sha256-LwFS3KrhAotX9y88wYUreM/4KNMNEtwefwuh4cGi9XY=" }, "org/apache/velocity#velocity-engine-core/2.4.1": { "jar": "sha256-HBkVfRFx1WAIjkhb6XyTp6L36fVuUX8KMCc8XDnfYjE=", @@ -2348,9 +2202,6 @@ "jar": "sha256-pr01xTjPkP/5Qa1iWMQMCPygtcnD9TbGVxFPJ84FJ6c=", "pom": "sha256-NcnhYgmychJhNU6K6pcWJmSK2dQgHSIb2WkB2QA3LaA=" }, - "org/eclipse/ee4j#project/1.0.5": { - "pom": "sha256-kWtHlNjYIgpZo/32pk2+eUrrIzleiIuBrjaptaLFkaY=" - }, "org/eclipse/ee4j#project/1.0.6": { "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0=" }, @@ -2363,84 +2214,12 @@ "org/eclipse/ee4j#project/1.0.9": { "pom": "sha256-glN5k0oc8pJJ80ny0Yra95p7LLLb4jFRiXTh7nCUHBc=" }, - "org/eclipse/jetty#jetty-alpn-client/11.0.24": { - "pom": "sha256-4ChUPNXWBpMyzMepXiaeCUfgUWY62QK8CRmkbgxrfSk=" - }, - "org/eclipse/jetty#jetty-alpn-java-client/11.0.24": { - "pom": "sha256-EXzXCLo3u6kMVwaD9v3LsY9IPiDkpOj0QhRT/JP47a0=" - }, - "org/eclipse/jetty#jetty-alpn-java-server/11.0.24": { - "pom": "sha256-jq2POCgEbXoevHVoT2OTaLdhQ51Ru19sgiCscdMJ33o=" - }, - "org/eclipse/jetty#jetty-alpn-parent/11.0.24": { - "pom": "sha256-OEfidTdZ+GkaIo2c8dddJPcwJG4J3FL/8b0r0PTbnVc=" - }, - "org/eclipse/jetty#jetty-alpn-server/11.0.24": { - "pom": "sha256-Kl+OKVd+qPdvkUmX9VOPjofcGYeJef4SC+UFRtsUoUg=" - }, - "org/eclipse/jetty#jetty-bom/11.0.24": { - "pom": "sha256-OzjVNA/7MaYiymePR8K2Bawg6lhVJZ84Xm0ujyfs1dk=" - }, - "org/eclipse/jetty#jetty-client/11.0.24": { - "pom": "sha256-u68OEXqGWPInb/qKEbdVywctM1NQWvsKPk7BpkzkbP4=" - }, - "org/eclipse/jetty#jetty-http/11.0.24": { - "pom": "sha256-/lve2cVDbsrkT438v4Rw0O96qj/U1nAe+oEuV4EOeP8=" - }, - "org/eclipse/jetty#jetty-io/11.0.24": { - "pom": "sha256-vTPGW6IaAznasQRHEZ9yPb23L7mSM0AHjtTT1ZVTkwc=" - }, - "org/eclipse/jetty#jetty-project/11.0.24": { - "pom": "sha256-9miJ0dIX26PbBfSwXOwksKIg1PHRbFLSA9m2+3HaYIY=" - }, - "org/eclipse/jetty#jetty-proxy/11.0.24": { - "pom": "sha256-NaAFoAOnCQTDSyp+GfgdI71U25KBjCEfYsTiInDyGys=" - }, - "org/eclipse/jetty#jetty-security/11.0.24": { - "pom": "sha256-NeCJ1jkTMrp34adpkgnU7j7zlq0pkmWDWt4tm/0Esp0=" - }, - "org/eclipse/jetty#jetty-server/11.0.24": { - "pom": "sha256-5yEko9Ho+3DaG1JY4VQrgB/+sDOqExYB2hH3lLQpj1Q=" - }, - "org/eclipse/jetty#jetty-servlet/11.0.24": { - "pom": "sha256-3uiUnisDmOn03P7p/2yS86l4qZd3aF1i6MheSx+7itg=" - }, - "org/eclipse/jetty#jetty-servlets/11.0.24": { - "pom": "sha256-gbRgsSDWSrntgs0oDfrdtb4om9P6V2M6D4/1e6R1HoQ=" - }, - "org/eclipse/jetty#jetty-util/11.0.24": { - "pom": "sha256-7ro8qZy7kyAEbuNm6V3wzr8vEQciaPRcouvj4iO2m8o=" - }, - "org/eclipse/jetty#jetty-webapp/11.0.24": { - "pom": "sha256-Y9pNCE6Eb9AtbJpCi8zGYK+hxb17wkfsIfFsN6cWaBs=" - }, - "org/eclipse/jetty#jetty-xml/11.0.24": { - "pom": "sha256-JXNlZfHw0Et42x+ZH449AZRmgAWbwqhXauRd7pJu8h8=" + "org/eclipse/jgit#org.eclipse.jgit-parent/7.5.0.202512021534-r": { + "pom": "sha256-fjiAaoU2kaSdsW6sg2/mtiYnaUOxCLZ3VKPVx0D7vA4=" }, - "org/eclipse/jetty/http2#http2-common/11.0.24": { - "pom": "sha256-aEwrliRzkYCfzaIEvCz/NqLyc7LgCLlDxs6QTrmkCsE=" - }, - "org/eclipse/jetty/http2#http2-hpack/11.0.24": { - "pom": "sha256-4N056ZrPI6FKjnFfmLf5Lxe6AgVMJuI4XOXEm85i4jU=" - }, - "org/eclipse/jetty/http2#http2-parent/11.0.24": { - "pom": "sha256-H/63MlEaizavZ8nPMV5XckiQjy/U8WLyxVezUjFsBis=" - }, - "org/eclipse/jetty/http2#http2-server/11.0.24": { - "pom": "sha256-e4PC3DueupOTnXmCIU9A++tU/iean6/NAb9Me0dVdE0=" - }, - "org/eclipse/jetty/toolchain#jetty-jakarta-servlet-api/5.0.2": { - "pom": "sha256-g+y5PmHWvZyMgfwlzcrUp3ONx7LAiCnRcihj7kaaSIo=" - }, - "org/eclipse/jetty/toolchain#jetty-toolchain/1.6": { - "pom": "sha256-RVY/EXXZhZwcBmoJgPvbn2u0xtPBLgXYlXm7F4P0e2w=" - }, - "org/eclipse/jgit#org.eclipse.jgit-parent/7.3.0.202506031305-r": { - "pom": "sha256-EuCm1BYOBfIGFJVPhMPmemiCdBhQJTysHHTj+5nXmjQ=" - }, - "org/eclipse/jgit#org.eclipse.jgit/7.3.0.202506031305-r": { - "jar": "sha256-xMTho+sa/p3Gqck7HIkG6qq5panNtcld5MyA7/TKDcE=", - "pom": "sha256-vWj77cwn8P6jA6dOS4JFmyRaL8IR0DZDrda/XpxYVyg=" + "org/eclipse/jgit#org.eclipse.jgit/7.5.0.202512021534-r": { + "jar": "sha256-FZe8eKjYwBFpdtRqlIcqLMKGVnDrpNsLn1GBGzSTbXI=", + "pom": "sha256-bJVN/BDxwwG9uiXT1jCfd0eYBDY891VuUei7NxRVXGQ=" }, "org/eclipse/lsp4j#org.eclipse.lsp4j.jsonrpc/0.24.0": { "jar": "sha256-dyFXLoSdTzWbRu3lXVYEuYL/SY0NkuvHDhgCn1mCPAg=", @@ -2459,10 +2238,10 @@ "module": "sha256-R0PuegFqASpt8zzShzaiKv7nhN6qOoO5X8YWqNg+VBw=", "pom": "sha256-b3He3vgo4AGrCr+l2+15Adgd9Uzo58ea0kQ8fqkZR0E=" }, - "org/fxmisc/richtext#richtextfx/0.11.6": { - "jar": "sha256-LRL3kNssLeNdILgJDljhhPjTD9R2GwCO7l7yWODuD78=", - "module": "sha256-+KGPzb69jD/3+NUqg7/TE/H0LZRl33kDUKQgfIx7tWc=", - "pom": "sha256-jVYX1QxejiqosXXT8HDenZxOWn7jgJkSI9dJVyE5p60=" + "org/fxmisc/richtext#richtextfx/0.11.7": { + "jar": "sha256-wmNVhtS6mjWou/X6N79afaNfsQ3Ylq78Z+u/hGCLmMw=", + "module": "sha256-hAX8CTISsp0PWhnk5JnRdca9bGoaW2lQH5xWRiCPRxo=", + "pom": "sha256-1mQ2pXSpvod9H3jLPWa5TLKXLGBynj4tSONRk4LT4Og=" }, "org/fxmisc/undo#undofx/2.1.1": { "jar": "sha256-25cIxYqOLbRX+9Z/BRXkqVlVygsLj06no9y7/L0Z0tc=", @@ -2484,6 +2263,7 @@ "pom": "sha256-5o1kXUXO91e5efhO+z/BMupcwMrGjITyoLu7E2SDfQk=" }, "org/glassfish/grizzly#grizzly-http-servlet/4.0.2": { + "jar": "sha256-OCI5UYe3scXFk6WM7MrI6DG//zEnqefH13GY+DZ5NrE=", "pom": "sha256-uRIINv8LSwQN83kziX5780xw4vcBqdVGYvos4izeo2w=" }, "org/glassfish/grizzly#grizzly-http/4.0.2": { @@ -2496,29 +2276,50 @@ "org/glassfish/hk2#external/3.1.1": { "pom": "sha256-Q1ET1J40IK3AYKMJqt75EHphOYgdgpRHhj7WWYygF48=" }, + "org/glassfish/hk2#external/4.0.0-M3": { + "pom": "sha256-h4t5Hl6qPIcE76MFUNGl5XF9yA0xS+a8szPMBWgC3WM=" + }, "org/glassfish/hk2#hk2-api/3.1.1": { - "jar": "sha256-rBTZKRCsU5UFtMDHKrbF91eqEqQ7yI0TpbyfI7GHBis=", "pom": "sha256-cZcycKIuCVh3fXK8+0SqW7wcpsoiIHm9XxfLlyEfbpg=" }, + "org/glassfish/hk2#hk2-api/4.0.0-M3": { + "jar": "sha256-ZvhZkW5qfeNiKXOs9/ZyqJXJusgWIggN+7laybAhsfg=", + "pom": "sha256-2ldYwcrGDJCVjWfLuaP++EZVE7gyTvQ/9si2VeHjJtc=" + }, + "org/glassfish/hk2#hk2-extra-parent/3.0.0": { + "pom": "sha256-7QQT8DTUZlo32xhiyiquiq9NjKuJTSrKTna7zN+qgFk=" + }, "org/glassfish/hk2#hk2-locator/3.1.1": { - "jar": "sha256-qx6GX1mGgJI1tlA0tc0i4AeqgdT35dFLb7TiKDOQt4g=", "pom": "sha256-Jx4a0fedi3l+kDJ1/BdNXui8Lod0MjC283fHLwxNBsY=" }, + "org/glassfish/hk2#hk2-locator/4.0.0-M3": { + "jar": "sha256-KQAnOV2Vv8u19AyZI3am8hx1v2PJyNTfPPwDS6GoXe0=", + "pom": "sha256-UPXyftFr6i4tPdqL7CtLQIr6plzyi3ySP/KwK9cQkSY=" + }, "org/glassfish/hk2#hk2-parent/3.1.1": { "pom": "sha256-u/kqbG0phpvXT9TOo8g0bgvQORe6kf8Rc6M4E9tdSRQ=" }, + "org/glassfish/hk2#hk2-parent/4.0.0-M3": { + "pom": "sha256-r2nz6US27idzz1BnoGR+pbNkKj60iZUTT2lPQFaO4jo=" + }, "org/glassfish/hk2#hk2-utils/3.1.1": { - "jar": "sha256-b16l/vUHVbog+7iTeCssY/mupGPBg9Y6V9zJ+msRcTk=", "pom": "sha256-9jp0ovDWaukmsU7dbk9W28NvctqQxZo/D/YCvNP3neU=" }, - "org/glassfish/hk2#osgi-resource-locator/1.0.3": { - "jar": "sha256-qrXXhJ98/Nosx8VBuhvTZRUdQidvFRyCU4ckXf3j3XQ=", - "pom": "sha256-i2Yi64HlVymfvZqoVLxax20wf3rl53BYZImli7Uziyo=" + "org/glassfish/hk2#hk2-utils/4.0.0-M3": { + "jar": "sha256-unCHgn/omvPYJPwmVWyYXOmvoMww+qJOi2UUXKD+/PE=", + "pom": "sha256-YJoXFaqpUEu2K0tT6Ndf61iAfGtYdDrV88HYw9S4RIY=" + }, + "org/glassfish/hk2#osgi-resource-locator/3.0.0": { + "jar": "sha256-oYZsz92qKfGNpdOd9mKJSrLdmQKZSlAA52RPbMHjflU=", + "pom": "sha256-nxPzihfjMzJMF7uo68PDkvZq3rkVZAN3XN5V7HMe7Pw=" }, "org/glassfish/hk2/external#aopalliance-repackaged/3.1.1": { - "jar": "sha256-5AxkMBbUDdmsqjhCqYC5O3ltlFYh+CD8vYKyXJaWj6s=", "pom": "sha256-WEztva7OI/utMabFsHInu1xPx+NU0/fbGmBxJdZxcZo=" }, + "org/glassfish/hk2/external#aopalliance-repackaged/4.0.0-M3": { + "jar": "sha256-ZcCruUbSqzoSN8YQ8kvxXwRpYVHpyvvhr6bO5S++1e0=", + "pom": "sha256-V9aw+yZOT3V7k1nvKC2cmXhG74JSSlA3Kj6GN8WKYe0=" + }, "org/glassfish/jaxb#jaxb-bom/4.0.6": { "pom": "sha256-frfNg7krfC/QqK5mvLNQY1TxZqE/gtKmbB2WJZcy0qU=" }, @@ -2534,102 +2335,81 @@ "jar": "sha256-/MdJeFQS7zgG/eHOcPk+9aAGXcxH/kSbyHHbB5XLEa8=", "pom": "sha256-avFKkbP56eMX96WOgNy+/T308vIFRINZ/zocWQFic3Q=" }, - "org/glassfish/jersey#jersey-bom/3.1.10": { - "pom": "sha256-KYl09Itfm23mIvJFApLexNuZs5vjJF9WVqbJpEtd67Q=" - }, - "org/glassfish/jersey#jersey-bom/3.1.11": { - "pom": "sha256-3DdcE5WY+5VgZlWat70vwxGHlvVcMMT19LW8O0dEIrQ=" - }, - "org/glassfish/jersey#project/3.1.10": { - "pom": "sha256-HwCrKqQxlS9Eb7DXajOYoWstCgzmAP/L/g8iKp9aRSU=" - }, - "org/glassfish/jersey#project/3.1.11": { - "pom": "sha256-0sAaDDv9lcCHl+FhePUlAWzPEudYUo6uG901UXrVDfs=" - }, - "org/glassfish/jersey/containers#jersey-container-grizzly2-http/3.1.10": { - "pom": "sha256-hLP/zKuuOE8Vx/0IucMSoW/AhcKOcxG+PM1ZuyTkC+s=" - }, - "org/glassfish/jersey/containers#jersey-container-grizzly2-http/3.1.11": { - "jar": "sha256-/zn2epqi6OHHtZUkxt2Xc/YHocMHVpwmh8Hkg4WhUY4=", - "pom": "sha256-GzqUkEc3Xl7M4fmTVVjrj86h6d12TrsrJpA3myk0pfk=" + "org/glassfish/jersey#jersey-bom/4.0.0": { + "pom": "sha256-xUcMOr8/QtNyHQo137qtS6NkMJy36M8vyBBX+R1LFhs=" }, - "org/glassfish/jersey/containers#jersey-container-grizzly2-servlet/3.1.11": { - "pom": "sha256-1LiQFi+vCLjfBGPSohCa+8Tu+vwCyE6egndv2kWZVSA=" + "org/glassfish/jersey#project/4.0.0": { + "pom": "sha256-AxgU8a/mE6OUS5+K/ekHabew9cTHZ665fFopnV+mvxU=" }, - "org/glassfish/jersey/containers#jersey-container-servlet-core/3.1.11": { - "pom": "sha256-X55C8+DtJ16eEiSqgrpdrn08IJCCb5G818lt3LJtbNE=" + "org/glassfish/jersey/containers#jersey-container-grizzly2-http/4.0.0": { + "jar": "sha256-hwJuwE1+udvbAAIg1Uypkw9MTQSB/RhkTroHovBAyVU=", + "pom": "sha256-uvsXcNbWMs3d7c/97C4Sqmb7x9YkoAGSsUpu8QIwIPU=" }, - "org/glassfish/jersey/containers#jersey-container-servlet/3.1.11": { - "pom": "sha256-A7QnrQbxZbhH+95azcqHtVuOPptUxE0n0wiqj3Lfj5o=" + "org/glassfish/jersey/containers#jersey-container-grizzly2-servlet/4.0.0": { + "jar": "sha256-8vgixexSs7jnKuwQVIxDJMOJWJ0sYtdLJA81DCAnEP8=", + "pom": "sha256-l050jqVCcVWuC30u8CUdDviskTblit47C+afCmBLeAE=" }, - "org/glassfish/jersey/containers#project/3.1.10": { - "pom": "sha256-srKeL9s0eph5sEbHW+rV6E9O/C0gQp9KVCoMsxkYRSM=" + "org/glassfish/jersey/containers#jersey-container-servlet/4.0.0": { + "jar": "sha256-ckfY37DUlQmRaQWAYGxa2TO5F8an/oW1JW8j8oeCTA8=", + "pom": "sha256-V1zTMUcq1HkWWuVDODpFUoCJ8RVba/yI/WsgDkAq6T8=" }, - "org/glassfish/jersey/containers#project/3.1.11": { - "pom": "sha256-ZJwIEcmQf12y85FoimBT7AGS8F5oMiD8mII2CYgz5BQ=" + "org/glassfish/jersey/containers#project/4.0.0": { + "pom": "sha256-P0Q/lOWOho6LjY/aaLcLiSTgSXEao9PMM12z2Q4MwsE=" }, - "org/glassfish/jersey/core#jersey-client/3.1.11": { - "jar": "sha256-nw9TKmurtTD0x9b8T0UrmWqXqnw0JIvySe6oos5jl1g=", - "pom": "sha256-l065XrwW5iL+YL9j3SIbCWaaO9NqAEXTdtLDIv3i4XM=" + "org/glassfish/jersey/core#jersey-client/4.0.0": { + "jar": "sha256-ng3FA4bcY/jqaNkW3OVeogSmSAl4W/k1dp38Ew9maaM=", + "pom": "sha256-Em+B58WqDE5cQyjIBW2aTIiYzaLG1c/7yYDj6B3OUPE=" }, - "org/glassfish/jersey/core#jersey-common/3.1.10": { - "pom": "sha256-37Tr4q/ZEifpSSJXnGk6Wx6+UOupnI9HDFwZZjgipBY=" + "org/glassfish/jersey/core#jersey-common/4.0.0": { + "jar": "sha256-H5/ES2basv+CkfTHCSqn4LObs+/hu/UM5poy+gl5ZhY=", + "pom": "sha256-LmkrASQngfxhm6CxdtWE2VAw267AfEDG1//FVb6xr5U=" }, - "org/glassfish/jersey/core#jersey-common/3.1.11": { - "jar": "sha256-7FFtfC/c/NfrdznqzzzWkU4XoVlf1FgmszyHZZZZgbI=", - "pom": "sha256-/shJQsC+skBPjbOWRrqMMPqM/elJPYO7FGUKl/kbDYk=" + "org/glassfish/jersey/core#jersey-server/4.0.0": { + "jar": "sha256-ZPQgKGYxe+xYDCtl5C5/I3HBC/cIWvYTwwyLQQI0Abg=", + "pom": "sha256-HwcEUUOi9xKWboWKwuU6T7lTeqWOZAy7a+A3ONP228M=" }, - "org/glassfish/jersey/core#jersey-server/3.1.11": { - "jar": "sha256-fd4q32YA8+j3I+N6jJbDGDimgvjbhU/c/PTwBpXW+QM=", - "pom": "sha256-y+VJe4ExCM0BGlMEa0T5akNQ5ozlz0T+eiG32RxOzu4=" + "org/glassfish/jersey/inject#jersey-hk2/4.0.0": { + "jar": "sha256-cZdRkWdrvjicm6EUrhlGyXFBmMrJnL3vVq2+s9Yip0E=", + "pom": "sha256-4DauIN1e9qyVr3h1K9jXVNqIwcKlbQwHrC7k+bha3nc=" }, - "org/glassfish/jersey/inject#jersey-hk2/3.1.11": { - "jar": "sha256-+u7phdcLgiOp6yK6q/V52fhgFBcW78r3SwolKmOVn8M=", - "pom": "sha256-667WoeVDo3q08uqt1wqEz3P24YffKd2nZaQS5vMEY2M=" + "org/glassfish/jersey/inject#project/4.0.0": { + "pom": "sha256-KxCS7+A0OpDAuAeAUVD8HabmyIfNmw0gUqs+vZhJYeE=" }, - "org/glassfish/jersey/inject#project/3.1.11": { - "pom": "sha256-2HawxNlN/CHWyem7mcxXmNmwT7MF/KPKIVXfn8A4Obg=" + "org/glassfish/jersey/media#jersey-media-jaxb/4.0.0": { + "jar": "sha256-tM615k4UTN85DX6GxzmtHtwKoy8fSLDIXvgw/Kz7SwY=", + "pom": "sha256-R5qbwqpPN0qjDDZaQSAwli7cQQYq+1WqaHu+TwtR0Vk=" }, - "org/glassfish/jersey/media#jersey-media-jaxb/3.1.11": { - "pom": "sha256-OJl3I+KYlhzoC1ThHpSKYGdDeV5BXJlbGpknliUiWTA=" + "org/glassfish/jersey/media#project/4.0.0": { + "pom": "sha256-e4ZcegGG5BiqMEipkySzRMxhM+WptxAnGOLvSFIHrX4=" }, - "org/glassfish/jersey/media#project/3.1.11": { - "pom": "sha256-tQmzXrfR7wVA43bK+DvPUC949pI6yrNn7oXX0S6OM3w=" + "org/glassfish/jersey/test-framework#jersey-test-framework-core/4.0.0": { + "jar": "sha256-nAniDTwafpg/QeHneWfVVrmtDzwE5NYiHcqTIhflK2M=", + "pom": "sha256-HOYqBvbWnmF1v0EFGTdiZBO2knwmrCryp6qD52NZQfo=" }, - "org/glassfish/jersey/test-framework#jersey-test-framework-core/3.1.11": { - "pom": "sha256-KGnwIIig8xxsFCqbkudX/vCfxfrMADIHZP3p+4P0myE=" + "org/glassfish/jersey/test-framework#project/4.0.0": { + "pom": "sha256-qljN8WaFhfXzlBBNCRdBvOODFsS3Smt5IZZ9o8bMP2U=" }, - "org/glassfish/jersey/test-framework#project/3.1.11": { - "pom": "sha256-3OqcXyh28KciQ9MSMgrCfxLGwXElVMEkb7+h0aDs4Ag=" + "org/glassfish/jersey/test-framework/providers#jersey-test-framework-provider-grizzly2/4.0.0": { + "jar": "sha256-Zlu20Jxi44hLwWmVqkfVVqXPt/4pKzXip/nFqp8VTdU=", + "pom": "sha256-nqTMjn8SCGQ/qHPYpBk/tB6I7qlpVZSpHw0fkSE/iLY=" }, - "org/glassfish/jersey/test-framework/providers#jersey-test-framework-provider-grizzly2/3.1.11": { - "pom": "sha256-IQazyx8NVZXetuIfp0A8MdW4tO+WhflFzC9IF262FzM=" - }, - "org/glassfish/jersey/test-framework/providers#project/3.1.11": { - "pom": "sha256-+Gd6F5VqTZ8wjT1QTcn7JdS2if9ERQ+HUn26AcO/7gk=" + "org/glassfish/jersey/test-framework/providers#project/4.0.0": { + "pom": "sha256-BPXWhR3CI7huGPYMpHp/Kd++wr2UJqsDMdqSmLBxsxw=" }, "org/hamcrest#hamcrest-core/1.3": { "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" }, - "org/hamcrest#hamcrest-core/2.2": { - "pom": "sha256-9/3i//UQGl/Do54ogQuRHC2iAt3CvVB2X4nnxv+M590=" - }, "org/hamcrest#hamcrest-parent/1.3": { "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" }, "org/hamcrest#hamcrest/3.0": { + "jar": "sha256-XWa2pKaAdVy27XyxBPp4Ne9kRmdYb/Bzet65d8Oezbw=", "module": "sha256-mhBVNzjTWME+a69Zeb8sGlSQ7uScLcas8xcPzKCSDd4=", "pom": "sha256-SgSmgTO/MkYfR7ilPI7p30zi9JoNrZeUvOhxe+5brDE=" }, - "org/hibernate/validator#hibernate-validator/9.0.1.Final": { - "jar": "sha256-JfQBGPpMUPhSLQkNJdUtWjiVOwzNElCDXwUue9MWTOA=", - "pom": "sha256-5w3BopQp/dTgh1E+tk70V1IMrwpRqxFFw7ilN8hC6gw=" - }, - "org/infinispan#infinispan-bom/11.0.19.Final": { - "pom": "sha256-OmBv0rX3f991rPM15brdRnxCQFsR8mjnPBfrkkM+WhE=" - }, - "org/infinispan#infinispan-build-configuration-parent/11.0.19.Final": { - "pom": "sha256-EghgxWpNd7zBIjy650Dusm8vk1XUmhfV8WWADuCvqno=" + "org/hibernate/validator#hibernate-validator/9.1.0.Final": { + "jar": "sha256-Teogx4DRLorW4f59aVRgr3T4Zo3561iRCZGRkZRBIYg=", + "pom": "sha256-1XS291wE5USxv3YAcMLvuDnfufY0SNN19Z/dB+QM4JQ=" }, "org/jabref#afterburner.fx/2.0.0": { "jar": "sha256-PhxWSKv8xpaYIdi3BnPwxMV5qp8IBP/9/gwn1UTZDIM=", @@ -2649,9 +2429,6 @@ "jar": "sha256-sOqDZn2darH89q2EieF6pRsA18CGRUrsNQFuL7Ucm7U=", "pom": "sha256-ZMsdu8KSZgmcYTnVsq8NXKfUxgVV/gABoBePhGjfnCo=" }, - "org/jboss#jboss-parent/36": { - "pom": "sha256-AA3WFimK69IanVcxh03wg9cphCS5HgN7c8vdB+vIPg4=" - }, "org/jboss#jboss-parent/42": { "pom": "sha256-5BJ27+NQkFTLpBl7PWNgxR3Ve8ZA3eSM832vqkWgnDs=" }, @@ -2667,30 +2444,39 @@ "module": "sha256-n+hq62S4YyPo5XlQOxGgOKFAaUwTtoBDQ/ik3Jo6RrE=", "pom": "sha256-mn4e3huQFzBSwebtck+w8OvMiP9oLQI/DJs0PhN3p/8=" }, - "org/jetbrains/kotlin#kotlin-stdlib-jdk7/2.2.0": { - "jar": "sha256-DRC8DUK4YF8jYpo/MeonwZzbyp3N9PU/bSLNY2aDbRg=", - "pom": "sha256-lcIYnDXve/xIlRwyrXCEeyHzgJ0m9dCnbiNXCHmYjDA=" + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/2.2.21": { + "jar": "sha256-t4WSLxHm2Rpt0ddcsK7xzje4P43g46ITkTnfuCO7iiw=", + "pom": "sha256-I3xPNRZpV77Mwm7J8WxNjdTJtSNZ98cdAdznfYqwdmI=" }, - "org/jetbrains/kotlin#kotlin-stdlib-jdk8/2.2.0": { - "jar": "sha256-rcFmSNu881sNEOfsMBw110bRwv5GDGBqulnxKxF8+bA=", - "pom": "sha256-I00G/b3CncvAdEfijEomq6uVmdXD2qPZKjTmrt6iNqY=" + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/2.2.21": { + "jar": "sha256-xiJ1xQ7lkcovgse6QmlreRYAwlhE9H6EvZRgMCoNUjg=", + "pom": "sha256-RN6GQYDP52PPB8EmjPJ5uYqVVaQjuyyBHe3bVawsyFk=" }, "org/jetbrains/kotlin#kotlin-stdlib/2.1.21": { "module": "sha256-DTc1BD1ot6WvtE0n3mX4Cp0rIIRicJwu27SP1bOVrYo=", "pom": "sha256-xVJAhso+SaZ5ht+P3M1mA3uvXzxaNYt2+d1gm+57tjg=" }, "org/jetbrains/kotlin#kotlin-stdlib/2.2.0": { - "jar": "sha256-ZdEthaO4ZcFg25FHhRcSpksQ2t1osi7qIqlb+KhnDco=", "module": "sha256-pbmP3NnbAX1ULhlyJdzuGNZYpW3h2yzEHhMZbWsXaaQ=", "pom": "sha256-jDyCEAfBNBFVhzm589U4LrgVUds4lc/7iVYeVsD03BY=" }, + "org/jetbrains/kotlin#kotlin-stdlib/2.2.20": { + "jar": "sha256-iDbM/9NYX63amQEkSyDUKQHS881YEFjYQ04v+rzzo+c=", + "module": "sha256-yRj1IU0CGnLjdn8nVul9EDpSbgTxQj2jZj79+1hH25U=", + "pom": "sha256-SosIbmQxvPYjY39Ssv8ZLhrbkTg4dC5cDupwqN7kKcQ=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.2.21": { + "jar": "sha256-ZVij0jPaVqIJNLMhWfnbX4btWBbvCY94osIj3Gq7ed0=", + "module": "sha256-v7xlfd06jjfkyK1BeWjV6wsLFxyfzkj5YsKtMu5DTCE=", + "pom": "sha256-zzH5IxlsY67ezQpXwkJpvTcCpOR8C/C9ZLWtpd5SInI=" + }, "org/jooq#jool/0.9.15": { "jar": "sha256-ow2WcZCZ603oewgVL5etsLo8/vmX2tys6LLk3NwZf4Q=", "pom": "sha256-/mCqsovG1YbUq0u/zSPc9KFXa/gzK2lEwhxaehS8x4M=" }, - "org/jsoup#jsoup/1.20.1": { - "jar": "sha256-ybt7LA9JVfx4WlXAVKPWpbFzuQ6krIhm17GmFuOEkc0=", - "pom": "sha256-oeGYRMAjusOTjPx5zGLPovp1SonWyooyxL+anx1IhIU=" + "org/jsoup#jsoup/1.21.2": { + "jar": "sha256-8FSW4lVzR1nw1LVjLaeyT4ExMUfHjGnpCtBF0JYZE0Q=", + "pom": "sha256-S74tJSipD5l8QK7ztitRn9NzxWBXtU/7CGzCvvAe9EY=" }, "org/jspecify#jspecify/1.0.0": { "jar": "sha256-H61ua+dVd4Hk0zcp1Jrhzcj92m/kd7sMxozjUer9+6s=", @@ -2705,10 +2491,6 @@ "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" }, - "org/junit#junit-bom/5.10.3": { - "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=", - "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw=" - }, "org/junit#junit-bom/5.10.5": { "module": "sha256-hXsWv6Q5P1aoQJN8Z01TbeTiPFxjRpYgp3m1BcCowak=", "pom": "sha256-g+QFzK2rN7rfIrfdZ6LS90vPLmgB+1W7LV1+eUI3Lho=" @@ -2748,64 +2530,60 @@ "org/junit#junit-bom/5.5.1": { "pom": "sha256-eHThBkE5sx4sWkZrPcEClwk2IWK98B8PSqq3OKuTLTM=" }, - "org/junit#junit-bom/5.9.1": { - "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=", - "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw=" - }, - "org/junit#junit-bom/6.0.0": { - "module": "sha256-R98chw1F2mEXtKYNzAYhRmrD332s6I2aL5TXhAYkbkU=", - "pom": "sha256-s9mDL1wRu7aw5ihRuTqinSeMOfsadR63cbRtAEohYhk=" + "org/junit#junit-bom/6.0.1": { + "module": "sha256-xI2Y9e3P2cVeefrLugEB98G6CIY0ib6EqRYrmaGG0cI=", + "pom": "sha256-4xXFzLsIchbc4ErnDDK/F2K+KguKQ++B47p4MXpM1cg=" }, "org/junit/jupiter#junit-jupiter-api/5.12.2": { "module": "sha256-VFfyRO3hjRFzbwfrnF8wklrrCW5Cw1m2oEqaDgOyKes=", "pom": "sha256-VmKCFmSJvUCxLDUHuZXkj44CXgmgXn0W3SuY3GQs994=" }, - "org/junit/jupiter#junit-jupiter-api/6.0.0": { - "jar": "sha256-iNaQ0tNzzWYXB3DDF5dxls6eRl8jiJMPS8lmXohzhfY=", - "module": "sha256-ulAS9rG1AydsxsokGUPC2bJuJFkCXowg3VjsMeumcXU=", - "pom": "sha256-rNeSzwaDpEvqadPP/uujfRm5kAwdnogijjKfJsRBNQM=" + "org/junit/jupiter#junit-jupiter-api/6.0.1": { + "jar": "sha256-o8qMflZ0Ngk+SmcD1dSqwC2+o2EG6jL9E2e1beINTgI=", + "module": "sha256-zK14mBan6wSIQ0ad+9pkHonhhJ5juCSS8kvGCzBQu5s=", + "pom": "sha256-NjNXApnLjlv8KBYedmHSEfODqx4QndQNBWbGr6FDlxo=" }, "org/junit/jupiter#junit-jupiter-engine/5.12.2": { "module": "sha256-0W0wjmqiWjCz75JNnf5PiJqb/ybqvXLvMO6oH864SBU=", "pom": "sha256-PHGRdFCb6dsfqBesY7eLIfH2fQaL5HHaPQR4G9RAKqM=" }, - "org/junit/jupiter#junit-jupiter-engine/6.0.0": { - "jar": "sha256-j6HWw32ymm70cYO0mFHudnbwj9exwntozPOk5XzgL0g=", - "module": "sha256-/BOeA32ssQfRpQ6FVVg2h0+pwgKIwx17a86To9PoUEw=", - "pom": "sha256-qzyiIIkCJq8xuRVzeT+n8APHqBdSuskFZx3Krum5fXM=" + "org/junit/jupiter#junit-jupiter-engine/6.0.1": { + "jar": "sha256-dHalb0qqtX/C9FmEfNa/txKzvQSprAuJ7ZVz963CxVA=", + "module": "sha256-DNBLxyt1p94NOMErkbE3PcQ3OgP+Iv/3oV6MvRyfXfk=", + "pom": "sha256-w0n6QNgPtJ/b+0TyYlR2zSa4vpWQQP+or4in/bHiSPY=" }, "org/junit/jupiter#junit-jupiter-params/5.12.2": { "module": "sha256-x3KP8z0SJgBzLq09DW+K3XRd4+lEFRmHE5WuiZymFHQ=", "pom": "sha256-pcfvF8refV90q2IHK7xrxxy9AWgGJGvOQl/LvBEISTw=" }, - "org/junit/jupiter#junit-jupiter-params/6.0.0": { - "jar": "sha256-IIR+RcVT1R45JEbgM1UGnxOP4MUekdfvG9v/wNOvBFQ=", - "module": "sha256-VfWJwqiUZt40HEAL8AzdGihwp+bc1oUL2tcyLbONc7c=", - "pom": "sha256-91zeM8lEa0XsSlqaKC3LWyv7dj1KMKshv8+EgqZg5UI=" + "org/junit/jupiter#junit-jupiter-params/6.0.1": { + "jar": "sha256-lWbiSbTUx9U6bIkI9XeIXOLUxjE8kWvfv3/7xSa4o28=", + "module": "sha256-p9p+0ICwGl76I7bWB/qxxmMhEYc0EXoaVkde/DU7HMA=", + "pom": "sha256-sfUTKYkKt1oPR+kBQNZOJf6z57dM5KEHRZg9YViQbnM=" }, "org/junit/jupiter#junit-jupiter/5.12.2": { "module": "sha256-ioIpqKD4Se/BzD/9XPlN4W6sgAYcX5M5eoXAk8nX6nA=", "pom": "sha256-ka2OSkvzBCMslByQFKyRNnvroTHx21jVv+SZx5DUbxc=" }, - "org/junit/jupiter#junit-jupiter/6.0.0": { - "jar": "sha256-jb8LIX4usBPWU9kW/BBgkklrfMrI8IQyiYHlXjZzrnE=", - "module": "sha256-YdlnTuitkcdk2IbQzTFjO1up967ad6okIPglNaJVXOE=", - "pom": "sha256-9j4gTo0IDEzis05lnzGVzHHYpKZrcyqAW5pv0rjyVrs=" + "org/junit/jupiter#junit-jupiter/6.0.1": { + "jar": "sha256-vXrygd/vjcwdCKUDzpMEWXtl4YUKDbgsmattjLEDGxQ=", + "module": "sha256-iuvBy0oYWd7uRjDJq3S2/KKMAdpl0h6Z7XgEp7ibGMo=", + "pom": "sha256-VICrz2YRG4YweP/+OFMKTcrtJoK9gCtO2VBdrzVleTM=" }, - "org/junit/platform#junit-platform-commons/6.0.0": { - "jar": "sha256-huj6+H8xUaPVRYUIUqDyzFXqiiQ07ungj4OIHFLVWZI=", - "module": "sha256-oNE82wfx2950q74HZmT/XcQEOtXRO/+UD3i55gTyElE=", - "pom": "sha256-lDFdk3FOzUB6kg2TOcj0S0DPCEBBMWMu1/m3dwzxCgU=" + "org/junit/platform#junit-platform-commons/6.0.1": { + "jar": "sha256-+IU/RcEPOA3bFXz0KrupsHNHTwXMQDNbWFBV+FU43K0=", + "module": "sha256-mS8uNl3Y24i+YC+eXFwI+B/USwxbj6HPFzTzb8fh8f0=", + "pom": "sha256-E6l3Y7CJ0P0kyrrGE/d5pyEmm+5VHz5cHbr+mhzQ6tI=" }, - "org/junit/platform#junit-platform-engine/6.0.0": { - "jar": "sha256-b4GELpwT6ZfKxmtEYUUi82OUGeI4iuLQAMS8CmuS2T8=", - "module": "sha256-GcijGiINhY0hWr20mfYjuLxy/ig3jMBABI0ymTCliSE=", - "pom": "sha256-TD7A1PapQGLOgr3kLuvtHya5m7XLHWl24VmPzF+KSS0=" + "org/junit/platform#junit-platform-engine/6.0.1": { + "jar": "sha256-9JV3Bzp64YTHGNm0OuDY7cuKv8Wsc4c17jM51GUukr8=", + "module": "sha256-2aXeq5puUhW79Aw5/+2pCwZXdPjNAY5Xuyod7OI0VKQ=", + "pom": "sha256-oiRe8nBlLAfVls5x2NZw0KipklHNzvRU85ZRmaycTpo=" }, - "org/junit/platform#junit-platform-launcher/6.0.0": { - "jar": "sha256-Xwl7AMZxS7cez7XexitZu0wveJdj+v0ezpbE7w5sKA8=", - "module": "sha256-/OwWMsXFlyf/nn6jCKmTh9ci/6iC2FzKUFKv7Iw47ug=", - "pom": "sha256-RwG8mhY9lbI1zhatdt4Z8qyFTFyjT689LsThAYsIzHQ=" + "org/junit/platform#junit-platform-launcher/6.0.1": { + "jar": "sha256-7nWN2wb6sf0aiQwLrkqs+NwATE82fhONv/yxE80J66w=", + "module": "sha256-QGPjXSBE9xraiSUfrtFB8KWvnOwm1uO3znI889Vz29c=", + "pom": "sha256-TNsMG5Lxon57UucN6Buik1shlBgC2MqoiOnZ4V+s/ho=" }, "org/kordamp/ikonli#ikonli-bootstrapicons-pack/12.4.0": { "jar": "sha256-RbwgHLWfhluydZcOCI394XH01pxIwRYZS68xmSbFWAw=", @@ -2842,9 +2620,9 @@ "org/mockito#mockito-bom/4.11.0": { "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" }, - "org/mockito#mockito-core/5.20.0": { - "jar": "sha256-0altJSEo06QkfP2KLnZBLvo8wQOXe+F5M8lCEXok83Q=", - "pom": "sha256-mQPiB1XAxIh6q5xPEAYft/ERUdOp+t2WTp+6QnIm0TU=" + "org/mockito#mockito-core/5.21.0": { + "jar": "sha256-A9sj3nQsvKQqo9YSf9rOVg+sN7A22TGHCAH4TCiL0oY=", + "pom": "sha256-AiGzH5bfAaFYxkU3Gq2BstP1vuD1icoNDC6qbo2gkvM=" }, "org/objenesis#objenesis-parent/3.3": { "pom": "sha256-MFw4SqLx4cf+U6ltpBw+w1JDuX1CjSSo93mBjMEL5P8=" @@ -2945,14 +2723,11 @@ "org/ow2#ow2/1.5.1": { "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" }, - "org/ow2/asm#asm-bom/9.7": { - "pom": "sha256-jIZR874EOzV43SihXAFhhhsV6wObf1JHZ5wMwNvwd4c=" - }, - "org/ow2/asm#asm-bom/9.8": { - "pom": "sha256-DaHcsibmzf2ttNrFkZFruRe1c3RnTZG9LxMAMTe0FSA=" + "org/ow2/asm#asm-bom/9.9": { + "pom": "sha256-D6JzNvp7YpI8qb3GlSbr5xKjv7H37ov3bEoLP4XxnWI=" }, - "org/ow2/asm#asm/9.8": { - "pom": "sha256-wTZ8O7OD12Gef3l+ON91E4hfLu8ErntZCPaCImV7W6o=" + "org/ow2/asm#asm/9.9": { + "pom": "sha256-z4Ye8edF1XFUr3muFN80DtU0Hl3NAVfO/NLrfxqgXFc=" }, "org/pcollections#pcollections/4.0.1": { "jar": "sha256-H4J2bXwyIZMIVAM76/9Qc+pGtD8nMmB0u+FdFIwYv7M=", @@ -2985,6 +2760,10 @@ "org/slf4j#slf4j-parent/2.0.17": { "pom": "sha256-lc1x6FLf2ykSbli3uTnVfsKy5gJDkYUuC1Rd7ggrvzs=" }, + "org/snakeyaml#snakeyaml-engine/2.10": { + "jar": "sha256-yZ2f1mx8JR2IGpzZUIm3yARMKaGwKYPXA2mBvUNU7Dc=", + "pom": "sha256-VhQsopiYjPZNplrivcGYNJIdc411qyN2Go+sS19YMUk=" + }, "org/sonatype/oss#oss-parent/5": { "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0=" }, @@ -2998,9 +2777,6 @@ "module": "sha256-+ItA4qUDM7QLQvGB7uJyt17HXdhmbLFFvZCxW5fhg+M=", "pom": "sha256-9tSBCT51dny6Gsfh2zj49pLL4+OHRGkzcada6yHGFIs=" }, - "org/testcontainers#testcontainers-bom/1.20.1": { - "pom": "sha256-CKrS6R3QXKeycG0t/Ap66AxLXFBHAweZyLzbcyfLL0A=" - }, "org/testfx#testfx-core/4.0.18": { "pom": "sha256-+rVBhIAbFZm8WzBb8R0X3ACeT1lqUXwT3BxUb6jdOxo=" }, @@ -3023,28 +2799,15 @@ "jar": "sha256-lcY8GlWyLdZFOJCkGcwaZA95C799iugtseMK7++wiIg=", "pom": "sha256-72CLg8O7bI4+azvqo4hCuhWWO0ZJXkr5GwdGyLdQ87k=" }, - "org/wiremock#wiremock/3.13.0": { - "module": "sha256-6UqHsje9650nqsFtS6+ujcPjsXblK3tBQSOKrhEsZgs=", - "pom": "sha256-8DaGoIr4nd2qb8RQ2/havBO4oKS99AXlSZo2vLhLjZ4=" - }, "org/xmlunit#xmlunit-core/2.10.4": { "pom": "sha256-QMVRcQPPFS8IejttyqpTDs5h8D1/KUSR/4gtk2utBl8=" }, - "org/xmlunit#xmlunit-legacy/2.10.0": { - "pom": "sha256-B0sBekWQP79QoP3faxekM90lzFQDmMGvuG+tkOxxwmg=" - }, "org/xmlunit#xmlunit-matchers/2.10.4": { "pom": "sha256-JH4kA3uLcvdMy7TUXzVPlJ1VUQTeyL7U6K/dVleCvww=" }, - "org/xmlunit#xmlunit-parent/2.10.0": { - "pom": "sha256-XOnCkW1QdlQJ78IKgQf5jvF3BAzr4LG4VwSI4h0JYcc=" - }, "org/xmlunit#xmlunit-parent/2.10.4": { "pom": "sha256-g9gzkrJTxbwHpRKgjYt5RiPn1MW7u6DE25H0zjeAkeI=" }, - "org/xmlunit#xmlunit-placeholders/2.10.0": { - "pom": "sha256-41+qK1zuBc03FaViqCOoA4/PQyp97WWZny0lBaGMSes=" - }, "org/yaml#snakeyaml/2.5": { "jar": "sha256-5mgqzxrOd1CO8TZJy/T40J0s9UV722HSX/tqwCM9eN0=", "pom": "sha256-ugGuenRMtS/o7POwI8vDLgzMjGvu+fJt53pHgII5RH0=" @@ -3070,6 +2833,30 @@ }, "tech/uom/lib#uom-lib/2.2": { "pom": "sha256-EUCfWa/BJ74iyO5VCUNHZPSB5mX3FMBz5HGciB0oM8k=" + }, + "tools/jackson#jackson-base/3.0.2": { + "pom": "sha256-bNfjpxD7/9oYOZzlZe//tviCVICZC7Yxj4Ps8Z28k7I=" + }, + "tools/jackson#jackson-bom/3.0.2": { + "pom": "sha256-j/nmDa1VX3MadR8hSPVo36hhFpZPnofSOOK6m1fI0fQ=" + }, + "tools/jackson/core#jackson-core/3.0.2": { + "jar": "sha256-+nRRW6X8ASgs7Kt+WXD6EqD0/yO9bCBh6cd4MzjQtDY=", + "module": "sha256-ahqDE3aR5sMwIzIHsENnSsV+gohKRgT9erpnPsv4Dok=", + "pom": "sha256-M0PoYpgxJsUq1LGVhV/fKYlwcAFTRWHR5cH3DbrM5SM=" + }, + "tools/jackson/core#jackson-databind/3.0.2": { + "jar": "sha256-9U9pv8eAOAo/TeQvssPoKyLI702EupGM/4HSLGqhBp8=", + "module": "sha256-r8lO4gcAP1TxfepZ1em1DdSPSGl6aDD2XWKtwfJ35Lw=", + "pom": "sha256-Mk6hllrSTyPQU/zkQJ0lBaxZckJGcp1QLpct6f0fxIw=" + }, + "tools/jackson/dataformat#jackson-dataformat-yaml/3.0.2": { + "jar": "sha256-9Of2pLjGDePEiuIQe+eQo/1wUYg7P3tWfo2cAmG37sk=", + "module": "sha256-WhXr7vNPJ04OgA0ntENjjpEALsar8JhxUcjyxaLchBc=", + "pom": "sha256-WInJZdlIuikWXxpy2nGwVK3oL0RX3HREKwRvhcAUlTA=" + }, + "tools/jackson/dataformat#jackson-dataformats-text/3.0.2": { + "pom": "sha256-YV+jqbxqx0NoZZS1gJPmq8wW/zFypaxRErTrjzG6Too=" } } } diff --git a/pkgs/by-name/ja/jabref/package.nix b/pkgs/by-name/ja/jabref/package.nix index d8f0363e0390..2e31f41c8b30 100644 --- a/pkgs/by-name/ja/jabref/package.nix +++ b/pkgs/by-name/ja/jabref/package.nix @@ -13,6 +13,7 @@ gtk3, jdk25, openjfx25, + jre25_minimal, gradle_9, python3, postgresql, @@ -22,6 +23,31 @@ let jdk = jdk25; openjfx = openjfx25; + jre = jre25_minimal.override { + modules = [ + "java.base" + "java.compiler" + "java.datatransfer" + "java.desktop" + "java.logging" + "java.management" + "java.naming" + "java.net.http" + "java.prefs" + "java.scripting" + "java.sql" + "java.sql.rowset" + "java.xml" + "jdk.httpserver" + "jdk.incubator.vector" + "jdk.jsobject" + "jdk.net" + "jdk.security.auth" + "jdk.unsupported" + "jdk.unsupported.desktop" + "jdk.xml.dom" + ]; + }; gradle = gradle_9; ltwaUrl = "https://www.issn.org/wp-content/uploads/2021/07/ltwa_20210702.csv"; ltwa = fetchurl { @@ -30,14 +56,14 @@ let }; in stdenv.mkDerivation rec { - version = "6.0-alpha.3"; + version = "6.0-alpha.4"; pname = "jabref"; src = fetchFromGitHub { owner = "JabRef"; repo = "jabref"; tag = "v${version}"; - hash = "sha256-ZX4LQe8xKZCDJqVh+L9BHkJK82Pz/qPhlaE8SrAin6o="; + hash = "sha256-ZhyWYZD8QT3dH6MwG2kMjTAjkxaVFIMR4C9aAvi3FJQ="; fetchSubmodules = true; }; @@ -62,10 +88,8 @@ stdenv.mkDerivation rec { postPatch = '' sed -i -e '/vendor/d' -e '/JavaLanguageVersion/s/24/25/' build-logic/src/main/kotlin/org.jabref.gradle.feature.compile.gradle.kts - sed -i -e '/javafx-base/s/24.0.1/25/' build-support/src/main/java/*.java - - substituteInPlace build-support/src/main/java/*.java \ - --replace-fail 'JAVA 24' 'JAVA 25' + sed -i -e '/javafx-base/s/24.0.2/25/' build-support/src/main/java/*.java + sed -i -e 's/javafx = .*/javafx = "25"/' versions/build.gradle.kts sed -i -e '1a //REPOS file://${mitmCache}/https/repo.maven.apache.org/maven2,file://${mitmCache}/https/plugins.gradle.org/m2' build-support/src/main/java/*.java @@ -135,9 +159,15 @@ stdenv.mkDerivation rec { tar xf $tarball -C $out --strip-components=1 done + # Replace .so files with the ones from nixpkgs + cp ${openjfx}/modules_libs/javafx.graphics/*.so $out/lib # Temp fix: openjfx doesn't build with webkit unzip $out/lib/javafx-web-*-*.jar libjfxwebkit.so -d $out/lib/ + zip -d $out/lib/javafx-media-*-*.jar "*.so" + zip -d $out/lib/javafx-graphics-*-*.jar "*.so" + zip -d $out/lib/javafx-web-*-*.jar "*.so" + # Use postgresql from nixpkgs since the bundled binary doesn't work on NixOS ARCH1=${if stdenv.isAarch64 then "arm64v8" else "amd64"} ARCH2=${if stdenv.isAarch64 then "arm_64" else "x86_64"} @@ -169,7 +199,7 @@ stdenv.mkDerivation rec { rm $out/bin/$bin* # put this in postFixup because some gappsWrapperArgs are generated in gappsWrapperArgsHook in preFixup - makeWrapper ${jdk}/bin/java $out/bin/$bin \ + makeWrapper ${jre}/bin/java $out/bin/$bin \ "''${gappsWrapperArgs[@]}" \ --suffix PATH : ${ lib.makeBinPath [ @@ -178,7 +208,7 @@ stdenv.mkDerivation rec { ] } \ --add-flags "$DEFAULT_JVM_OPTS \ - -Djava.library.path=$out/lib/:${openjfx}/modules_libs/javafx.graphics:${openjfx}/modules_libs/javafx.media \ + -Djava.library.path=$out/lib/ \ --module-path $MODULE_PATH \ --module $MODULE" done diff --git a/pkgs/by-name/ja/javacc/package.nix b/pkgs/by-name/ja/javacc/package.nix index 7f78beec439c..50e4579a55d5 100644 --- a/pkgs/by-name/ja/javacc/package.nix +++ b/pkgs/by-name/ja/javacc/package.nix @@ -65,6 +65,5 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://javacc.github.io/javacc"; license = lib.licenses.bsd2; mainProgram = "javacc"; - teams = [ lib.teams.deshaw ]; }; }) diff --git a/pkgs/by-name/ji/jid/package.nix b/pkgs/by-name/ji/jid/package.nix index f7af65b01f42..620bf539b2ea 100644 --- a/pkgs/by-name/ji/jid/package.nix +++ b/pkgs/by-name/ji/jid/package.nix @@ -39,6 +39,6 @@ buildGoModule rec { mainProgram = "jid"; homepage = "https://github.com/simeji/jid"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ stesie ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/jj/jjui/package.nix b/pkgs/by-name/jj/jjui/package.nix index 082cd77da9c5..b6960bceed6b 100644 --- a/pkgs/by-name/jj/jjui/package.nix +++ b/pkgs/by-name/jj/jjui/package.nix @@ -8,13 +8,13 @@ }: buildGoModule (finalAttrs: { pname = "jjui"; - version = "0.9.9"; + version = "0.9.10"; src = fetchFromGitHub { owner = "idursun"; repo = "jjui"; tag = "v${finalAttrs.version}"; - hash = "sha256-kBhEX6k/1vVhSqKeUcIQp6sOpKDnJfgUNKOTzbjG/VI="; + hash = "sha256-Hsuyf5VcSZcNi2gmubXS47uRarL17oPEtorisY75bbM="; }; vendorHash = "sha256-jte0g+aUiGNARLi8DyfsX6wYYJnodHnILzmid6KvMiA="; diff --git a/pkgs/by-name/ka/karing/package.nix b/pkgs/by-name/ka/karing/package.nix index fc9d0e8624bd..82660e9e4967 100644 --- a/pkgs/by-name/ka/karing/package.nix +++ b/pkgs/by-name/ka/karing/package.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "karing"; - version = "1.2.10.1306"; + version = "1.2.11.1406"; src = fetchurl { url = "https://github.com/KaringX/karing/releases/download/v${finalAttrs.version}/karing_${finalAttrs.version}_linux_amd64.deb"; - hash = "sha256-1mlXSe12M5ngRV+zmCzQ1r8K0DVAehWrDqL4673lgJ8="; + hash = "sha256-RfUzPDT6x2e8J+IazjcPRZ+yY3UEHEdAUNxs1cQlGaE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/kc/kcl-language-server/package.nix b/pkgs/by-name/kc/kcl-language-server/package.nix index 36586717f0ff..213b14e0b27d 100644 --- a/pkgs/by-name/kc/kcl-language-server/package.nix +++ b/pkgs/by-name/kc/kcl-language-server/package.nix @@ -9,18 +9,18 @@ rustPlatform.buildRustPackage rec { pname = "kcl-language-server"; - version = "0.11.2"; + version = "0.11.2-unstable-2025-10-26"; src = fetchFromGitHub { owner = "kcl-lang"; repo = "kcl"; - rev = "v${version}"; - hash = "sha256-6XDLxTpgENhP7F51kicAJB7BNMtX4cONKJApAhqgdno="; + rev = "68b4062e1f6b818b2fc64cfc69ef0a692b35943d"; + hash = "sha256-5yX9TYmn0nGlSI8jiAwxuYpBXq9ie+yVDHwcC1FLcBk="; }; sourceRoot = "${src.name}/kclvm"; - cargoHash = "sha256-eJ3Gh2l6T2DxJRQRHamPOr/ILtzsqFB497DdXVJ90RE="; + cargoHash = "sha256-FulW9qNVVZtOoRfm+NPwQENJU9Ib1GBzcjHxk5QS70g="; PROTOC = "${protobuf}/bin/protoc"; PROTOC_INCLUDE = "${protobuf}/include"; diff --git a/pkgs/by-name/ke/keychron-udev-rules/package.nix b/pkgs/by-name/ke/keychron-udev-rules/package.nix index 7731eba47b37..f1bb1ec46e08 100644 --- a/pkgs/by-name/ke/keychron-udev-rules/package.nix +++ b/pkgs/by-name/ke/keychron-udev-rules/package.nix @@ -6,7 +6,7 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "keychron-udev-rules"; - version = "23-10-2025"; + version = "0-unstable-2026-01-07"; nativeBuildInputs = [ udevCheckHook ]; @@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; meta = { - description = "Keychron Keyboard Udev Rules, fixes issues with keyboard detection on Linux"; + description = "Keychron Keyboard Udev Rules, fixes issues with keyboard detection on Linux & permissions on Keychron Launcher"; license = lib.licenses.mit; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ kruziikrel13 ]; diff --git a/pkgs/by-name/ku/kubo-migrator-unwrapped/package.nix b/pkgs/by-name/ku/kubo-migrator-unwrapped/package.nix index 4734a263459e..209306c68d05 100644 --- a/pkgs/by-name/ku/kubo-migrator-unwrapped/package.nix +++ b/pkgs/by-name/ku/kubo-migrator-unwrapped/package.nix @@ -29,7 +29,6 @@ buildGoModule rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ Luflosi - elitak ]; mainProgram = "fs-repo-migrations"; }; diff --git a/pkgs/by-name/la/lasuite-docs/package.nix b/pkgs/by-name/la/lasuite-docs/package.nix index 3be6d11eec1d..7a5c134d6061 100644 --- a/pkgs/by-name/la/lasuite-docs/package.nix +++ b/pkgs/by-name/la/lasuite-docs/package.nix @@ -13,7 +13,7 @@ let python = python3.override { self = python3; packageOverrides = self: super: { - django = super.django_5_2; + django = super.django_5; }; }; diff --git a/pkgs/by-name/la/lasuite-meet/package.nix b/pkgs/by-name/la/lasuite-meet/package.nix index 4498801eb593..674507684ea7 100644 --- a/pkgs/by-name/la/lasuite-meet/package.nix +++ b/pkgs/by-name/la/lasuite-meet/package.nix @@ -7,7 +7,7 @@ let python = python3.override { self = python3; - packageOverrides = (self: super: { django = super.django_5_2; }); + packageOverrides = (self: super: { django = super.django_5; }); }; in diff --git a/pkgs/by-name/la/lazydocker/package.nix b/pkgs/by-name/la/lazydocker/package.nix index fe57e737db12..967fe27821db 100644 --- a/pkgs/by-name/la/lazydocker/package.nix +++ b/pkgs/by-name/la/lazydocker/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "lazydocker"; - version = "0.24.3"; + version = "0.24.4"; src = fetchFromGitHub { owner = "jesseduffield"; repo = "lazydocker"; rev = "v${version}"; - sha256 = "sha256-JbiG3cy+nn9BWJxX43YW+FKmWvsJPtRZ9NdMHtulzcw="; + sha256 = "sha256-cW90/yblSLBkcR4ZdtcSI9MXFjOUxyEectjRn9vZwvg="; }; vendorHash = null; diff --git a/pkgs/by-name/le/ledger-web/package.nix b/pkgs/by-name/le/ledger-web/package.nix index 061b93a92feb..e16fc4265a6c 100644 --- a/pkgs/by-name/le/ledger-web/package.nix +++ b/pkgs/by-name/le/ledger-web/package.nix @@ -26,7 +26,6 @@ bundlerApp { homepage = "https://github.com/peterkeen/ledger-web"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ - manveru nicknovitski ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/le/legendary-gl/package.nix b/pkgs/by-name/le/legendary-gl/package.nix index cf0c0dc8bb79..0f46e05b024f 100644 --- a/pkgs/by-name/le/legendary-gl/package.nix +++ b/pkgs/by-name/le/legendary-gl/package.nix @@ -26,8 +26,6 @@ python3Packages.buildPythonApplication { filelock ]; - disabled = python3Packages.pythonOlder "3.8"; - # no tests doCheck = false; diff --git a/pkgs/by-name/li/libgedit-amtk/package.nix b/pkgs/by-name/li/libgedit-amtk/package.nix index 047abb5d73d2..80838b14f74b 100644 --- a/pkgs/by-name/li/libgedit-amtk/package.nix +++ b/pkgs/by-name/li/libgedit-amtk/package.nix @@ -77,7 +77,6 @@ stdenv.mkDerivation rec { changelog = "https://gitlab.gnome.org/World/gedit/libgedit-amtk/-/blob/${version}/NEWS?ref_type=tags"; description = "Actions, Menus and Toolbars Kit for GTK applications"; maintainers = with lib.maintainers; [ - manveru bobby285271 ]; license = lib.licenses.lgpl21Plus; diff --git a/pkgs/by-name/li/libgedit-tepl/package.nix b/pkgs/by-name/li/libgedit-tepl/package.nix index aaf520fb4722..ab6b99865d92 100644 --- a/pkgs/by-name/li/libgedit-tepl/package.nix +++ b/pkgs/by-name/li/libgedit-tepl/package.nix @@ -68,7 +68,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/World/gedit/libgedit-tepl"; description = "Text editor product line"; maintainers = with lib.maintainers; [ - manveru bobby285271 ]; license = lib.licenses.lgpl3Plus; diff --git a/pkgs/by-name/li/libglycin/package.nix b/pkgs/by-name/li/libglycin/package.nix index 324c6ff988d2..ff497becdea5 100644 --- a/pkgs/by-name/li/libglycin/package.nix +++ b/pkgs/by-name/li/libglycin/package.nix @@ -130,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: { mpl20 # or lgpl21Plus ]; - maintainers = with lib.maintainers; [ normalcea ]; + maintainers = [ ]; teams = [ lib.teams.gnome ]; platforms = lib.platforms.linux; pkgConfigModules = [ diff --git a/pkgs/by-name/li/libmaddy-markdown/package.nix b/pkgs/by-name/li/libmaddy-markdown/package.nix index 621c7d857094..c218f2392eda 100644 --- a/pkgs/by-name/li/libmaddy-markdown/package.nix +++ b/pkgs/by-name/li/libmaddy-markdown/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { description = "C++ Markdown to HTML header-only parser library"; homepage = "https://github.com/progsource/maddy"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.normalcea ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/li/libmaxminddb/package.nix b/pkgs/by-name/li/libmaxminddb/package.nix index cf591a7f1adb..93428fbea46a 100644 --- a/pkgs/by-name/li/libmaxminddb/package.nix +++ b/pkgs/by-name/li/libmaxminddb/package.nix @@ -17,8 +17,11 @@ stdenv.mkDerivation rec { description = "C library for working with MaxMind geolocation DB files"; homepage = "https://github.com/maxmind/libmaxminddb"; license = lib.licenses.asl20; - teams = [ lib.teams.helsinki-systems ]; mainProgram = "mmdblookup"; + maintainers = with lib.maintainers; [ + das_j + helsinki-Jo + ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/li/libnick/package.nix b/pkgs/by-name/li/libnick/package.nix index f583c3fc9b86..96aebceb55ef 100644 --- a/pkgs/by-name/li/libnick/package.nix +++ b/pkgs/by-name/li/libnick/package.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Cross-platform development base for native Nickvision applications"; homepage = "https://github.com/NickvisionApps/libnick"; license = lib.licenses.gpl3Plus; - maintainers = [ lib.maintainers.normalcea ]; + maintainers = [ ]; platforms = lib.platforms.unix ++ lib.platforms.windows; pkgConfigModules = [ "libnick" ]; }; diff --git a/pkgs/by-name/li/libosmium/package.nix b/pkgs/by-name/li/libosmium/package.nix index dffca35acfcb..f1d66a8fb58e 100644 --- a/pkgs/by-name/li/libosmium/package.nix +++ b/pkgs/by-name/li/libosmium/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libosmium"; - version = "2.22.0"; + version = "2.23.0"; src = fetchFromGitHub { owner = "osmcode"; repo = "libosmium"; tag = "v${finalAttrs.version}"; - hash = "sha256-b4jdPh6lJ/ALPVblDt16Nabx9ZL8MW8/roI+NqTZshU="; + hash = "sha256-VYNNp7czQgIvPhYxXlPaY/qlVxoZZ6CiJXWrHW+zAD8="; }; nativeBuildInputs = [ cmake ]; @@ -34,8 +34,6 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - # Fix the build with CMake 4. - "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" (lib.cmakeBool "INSTALL_GDALCPP" true) ]; diff --git a/pkgs/by-name/li/libspecbleach/package.nix b/pkgs/by-name/li/libspecbleach/package.nix index 1b0eca73d4a5..f3b3bb6d9042 100644 --- a/pkgs/by-name/li/libspecbleach/package.nix +++ b/pkgs/by-name/li/libspecbleach/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "libspecbleach"; - version = "0.1.6"; + version = "0.2.0"; src = fetchFromGitHub { owner = "lucianodato"; repo = "libspecbleach"; rev = "v${version}"; - sha256 = "sha256-Tw5nrGVAeoiMH00efJwcU+QLmKDZZTXHQPSV9x789TM="; + sha256 = "sha256-s8eHryJfLz63m08O7l3r2iXOAgFqiuVTEcD774C3iXE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libspf2/package.nix b/pkgs/by-name/li/libspf2/package.nix index fc6516722fcd..c87fa3910f70 100644 --- a/pkgs/by-name/li/libspf2/package.nix +++ b/pkgs/by-name/li/libspf2/package.nix @@ -40,8 +40,11 @@ stdenv.mkDerivation rec { lgpl21Plus bsd2 ]; - maintainers = with lib.maintainers; [ euxane ]; - teams = [ lib.teams.helsinki-systems ]; + maintainers = with lib.maintainers; [ + das_j + euxane + helsinki-Jo + ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/li/libwacom/package.nix b/pkgs/by-name/li/libwacom/package.nix index 0f6833c92b42..bf5f8c08193f 100644 --- a/pkgs/by-name/li/libwacom/package.nix +++ b/pkgs/by-name/li/libwacom/package.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation (finalAttrs: { version = "2.17.0"; outputs = [ + "bin" "out" "dev" ]; diff --git a/pkgs/by-name/li/libxmlxx5/package.nix b/pkgs/by-name/li/libxmlxx5/package.nix index dbc2533f802c..980f534ce75c 100644 --- a/pkgs/by-name/li/libxmlxx5/package.nix +++ b/pkgs/by-name/li/libxmlxx5/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "C++ wrapper for the libxml2 XML parser library"; homepage = "https://libxmlplusplus.sourceforge.net/"; license = lib.licenses.lgpl2Plus; - maintainers = [ lib.maintainers.normalcea ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/li/libxsmm/package.nix b/pkgs/by-name/li/libxsmm/package.nix index ebcdfb6ee79b..6382c5fda724 100644 --- a/pkgs/by-name/li/libxsmm/package.nix +++ b/pkgs/by-name/li/libxsmm/package.nix @@ -51,6 +51,8 @@ stdenv.mkDerivation rec { "STATIC=${static}" ]; + env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-int -std=gnu17"; + postInstall = '' mkdir -p $dev/lib/pkgconfig mv $out/lib/*.pc $dev/lib/pkgconfig diff --git a/pkgs/by-name/li/lifelines/package.nix b/pkgs/by-name/li/lifelines/package.nix index 4f45e30442c3..8d123c865b2a 100644 --- a/pkgs/by-name/li/lifelines/package.nix +++ b/pkgs/by-name/li/lifelines/package.nix @@ -36,7 +36,6 @@ stdenv.mkDerivation { description = "Genealogy tool with ncurses interface"; homepage = "https://lifelines.github.io/lifelines/"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.disassembler ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/li/linyaps/package.nix b/pkgs/by-name/li/linyaps/package.nix index 547fd49e10b9..df7d2c833006 100644 --- a/pkgs/by-name/li/linyaps/package.nix +++ b/pkgs/by-name/li/linyaps/package.nix @@ -1,6 +1,5 @@ { fetchFromGitHub, - fetchpatch, lib, stdenv, cmake, @@ -10,10 +9,11 @@ linyaps-box, cli11, curl, + elfutils, gpgme, gtest, libarchive, - libelf, + libcap, libsodium, libsysprof-capture, nlohmann_json, @@ -24,7 +24,6 @@ uncrustify, xz, yaml-cpp, - replaceVars, bash, binutils, coreutils, @@ -39,13 +38,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "linyaps"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "OpenAtom-Linyaps"; repo = finalAttrs.pname; tag = finalAttrs.version; - hash = "sha256-C5rP6r3V+hxTjM+kmXjS4MnuL6P5wxSVP9nNmlQbcB8="; + hash = "sha256-qPHDAwEQVnHLWGioEfgz11ZWhlEBJynap3a0hgfL050="; }; patches = [ @@ -53,6 +52,9 @@ stdenv.mkDerivation (finalAttrs: { ]; postPatch = '' + substituteInPlace apps/ll-cli/src/main.cpp \ + --replace-fail "ociRuntimeCLI, { BINDIR }" "ociRuntimeCLI, { \"${lib.getBin linyaps-box}/bin\" }" + substituteInPlace apps/ll-init/CMakeLists.txt \ --replace-fail "target_link_options(\''${LL_INIT_TARGET} PRIVATE -static -static-libgcc" \ "target_link_options(\''${LL_INIT_TARGET} PRIVATE -static -static-libgcc -L${stdenv.cc.libc.static}/lib" @@ -68,10 +70,11 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ cli11 curl + elfutils gpgme gtest libarchive - libelf + libcap libsodium libsysprof-capture nlohmann_json @@ -92,6 +95,10 @@ stdenv.mkDerivation (finalAttrs: { qt6Packages.wrapQtAppsHook ]; + cmakeFlags = [ + (lib.cmakeBool "CPM_LOCAL_PACKAGES_ONLY" true) + ]; + postInstall = '' # move to the right location for systemd.packages option # https://github.com/NixOS/nixpkgs/blob/85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054/nixos/modules/system/boot/systemd.nix#L605 diff --git a/pkgs/by-name/li/listmonk/package.nix b/pkgs/by-name/li/listmonk/package.nix index 06c74debd822..21df027a9076 100644 --- a/pkgs/by-name/li/listmonk/package.nix +++ b/pkgs/by-name/li/listmonk/package.nix @@ -17,7 +17,7 @@ buildGoModule (finalAttrs: { owner = "knadh"; repo = "listmonk"; rev = "v${finalAttrs.version}"; - hash = "sha256-qfFspzAbb+wCv0rVasfgEVUgbFuFLR1ouT3LeWyKShQ="; + hash = "sha256-FUhmbp4P9zQFlSf3ss17zs4ZaPUi0CbVceq3ZJeIXBY="; }; vendorHash = "sha256-R4chuOzpy/aEB5i5owZV3M7ByqnrXzxLaCeUOcjzQKE="; diff --git a/pkgs/by-name/li/livepeer/package.nix b/pkgs/by-name/li/livepeer/package.nix index f64ce89481af..3b3e14643886 100644 --- a/pkgs/by-name/li/livepeer/package.nix +++ b/pkgs/by-name/li/livepeer/package.nix @@ -44,7 +44,6 @@ buildGoModule rec { homepage = "https://livepeer.org"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ - elitak bot-wxt1221 ]; mainProgram = "livepeer"; diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index dc4cdb36702f..3fe9e30521d3 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -74,13 +74,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "7704"; + version = "7767"; src = fetchFromGitHub { owner = "ggml-org"; repo = "llama.cpp"; tag = "b${finalAttrs.version}"; - hash = "sha256-yFHrboXmJ2WK6QPvUqTz6qM2o2PVQF0co5opxFdARUs="; + hash = "sha256-k6Q1fUci0SkEB8vH5G3oG/evG7aUYBSqo+iXYG6x/dE="; leaveDotGit = true; postFetch = '' git -C "$out" rev-parse --short HEAD > $out/COMMIT diff --git a/pkgs/by-name/lo/lolcat/package.nix b/pkgs/by-name/lo/lolcat/package.nix index 5578e542faca..8301ca611771 100644 --- a/pkgs/by-name/lo/lolcat/package.nix +++ b/pkgs/by-name/lo/lolcat/package.nix @@ -18,7 +18,6 @@ license = lib.licenses.bsd3; maintainers = [ lib.maintainers.StillerHarpo - lib.maintainers.manveru lib.maintainers.nicknovitski ]; mainProgram = "lolcat"; diff --git a/pkgs/by-name/ls/lsp-ai/package.nix b/pkgs/by-name/ls/lsp-ai/package.nix index bf701de5f5fa..f6027464ee93 100644 --- a/pkgs/by-name/ls/lsp-ai/package.nix +++ b/pkgs/by-name/ls/lsp-ai/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, pkg-config, cmake, + oniguruma, openssl, zlib, perl, @@ -56,10 +57,14 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ + oniguruma openssl zlib ]; + # use system oniguruma since the bundled one fails to build with gcc15 + env.RUSTONIG_SYSTEM_LIBONIG = 1; + cargoBuildFlags = [ "-p lsp-ai" ]; passthru.updateScript = gitUpdater { diff --git a/pkgs/by-name/m1/m1n1/package.nix b/pkgs/by-name/m1/m1n1/package.nix index a0d89aec4ea6..0e2d9009da07 100644 --- a/pkgs/by-name/m1/m1n1/package.nix +++ b/pkgs/by-name/m1/m1n1/package.nix @@ -151,7 +151,7 @@ stdenv.mkDerivation (finalAttrs: { bsd3 asl20 ]; - maintainers = with lib.maintainers; [ normalcea ]; + maintainers = [ ]; platforms = lib.platforms.aarch64; }; }) diff --git a/pkgs/by-name/ma/magma/magma-hipblas-v2-buildflags.patch b/pkgs/by-name/ma/magma/magma-hipblas-v2-buildflags.patch new file mode 100644 index 000000000000..0fd6dc80997e --- /dev/null +++ b/pkgs/by-name/ma/magma/magma-hipblas-v2-buildflags.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fc61af7..b2b594e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -303,7 +303,7 @@ if (MAGMA_ENABLE_HIP) + set(GPU_ARCH_FLAGS ${DEVCCFLAGS}) + + #add_compile_options(${GPU_ARCH_FLAGS}) +- set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__HIP_PLATFORM_AMD__" ) ++ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__HIP_PLATFORM_AMD__ -DHIPBLAS_V2" ) + option(ROCM_CORE "Location of the rocm-core package") + execute_process(COMMAND "${CMAKE_SOURCE_DIR}/tools/get-rocm-version.sh" "${ROCM_CORE}" OUTPUT_VARIABLE ROCM_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) + message(STATUS "ROCM_VERSION=${ROCM_VERSION}") +diff --git a/Makefile b/Makefile +index 44880ab..afaab45 100644 +--- a/Makefile ++++ b/Makefile +@@ -846,7 +846,7 @@ ifeq ($(BACKEND),cuda) + d_ext := cu + else ifeq ($(BACKEND),hip) + d_ext := cpp +-CXXFLAGS += -D__HIP_PLATFORM_AMD__ ++CXXFLAGS += -D__HIP_PLATFORM_AMD__ -DHIPBLAS_V2 + CXXFLAGS += -DROCM_VERSION=$(shell ./tools/get-rocm-version.sh) + endif + diff --git a/pkgs/by-name/ma/magma/package.nix b/pkgs/by-name/ma/magma/package.nix index 8c1876cc75cd..9aac8699c4c9 100644 --- a/pkgs/by-name/ma/magma/package.nix +++ b/pkgs/by-name/ma/magma/package.nix @@ -4,8 +4,8 @@ cmake, cudaPackages, cudaSupport ? config.cudaSupport, + fetchFromGitHub, fetchpatch, - fetchurl, gfortran, gpuTargets ? [ ], # Non-CUDA targets, that is HIP rocmPackages, @@ -13,6 +13,7 @@ lib, libpthreadstubs, ninja, + perl, python3, config, # At least one back-end has to be enabled, @@ -115,9 +116,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "magma"; version = "2.9.0"; - src = fetchurl { - url = "https://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-${finalAttrs.version}.tar.gz"; - hash = "sha256-/3f9Nyaz3+w7+1V5CwZICqXMOEOWwts1xW/a5KgsZBw="; + src = fetchFromGitHub { + owner = "icl-utk-edu"; + repo = "magma"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ZV50id9qiCrc1K87812Lvv1tmeU/6vhpxFCz8nj61wM="; }; # Magma doesn't have anything which could be run under doCheck, but it does build test suite executables. @@ -134,6 +137,24 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/icl-utk-edu/magma/commit/2fecaf3f0c811344363f713669c1fe30f6879acd.patch"; hash = "sha256-Dfzq2gqoLSByCLWV5xvY/lXZeVa/yQ67lDSoIAa9jUU="; }) + ] + ++ lib.optionals rocmSupport [ + # TODO: Drop both these patches on next magma release + (fetchpatch { + # ROCm 7.0 compat: use HIPBLAS_V2 types and APIs + # Requires building from git w/ make generate call. If applied to release tarball + # pre-generated hipified code will remain unpatched + name = "magma-ROCm-7.0-compat.patch"; + url = "https://github.com/icl-utk-edu/magma/commit/02ecee0ccc56cce85194fdda18c9e0614797b2f9.patch"; + hash = "sha256-vm58X30ZR02sOMsKrvxEcEF27tJYuuyZZrz+GGFNz5Q="; + excludes = [ + "testing/testing_ztrsv_batched.cpp" + "CMakeLists.txt" + "Makefile" + ]; + }) + # Vendored patch with CMakeLists.txt and Makefile hunks from above commit (context differs) + ./magma-hipblas-v2-buildflags.patch ]; postPatch = '' @@ -147,12 +168,25 @@ stdenv.mkDerivation (finalAttrs: { autoPatchelfHook cmake ninja + perl # for make generate gfortran ] ++ lists.optionals cudaSupport [ cudaPackages.cuda_nvcc ]; + # README Step 0: generate precision variants and CMake.src.{hip|cuda} when building from git + # GPU_TARGET is a dummy value; CMake vars control target selection and `make generate` + # does not use the target setting, but the main makefile errors without it + preConfigure = '' + cat > make.inc <<EOF + BACKEND = ${if rocmSupport then "hip" else "cuda"} + FORT = true + GPU_TARGET = ${if rocmSupport then "gfx900" else "sm_90"} + EOF + make -j$NIX_BUILD_CORES generate + ''; + buildInputs = [ libpthreadstubs lapack @@ -183,6 +217,7 @@ stdenv.mkDerivation (finalAttrs: { env.CFLAGS = "-DADD_" + lib.optionalString rocmSupport " -fopenmp"; env.CXXFLAGS = finalAttrs.env.CFLAGS; env.FFLAGS = "-DADD_"; + env.ROCM_PATH = lib.optionalString rocmSupport rocmPackages.clr; cmakeFlags = [ (strings.cmakeFeature "GPU_TARGET" gpuTargetString) @@ -199,10 +234,6 @@ stdenv.mkDerivation (finalAttrs: { (strings.cmakeFeature "MIN_ARCH" minArch) # Disarms magma's asserts ] ++ lists.optionals rocmSupport [ - # Can be removed once https://github.com/icl-utk-edu/magma/pull/27 is merged - # Can't easily apply the PR as a patch because we rely on the tarball with pregenerated - # hipified files ∴ fetchpatch of the PR will apply cleanly but fail to build - (strings.cmakeFeature "ROCM_CORE" "${rocmPackages.clr}") (strings.cmakeFeature "CMAKE_C_COMPILER" "${rocmPackages.clang}/bin/clang") (strings.cmakeFeature "CMAKE_CXX_COMPILER" "${rocmPackages.clang}/bin/clang++") ]; diff --git a/pkgs/by-name/ma/mago/package.nix b/pkgs/by-name/ma/mago/package.nix index f5da3865acb6..b9010902dd0a 100644 --- a/pkgs/by-name/ma/mago/package.nix +++ b/pkgs/by-name/ma/mago/package.nix @@ -9,16 +9,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mago"; - version = "1.0.0-beta.14"; + version = "1.0.3"; src = fetchFromGitHub { owner = "carthage-software"; repo = "mago"; tag = finalAttrs.version; - hash = "sha256-UKoq4RkFcLS47DZHPY/MhrRuLQoWYLoOzO2BeeJZoQw="; + hash = "sha256-i8iC16TFT2zqgJeCcJICcbmPr2kAOTZHvZvAXtHwQQw="; + forceFetchGit = true; # Does not download all files otherwise }; - cargoHash = "sha256-/THZFU3lJbgJGA4lxWt6fyiHqIgQ539vj57iKoQfXZo="; + cargoHash = "sha256-EGtUvFZw16Rxj8gPQLBapJpKUgRjawZQmn1sRD5gU1E="; env = { # Get openssl-sys to use pkg-config diff --git a/pkgs/by-name/ma/mailhog/package.nix b/pkgs/by-name/ma/mailhog/package.nix index ddfc7a54753d..bac7fee18371 100644 --- a/pkgs/by-name/ma/mailhog/package.nix +++ b/pkgs/by-name/ma/mailhog/package.nix @@ -40,7 +40,6 @@ buildGoModule rec { homepage = "https://github.com/mailhog/MailHog"; changelog = "https://github.com/mailhog/MailHog/releases/tag/v${version}"; maintainers = with lib.maintainers; [ - disassembler jojosch ]; license = lib.licenses.mit; diff --git a/pkgs/by-name/ma/mapproxy/package.nix b/pkgs/by-name/ma/mapproxy/package.nix index 50f45c37b661..1c1465454fb0 100644 --- a/pkgs/by-name/ma/mapproxy/package.nix +++ b/pkgs/by-name/ma/mapproxy/package.nix @@ -9,7 +9,6 @@ python3Packages.buildPythonApplication rec { pname = "mapproxy"; version = "5.1.1"; pyproject = true; - disabled = python3Packages.pythonOlder "3.8"; src = fetchFromGitHub { owner = "mapproxy"; diff --git a/pkgs/by-name/ma/marathonctl/package.nix b/pkgs/by-name/ma/marathonctl/package.nix index 4741bdcce0e6..3bbe104f76f5 100644 --- a/pkgs/by-name/ma/marathonctl/package.nix +++ b/pkgs/by-name/ma/marathonctl/package.nix @@ -26,7 +26,6 @@ buildGoModule rec { homepage = "https://github.com/shoenig/marathonctl"; description = "CLI tool for Marathon"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ manveru ]; mainProgram = "marathonctl"; }; } diff --git a/pkgs/by-name/ma/mariadb-galera/package.nix b/pkgs/by-name/ma/mariadb-galera/package.nix index c2002555c61b..5d71dfcd944b 100644 --- a/pkgs/by-name/ma/mariadb-galera/package.nix +++ b/pkgs/by-name/ma/mariadb-galera/package.nix @@ -52,8 +52,12 @@ stdenv.mkDerivation rec { mainProgram = "garbd"; homepage = "https://galeracluster.com/"; license = lib.licenses.lgpl2Only; - maintainers = with lib.maintainers; [ izorkin ]; - teams = [ lib.teams.helsinki-systems ]; + maintainers = with lib.maintainers; [ + conni2461 + das_j + helsinki-Jo + izorkin + ]; platforms = lib.platforms.all; broken = stdenv.hostPlatform.isDarwin; }; diff --git a/pkgs/by-name/ma/mask/package.nix b/pkgs/by-name/ma/mask/package.nix index a50c8d0246c3..6cd1458177c1 100644 --- a/pkgs/by-name/ma/mask/package.nix +++ b/pkgs/by-name/ma/mask/package.nix @@ -7,36 +7,43 @@ nix-update-script, # tests + lua, nodejs, - python3, php, + python3, ruby, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "mask"; - version = "0.11.6"; + version = "0.11.7"; src = fetchFromGitHub { owner = "jacobdeichert"; repo = "mask"; tag = "mask/${finalAttrs.version}"; - hash = "sha256-xGD23pso5iS+9dmfTMNtR6YqUqKnzJTzMl+OnRGpL3g="; + hash = "sha256-jz2x3Do+fqDHS7vNdnZsNOj36dRFt/khFaF/ztyKji8="; }; - cargoHash = "sha256-JaYr6J3NOwVIHzGO4wLkke5O/T/9WUDENPgLP5Fwyhg="; + cargoHash = "sha256-HnRNg1/ZVWr6JRIsBf2kH9Xys7Hth4fMI12dClsPKv0="; preCheck = '' export PATH=$PATH:$PWD/target/${stdenv.hostPlatform.rust.rustcTarget}/$cargoBuildType ''; nativeCheckInputs = [ + lua nodejs - python3 php + python3 ruby ]; + checkFlags = [ + # requires swift which currently fails to build + "--skip=swift" + ]; + nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; @@ -48,8 +55,6 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/jacobdeichert/mask"; changelog = "https://github.com/jacobdeichert/mask/blob/mask/${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ - defelo - ]; + maintainers = with lib.maintainers; [ defelo ]; }; }) diff --git a/pkgs/by-name/ma/matter-compiler/package.nix b/pkgs/by-name/ma/matter-compiler/package.nix index 5d28606c00e2..5d17568e92be 100644 --- a/pkgs/by-name/ma/matter-compiler/package.nix +++ b/pkgs/by-name/ma/matter-compiler/package.nix @@ -20,7 +20,6 @@ bundlerApp { license = lib.licenses.mit; maintainers = with lib.maintainers; [ rvlander - manveru nicknovitski ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/md/mdl/package.nix b/pkgs/by-name/md/mdl/package.nix index 4f0305056051..d235c29688df 100644 --- a/pkgs/by-name/md/mdl/package.nix +++ b/pkgs/by-name/md/mdl/package.nix @@ -17,7 +17,6 @@ bundlerApp { license = lib.licenses.mit; maintainers = with lib.maintainers; [ gerschtli - manveru nicknovitski totoroot ]; diff --git a/pkgs/by-name/me/media-downloader/package.nix b/pkgs/by-name/me/media-downloader/package.nix index a456b4b44beb..2fa622434d97 100644 --- a/pkgs/by-name/me/media-downloader/package.nix +++ b/pkgs/by-name/me/media-downloader/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "media-downloader"; - version = "5.4.6"; + version = "5.4.7"; src = fetchFromGitHub { owner = "mhogomchungu"; repo = "media-downloader"; rev = finalAttrs.version; - hash = "sha256-2VcxNoC/9dVYItDJdWxuXFtl31p8kKCnbmAWfYFBGwQ="; + hash = "sha256-Rbzuji46o6n8gaGqj8TDzLEBU9Eq754rnzkRxF6iir4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/me/memcached-exporter/package.nix b/pkgs/by-name/me/memcached-exporter/package.nix index d5ba29db7a7c..508f40801b3f 100644 --- a/pkgs/by-name/me/memcached-exporter/package.nix +++ b/pkgs/by-name/me/memcached-exporter/package.nix @@ -26,6 +26,9 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/prometheus/memcached_exporter"; license = lib.licenses.asl20; mainProgram = "memcached_exporter"; - teams = with lib.teams; [ deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; }) diff --git a/pkgs/by-name/me/meowlnir/package.nix b/pkgs/by-name/me/meowlnir/package.nix index bc00dad687e9..c0e3d35c4e49 100644 --- a/pkgs/by-name/me/meowlnir/package.nix +++ b/pkgs/by-name/me/meowlnir/package.nix @@ -9,18 +9,19 @@ buildGoModule rec { pname = "meowlnir"; - version = "0.7.0"; + version = "26.01"; + tag = "v0.2601.0"; src = fetchFromGitHub { owner = "maunium"; repo = "meowlnir"; - tag = "v${version}"; - hash = "sha256-S0GrM8uKfWJh0/oAQp2f7P+yj99N0bovCNscM8b7tB8="; + inherit tag; + hash = "sha256-vrj19+YuhCFwluR+f73WPOJ4bMVxzoG3WjWrN3QuhZ0="; }; buildInputs = [ olm ]; - vendorHash = "sha256-gzigJ2gg9jaREbFdX+38sUV8I/gcB5x+lYaABnS2Mbk="; + vendorHash = "sha256-l6H6NqAq3C0OBYaea3ed6g/wHdNmo5tVkgizx+vU09E="; doCheck = true; doInstallCheck = true; diff --git a/pkgs/by-name/mi/mint/package.nix b/pkgs/by-name/mi/mint/package.nix index 4f0f65ea4487..763640599e22 100644 --- a/pkgs/by-name/mi/mint/package.nix +++ b/pkgs/by-name/mi/mint/package.nix @@ -40,6 +40,5 @@ crystal.buildCrystalPackage rec { mainProgram = "mint"; homepage = "https://www.mint-lang.com/"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ manveru ]; }; } diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json index 6be5b07cd1fd..194e1d1c98bd 100644 --- a/pkgs/by-name/mi/mirrord/manifest.json +++ b/pkgs/by-name/mi/mirrord/manifest.json @@ -1,21 +1,21 @@ { - "version": "3.180.0", + "version": "3.181.0", "assets": { "x86_64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.180.0/mirrord_linux_x86_64", - "hash": "sha256-hpmuMhN2HS+4zPlTOh87A1UQvlxVKlzqHKKDm1VBLhg=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.181.0/mirrord_linux_x86_64", + "hash": "sha256-hLTPM7TMoXL1AlPPLYrqCpE3JrfeOISK4RKekQg2GzY=" }, "aarch64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.180.0/mirrord_linux_aarch64", - "hash": "sha256-dGe0r7ckuKkMzVkGyWaYR2PVkDtGRRhC3ievXzKs5dU=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.181.0/mirrord_linux_aarch64", + "hash": "sha256-LyJxTLWP2TZpGeKVQEhMILBpxik5LuT96en9272Ff0k=" }, "aarch64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.180.0/mirrord_mac_universal", - "hash": "sha256-YxDaYQyh9C64bSqqkIWX4zEKadps+jqnXJA1BGdtxzw=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.181.0/mirrord_mac_universal", + "hash": "sha256-E0F6i/irdOKizI558XX9gh9YQ6T9d7H2SKwh4AjzSCk=" }, "x86_64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.180.0/mirrord_mac_universal", - "hash": "sha256-YxDaYQyh9C64bSqqkIWX4zEKadps+jqnXJA1BGdtxzw=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.181.0/mirrord_mac_universal", + "hash": "sha256-E0F6i/irdOKizI558XX9gh9YQ6T9d7H2SKwh4AjzSCk=" } } } diff --git a/pkgs/by-name/mo/monophony/package.nix b/pkgs/by-name/mo/monophony/package.nix index 158e2b95d393..0d91dd20592d 100644 --- a/pkgs/by-name/mo/monophony/package.nix +++ b/pkgs/by-name/mo/monophony/package.nix @@ -12,14 +12,14 @@ }: python3Packages.buildPythonApplication rec { pname = "monophony"; - version = "4.3.0"; + version = "4.3.1"; pyproject = true; src = fetchFromGitLab { owner = "zehkira"; repo = "monophony"; tag = "v${version}"; - hash = "sha256-w2ev/fpswaNcutxg2zMwrtFkulMbbG7BUm3L8qlnZKk="; + hash = "sha256-Jp2RwfTcOb4xALIMc4DAQX+fWdqPE+TWv5qRgdSopbM="; }; sourceRoot = "${src.name}/source"; diff --git a/pkgs/by-name/mo/moon/package.nix b/pkgs/by-name/mo/moon/package.nix index af391fcfae2d..42d00115174e 100644 --- a/pkgs/by-name/mo/moon/package.nix +++ b/pkgs/by-name/mo/moon/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "moon"; - version = "1.41.5"; + version = "1.41.8"; src = fetchFromGitHub { owner = "moonrepo"; repo = "moon"; tag = "v${finalAttrs.version}"; - hash = "sha256-BcDKjw2k102TQmLeq6+59Z6b4IpnGDRbQ4/nAXXIPBo="; + hash = "sha256-KPK1XE18A8vh5FlGIPizxWmEVPkJHcy6fvtFsOQlhok="; }; - cargoHash = "sha256-mc3A573QaovLwhcZshe9Z60ebHmcCyW/izbxlb2FNpk="; + cargoHash = "sha256-U3Hq5zy1dvG/sJA08bBi2mwMbTP2E5LLIpx0rMq2U1A="; env = { RUSTFLAGS = "-C strip=symbols"; diff --git a/pkgs/by-name/mo/mosdns/package.nix b/pkgs/by-name/mo/mosdns/package.nix index 826b7f6d7390..a647d28374aa 100644 --- a/pkgs/by-name/mo/mosdns/package.nix +++ b/pkgs/by-name/mo/mosdns/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "mosdns"; - version = "5.3.3"; + version = "5.3.4"; src = fetchFromGitHub { owner = "IrineSistiana"; repo = "mosdns"; tag = "v${version}"; - hash = "sha256-nSqSfbpi91W28DaLjCsWlPiLe1gLVHeZnstktc/CLag="; + hash = "sha256-N0JY0brs9IXx3L+sz66JniRaBzY0bGD8PawJ1WA3tkw="; }; - vendorHash = "sha256-RpvWkIDhHSNbdkpBCcXYbbvbmGiG15qyB5aEJRmg9s4="; + vendorHash = "sha256-FfCA5204MP+m5nkzj/jLDh5NzpD1EtrL7owmcvZhOBU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/mp/mpd-mpris/package.nix b/pkgs/by-name/mp/mpd-mpris/package.nix index 8abed8f15f53..b1bc34480ba3 100644 --- a/pkgs/by-name/mp/mpd-mpris/package.nix +++ b/pkgs/by-name/mp/mpd-mpris/package.nix @@ -2,37 +2,30 @@ lib, buildGoModule, fetchFromGitHub, - fetchpatch, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "mpd-mpris"; - version = "0.4.1"; + version = "0.4.3"; src = fetchFromGitHub { owner = "natsukagami"; repo = "mpd-mpris"; - rev = "v${version}"; - sha256 = "sha256-QxPkGWpCWiyEbChH9SHeD+SiV8k0c/G7MG/azksP3xU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-w8OH34JW++OYLpNIHfQvc45dFyU/wVWVa+vEwWb8VqU="; }; - patches = [ - # Makes Exec= path not absolute, see https://github.com/natsukagami/mpd-mpris/pull/42 - (fetchpatch { - url = "https://github.com/natsukagami/mpd-mpris/commit/8a5b53b1aa3174c3ccb1db24fb4e39f90012b98f.patch"; - hash = "sha256-LArPq+RRPJOs0je1olqg+pK7nvU7UIlrpGtHv2PhIY4="; - }) - ]; - - vendorHash = "sha256-HCDJrp9WFB1z+FnYpOI5e/AojtdnpN2ZNtgGVaH/v/Q="; - - doCheck = false; + vendorHash = "sha256-ugJEw02jSsfObljDaup31zoQlf2HvwDRUljD7lp7Ys4="; subPackages = [ "cmd/mpd-mpris" ]; + postPatch = '' + substituteInPlace services/mpd-mpris.service --replace-fail "ExecStart=" "ExecStart=$out/bin/" + ''; + postInstall = '' - install -Dm644 mpd-mpris.service $out/lib/systemd/user/mpd-mpris.service - install -Dm644 mpd-mpris.desktop $out/etc/xdg/autostart/mpd-mpris.desktop + install -Dm644 services/mpd-mpris.service -t $out/lib/systemd/user + install -Dm644 mpd-mpris.desktop -t $out/etc/xdg/autostart ''; meta = { @@ -42,4 +35,4 @@ buildGoModule rec { maintainers = with lib.maintainers; [ doronbehar ]; mainProgram = "mpd-mpris"; }; -} +}) diff --git a/pkgs/by-name/mp/mpdcron/package.nix b/pkgs/by-name/mp/mpdcron/package.nix index 91a535aec1f1..8b74a4eb86a8 100644 --- a/pkgs/by-name/mp/mpdcron/package.nix +++ b/pkgs/by-name/mp/mpdcron/package.nix @@ -65,7 +65,6 @@ stdenv.mkDerivation { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ lovek323 - manveru ]; }; } diff --git a/pkgs/by-name/ms/mscp/package.nix b/pkgs/by-name/ms/mscp/package.nix index 975002979981..45cc26a8e241 100644 --- a/pkgs/by-name/ms/mscp/package.nix +++ b/pkgs/by-name/ms/mscp/package.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/upa/mscp"; mainProgram = "mscp"; license = lib.licenses.gpl3Only; - teams = [ lib.teams.deshaw ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix index 3877924bfac4..fe7ab9c868bb 100644 --- a/pkgs/by-name/mu/music-assistant/package.nix +++ b/pkgs/by-name/mu/music-assistant/package.nix @@ -47,14 +47,14 @@ assert python.pkgs.buildPythonApplication rec { pname = "music-assistant"; - version = "2.7.3"; + version = "2.7.5"; pyproject = true; src = fetchFromGitHub { owner = "music-assistant"; repo = "server"; tag = version; - hash = "sha256-6D3B88wjfVHvNhNrTDOu77eAkherOqdBVafUhht7okA="; + hash = "sha256-iWdOGdmPJO7Pjdn8UjuSOhWnRGBFjmARFsuHmP6IP58="; }; patches = [ diff --git a/pkgs/by-name/mu/music-assistant/providers.nix b/pkgs/by-name/mu/music-assistant/providers.nix index a40106dec226..0ad1828c4768 100644 --- a/pkgs/by-name/mu/music-assistant/providers.nix +++ b/pkgs/by-name/mu/music-assistant/providers.nix @@ -1,7 +1,7 @@ # Do not edit manually, run ./update-providers.py { - version = "2.7.3"; + version = "2.7.5"; providers = { airplay = ps: [ ]; @@ -134,6 +134,7 @@ sendspin = ps: with ps; [ aiosendspin + av ]; siriusxm = ps: [ ]; # missing sxm diff --git a/pkgs/by-name/ne/netbird-dashboard/package.nix b/pkgs/by-name/ne/netbird-dashboard/package.nix index 849d758898e6..83aa10953964 100644 --- a/pkgs/by-name/ne/netbird-dashboard/package.nix +++ b/pkgs/by-name/ne/netbird-dashboard/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "netbird-dashboard"; - version = "2.26.1"; + version = "2.27.1"; src = fetchFromGitHub { owner = "netbirdio"; repo = "dashboard"; rev = "v${version}"; - hash = "sha256-8MC3sHKs7HmxzqFw7px+Q0zX9PzzZhb4I5gcJ/fQ4uc="; + hash = "sha256-XVB3zgdfgApqNwMdZMung4qLZOPfsaWdpqlFUz5z9ZU="; }; - npmDepsHash = "sha256-RIhVSRjqzFawXaRZHAUwGodnNerGz+I3GbPFsP5qESY="; + npmDepsHash = "sha256-e4Uxy1bwR3a+thIkaNWpAwDvIJyTbM5TwVy+YVD0CQQ="; npmFlags = [ "--legacy-peer-deps" ]; installPhase = '' diff --git a/pkgs/by-name/ne/netbox_4_3/package.nix b/pkgs/by-name/ne/netbox_4_3/package.nix index dc5807639598..3689a4177415 100644 --- a/pkgs/by-name/ne/netbox_4_3/package.nix +++ b/pkgs/by-name/ne/netbox_4_3/package.nix @@ -9,7 +9,7 @@ let py = python3.override { self = py; - packageOverrides = _final: prev: { django = prev.django_5_2; }; + packageOverrides = _final: prev: { django = prev.django_5; }; }; extraBuildInputs = plugins py.pkgs; diff --git a/pkgs/by-name/ne/netbox_4_4/package.nix b/pkgs/by-name/ne/netbox_4_4/package.nix index 01ee99b882e6..1a6bea9d66bf 100644 --- a/pkgs/by-name/ne/netbox_4_4/package.nix +++ b/pkgs/by-name/ne/netbox_4_4/package.nix @@ -9,7 +9,7 @@ let py = python3.override { self = py; - packageOverrides = _final: prev: { django = prev.django_5_2; }; + packageOverrides = _final: prev: { django = prev.django_5; }; }; extraBuildInputs = plugins py.pkgs; diff --git a/pkgs/by-name/ni/ni/package.nix b/pkgs/by-name/ni/ni/package.nix index 93e53d3322df..63223326f773 100644 --- a/pkgs/by-name/ni/ni/package.nix +++ b/pkgs/by-name/ni/ni/package.nix @@ -12,19 +12,19 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "ni"; - version = "28.1.0"; + version = "28.2.0"; src = fetchFromGitHub { owner = "antfu-collective"; repo = "ni"; tag = "v${finalAttrs.version}"; - hash = "sha256-D6TzDyT3HIULeHL/ACkOcVQ/g7pAw8jONnWfwJgWyx4="; + hash = "sha256-QRatGm8e12mYtCPpeZwz4adtl6PTPUXTRlge6UKqiqI="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; fetcherVersion = 2; - hash = "sha256-eSnrR2Cik24wEbSObabJSzZOGfl6XzQrEyDB7Ea2hg8="; + hash = "sha256-n/iqROsdVwLZEAHU3G6Hkl2wrwnwJv7BUMzJif9bYRM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ni/nix-init/package.nix b/pkgs/by-name/ni/nix-init/package.nix index e6a84d96ea5e..fee8f60c7566 100644 --- a/pkgs/by-name/ni/nix-init/package.nix +++ b/pkgs/by-name/ni/nix-init/package.nix @@ -95,6 +95,9 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/nix-community/nix-init"; changelog = "https://github.com/nix-community/nix-init/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mpl20; - maintainers = [ lib.maintainers.eclairevoyant ]; + maintainers = with lib.maintainers; [ + eclairevoyant + figsoda + ]; }; }) diff --git a/pkgs/by-name/ni/nix-search-cli/package.nix b/pkgs/by-name/ni/nix-search-cli/package.nix index e5198fb28a7c..8a6ba783cb83 100644 --- a/pkgs/by-name/ni/nix-search-cli/package.nix +++ b/pkgs/by-name/ni/nix-search-cli/package.nix @@ -7,16 +7,16 @@ buildGoModule { pname = "nix-search-cli"; - version = "0.2-unstable-2024-09-24"; + version = "0.3-unstable-2025-12-03"; src = fetchFromGitHub { owner = "peterldowns"; repo = "nix-search-cli"; - rev = "7d6b4c501ee448dc2e5c123aa4c6d9db44a6dd12"; - hash = "sha256-0Zms/QVCUKxILLLJYsaodSW64DJrVr/yB13SnNL8+Wg="; + rev = "ab0d5156c1e3b383c250ff273639cd3dea6de2d9"; + hash = "sha256-NGL9jj4y16+d0Es7aK1oxqAimZn7sdJDAxVkcY3CTcg="; }; - vendorHash = "sha256-RZuB0aRiMSccPhX30cGKBBEMCSvmC6r53dWaqDYbmyA="; + vendorHash = "sha256-VlJ2OuHOTqIJeGUm2NbBiz33i8QTxaZnnm0JkVGkw1U="; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/by-name/ni/nixbit/package.nix b/pkgs/by-name/ni/nixbit/package.nix index 533f5196db13..816a77745722 100644 --- a/pkgs/by-name/ni/nixbit/package.nix +++ b/pkgs/by-name/ni/nixbit/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nixbit"; - version = "0.6.3"; + version = "0.7.1"; src = fetchFromGitHub { owner = "pbek"; repo = "nixbit"; tag = "v${finalAttrs.version}"; - hash = "sha256-wh7pXUinqjlNA2gGbxY/48f4yScqWqQTWF9SIPOz3/w="; + hash = "sha256-VBstZEs1ptLWjqiat5vLdrduUDTBj2Lm9CwpMt1puyM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/nm/nmh/package.nix b/pkgs/by-name/nm/nmh/package.nix index 4b92436f02d7..49c9f935a20f 100644 --- a/pkgs/by-name/nm/nmh/package.nix +++ b/pkgs/by-name/nm/nmh/package.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { claws-mail's mail folders. Most other mail clients have migrated to maildir. ''; - maintainers = with lib.maintainers; [ normalcea ]; + maintainers = [ ]; }; }) diff --git a/pkgs/by-name/no/noise-repellent/package.nix b/pkgs/by-name/no/noise-repellent/package.nix index 55e595763d2f..08753c0f3cca 100644 --- a/pkgs/by-name/no/noise-repellent/package.nix +++ b/pkgs/by-name/no/noise-repellent/package.nix @@ -10,15 +10,15 @@ lv2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "noise-repellent"; - version = "0.2.3"; + version = "0.2.5"; src = fetchFromGitHub { owner = "lucianodato"; repo = "noise-repellent"; - rev = "v${version}"; - sha256 = "sha256-d8csYC3z3vXdmN/G6mAK+H8ia0vOCsoUpoA3W8/OADc="; + tag = "v${finalAttrs.version}"; + hash = "sha256-GzOUcC161syjazazf+ywssWL0iH17eNhmhTBcjsuaQ0="; }; mesonFlags = [ @@ -40,8 +40,9 @@ stdenv.mkDerivation rec { meta = { description = "LV2 plugin for broadband noise reduction"; homepage = "https://github.com/lucianodato/noise-repellent"; + changelog = "https://github.com/lucianodato/noise-repellent/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/nu/nurl/package.nix b/pkgs/by-name/nu/nurl/package.nix index 88d1ae1c0311..0211d0575337 100644 --- a/pkgs/by-name/nu/nurl/package.nix +++ b/pkgs/by-name/nu/nurl/package.nix @@ -52,7 +52,10 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/nix-community/nurl"; changelog = "https://github.com/nix-community/nurl/blob/v${version}/CHANGELOG.md"; license = lib.licenses.mpl20; - maintainers = [ lib.maintainers.matthiasbeyer ]; + maintainers = with lib.maintainers; [ + figsoda + matthiasbeyer + ]; mainProgram = "nurl"; }; } diff --git a/pkgs/by-name/ob/obfs4/package.nix b/pkgs/by-name/ob/obfs4/package.nix index 31ac4a734c29..6e1c34fa9d60 100644 --- a/pkgs/by-name/ob/obfs4/package.nix +++ b/pkgs/by-name/ob/obfs4/package.nix @@ -9,7 +9,7 @@ buildGoModule (finalAttrs: { pname = "obfs4"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -19,10 +19,10 @@ buildGoModule (finalAttrs: { # will collide with lyrebird Gtk3 program. repo = "lyrebird"; tag = "lyrebird-${finalAttrs.version}"; - hash = "sha256-h4ZhjyWRovoEFEFjjJBHBWc3kup60MNFvaYN6UPPxOE="; + hash = "sha256-KI9tGQomqSbiW8itxQ72rPwL67LVTmP110FrYVELr5w="; }; - vendorHash = "sha256-isquplrmgtR8Mn5M+XNRdeGJHrAm7V7h1etVmVmN60I="; + vendorHash = "sha256-AlLRJieCiCLQPbqT+0J3Zxe73ryNB8MQkAyHsU+wr2A="; ldflags = [ "-s" diff --git a/pkgs/by-name/oc/ocrfeeder/package.nix b/pkgs/by-name/oc/ocrfeeder/package.nix index 5dc36c45b4ca..3554e3867424 100644 --- a/pkgs/by-name/oc/ocrfeeder/package.nix +++ b/pkgs/by-name/oc/ocrfeeder/package.nix @@ -55,6 +55,7 @@ stdenv.mkDerivation (finalAttrs: { reportlab odfpy pygobject3 + standard-imghdr ] )) ]; diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index 0ead4f13d7c4..b62877f6a9ad 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -14,7 +14,7 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencode"; - version = "1.1.23"; + version = "1.1.25"; src = fetchFromGitHub { owner = "anomalyco"; repo = "opencode"; diff --git a/pkgs/by-name/op/opendmarc/package.nix b/pkgs/by-name/op/opendmarc/package.nix index 34bafbc67d8b..3630c4f126c6 100644 --- a/pkgs/by-name/op/opendmarc/package.nix +++ b/pkgs/by-name/op/opendmarc/package.nix @@ -70,6 +70,9 @@ stdenv.mkDerivation rec { bsd3 sendmail ]; - teams = [ lib.teams.helsinki-systems ]; + maintainers = with lib.maintainers; [ + das_j + helsinki-Jo + ]; }; } diff --git a/pkgs/by-name/op/openldap/package.nix b/pkgs/by-name/op/openldap/package.nix index d45b2b1ede92..18f22935befa 100644 --- a/pkgs/by-name/op/openldap/package.nix +++ b/pkgs/by-name/op/openldap/package.nix @@ -159,7 +159,11 @@ stdenv.mkDerivation rec { homepage = "https://www.openldap.org/"; description = "Open source implementation of the Lightweight Directory Access Protocol"; license = lib.licenses.openldap; - teams = [ lib.teams.helsinki-systems ]; + maintainers = with lib.maintainers; [ + conni2461 + das_j + helsinki-Jo + ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/op/opensplat/package.nix b/pkgs/by-name/op/opensplat/package.nix index 45791b230c1b..a4c417c9be8e 100644 --- a/pkgs/by-name/op/opensplat/package.nix +++ b/pkgs/by-name/op/opensplat/package.nix @@ -12,15 +12,16 @@ cxxopts, nix-update-script, config, - # Upstream has rocm/hip support, too. anyone? cudaSupport ? config.cudaSupport, cudaPackages, + rocmSupport ? config.rocmSupport, + rocmPackages, autoAddDriverRunpath, fetchpatch2, }: let version = "1.1.4"; - torch = python3.pkgs.torch.override { inherit cudaSupport; }; + torch = python3.pkgs.torch.override { inherit cudaSupport rocmSupport; }; # Using a normal stdenv with cuda torch gives # ld: /nix/store/k1l7y96gv0nc685cg7i3g43i4icmddzk-python3.11-torch-2.2.1-lib/lib/libc10.so: undefined reference to `std::ios_base_library_init()@GLIBCXX_3.4.32' stdenv' = if cudaSupport then cudaPackages.backendStdenv else stdenv; @@ -43,10 +44,32 @@ stdenv'.mkDerivation { }) ]; + postPatch = lib.optionalString rocmSupport '' + # ROCm CMake targets must be available before find_package(Torch) + # because Torch's Caffe2Targets.cmake references them in torch_hip_library + substituteInPlace CMakeLists.txt \ + --replace-fail "find_package(Torch REQUIRED)" \ + "find_package(hip REQUIRED) + find_package(hiprtc REQUIRED) + find_package(hipblas REQUIRED) + find_package(hipfft REQUIRED) + find_package(hiprand REQUIRED) + find_package(hipsparse REQUIRED) + find_package(hipsolver REQUIRED) + find_package(hipblaslt REQUIRED) + find_package(rocblas REQUIRED) + find_package(rocsolver REQUIRED) + find_package(miopen REQUIRED) + find_package(Torch REQUIRED)" + ''; + nativeBuildInputs = [ cmake ninja ] + ++ lib.optionals rocmSupport [ + rocmPackages.clr + ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc autoAddDriverRunpath @@ -61,16 +84,39 @@ stdenv'.mkDerivation { torch opencv ] + ++ lib.optionals rocmSupport [ + rocmPackages.clr + rocmPackages.hipblas + rocmPackages.hipfft + rocmPackages.hiprand + rocmPackages.hipsparse + rocmPackages.hipsolver + rocmPackages.hipblaslt + rocmPackages.rocblas + rocmPackages.rocsolver + rocmPackages.rocsolver + rocmPackages.miopen + ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ]; - env.TORCH_CUDA_ARCH_LIST = "${lib.concatStringsSep ";" python3.pkgs.torch.cudaCapabilities}"; + env = + lib.optionalAttrs cudaSupport { + TORCH_CUDA_ARCH_LIST = "${lib.concatStringsSep ";" python3.pkgs.torch.cudaCapabilities}"; + NIX_LDFLAGS = "-L${lib.getOutput "stubs" cudaPackages.cuda_cudart}/lib/stubs"; # fixes -lcuda not found + } + // lib.optionalAttrs rocmSupport { + HIPFLAGS = "-I${lib.getInclude rocmPackages.rocthrust}/include -I${lib.getInclude rocmPackages.rocprim}/include"; + }; cmakeFlags = [ (lib.cmakeBool "CMAKE_SKIP_RPATH" true) (lib.cmakeFeature "FETCHCONTENT_TRY_FIND_PACKAGE_MODE" "ALWAYS") ] + ++ lib.optionals rocmSupport [ + (lib.cmakeFeature "GPU_RUNTIME" "HIP") + ] ++ lib.optionals cudaSupport [ (lib.cmakeFeature "GPU_RUNTIME" "CUDA") (lib.cmakeFeature "CUDA_TOOLKIT_ROOT_DIR" "${cudaPackages.cudatoolkit}/") @@ -87,7 +133,10 @@ stdenv'.mkDerivation { # vendored+modified gsplat lib.licenses.asl20 ]; - maintainers = [ lib.maintainers.jcaesar ]; + maintainers = [ + lib.maintainers.jcaesar + lib.maintainers.LunNova + ]; platforms = lib.platforms.linux ++ lib.optionals (!cudaSupport) lib.platforms.darwin; }; } diff --git a/pkgs/by-name/or/orbvis/package.nix b/pkgs/by-name/or/orbvis/package.nix index 4b356e652eaa..6099bb5b8ba5 100644 --- a/pkgs/by-name/or/orbvis/package.nix +++ b/pkgs/by-name/or/orbvis/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "orbvis"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "wojciech-graj"; repo = "orbvis"; tag = "v${finalAttrs.version}"; - hash = "sha256-kPbRhm+HymY6DuR4JgE6qTTYKGIqVxvwxtveu7dOOO0="; + hash = "sha256-U19kslgAULBBFozK5KUtew6KRsFeJ4+h8bL9cXmnzso="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ow/owncloud-client/package.nix b/pkgs/by-name/ow/owncloud-client/package.nix index 503c9bfa96eb..62b59845d01e 100644 --- a/pkgs/by-name/ow/owncloud-client/package.nix +++ b/pkgs/by-name/ow/owncloud-client/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "owncloud-client"; - version = "6.0.2"; + version = "6.0.3"; src = fetchFromGitHub { owner = "owncloud"; repo = "client"; tag = "v${version}"; - hash = "sha256-cqnDe9q7+qQ0MNrt48zTw6TcNYCEFgQmwXkmQCjR1Uc="; + hash = "sha256-11ZqCqFKJexMRH73IEBRuNx5Dxf4aMHlShwull0z4hI="; }; patches = [ diff --git a/pkgs/by-name/ox/oxlint/package.nix b/pkgs/by-name/ox/oxlint/package.nix index 1167bf7d00de..ed47b1b9a8de 100644 --- a/pkgs/by-name/ox/oxlint/package.nix +++ b/pkgs/by-name/ox/oxlint/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "oxlint"; - version = "1.38.0"; + version = "1.39.0"; src = fetchFromGitHub { owner = "oxc-project"; repo = "oxc"; tag = "oxlint_v${finalAttrs.version}"; - hash = "sha256-kMCGKbc7qaY0KUOR+67mLvKW4J5CuvYUmC6Aj9xlzSk="; + hash = "sha256-Sg9NtXRuQ0ZruK8a8k5EkeDOJ9v6uzpNzEQ/FY56ioY="; }; - cargoHash = "sha256-cesj9jwWHIFxpFV62QDgYl22EUE8qVjIbb2nRObAyLo="; + cargoHash = "sha256-sgIarCuUmSTAVPVr82rp4dQwzDMWESIbGgkCYEExz6o="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/pa/pan/package.nix b/pkgs/by-name/pa/pan/package.nix index 2116056ac0f1..35ff4b4c3f35 100644 --- a/pkgs/by-name/pa/pan/package.nix +++ b/pkgs/by-name/pa/pan/package.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "pan"; - version = "0.164"; + version = "0.165"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "pan"; tag = "v${finalAttrs.version}"; - hash = "sha256-fVhjgnDvDf5rmhuW27UpEp3m7o8FFcpakVcGBhBic0Y="; + hash = "sha256-y9ejT/XTMoWMLSIOePEtPCUy51JThJrBBOCdSUTk2yc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix index 9a03cf6d1722..4a2746ae109c 100644 --- a/pkgs/by-name/pa/paperless-ngx/package.nix +++ b/pkgs/by-name/pa/paperless-ngx/package.nix @@ -42,7 +42,7 @@ let python = python3.override { self = python; packageOverrides = final: prev: { - django = prev.django_5_2; + django = prev.django_5; fido2 = prev.fido2.overridePythonAttrs { version = "1.2.0"; diff --git a/pkgs/by-name/pa/par-lang/package.nix b/pkgs/by-name/pa/par-lang/package.nix index d3ccb069dcd9..7c81a11d3f35 100644 --- a/pkgs/by-name/pa/par-lang/package.nix +++ b/pkgs/by-name/pa/par-lang/package.nix @@ -16,13 +16,13 @@ rustPlatform.buildRustPackage { pname = "par-lang"; - version = "0-unstable-2025-12-04"; + version = "0-unstable-2026-01-18"; src = fetchFromGitHub { owner = "faiface"; repo = "par-lang"; - rev = "9056718048a5c8d1ff32c60f9fc5db5af36a0259"; - hash = "sha256-uerYlhUqwpt3BbYiN6+CubhZAcMRXTFKqKSqyqh5WYY="; + rev = "e10c1e4be92162fefdb515f321a2699c73726005"; + hash = "sha256-/Rz0D7zAxjJgm/61/M3iGZ6XwHEHGT6tTmispUjSbW4="; }; cargoHash = "sha256-sW+gAIp/DjlTo44QDXpP6COrCK/CcDlx3no284MEQJo="; diff --git a/pkgs/by-name/pa/parabolic/package.nix b/pkgs/by-name/pa/parabolic/package.nix index 254c884f0d88..eab8c6ab9392 100644 --- a/pkgs/by-name/pa/parabolic/package.nix +++ b/pkgs/by-name/pa/parabolic/package.nix @@ -105,7 +105,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/NickvisionApps/Parabolic"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ - normalcea getchoo ]; mainProgram = "org.nickvision.tubeconverter"; diff --git a/pkgs/by-name/pa/part-db/fix-composer-validate.diff b/pkgs/by-name/pa/part-db/fix-composer-validate.diff deleted file mode 100644 index 73060f3e0591..000000000000 --- a/pkgs/by-name/pa/part-db/fix-composer-validate.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/composer.json b/composer.json -index 0659f2ee..5a2dee70 100644 ---- a/composer.json -+++ b/composer.json -@@ -1,4 +1,6 @@ - { -+ "name": "part-db/part-db-server", -+ "description": "Part-DB is an Open source inventory management system for your electronic components", - "type": "project", - "license": "AGPL-3.0-or-later", - "require": { -diff --git a/composer.lock b/composer.lock -index 614a35f7..e0c949eb 100644 ---- a/composer.lock -+++ b/composer.lock -@@ -4,7 +4,7 @@ - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", - "This file is @generated automatically" - ], -- "content-hash": "465fa2ab7f9f8dad2b8cfbeaa640c136", -+ "content-hash": "cec123f8cbf51820ba08c5c69ec2ded4", - "packages": [ - { - "name": "amphp/amp", diff --git a/pkgs/by-name/pa/part-db/package.nix b/pkgs/by-name/pa/part-db/package.nix index 67fe7e1b0e08..0cf1b1cae224 100644 --- a/pkgs/by-name/pa/part-db/package.nix +++ b/pkgs/by-name/pa/part-db/package.nix @@ -7,29 +7,25 @@ nodejs, yarnConfigHook, yarnBuildHook, - yarnInstallHook, + nixosTests, envLocalPath ? "/var/lib/part-db/env.local", cachePath ? "/var/cache/part-db/", logPath ? "/var/log/part-db/", }: let pname = "part-db"; - version = "1.14.5"; + version = "2.4.0"; - srcWithVendor = php.buildComposerProject { + srcWithVendor = php.buildComposerProject2 { inherit pname version; src = fetchFromGitHub { owner = "Part-DB"; repo = "Part-DB-server"; tag = "v${version}"; - hash = "sha256-KtNWog4aSnmgJsFckDuBrlnd9cj1f8kmSFi+nv2cZOg="; + hash = "sha256-z/bvFFzKVMN6lr9RnrBc/hTrZ9a/mjgpkDYslUFHM50="; }; - patches = [ - ./fix-composer-validate.diff - ]; - php = php.buildEnv { extensions = ( { enabled, all }: @@ -40,15 +36,25 @@ let ); }; - vendorHash = "sha256-PJtm/3Vdm2zomUklVMKlDAe/vziJN4e+JNNf/u8N3B4="; + vendorHash = "sha256-gt5HBi+vV5WhaEXNFFIO8xcbX1Z60SICvxXWGNzsn5o="; + # Upstream composer.json file is missing the description field + composerStrictValidation = false; composerNoPlugins = false; postInstall = '' + chmod -R u+w $out/share + cd "$out"/share/php/part-db + echo "Running composer dump-autoload to generate autoload_runtime.php..." + composer dump-autoload --no-interaction + export APP_ENV=prod + export APP_SECRET=dummy + export DATABASE_URL=sqlite:///%kernel.project_dir%/data/app.db + php -d memory_limit=256M bin/console cache:warmup + cd /build mv "$out"/share/php/part-db/* $out/ mv "$out"/share/php/part-db/.* $out/ - cd $out/ - php -d memory_limit=256M bin/console cache:warmup + rm -rf "$out/share" ''; }; in @@ -59,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { yarnOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-Mjss2UUHVUdJ4UAI3GkG6HB6g7LbJTqvgrIXFhZmw1Q="; + hash = "sha256-F9kZ8nAIghkg+xUkglvRZXOSadv2lbKTP0gNfLD4LYE="; }; nativeBuildInputs = [ @@ -79,12 +85,17 @@ stdenv.mkDerivation (finalAttrs: { ln -s ${cachePath} $out/var/cache ''; + passthru.tests = { inherit (nixosTests) part-db; }; + meta = { description = "Open source inventory management system for your electronic components"; homepage = "https://docs.part-db.de/"; changelog = "https://github.com/Part-DB/Part-DB-server/releases/tag/v${version}"; license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ felbinger ]; + maintainers = with lib.maintainers; [ + felbinger + oddlama + ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/pa/patroni/package.nix b/pkgs/by-name/pa/patroni/package.nix index bfc0ef13296d..003004ec46a8 100644 --- a/pkgs/by-name/pa/patroni/package.nix +++ b/pkgs/by-name/pa/patroni/package.nix @@ -65,6 +65,9 @@ python3Packages.buildPythonApplication rec { changelog = "https://github.com/patroni/patroni/blob/v${version}/docs/releases.rst"; license = lib.licenses.mit; platforms = lib.platforms.unix; - teams = [ lib.teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; } diff --git a/pkgs/by-name/pd/pdk/Gemfile.lock b/pkgs/by-name/pd/pdk/Gemfile.lock index c34293761fb2..0c94599445ee 100644 --- a/pkgs/by-name/pd/pdk/Gemfile.lock +++ b/pkgs/by-name/pd/pdk/Gemfile.lock @@ -7,13 +7,13 @@ GEM logger (~> 1.5) cri (2.15.12) deep_merge (1.2.2) - diff-lcs (1.5.1) - ffi (1.17.0) + diff-lcs (1.6.2) + ffi (1.17.2) hitimes (2.0.0) json-schema (4.3.1) addressable (>= 2.8) json_pure (2.6.3) - logger (1.6.1) + logger (1.7.0) minitar (0.12.1) pastel (0.8.0) tty-color (~> 0.5) @@ -34,7 +34,7 @@ GEM tty-prompt (~> 0.23) tty-spinner (~> 0.9) tty-which (~> 0.5) - public_suffix (6.0.1) + public_suffix (6.0.2) puppet-modulebuilder (1.1.0) minitar (~> 0.9) pathspec (>= 0.2.1, < 3.0.0) @@ -60,4 +60,4 @@ DEPENDENCIES pdk (= 3.3.0) BUNDLED WITH - 2.5.16 + 2.6.9 diff --git a/pkgs/by-name/pd/pdk/gemset.nix b/pkgs/by-name/pd/pdk/gemset.nix index 8d53eaed9c38..90aef1568ff3 100644 --- a/pkgs/by-name/pd/pdk/gemset.nix +++ b/pkgs/by-name/pd/pdk/gemset.nix @@ -46,20 +46,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1znxccz83m4xgpd239nyqxlifdb7m8rlfayk6s259186nkgj6ci7"; + sha256 = "0qlrj2qyysc9avzlr4zs1py3x684hqm61n4czrsk1pyllz5x5q4s"; type = "gem"; }; - version = "1.5.1"; + version = "1.6.2"; }; ffi = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi"; + sha256 = "19kdyjg3kv7x0ad4xsd4swy5izsbb1vl1rpb6qqcqisr5s23awi9"; type = "gem"; }; - version = "1.17.0"; + version = "1.17.2"; }; hitimes = { groups = [ "default" ]; @@ -97,10 +97,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s"; + sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr"; type = "gem"; }; - version = "1.6.1"; + version = "1.7.0"; }; minitar = { groups = [ "default" ]; @@ -164,10 +164,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31"; + sha256 = "1543ap9w3ydhx39ljcd675cdz9cr948x9mp00ab8qvq6118wv9xz"; type = "gem"; }; - version = "6.0.1"; + version = "6.0.2"; }; puppet-modulebuilder = { dependencies = [ diff --git a/pkgs/by-name/pd/pdm/package.nix b/pkgs/by-name/pd/pdm/package.nix index 6cfac71c071e..3700f96f4a3e 100644 --- a/pkgs/by-name/pd/pdm/package.nix +++ b/pkgs/by-name/pd/pdm/package.nix @@ -33,8 +33,6 @@ python.pkgs.buildPythonApplication rec { version = "2.26.2"; pyproject = true; - disabled = python.pkgs.pythonOlder "3.8"; - src = fetchFromGitHub { owner = "pdm-project"; repo = "pdm"; diff --git a/pkgs/by-name/pd/pdns/package.nix b/pkgs/by-name/pd/pdns/package.nix index 9a0ea3f37d70..e691e76e963b 100644 --- a/pkgs/by-name/pd/pdns/package.nix +++ b/pkgs/by-name/pd/pdns/package.nix @@ -108,7 +108,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ mic92 - disassembler nickcao ]; }; diff --git a/pkgs/by-name/pe/peering-manager/package.nix b/pkgs/by-name/pe/peering-manager/package.nix index bab7c5c14e7a..8534577e3529 100644 --- a/pkgs/by-name/pe/peering-manager/package.nix +++ b/pkgs/by-name/pe/peering-manager/package.nix @@ -10,7 +10,7 @@ let python = python3.override { packageOverrides = final: prev: { - django = prev.django_5_2; + django = prev.django_5; }; }; in diff --git a/pkgs/by-name/pe/penelope/package.nix b/pkgs/by-name/pe/penelope/package.nix index f1a2246e204a..3f0a4361c627 100644 --- a/pkgs/by-name/pe/penelope/package.nix +++ b/pkgs/by-name/pe/penelope/package.nix @@ -4,16 +4,16 @@ fetchFromGitHub, }: -python3.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication (finalAttrs: { pname = "penelope"; - version = "0.15.0"; + version = "0.18.0"; pyproject = true; src = fetchFromGitHub { owner = "brightio"; repo = "penelope"; - tag = "v${version}"; - hash = "sha256-paVKCqR8J1bINz80qOBqiG2wxGjiJlf0gv3LIyS/Xs0="; + tag = "v${finalAttrs.version}"; + hash = "sha256-ryUG/OQsU6mecr+kSe5CD41a53xNRrPs1esL+V1lmdQ="; }; postPatch = '' @@ -30,10 +30,10 @@ python3.pkgs.buildPythonApplication rec { meta = { description = "Penelope Shell Handler"; homepage = "https://github.com/brightio/penelope"; - changelog = "https://github.com/brightio/penelope/releases/tag/v${version}"; + changelog = "https://github.com/brightio/penelope/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; mainProgram = "penelope.py"; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/pe/perfect_dark/package.nix b/pkgs/by-name/pe/perfect_dark/package.nix index c37418334bb3..5fb2a595f136 100644 --- a/pkgs/by-name/pe/perfect_dark/package.nix +++ b/pkgs/by-name/pe/perfect_dark/package.nix @@ -130,7 +130,6 @@ stdenv.mkDerivation (finalAttrs: { ]; maintainers = with lib.maintainers; [ PaulGrandperrin - normalcea sigmasquadron ]; mainProgram = "io.github.fgsfdsfgs.perfect_dark"; diff --git a/pkgs/by-name/pg/pg_activity/package.nix b/pkgs/by-name/pg/pg_activity/package.nix index 8244a42fb6ec..345e64177ba7 100644 --- a/pkgs/by-name/pg/pg_activity/package.nix +++ b/pkgs/by-name/pg/pg_activity/package.nix @@ -8,7 +8,6 @@ python3Packages.buildPythonApplication rec { pname = "pg_activity"; version = "3.6.1"; pyproject = true; - disabled = python3Packages.pythonOlder "3.8"; src = fetchFromGitHub { owner = "dalibo"; diff --git a/pkgs/by-name/pi/pik/package.nix b/pkgs/by-name/pi/pik/package.nix index 60c036d0bf34..d14537418401 100644 --- a/pkgs/by-name/pi/pik/package.nix +++ b/pkgs/by-name/pi/pik/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "pik"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "jacek-kurlit"; repo = "pik"; rev = version; - hash = "sha256-qpIMm6ivt+v+Un+F03cCtUYMX2dxN/jVGKeCMA20294="; + hash = "sha256-M3zje2UX03go7i9/06jXb8N2imx4VnZp6PHakJB3oZM="; }; - cargoHash = "sha256-ugoXWn2ybdF/HbKqqUQWfNLqtxMdANTn3qnooOYLDKI="; + cargoHash = "sha256-ulMgapYkfTfynNW3XfiC/jo4GWGJ4HS9TCnXAGqs7Ac="; passthru.tests.version = testers.testVersion { package = pik; }; diff --git a/pkgs/by-name/pi/pipeline/package.nix b/pkgs/by-name/pi/pipeline/package.nix index 53e4c5898a60..9141227d681e 100644 --- a/pkgs/by-name/pi/pipeline/package.nix +++ b/pkgs/by-name/pi/pipeline/package.nix @@ -105,7 +105,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ chuangzhu - normalcea ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/po/pop-wallpapers/package.nix b/pkgs/by-name/po/pop-wallpapers/package.nix index 350d569f99dc..4595f981222c 100644 --- a/pkgs/by-name/po/pop-wallpapers/package.nix +++ b/pkgs/by-name/po/pop-wallpapers/package.nix @@ -85,7 +85,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { publicDomain ]; maintainers = with lib.maintainers; [ - normalcea pandapip1 ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/po/portablemc/package.nix b/pkgs/by-name/po/portablemc/package.nix index 6f94c7abc528..435c3e02ee79 100644 --- a/pkgs/by-name/po/portablemc/package.nix +++ b/pkgs/by-name/po/portablemc/package.nix @@ -50,8 +50,6 @@ python3Packages.buildPythonApplication rec { version = "4.4.1"; pyproject = true; - disabled = python3Packages.pythonOlder "3.8"; - src = fetchFromGitHub { owner = "mindstorm38"; repo = "portablemc"; diff --git a/pkgs/by-name/pr/prek/package.nix b/pkgs/by-name/pr/prek/package.nix index aa67696130c7..c4b42b2ce913 100644 --- a/pkgs/by-name/pr/prek/package.nix +++ b/pkgs/by-name/pr/prek/package.nix @@ -5,21 +5,22 @@ git, uv, python312, + versionCheckHook, nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "prek"; - version = "0.2.20"; + version = "0.2.30"; src = fetchFromGitHub { owner = "j178"; repo = "prek"; tag = "v${finalAttrs.version}"; - hash = "sha256-AZyYjgUd2dGnBUHwo/cPagFE8IJmzsgMLwebTypLAgE="; + hash = "sha256-IqFUJNFs7a/M9IUNEwW40EZTAh+6a5Ov37xg5c9iwRc="; }; - cargoHash = "sha256-a1yBu4MuyR0veBSQAUdaE/9rB04i6RVJ/NdWNmpRzmM="; + cargoHash = "sha256-KOpQ3P9cmcWYT3bPKtKpzHPagX4b9hH0EiWGpt98NnE="; nativeCheckInputs = [ git @@ -45,7 +46,13 @@ rustPlatform.buildRustPackage (finalAttrs: { useNextest = true; # some python tests use uv, which in turn needs python - UV_PYTHON = "${python312}/bin/python"; + env = { + UV_PYTHON = "${python312}/bin/python"; + UV_NO_MANAGED_PYTHON = true; + UV_SYSTEM_PYTHON = true; + }; + + cargoTestFlags = [ "--no-fail-fast" ]; checkFlags = map (t: "--skip ${t}") [ # these tests require internet access @@ -67,6 +74,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "rust::remote_hooks" "rust::remote_hooks_with_lib_deps" "unsupported::unsupported_language" + "remote_hook_non_workspace" # "meta_hooks" "reuse_env" "docker::docker" @@ -145,15 +153,37 @@ rustPlatform.buildRustPackage (finalAttrs: { "run_in_non_git_repo" # depends on locale "init_nonexistent_repo" + # https://github.com/astral-sh/uv/issues/8635 + "alternate_config_file" + "basic_discovery" + "color" + "cookiecutter_template_directories_are_skipped" + "empty_entry" + "git_dir_respected" + "git_env_vars_not_leaked_to_pip_install" + "gitignore_respected" + "invalid_entry" + "local_python_hook" + "orphan_projects" + "run_with_selectors" + "run_with_stdin_closed" + "show_diff_on_failure" + "submodule_discovery" + "workspace_install_hooks" + # We don't have git info; we run versionCheckHook instead + "version_info" ]; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + passthru.updateScript = nix-update-script { }; meta = { homepage = "https://github.com/j178/prek"; description = "Better `pre-commit`, re-engineered in Rust "; mainProgram = "prek"; - changelog = "https://github.com/j178/prek/releases/tag/${finalAttrs.src.tag}"; + changelog = "https://github.com/j178/prek/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = [ lib.licenses.mit ]; maintainers = [ lib.maintainers.knl ]; }; diff --git a/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix index c9db67140ba9..c15867c1ca82 100644 --- a/pkgs/by-name/pr/pretalx/package.nix +++ b/pkgs/by-name/pr/pretalx/package.nix @@ -12,7 +12,7 @@ let python = python3.override { self = python; packageOverrides = final: prev: { - django = prev.django_5_2; + django = prev.django_5; django-countries = prev.django-countries.overridePythonAttrs (oldAttrs: rec { version = "8.1.0"; diff --git a/pkgs/by-name/pr/procfd/package.nix b/pkgs/by-name/pr/procfd/package.nix index baf6d9131422..07984c82b89e 100644 --- a/pkgs/by-name/pr/procfd/package.nix +++ b/pkgs/by-name/pr/procfd/package.nix @@ -29,6 +29,9 @@ rustPlatform.buildRustPackage (finalAttrs: { license = lib.licenses.bsd3; mainProgram = "procfd"; platforms = lib.platforms.linux; - teams = with lib.teams; [ deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; }) diff --git a/pkgs/by-name/pr/procodile/package.nix b/pkgs/by-name/pr/procodile/package.nix index 3524d743a8de..5fdc97bb899b 100644 --- a/pkgs/by-name/pr/procodile/package.nix +++ b/pkgs/by-name/pr/procodile/package.nix @@ -16,7 +16,6 @@ bundlerApp { homepage = "https://github.com/adamcooke/procodile"; license = with lib.licenses; mit; maintainers = with lib.maintainers; [ - manveru nicknovitski ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix b/pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix index 03be768cb83c..5016e1ae3b7e 100644 --- a/pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix @@ -46,7 +46,10 @@ buildGoModule rec { description = "NVIDIA GPU metrics exporter for Prometheus leveraging DCGM"; homepage = "https://github.com/NVIDIA/dcgm-exporter"; license = lib.licenses.asl20; - teams = [ lib.teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; mainProgram = "dcgm-exporter"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix b/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix index 79f8dca869b6..04a7d3696659 100644 --- a/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix @@ -21,6 +21,9 @@ buildGoModule rec { mainProgram = "elasticsearch_exporter"; homepage = "https://github.com/prometheus-community/elasticsearch_exporter"; license = lib.licenses.asl20; - teams = [ lib.teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; } diff --git a/pkgs/by-name/pr/prometheus-surfboard-exporter/package.nix b/pkgs/by-name/pr/prometheus-surfboard-exporter/package.nix index d2bf5f120bc3..aa990aa2b125 100644 --- a/pkgs/by-name/pr/prometheus-surfboard-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-surfboard-exporter/package.nix @@ -29,7 +29,6 @@ buildGoModule rec { mainProgram = "surfboard_exporter"; homepage = "https://github.com/ipstatic/surfboard_exporter"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ disassembler ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/pr/proton-pass-cli/package.nix b/pkgs/by-name/pr/proton-pass-cli/package.nix index d13608ae3ffe..9c44bd96c4b7 100644 --- a/pkgs/by-name/pr/proton-pass-cli/package.nix +++ b/pkgs/by-name/pr/proton-pass-cli/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "proton-pass-cli"; - version = "1.3.3"; + version = "1.3.5"; src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system}; @@ -47,19 +47,19 @@ stdenv.mkDerivation (finalAttrs: { sources = { "aarch64-darwin" = fetchurl { url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-macos-aarch64"; - hash = "sha256-JPjJsbPvmJ83gOw9xy7QEStY/00X9acHukOx6W/M8YM="; + hash = "sha256-I+QYefg6ECxxb68RDyjw0dK4+vSOvu8qQ2kPhuPoabU="; }; "aarch64-linux" = fetchurl { url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-linux-aarch64"; - hash = "sha256-kGwL6bvmdogx1xZFH8Z7O55GSQWZSEORD86A2sVKoGU="; + hash = "sha256-ohKFj+d75hYev6jwn7WLtf2exNJJN2cFeGkwgFHvx1E="; }; "x86_64-darwin" = fetchurl { url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-macos-x86_64"; - hash = "sha256-JYQmHNcPpaJTJHq+qsy2Y06SSr10MOREVvtUDWILR78="; + hash = "sha256-7TMcen4iX9nr0rxmF7vFWJ19tkNN5d7YqImL0LF9jkw="; }; "x86_64-linux" = fetchurl { url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-linux-x86_64"; - hash = "sha256-rcu+Ob3N4S2q5MUc3OLS8frMF2QyLn83/88QtI96/cE="; + hash = "sha256-LerztCDNQ63wYUOfiULdvY2zQDUlVXNcDsf13SDaIg8="; }; }; updateScript = writeShellScript "update-proton-pass-cli" '' diff --git a/pkgs/by-name/pt/pt/package.nix b/pkgs/by-name/pt/pt/package.nix index b9e70ca9a935..c6b69c7670d6 100644 --- a/pkgs/by-name/pt/pt/package.nix +++ b/pkgs/by-name/pt/pt/package.nix @@ -16,7 +16,6 @@ bundlerApp { homepage = "http://www.github.com/raul/pt"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ - manveru nicknovitski ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/pu/puppet-bolt/Gemfile.lock b/pkgs/by-name/pu/puppet-bolt/Gemfile.lock index 43c5bea6e0b7..70a706d69e61 100644 --- a/pkgs/by-name/pu/puppet-bolt/Gemfile.lock +++ b/pkgs/by-name/pu/puppet-bolt/Gemfile.lock @@ -7,22 +7,25 @@ GEM rexml addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) - aws-eventstream (1.3.0) - aws-partitions (1.968.0) - aws-sdk-core (3.201.5) + aws-eventstream (1.4.0) + aws-partitions (1.1140.0) + aws-sdk-core (3.228.0) aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.651.0) + aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) + base64 + bigdecimal jmespath (~> 1, >= 1.6.1) - aws-sdk-ec2 (1.470.0) - aws-sdk-core (~> 3, >= 3.201.0) + logger + aws-sdk-ec2 (1.544.0) + aws-sdk-core (~> 3, >= 3.228.0) aws-sigv4 (~> 1.5) - aws-sigv4 (1.9.1) + aws-sigv4 (1.12.1) aws-eventstream (~> 1, >= 1.0.2) - base64 (0.2.0) - bigdecimal (3.1.8) - bindata (2.5.0) - bolt (3.30.0) + base64 (0.3.0) + bigdecimal (3.2.2) + bindata (2.5.1) + bolt (4.0.0) CFPropertyList (>= 2.2) addressable (~> 2.5) aws-sdk-ec2 (~> 1) @@ -35,57 +38,43 @@ GEM net-scp (>= 1.2, < 5.0) net-ssh (>= 4.0, < 8.0) net-ssh-krb (~> 0.5) - orchestrator_client (~> 0.5) + orchestrator_client (~> 0.7) puppet (>= 6.18.0) puppet-resource_api (>= 1.8.1) puppet-strings (>= 2.3.0, < 5.0) puppetfile-resolver (>= 0.6.2, < 1.0) - r10k (~> 3.10) + r10k (>= 3.10, < 5) ruby_smb (~> 1.0) terminal-table (~> 3.0) winrm (~> 2.0) winrm-fs (~> 1.3) builder (3.3.0) colored2 (3.1.2) - concurrent-ruby (1.3.4) - connection_pool (2.4.1) + concurrent-ruby (1.3.5) + connection_pool (2.5.3) cri (2.15.12) deep_merge (1.2.2) - erubi (1.13.0) - facter (4.6.1) + erubi (1.13.1) + facter (4.10.0) hocon (~> 1.3) - thor (>= 1.0.1, < 2.0) - faraday (1.10.3) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0) - faraday-multipart (~> 1.0) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.0) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - faraday-retry (~> 1.0) - ruby2_keywords (>= 0.0.4) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) - faraday-net_http (1.0.2) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) - faraday-retry (1.0.3) - faraday_middleware (1.2.0) - faraday (~> 1.0) + thor (>= 1.0.1, < 1.3) + faraday (2.13.4) + faraday-net_http (>= 2.0, < 3.5) + json + logger + faraday-follow_redirects (0.3.0) + faraday (>= 1, < 3) + faraday-net_http (3.4.1) + net-http (>= 0.5.0) + faraday-net_http_persistent (2.3.1) + faraday (~> 2.5) + net-http-persistent (>= 4.0.4, < 5) fast_gettext (2.4.0) prime - ffi (1.17.0) + ffi (1.17.2) forwardable (1.3.3) getoptlong (0.2.1) - gettext (3.4.9) + gettext (3.5.1) erubi locale (>= 2.0.5) prime @@ -103,43 +92,49 @@ GEM hiera-eyaml (3.4.0) highline optimist - highline (3.1.0) + highline (3.1.2) reline hocon (1.4.0) - httpclient (2.8.3) - io-console (0.7.2) + httpclient (2.9.0) + mutex_m + io-console (0.8.1) jmespath (1.6.2) - jwt (2.7.1) + json (2.13.2) + jwt (2.10.2) + base64 little-plugger (1.1.4) locale (2.1.4) log4r (1.1.10) + logger (1.7.0) logging (2.4.0) little-plugger (~> 1.1) multi_json (~> 1.14) minitar (0.12.1) molinillo (0.8.0) - multi_json (1.15.0) - multipart-post (2.4.1) - net-http-persistent (4.0.2) - connection_pool (~> 2.2) - net-scp (4.0.0) + multi_json (1.17.0) + mutex_m (0.3.0) + net-http (0.6.0) + uri + net-http-persistent (4.0.6) + connection_pool (~> 2.2, >= 2.2.4) + net-scp (4.1.0) net-ssh (>= 2.6.5, < 8.0.0) - net-ssh (7.2.3) + net-ssh (7.3.0) net-ssh-krb (0.5.1) gssapi (~> 1.3.0) net-ssh (>= 2.0) nkf (0.2.0) nori (2.7.1) bigdecimal - optimist (3.1.0) - orchestrator_client (0.7.0) - faraday (~> 1.4) - net-http-persistent (~> 4.0) - prime (0.1.2) + optimist (3.2.1) + orchestrator_client (0.7.1) + faraday (>= 1.4, < 3.0) + faraday-net_http_persistent (>= 1.0, < 3.0) + prime (0.1.4) forwardable singleton - public_suffix (6.0.1) - puppet (8.8.1) + public_suffix (6.0.2) + puppet (8.10.0) concurrent-ruby (~> 1.0) deep_merge (~> 1.0) facter (>= 4.3.0, < 5) @@ -152,51 +147,47 @@ GEM semantic_puppet (~> 1.0) puppet-resource_api (1.9.0) hocon (>= 1.0) - puppet-strings (4.1.2) + puppet-strings (4.1.3) rgen (~> 0.9) - yard (~> 0.9) - puppet_forge (3.2.0) - faraday (~> 1.3) - faraday_middleware (~> 1.0) - minitar + yard (~> 0.9, < 0.9.37) + puppet_forge (5.0.4) + faraday (~> 2.0) + faraday-follow_redirects (~> 0.3.0) + minitar (< 1.0.0) semantic_puppet (~> 1.0) puppetfile-resolver (0.6.3) molinillo (~> 0.6) semantic_puppet (~> 1.0) - r10k (3.16.2) + r10k (4.1.0) colored2 (= 3.1.2) cri (>= 2.15.10) - fast_gettext (>= 1.1.0, < 3.0.0) - gettext (>= 3.0.2, < 4.0.0) - gettext-setup (>= 0.24, < 2.0.0) - jwt (>= 2.2.3, < 2.8.0) + gettext-setup (>= 0.24, < 2.0) + jwt (>= 2.2.3, < 3) log4r (= 1.1.10) minitar (~> 0.9) multi_json (~> 1.10) - puppet_forge (>= 2.3.0, < 4.0.0) + puppet_forge (>= 4.1, < 6) racc (1.8.1) - reline (0.5.9) + reline (0.6.2) io-console (~> 0.5) - rexml (3.3.6) - strscan - rgen (0.9.1) - ruby2_keywords (0.0.5) + rexml (3.4.1) + rgen (0.10.2) ruby_smb (1.1.0) bindata rubyntlm windows_error rubyntlm (0.6.5) base64 - rubyzip (2.3.2) + rubyzip (2.4.1) scanf (1.0.0) - semantic_puppet (1.1.0) - singleton (0.2.0) - strscan (3.1.0) + semantic_puppet (1.1.1) + singleton (0.3.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) text (1.3.1) - thor (1.3.1) - unicode-display_width (2.5.0) + thor (1.2.2) + unicode-display_width (2.6.0) + uri (1.0.3) windows_error (0.1.5) winrm (2.3.9) builder (>= 2.1.2) @@ -222,4 +213,4 @@ DEPENDENCIES bolt BUNDLED WITH - 2.5.16 + 2.6.9 diff --git a/pkgs/by-name/pu/puppet-bolt/gemset.nix b/pkgs/by-name/pu/puppet-bolt/gemset.nix index 536eabfe2656..07d6d2930ff5 100644 --- a/pkgs/by-name/pu/puppet-bolt/gemset.nix +++ b/pkgs/by-name/pu/puppet-bolt/gemset.nix @@ -15,36 +15,39 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0gvdg4yx4p9av2glmp7vsxhs0n8fj1ga9kq2xdb8f95j7b04qhzi"; + sha256 = "0fqqdqg15rgwgz3mn4pj91agd20csk9gbrhi103d20328dfghsqi"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.0"; }; aws-partitions = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0m74rrlwv741wlp2imw5y93ybrzczx0r2jvcgp1v4zq299z3zy29"; + sha256 = "1snwg6nj6v1rmqp96xlff3k1lkg0z4jamkj7cj978vdkzsfi807k"; type = "gem"; }; - version = "1.968.0"; + version = "1.1140.0"; }; aws-sdk-core = { dependencies = [ "aws-eventstream" "aws-partitions" "aws-sigv4" + "base64" + "bigdecimal" "jmespath" + "logger" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0l5c37gvarb3p3zsip1p9mpmir0zdccp0aibgx9cy61im4pwaj0q"; + sha256 = "0r3mvwqndqg0c29cnznhmgnkcsmxncx4r6gqwfjwp5imkrgarp86"; type = "gem"; }; - version = "3.201.5"; + version = "3.228.0"; }; aws-sdk-ec2 = { dependencies = [ @@ -55,10 +58,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0z7zk5z9zyqqljh8fxhq8ngp8pixbm85pa9ygpr0nmgdl2b1i7ff"; + sha256 = "0wi5xy62z34r6h1j5padz00wi6q21v4g1i7b04sqnvmb9kxdklzf"; type = "gem"; }; - version = "1.470.0"; + version = "1.544.0"; }; aws-sigv4 = { dependencies = [ "aws-eventstream" ]; @@ -66,40 +69,40 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0yf396fxashbqn0drbnvd9srxfg7w06v70q8kqpzi04zqchf6lvp"; + sha256 = "003ch8qzh3mppsxch83ns0jra8d222ahxs96p9cdrl0grfazywv9"; type = "gem"; }; - version = "1.9.1"; + version = "1.12.1"; }; base64 = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; + sha256 = "0yx9yn47a8lkfcjmigk79fykxvr80r4m1i35q82sxzynpbm7lcr7"; type = "gem"; }; - version = "0.2.0"; + version = "0.3.0"; }; bigdecimal = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558"; + sha256 = "1p2szbr4jdvmwaaj2kxlbv1rp0m6ycbgfyp0kjkkkswmniv5y21r"; type = "gem"; }; - version = "3.1.8"; + version = "3.2.2"; }; bindata = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "08r67nglsqnxrbn803szf5bdnqhchhq8kf2by94f37fcl65wpp19"; + sha256 = "0n4ymlgik3xcg94h52dzmh583ss40rl3sn0kni63v56sq8g6l62k"; type = "gem"; }; - version = "2.5.0"; + version = "2.5.1"; }; bolt = { dependencies = [ @@ -130,10 +133,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0krs4mmy1db531gyibhzaxmghb606yjmqqyfghvriy7b9sgi6bq8"; + sha256 = "0j7yr4v8id58ag521l1xmdqhb7nsmnffb7bv32krfzvwi1f26mrj"; type = "gem"; }; - version = "3.30.0"; + version = "4.0.0"; }; builder = { groups = [ "default" ]; @@ -175,20 +178,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl"; + sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1"; type = "gem"; }; - version = "1.3.4"; + version = "1.3.5"; }; connection_pool = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g"; + sha256 = "0nrhsk7b3sjqbyl1cah6ibf1kvi3v93a7wf4637d355hp614mmyg"; type = "gem"; }; - version = "2.4.1"; + version = "2.5.3"; }; cri = { groups = [ "default" ]; @@ -215,10 +218,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0qnd6ff4az22ysnmni3730c41b979xinilahzg86bn7gv93ip9pw"; + sha256 = "1naaxsqkv5b3vklab5sbb9sdpszrjzlfsbqpy7ncbnw510xi10m0"; type = "gem"; }; - version = "1.13.0"; + version = "1.13.1"; }; facter = { dependencies = [ @@ -229,145 +232,61 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0pxpldfcf40dr9khra3sa131ij7gzd97bba2vpw89c785pl736a7"; + sha256 = "17d561xf4s5016fm9jkfkkafn6660g04fz1yp5xfvkb0j4xj32mp"; type = "gem"; }; - version = "4.6.1"; + version = "4.10.0"; }; faraday = { dependencies = [ - "faraday-em_http" - "faraday-em_synchrony" - "faraday-excon" - "faraday-httpclient" - "faraday-multipart" "faraday-net_http" - "faraday-net_http_persistent" - "faraday-patron" - "faraday-rack" - "faraday-retry" - "ruby2_keywords" + "json" + "logger" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1c760q0ks4vj4wmaa7nh1dgvgqiwaw0mjr7v8cymy7i3ffgjxx90"; - type = "gem"; - }; - version = "1.10.3"; - }; - faraday-em_http = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "12cnqpbak4vhikrh2cdn94assh3yxza8rq2p9w2j34bqg5q4qgbs"; - type = "gem"; - }; - version = "1.0.0"; - }; - faraday-em_synchrony = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6"; + sha256 = "09mcghancmn0s5cwk2xz581j3xm3xqxfv0yxg75axnyhrx9gy6f7"; type = "gem"; }; - version = "1.0.0"; + version = "2.13.4"; }; - faraday-excon = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh"; - type = "gem"; - }; - version = "1.1.0"; - }; - faraday-httpclient = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc"; - type = "gem"; - }; - version = "1.0.1"; - }; - faraday-multipart = { - dependencies = [ "multipart-post" ]; + faraday-follow_redirects = { + dependencies = [ "faraday" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "09871c4hd7s5ws1wl4gs7js1k2wlby6v947m2bbzg43pnld044lh"; + sha256 = "1y87p3yk15bjbk0z9mf01r50lzxvp7agr56lbm9gxiz26mb9fbfr"; type = "gem"; }; - version = "1.0.4"; + version = "0.3.0"; }; faraday-net_http = { + dependencies = [ "net-http" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "10n6wikd442mfm15hd6gzm0qb527161w1wwch4h5m4iclkz2x6b3"; + sha256 = "0fxbckg468dabkkznv48ss8zv14d9cd8mh1rr3m98aw7wzx5fmq9"; type = "gem"; }; - version = "1.0.2"; + version = "3.4.1"; }; faraday-net_http_persistent = { + dependencies = [ + "faraday" + "net-http-persistent" + ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b"; - type = "gem"; - }; - version = "1.2.0"; - }; - faraday-patron = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w"; - type = "gem"; - }; - version = "1.0.0"; - }; - faraday-rack = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1h184g4vqql5jv9s9im6igy00jp6mrah2h14py6mpf9bkabfqq7g"; - type = "gem"; - }; - version = "1.0.0"; - }; - faraday-retry = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd"; - type = "gem"; - }; - version = "1.0.3"; - }; - faraday_middleware = { - dependencies = [ "faraday" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1bw8mfh4yin2xk7138rg3fhb2p5g2dlmdma88k82psah9mbmvlfy"; + sha256 = "18zwd0p2vknmpk7zrw3gz9rsln69is8h2g831yhhfy52sqvvmzr3"; type = "gem"; }; - version = "1.2.0"; + version = "2.3.1"; }; fast_gettext = { dependencies = [ "prime" ]; @@ -385,10 +304,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi"; + sha256 = "19kdyjg3kv7x0ad4xsd4swy5izsbb1vl1rpb6qqcqisr5s23awi9"; type = "gem"; }; - version = "1.17.0"; + version = "1.17.2"; }; forwardable = { groups = [ "default" ]; @@ -422,10 +341,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "16h0kda5z4s4zqygyk0f52xzs9mlz9r4lnhjwk729hhmdbz68a19"; + sha256 = "0aji3873pxn6gc5qkvnv5y9025mqk0p6h22yrpyz2b3yx9qpzv03"; type = "gem"; }; - version = "3.4.9"; + version = "3.5.1"; }; gettext-setup = { dependencies = [ @@ -487,10 +406,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1sxqnaz6wvkwbwzsipwsqcg1zw2kn67x7l362whv87zl5133w60l"; + sha256 = "0jmvyhjp2v3iq47la7w6psrxbprnbnmzz0hxxski3vzn356x7jv7"; type = "gem"; }; - version = "3.1.0"; + version = "3.1.2"; }; hocon = { groups = [ "default" ]; @@ -503,24 +422,25 @@ version = "1.4.0"; }; httpclient = { + dependencies = [ "mutex_m" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; + sha256 = "1j4qwj1nv66v3n9s4xqf64x2galvjm630bwa5xngicllwic5jr2b"; type = "gem"; }; - version = "2.8.3"; + version = "2.9.0"; }; io-console = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "08d2lx42pa8jjav0lcjbzfzmw61b8imxr9041pva8xzqabrczp7h"; + sha256 = "1jszj95hazqqpnrjjzr326nn1j32xmsc9xvd97mbcrrgdc54858y"; type = "gem"; }; - version = "0.7.2"; + version = "0.8.1"; }; jmespath = { groups = [ "default" ]; @@ -532,15 +452,26 @@ }; version = "1.6.2"; }; + json = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0s5vklcy2fgdxa9c6da34jbfrqq7xs6mryjglqqb5iilshcg3q82"; + type = "gem"; + }; + version = "2.13.2"; + }; jwt = { + dependencies = [ "base64" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "16z11alz13vfc4zs5l3fk6n51n2jw9lskvc4h4prnww0y797qd87"; + sha256 = "1x64l31nkqjwfv51s2vsm0yqq4cwzrlnji12wvaq761myx3fxq9i"; type = "gem"; }; - version = "2.7.1"; + version = "2.10.2"; }; little-plugger = { groups = [ "default" ]; @@ -572,6 +503,16 @@ }; version = "1.1.10"; }; + logger = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr"; + type = "gem"; + }; + version = "1.7.0"; + }; logging = { dependencies = [ "little-plugger" @@ -611,20 +552,31 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; + sha256 = "06sabsvnw0x1aqdcswc6bqrqz6705548bfd8z22jxgxfjrn1yn3n"; type = "gem"; }; - version = "1.15.0"; + version = "1.17.0"; }; - multipart-post = { + mutex_m = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1a5lrlvmg2kb2dhw3lxcsv6x276bwgsxpnka1752082miqxd0wlq"; + sha256 = "0l875dw0lk7b2ywa54l0wjcggs94vb7gs8khfw9li75n2sn09jyg"; type = "gem"; }; - version = "2.4.1"; + version = "0.3.0"; + }; + net-http = { + dependencies = [ "uri" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ysrwaabhf0sn24jrp0nnp51cdv0jf688mh5i6fsz63q2c6b48cn"; + type = "gem"; + }; + version = "0.6.0"; }; net-http-persistent = { dependencies = [ "connection_pool" ]; @@ -632,10 +584,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0i1as2lgnw7b4jid0gw5glv5hnxz36nmfsbr9rmxbcap72ijgy03"; + sha256 = "0pfxhhn1lqnxx8dj3ig3lgnhkxq5jsb0brg7w2wnrpwf8c23mfra"; type = "gem"; }; - version = "4.0.2"; + version = "4.0.6"; }; net-scp = { dependencies = [ "net-ssh" ]; @@ -643,20 +595,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1si2nq9l6jy5n2zw1q59a5gaji7v9vhy8qx08h4fg368906ysbdk"; + sha256 = "0p8s7l4pr6hkn0l6rxflsc11alwi1kfg5ysgvsq61lz5l690p6x9"; type = "gem"; }; - version = "4.0.0"; + version = "4.1.0"; }; net-ssh = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0sqbq5aks9xxnldbd2hy20ypnd59zcra98ql0r7jjc26s5rgc18n"; + sha256 = "1w1ypxa3n6mskkwb00b489314km19l61p5h3bar6zr8cng27c80p"; type = "gem"; }; - version = "7.2.3"; + version = "7.3.0"; }; net-ssh-krb = { dependencies = [ @@ -698,24 +650,24 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0q4jqq3v1bxlfr9jgqmahnygkvl81lr6s1rhm8qg66c9xr9nz241"; + sha256 = "0kp3f8g7g7cbw5vfkmpdv71pphhpcxk3lpc892mj9apkd7ys1y4c"; type = "gem"; }; - version = "3.1.0"; + version = "3.2.1"; }; orchestrator_client = { dependencies = [ "faraday" - "net-http-persistent" + "faraday-net_http_persistent" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "05jb10gjffrj5wy8ps1chki3n0z734bx1nx7a6wahh7cjnrqqmsg"; + sha256 = "0iij18nwivxflzyxfxhx5d0i5085hx1fa87spvi980lq31akhnwy"; type = "gem"; }; - version = "0.7.0"; + version = "0.7.1"; }; prime = { dependencies = [ @@ -726,20 +678,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1973kz8lbck6ga5v42f55jk8b8pnbgwp9p67dl1xw15gvz55dsfl"; + sha256 = "0pi2g9sd9ssyrpvbybh4skrgzqrv0rrd1q7ylgrsd519gjzmwxad"; type = "gem"; }; - version = "0.1.2"; + version = "0.1.4"; }; public_suffix = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31"; + sha256 = "1543ap9w3ydhx39ljcd675cdz9cr948x9mp00ab8qvq6118wv9xz"; type = "gem"; }; - version = "6.0.1"; + version = "6.0.2"; }; puppet = { dependencies = [ @@ -758,10 +710,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0v2jqkan3nidifxdlpm7lk0ih5s8khl9ps0nz62wj3zlywck0wsi"; + sha256 = "0fia3ji6isnqz4a31aq8k4nd8p7vkxn80hhgqfdc8kkrba7xxxgj"; type = "gem"; }; - version = "8.8.1"; + version = "8.10.0"; }; puppet-resource_api = { dependencies = [ "hocon" ]; @@ -783,15 +735,15 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0zcs25xxkfymks4knilryfpr8k0v7z3nazdm61v7a1x4rxhs7sxp"; + sha256 = "0gna12w39bjnczbqdz4gmlizqxhja8h4wvgn1qlpa3zm4w09xlcw"; type = "gem"; }; - version = "4.1.2"; + version = "4.1.3"; }; puppet_forge = { dependencies = [ "faraday" - "faraday_middleware" + "faraday-follow_redirects" "minitar" "semantic_puppet" ]; @@ -799,10 +751,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "03aaznd1gyf3wpqg34y32zfj2yxf67r85m6zfz05pv9ijizrmdnj"; + sha256 = "0d65zri1nmpph8iki5iigdzfqd6rfyc1mlgdfhg69q3566rcff06"; type = "gem"; }; - version = "3.2.0"; + version = "5.0.4"; }; puppetfile-resolver = { dependencies = [ @@ -822,8 +774,6 @@ dependencies = [ "colored2" "cri" - "fast_gettext" - "gettext" "gettext-setup" "jwt" "log4r" @@ -835,10 +785,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1f9fwfmr44lbnx31fdiabm7sb41nsbf10awm96zl79clp8kafxcp"; + sha256 = "0k3fr2f0pwyrabs12wqig31f37sqrqs8qza7jrn01d6blvhvkrb4"; type = "gem"; }; - version = "3.16.2"; + version = "4.1.0"; }; racc = { groups = [ "default" ]; @@ -856,41 +806,30 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0y6kyz7kcilwdpfy3saqfgnar38vr5ys9sp40ndffy6h1znxfbax"; + sha256 = "0ii8l0q5zkang3lxqlsamzfz5ja7jc8ln905isfdawl802k2db8x"; type = "gem"; }; - version = "0.5.9"; + version = "0.6.2"; }; rexml = { - dependencies = [ "strscan" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1ik3in0957l9s6iwdm3nsk4za072cj27riiqgpx6zzcd22flbw3s"; + sha256 = "1jmbf6lf7pcyacpb939xjjpn1f84c3nw83dy3p1lwjx0l2ljfif7"; type = "gem"; }; - version = "3.3.6"; + version = "3.4.1"; }; rgen = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1abg3frzak6inwbr4caq6mfd5spx37xnwlxss8615jr12wh525vp"; + sha256 = "0wgk4brd1v63ivdh5nnlkynfxk8m7bac9q50ydgq3d50hx4ghy6r"; type = "gem"; }; - version = "0.9.1"; - }; - ruby2_keywords = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; - type = "gem"; - }; - version = "0.0.5"; + version = "0.10.2"; }; ruby_smb = { dependencies = [ @@ -923,10 +862,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; + sha256 = "05an0wz87vkmqwcwyh5rjiaavydfn5f4q1lixcsqkphzvj7chxw5"; type = "gem"; }; - version = "2.3.2"; + version = "2.4.1"; }; scanf = { groups = [ "default" ]; @@ -943,30 +882,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ndqm3jnpdlwkk1jwqdyyb7yw7gv6r4kmjs30g09ap8siv80ilaj"; + sha256 = "15ksbizvakfx0zfdgjbh34hqnrnkjj47m4kbnsg58mpqsx45pzqm"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.1"; }; singleton = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0qq54imvbksnckzf9hrq9bjzcdb0n8wfv6l5jc0di10n88277jx6"; + sha256 = "0y2pc7lr979pab5n5lvk3jhsi99fhskl5f2s6004v8sabz51psl3"; type = "gem"; }; - version = "0.2.0"; - }; - strscan = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01"; - type = "gem"; - }; - version = "3.1.0"; + version = "0.3.0"; }; terminal-table = { dependencies = [ "unicode-display_width" ]; @@ -994,20 +923,30 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1vq1fjp45az9hfp6fxljhdrkv75cvbab1jfrwcw738pnsiqk8zps"; + sha256 = "0k7j2wn14h1pl4smibasw0bp66kg626drxb59z7rzflch99cd4rg"; type = "gem"; }; - version = "1.3.1"; + version = "1.2.2"; }; unicode-display_width = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky"; + sha256 = "0nkz7fadlrdbkf37m0x7sw8bnz8r355q3vwcfb9f9md6pds9h9qj"; type = "gem"; }; - version = "2.5.0"; + version = "2.6.0"; + }; + uri = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "04bhfvc25b07jaiaf62yrach7khhr5jlr5bx6nygg8pf11329wp9"; + type = "gem"; + }; + version = "1.0.3"; }; windows_error = { groups = [ "default" ]; diff --git a/pkgs/by-name/pu/puppet-lint/Gemfile.lock b/pkgs/by-name/pu/puppet-lint/Gemfile.lock index 61842458aa5b..e9b1610b37a7 100644 --- a/pkgs/by-name/pu/puppet-lint/Gemfile.lock +++ b/pkgs/by-name/pu/puppet-lint/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - puppet-lint (4.2.4) + puppet-lint (4.3.0) PLATFORMS ruby @@ -10,4 +10,4 @@ DEPENDENCIES puppet-lint BUNDLED WITH - 2.5.6 + 2.6.9 diff --git a/pkgs/by-name/pu/puppet-lint/gemset.nix b/pkgs/by-name/pu/puppet-lint/gemset.nix index 9a30ccf7c232..86ef0aa1f3f6 100644 --- a/pkgs/by-name/pu/puppet-lint/gemset.nix +++ b/pkgs/by-name/pu/puppet-lint/gemset.nix @@ -4,9 +4,9 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1n2pffwxj1n33hc7aw74g6a4gn5v7rawcs7rglidbdq1g4kzd829"; + sha256 = "1lbr7smgx3k48zxrsp4kkkpwfgr6q2mjyz0bz5r14j0in5j5j3xa"; type = "gem"; }; - version = "4.2.4"; + version = "4.3.0"; }; } diff --git a/pkgs/by-name/py/pyfa/package.nix b/pkgs/by-name/py/pyfa/package.nix index 45d0569508ad..f5ae3e1a16a0 100644 --- a/pkgs/by-name/py/pyfa/package.nix +++ b/pkgs/by-name/py/pyfa/package.nix @@ -11,7 +11,7 @@ copyDesktopItems, }: let - version = "2.65.2"; + version = "2.65.4"; in python3Packages.buildPythonApplication rec { inherit version; @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { owner = "pyfa-org"; repo = "Pyfa"; tag = "v${version}"; - hash = "sha256-W3HQ6x9WXYXCczVj+3MBhEnkoDgJUJ6oZal1N4iDjdg="; + hash = "sha256-dBJmtKZD2MvQjLhz2Jcn/ldAEbo0wllXDItQu5pyrW8="; }; desktopItems = [ diff --git a/pkgs/by-name/py/pyroscope/package.nix b/pkgs/by-name/py/pyroscope/package.nix index 53a0c852041d..90778dec86de 100644 --- a/pkgs/by-name/py/pyroscope/package.nix +++ b/pkgs/by-name/py/pyroscope/package.nix @@ -55,7 +55,10 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/grafana/pyroscope"; changelog = "https://github.com/grafana/pyroscope/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.agpl3Only; - teams = [ lib.teams.mercury ]; + maintainers = with lib.maintainers; [ + jkachmar + lf- + ]; mainProgram = "pyroscope"; }; }) diff --git a/pkgs/by-name/ql/qlementine-icons/package.nix b/pkgs/by-name/ql/qlementine-icons/package.nix index 582b494787bd..9839f9c3bdc7 100644 --- a/pkgs/by-name/ql/qlementine-icons/package.nix +++ b/pkgs/by-name/ql/qlementine-icons/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/oclero/qlementine-icons"; changelog = "https://github.com/oclero/qlementine-icons/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ normalcea ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/ql/qlementine/package.nix b/pkgs/by-name/ql/qlementine/package.nix index 16dc46ee4c15..683162e95beb 100644 --- a/pkgs/by-name/ql/qlementine/package.nix +++ b/pkgs/by-name/ql/qlementine/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://oclero.github.io/qlementine/"; changelog = "https://github.com/oclero/qlementine/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ normalcea ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/qm/qmqtt/package.nix b/pkgs/by-name/qm/qmqtt/package.nix index f9e2c138e6a5..6be416d7470e 100644 --- a/pkgs/by-name/qm/qmqtt/package.nix +++ b/pkgs/by-name/qm/qmqtt/package.nix @@ -3,18 +3,18 @@ stdenv, fetchFromGitHub, cmake, - qt5, + qt6, }: stdenv.mkDerivation rec { pname = "qmqtt"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "emqx"; repo = "qmqtt"; rev = "v${version}"; - hash = "sha256-JLGwEF5e/IKzPzCQBzB710REGWbc/MW+r5AHmyYUkUI="; + hash = "sha256-cIzBnJdMFY25cWf1rBoRQx1G0/5S32igF8vcte+nyHI="; }; outputs = [ @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - qt5.wrapQtAppsHook + qt6.wrapQtAppsHook ]; buildInputs = [ - qt5.qtbase + qt6.qtbase ]; meta = { diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix index 638603ba712e..e2944016f110 100644 --- a/pkgs/by-name/qo/qownnotes/package.nix +++ b/pkgs/by-name/qo/qownnotes/package.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "qownnotes"; appname = "QOwnNotes"; - version = "26.1.6"; + version = "26.1.8"; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz"; - hash = "sha256-qytiwlnuQvGljhgzLm7WpyA3E8VMpbhcKT7n5TcL2P0="; + hash = "sha256-pJBVkmXHDm5s3o5TxiJEdRhxQ3AUGw8bD/HTBXXDpIE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/qt/qtappinstancemanager/package.nix b/pkgs/by-name/qt/qtappinstancemanager/package.nix index 050d1345602f..ce0dc211c62c 100644 --- a/pkgs/by-name/qt/qtappinstancemanager/package.nix +++ b/pkgs/by-name/qt/qtappinstancemanager/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/oclero/qtappinstancemanager"; changelog = "https://github.com/oclero/qtappinstancemanager/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ normalcea ]; + maintainers = [ ]; mainProgram = "qtappinstancemanager"; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/qu/quickjs/package.nix b/pkgs/by-name/qu/quickjs/package.nix index 41e949c8c5bb..753362a301d6 100644 --- a/pkgs/by-name/qu/quickjs/package.nix +++ b/pkgs/by-name/qu/quickjs/package.nix @@ -118,9 +118,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ - stesie - ]; + maintainers = [ ]; mainProgram = "qjs"; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/r1/r10k/package.nix b/pkgs/by-name/r1/r10k/package.nix index 5973b9cb5365..fc94da7d29b7 100644 --- a/pkgs/by-name/r1/r10k/package.nix +++ b/pkgs/by-name/r1/r10k/package.nix @@ -42,7 +42,6 @@ bundlerApp rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ zimbatm - manveru nicknovitski anthonyroussel ]; diff --git a/pkgs/by-name/ra/radsecproxy/package.nix b/pkgs/by-name/ra/radsecproxy/package.nix index 737cb9891a53..5b32115c3fc5 100644 --- a/pkgs/by-name/ra/radsecproxy/package.nix +++ b/pkgs/by-name/ra/radsecproxy/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = "https://radsecproxy.github.io/"; description = "Generic RADIUS proxy that supports both UDP and TLS (RadSec) RADIUS transports"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ sargon ]; + maintainers = [ ]; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/by-name/ra/rake/package.nix b/pkgs/by-name/ra/rake/package.nix index 56037ee6555b..30a9d44aff7d 100644 --- a/pkgs/by-name/ra/rake/package.nix +++ b/pkgs/by-name/ra/rake/package.nix @@ -16,7 +16,6 @@ bundlerApp { homepage = "https://github.com/ruby/rake"; license = with lib.licenses; mit; maintainers = with lib.maintainers; [ - manveru nicknovitski ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/ra/rapid-photo-downloader/package.nix b/pkgs/by-name/ra/rapid-photo-downloader/package.nix index 8e86020d2354..ea9ccb492f23 100644 --- a/pkgs/by-name/ra/rapid-photo-downloader/package.nix +++ b/pkgs/by-name/ra/rapid-photo-downloader/package.nix @@ -36,35 +36,32 @@ python3Packages.buildPythonApplication rec { setuptools ]; - dependencies = - with python3Packages; - [ - ifuse - libimobiledevice - # Python dependencies - pyqt5 - pygobject3 - gphoto2 - pyzmq - tornado - psutil - pyxdg - arrow - python-dateutil - easygui - babel - colour - pillow - pymediainfo - sortedcontainers - requests - colorlog - pyprind - setuptools - show-in-file-manager - tenacity - ] - ++ lib.optional (pythonOlder "3.8") importlib-metadata; + dependencies = with python3Packages; [ + ifuse + libimobiledevice + # Python dependencies + pyqt5 + pygobject3 + gphoto2 + pyzmq + tornado + psutil + pyxdg + arrow + python-dateutil + easygui + babel + colour + pillow + pymediainfo + sortedcontainers + requests + colorlog + pyprind + setuptools + show-in-file-manager + tenacity + ]; postPatch = '' # Drop broken version specifier diff --git a/pkgs/by-name/ra/raspberrypi-eeprom/package.nix b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix index 7e4299c5fc90..4f09232a1548 100644 --- a/pkgs/by-name/ra/raspberrypi-eeprom/package.nix +++ b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix @@ -14,13 +14,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "raspberrypi-eeprom"; - version = "2025.12.08-2712"; + version = "2026.01.09-2711"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "rpi-eeprom"; tag = "v${finalAttrs.version}"; - hash = "sha256-6zlq6BibjPWSGQPl13vFNCPVzjnROfYowVYPttQ9jZQ="; + hash = "sha256-grJc7wvnYIYouybJhAE6uRb28JGJ12YP6eHIt/xrPPs="; }; buildInputs = [ python3 ]; diff --git a/pkgs/by-name/rc/rcu/package.nix b/pkgs/by-name/rc/rcu/package.nix index 7a00c9b90c72..9312c9a684f4 100644 --- a/pkgs/by-name/rc/rcu/package.nix +++ b/pkgs/by-name/rc/rcu/package.nix @@ -24,7 +24,7 @@ let in python3Packages.buildPythonApplication rec { pname = "rcu"; - version = "4.0.32"; + version = "4.0.33"; pyproject = false; @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { let src-tarball = requireFile { name = "rcu-${version}-source.tar.gz"; - hash = "sha256-0sJyCRDV76HUy78RBO27AgkXGroL217GNwHp8HMSKx8="; + hash = "sha256-ezbG3qUfUyr9JEXyKTrULYCVm4hA4+nvcHPzJpdLaWY="; url = "https://www.davisr.me/projects/rcu/"; }; in diff --git a/pkgs/by-name/re/readability-cli/lockfile.patch b/pkgs/by-name/re/readability-cli/lockfile.patch deleted file mode 100644 index 4f6fc5d8d5ea..000000000000 --- a/pkgs/by-name/re/readability-cli/lockfile.patch +++ /dev/null @@ -1,148 +0,0 @@ -diff --git a/package-lock.json b/package-lock.json -index 094c6d9..fba3807 100644 ---- a/package-lock.json -+++ b/package-lock.json -@@ -1,19 +1,19 @@ - { - "name": "readability-cli", -- "version": "2.4.4", -+ "version": "2.4.5", - "lockfileVersion": 2, - "requires": true, - "packages": { - "": { - "name": "readability-cli", -- "version": "2.4.4", -+ "version": "2.4.5", - "license": "GPL-3.0-only", - "dependencies": { - "@mozilla/readability": "^0.4.4", -- "dompurify": "^3.0.1", -- "jsdom": "^21.0.0", -+ "dompurify": "^3.0.5", -+ "jsdom": "^22.1.0", - "y18n": "^5.0.8", -- "yargs": "^17.7.1" -+ "yargs": "^17.7.2" - }, - "bin": { - "readable": "index.js" -@@ -271,9 +271,13 @@ - } - }, - "node_modules/dompurify": { -- "version": "3.0.1", -- "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.0.1.tgz", -- "integrity": "sha512-60tsgvPKwItxZZdfLmamp0MTcecCta3avOhsLgPZ0qcWt96OasFfhkeIRbJ6br5i0fQawT1/RBGB5L58/Jpwuw==" -+ "version": "3.2.6", -+ "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.6.tgz", -+ "integrity": "sha512-/2GogDQlohXPZe6D6NOgQvXLPSYBqIWMnZ8zzOhn09REE4eyAzb+Hed3jhoM9OkuaJ8P6ZGTTVWQKAi8ieIzfQ==", -+ "license": "(MPL-2.0 OR Apache-2.0)", -+ "optionalDependencies": { -+ "@types/trusted-types": "^2.0.7" -+ } - }, - "node_modules/emoji-regex": { - "version": "8.0.0", -@@ -532,9 +536,10 @@ - "dev": true - }, - "node_modules/jsdom": { -- "version": "21.1.1", -- "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-21.1.1.tgz", -- "integrity": "sha512-Jjgdmw48RKcdAIQyUD1UdBh2ecH7VqwaXPN3ehoZN6MqgVbMn+lRm1aAT1AsdJRAJpwfa4IpwgzySn61h2qu3w==", -+ "version": "22.1.0", -+ "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-22.1.0.tgz", -+ "integrity": "sha512-/9AVW7xNbsBv6GfWho4TTNjEo9fe6Zhf9O7s0Fhhr3u+awPwAJMKwAMXnkk5vBxflqLW9hTHX/0cs+P3gW+cQw==", -+ "license": "MIT", - "dependencies": { - "abab": "^2.0.6", - "acorn": "^8.8.2", -@@ -549,7 +554,7 @@ - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.1", - "is-potential-custom-element-name": "^1.0.1", -- "nwsapi": "^2.2.2", -+ "nwsapi": "^2.2.4", - "parse5": "^7.1.2", - "rrweb-cssom": "^0.6.0", - "saxes": "^6.0.0", -@@ -564,7 +569,7 @@ - "xml-name-validator": "^4.0.0" - }, - "engines": { -- "node": ">=14" -+ "node": ">=16" - }, - "peerDependencies": { - "canvas": "^2.5.0" -@@ -691,9 +696,10 @@ - } - }, - "node_modules/nwsapi": { -- "version": "2.2.2", -- "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.2.tgz", -- "integrity": "sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==" -+ "version": "2.2.20", -+ "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.20.tgz", -+ "integrity": "sha512-/ieB+mDe4MrrKMT8z+mQL8klXydZWGR5Dowt4RAGKbJ3kIGEx3X4ljUo+6V73IXtUPWgfOlU5B9MlGxFO5T+cA==", -+ "license": "MIT" - }, - "node_modules/optionator": { - "version": "0.8.3", -@@ -1198,9 +1204,10 @@ - "dev": true - }, - "node_modules/yargs": { -- "version": "17.7.1", -- "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz", -- "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==", -+ "version": "17.7.2", -+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", -+ "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", -+ "license": "MIT", - "dependencies": { - "cliui": "^8.0.1", - "escalade": "^3.1.1", -@@ -1423,9 +1430,12 @@ - } - }, - "dompurify": { -- "version": "3.0.1", -- "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.0.1.tgz", -- "integrity": "sha512-60tsgvPKwItxZZdfLmamp0MTcecCta3avOhsLgPZ0qcWt96OasFfhkeIRbJ6br5i0fQawT1/RBGB5L58/Jpwuw==" -+ "version": "3.2.6", -+ "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.6.tgz", -+ "integrity": "sha512-/2GogDQlohXPZe6D6NOgQvXLPSYBqIWMnZ8zzOhn09REE4eyAzb+Hed3jhoM9OkuaJ8P6ZGTTVWQKAi8ieIzfQ==", -+ "requires": { -+ "@types/trusted-types": "^2.0.7" -+ } - }, - "emoji-regex": { - "version": "8.0.0", -@@ -1611,9 +1621,9 @@ - "dev": true - }, - "jsdom": { -- "version": "21.1.1", -- "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-21.1.1.tgz", -- "integrity": "sha512-Jjgdmw48RKcdAIQyUD1UdBh2ecH7VqwaXPN3ehoZN6MqgVbMn+lRm1aAT1AsdJRAJpwfa4IpwgzySn61h2qu3w==", -+ "version": "22.1.0", -+ "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-22.1.0.tgz", -+ "integrity": "sha512-/9AVW7xNbsBv6GfWho4TTNjEo9fe6Zhf9O7s0Fhhr3u+awPwAJMKwAMXnkk5vBxflqLW9hTHX/0cs+P3gW+cQw==", - "requires": { - "abab": "^2.0.6", - "acorn": "^8.8.2", -@@ -2098,9 +2108,9 @@ - "dev": true - }, - "yargs": { -- "version": "17.7.1", -- "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz", -- "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==", -+ "version": "17.7.2", -+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", -+ "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", - "requires": { - "cliui": "^8.0.1", - "escalade": "^3.1.1", diff --git a/pkgs/by-name/re/readability-cli/package.nix b/pkgs/by-name/re/readability-cli/package.nix index f2ad25c2bd37..a3d411d3d16c 100644 --- a/pkgs/by-name/re/readability-cli/package.nix +++ b/pkgs/by-name/re/readability-cli/package.nix @@ -9,26 +9,22 @@ buildNpmPackage (finalAttrs: { pname = "readability-cli"; - version = "2.4.5"; + version = "2.4.5-unstable-2026-01-07"; src = fetchFromGitLab { owner = "gardenappl"; repo = "readability-cli"; - rev = "v${finalAttrs.version}"; - hash = "sha256-fkXhAXbvCj5eRkPcv0Q7ryZeGdERI/lHHg64EDyK2F4="; + rev = "72c232e3cd33e91ab04b7dacfa649082b8037436"; + hash = "sha256-5a4mQbfJKAL8nOSnqnKQCjb6bJEEX59puwCw0KmddOo="; }; - patches = [ - ./lockfile.patch - ]; - postPatch = '' # Set a script name to avoid yargs using index.js as $0 substituteInPlace common.mjs \ --replace-fail '.version(false)' '.version(false).scriptName("readable")' ''; - npmDepsHash = "sha256-9sN1TgyOjgGLQsAlnI/fVbez7Oy2r6QwfaUTKyLQRVc="; + npmDepsHash = "sha256-vzNUbC5q5mdmyQZYUsw9Qw/Uxk+H7meW2R8j9R5auPY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/re/redis-dump/package.nix b/pkgs/by-name/re/redis-dump/package.nix index 0e29ae1c00a9..269813ff0541 100644 --- a/pkgs/by-name/re/redis-dump/package.nix +++ b/pkgs/by-name/re/redis-dump/package.nix @@ -20,7 +20,6 @@ bundlerApp { license = lib.licenses.mit; maintainers = with lib.maintainers; [ offline - manveru nicknovitski ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/re/regal/package.nix b/pkgs/by-name/re/regal/package.nix index af6438144b46..3f312c59747f 100644 --- a/pkgs/by-name/re/regal/package.nix +++ b/pkgs/by-name/re/regal/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { name = "regal"; - version = "0.37.0"; + version = "0.38.1"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "regal"; rev = "v${version}"; - hash = "sha256-zAp4v1bKz+q+29jlhEccl7o9RWLA+Hn3Kp/UGBQlmA8="; + hash = "sha256-/WGZCwT9VJ5zjEmL4PZqPymaUJFaWzjbgq2KMBfl6uQ="; }; - vendorHash = "sha256-yvUvv8EL3WrsyBnzaGQK4DR+O5Ner9ehkZYCMnfRwRU="; + vendorHash = "sha256-b7Q9eqq/lDykIQ0tkwBWk2ukAoScBTApfwoE2Ubm5iQ="; # Only build the main binary, exclude build/lsp/main.go subPackages = [ "." ]; diff --git a/pkgs/by-name/re/remctl/package.nix b/pkgs/by-name/re/remctl/package.nix index de7ba2db61a4..f15acaef0905 100644 --- a/pkgs/by-name/re/remctl/package.nix +++ b/pkgs/by-name/re/remctl/package.nix @@ -60,6 +60,9 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.eyrie.org/~eagle/software/remctl"; mainProgram = "remctl"; license = lib.licenses.mit; - teams = [ lib.teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; }) diff --git a/pkgs/by-name/re/remind/package.nix b/pkgs/by-name/re/remind/package.nix index 0836507147fe..813f4fa9e139 100644 --- a/pkgs/by-name/re/remind/package.nix +++ b/pkgs/by-name/re/remind/package.nix @@ -16,14 +16,14 @@ tcl.mkTclDerivation rec { pname = "remind"; - version = "06.02.01"; + version = "06.02.02"; src = fetchFromGitea { domain = "git.skoll.ca"; owner = "Skollsoft-Public"; repo = "Remind"; rev = version; - hash = "sha256-bdR0uLPUGAaB5w4BNPaPOuI9Eg3utyETlUlLIQmcxMs="; + hash = "sha256-SkQT651LjHCZJRtb4Itbzqhq9x5p05jYUam1XiYT4os="; }; propagatedBuildInputs = lib.optionals withGui [ diff --git a/pkgs/by-name/re/remnote/package.nix b/pkgs/by-name/re/remnote/package.nix index 634570114df4..1c9c4f777c39 100644 --- a/pkgs/by-name/re/remnote/package.nix +++ b/pkgs/by-name/re/remnote/package.nix @@ -6,10 +6,10 @@ }: let pname = "remnote"; - version = "1.22.56"; + version = "1.22.58"; src = fetchurl { url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage"; - hash = "sha256-MGWwXEzgUD4vjBnxolvtma59abK8qpXQLVKMhk54wr4="; + hash = "sha256-xGA3ASWRuM+RloOHcaNregTClf+XUtP7jrTiQRem71s="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/pkgs/by-name/ri/riemann-dash/package.nix b/pkgs/by-name/ri/riemann-dash/package.nix index b61da9ca97b7..c6b260937bcf 100644 --- a/pkgs/by-name/ri/riemann-dash/package.nix +++ b/pkgs/by-name/ri/riemann-dash/package.nix @@ -16,7 +16,6 @@ bundlerApp { homepage = "https://github.com/riemann/riemann-dash"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ - manveru nicknovitski ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/ri/riemann-tools/package.nix b/pkgs/by-name/ri/riemann-tools/package.nix index 2a0d47172b78..edf6c527443e 100644 --- a/pkgs/by-name/ri/riemann-tools/package.nix +++ b/pkgs/by-name/ri/riemann-tools/package.nix @@ -36,7 +36,6 @@ bundlerApp { description = "Tools to submit data to Riemann"; homepage = "https://riemann.io"; maintainers = with lib.maintainers; [ - manveru nicknovitski ]; license = lib.licenses.mit; diff --git a/pkgs/by-name/ro/rocketchat-desktop/package.nix b/pkgs/by-name/ro/rocketchat-desktop/package.nix index c42956f5c5a8..8cb5f22c883d 100644 --- a/pkgs/by-name/ro/rocketchat-desktop/package.nix +++ b/pkgs/by-name/ro/rocketchat-desktop/package.nix @@ -20,13 +20,13 @@ let in stdenv.mkDerivation rec { pname = "rocketchat-desktop"; - version = "4.11.1"; + version = "4.11.2"; src = fetchFromGitHub { owner = "RocketChat"; repo = "Rocket.Chat.Electron"; tag = version; - hash = "sha256-JJb4VALCzw2QjiyBc4E9KUMMj1FvZL0SSJvyoEg7Olc="; + hash = "sha256-GTeRrj2zcu36h4z7zPLIYy0pEk94QejTi+6/e3r8XW8="; }; # This might need to be updated between releases. diff --git a/pkgs/by-name/rs/rsop/package.nix b/pkgs/by-name/rs/rsop/package.nix index c09ce45d476a..6ff92c7fe5ba 100644 --- a/pkgs/by-name/rs/rsop/package.nix +++ b/pkgs/by-name/rs/rsop/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "rsop"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitea { domain = "codeberg.org"; owner = "heiko"; repo = "rsop"; rev = "rsop/v${version}"; - hash = "sha256-rjlkXiG96TbAt7JLbEC/ExKAOfMpGbTc/ZXjLSXN3lw="; + hash = "sha256-eP3jh5TIhMHDWnttnYvBre/tfzxajLNGtInWNiFAPiw="; }; - cargoHash = "sha256-6o/JF25KJIKYtdeC9/ezAdwLk2GOGCu2r2FSLGxGzeY="; + cargoHash = "sha256-vmxqpOABd7S/htX8bbThyvfOSBY9f1CjX0gY9NQVHss="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix index fc50449ca92d..921b894cb3ee 100644 --- a/pkgs/by-name/ru/ruff/package.nix +++ b/pkgs/by-name/ru/ruff/package.nix @@ -16,18 +16,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ruff"; - version = "0.14.11"; + version = "0.14.13"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; tag = finalAttrs.version; - hash = "sha256-W8BYc0m/3WsguchDweUapreLrNp47jzkuldI5yEWgvA="; + hash = "sha256-ComgiY6fvM2f3Ul8kTgykyktvxEHL85X5C1Tudi5ZB4="; }; cargoBuildFlags = [ "--package=ruff" ]; - cargoHash = "sha256-0axyrkSHjBPhv40LvdcRDUqC+j0mUL/VzpgL/I0R5/o="; + cargoHash = "sha256-Vd9y9VQF7d62tjHJ0ikWlvV7+KDs4q61ld9yoJWaqpY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix index 6de2426703e0..69737b07249a 100644 --- a/pkgs/by-name/ru/ruffle/package.nix +++ b/pkgs/by-name/ru/ruffle/package.nix @@ -150,7 +150,6 @@ rustPlatform.buildRustPackage (finalAttrs: { changelog = "https://github.com/ruffle-rs/ruffle/releases/tag/${lib.strings.removePrefix "0.2.0-" finalAttrs.version}"; maintainers = [ lib.maintainers.jchw - lib.maintainers.normalcea ]; mainProgram = "ruffle"; platforms = lib.platforms.linux ++ lib.platforms.darwin; diff --git a/pkgs/by-name/ru/rustdesk-flutter/package.nix b/pkgs/by-name/ru/rustdesk-flutter/package.nix index df6437fe863f..8a4c00874b38 100644 --- a/pkgs/by-name/ru/rustdesk-flutter/package.nix +++ b/pkgs/by-name/ru/rustdesk-flutter/package.nix @@ -248,7 +248,10 @@ flutter329.buildFlutterApplication rec { homepage = "https://rustdesk.com"; changelog = "https://github.com/rustdesk/rustdesk/releases/${version}"; license = lib.licenses.agpl3Only; - teams = [ lib.teams.helsinki-systems ]; + maintainers = with lib.maintainers; [ + das_j + helsinki-Jo + ]; mainProgram = "rustdesk"; platforms = lib.platforms.linux; # should work on darwin as well but I have no machine to test with }; diff --git a/pkgs/by-name/ry/rygel/package.nix b/pkgs/by-name/ry/rygel/package.nix index f854150b842f..786575107ba7 100644 --- a/pkgs/by-name/ry/rygel/package.nix +++ b/pkgs/by-name/ry/rygel/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rygel"; - version = "45.0"; + version = "45.1"; # TODO: split out lib outputs = [ @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/rygel/${lib.versions.major finalAttrs.version}/rygel-${finalAttrs.version}.tar.xz"; - hash = "sha256-gmZ7kC/AZy5kz5HrcnpwE3qP3+ej2aTBWLD0sfxwCII="; + hash = "sha256-zzhuKA2Or5tmd6L0i6eEhMcqCVVNXFjFHNh/pZRWF8g="; }; patches = [ diff --git a/pkgs/by-name/sa/sammler/package.nix b/pkgs/by-name/sa/sammler/package.nix index 80d9cfc1c93a..7d6866807892 100644 --- a/pkgs/by-name/sa/sammler/package.nix +++ b/pkgs/by-name/sa/sammler/package.nix @@ -26,6 +26,5 @@ buildGoModule rec { homepage = "https://github.com/redcode-labs/Sammler"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; - teams = [ lib.teams.redcodelabs ]; }; } diff --git a/pkgs/by-name/sa/sass/package.nix b/pkgs/by-name/sa/sass/package.nix index 1b2e3d58992f..df9b30b290ea 100644 --- a/pkgs/by-name/sa/sass/package.nix +++ b/pkgs/by-name/sa/sass/package.nix @@ -21,7 +21,6 @@ bundlerApp { license = lib.licenses.mit; maintainers = with lib.maintainers; [ romildo - manveru nicknovitski ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/sc/scalafmt/package.nix b/pkgs/by-name/sc/scalafmt/package.nix index be1f1d383003..51aa064447e5 100644 --- a/pkgs/by-name/sc/scalafmt/package.nix +++ b/pkgs/by-name/sc/scalafmt/package.nix @@ -9,7 +9,7 @@ let baseName = "scalafmt"; - version = "3.10.3"; + version = "3.10.4"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -19,7 +19,7 @@ let cp $(< deps) $out/share/java/ ''; outputHashMode = "recursive"; - outputHash = "sha256-xJqppoHji0cYvd1iAmhqjCbuX0yV15TvqCvYKrf7Y3E="; + outputHash = "sha256-i4J7qFdzzcSb3RnYH2vAKFBVdMdW1V4hHcxQvNOEjXg="; }; in stdenv.mkDerivation { diff --git a/pkgs/by-name/sc/scooter/package.nix b/pkgs/by-name/sc/scooter/package.nix index 295238f701ca..6a6215838ab3 100644 --- a/pkgs/by-name/sc/scooter/package.nix +++ b/pkgs/by-name/sc/scooter/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "scooter"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "thomasschafer"; repo = "scooter"; rev = "v${version}"; - hash = "sha256-hOuhgPE24DBF/uFz/S51h+d7j5yDjPs8Mvfkcp2BQsc="; + hash = "sha256-hKF0b3vgZ8kIK9QT129Ms+Rua6+Rrv8Jk2pt81eCc5Y="; }; - cargoHash = "sha256-S2oLItnyRURPyYDroa7PlHbKIhnE4HdXeo1y6cAKvss="; + cargoHash = "sha256-008wp5xa0G6E3e6rIhd1sE8cIIcHQ3LoCBl/cJx76Sw="; # Ensure that only the `scooter` package is built (excluding `xtask`) cargoBuildFlags = [ diff --git a/pkgs/by-name/se/searxng/package.nix b/pkgs/by-name/se/searxng/package.nix index 59dbb4e24f26..bdde132fe399 100644 --- a/pkgs/by-name/se/searxng/package.nix +++ b/pkgs/by-name/se/searxng/package.nix @@ -13,14 +13,14 @@ in python.pkgs.toPythonModule ( python.pkgs.buildPythonApplication rec { pname = "searxng"; - version = "0-unstable-2025-11-25"; + version = "0-unstable-2026-01-11"; pyproject = true; src = fetchFromGitHub { owner = "searxng"; repo = "searxng"; - rev = "ebb9ea45715d655072400b2b5925f03ec96cf5eb"; - hash = "sha256-tRPaQcM7EzDuD4MOK4t81uY8mhl9lzvnC955CS7j/u8="; + rev = "cf74e1d9e9ad662aef450ddd79aedee43554dc3c"; + hash = "sha256-hKnfZBPr8rJyZAYBtVXpyzXwBQqg2DPFwqzH08qCITs="; }; nativeBuildInputs = with python.pkgs; [ pythonRelaxDepsHook ]; @@ -31,9 +31,8 @@ python.pkgs.toPythonModule ( "flask-babel" "httpx-socks" "lxml" - "setproctitle" + "msgspec" "typer-slim" - "typing-extensions" "whitenoise" ]; @@ -62,9 +61,7 @@ python.pkgs.toPythonModule ( with python.pkgs; [ babel - brotli certifi - cryptography fasttext-predict flask flask-babel @@ -78,9 +75,9 @@ python.pkgs.toPythonModule ( pygments python-dateutil pyyaml - setproctitle + sniffio typer-slim - uvloop + typing-extensions valkey whitenoise ] diff --git a/pkgs/by-name/se/selfci/Cargo.toml.patch b/pkgs/by-name/se/selfci/Cargo.toml.patch new file mode 100644 index 000000000000..ab385872ce7a --- /dev/null +++ b/pkgs/by-name/se/selfci/Cargo.toml.patch @@ -0,0 +1,13 @@ +diff --git a/Cargo.toml b/Cargo.toml +index 8f7a1e2..e2062c4 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -10,7 +10,7 @@ readme = "README.md" + keywords = ["ci"] + categories = ["development-tools"] + authors = ["dpc <dpc@dpc.pw>"] +-rust-version = "1.92" ++rust-version = "1.91" + + [[bin]] + name = "selfci" diff --git a/pkgs/by-name/se/selfci/package.nix b/pkgs/by-name/se/selfci/package.nix new file mode 100644 index 000000000000..a5c4f3d33b83 --- /dev/null +++ b/pkgs/by-name/se/selfci/package.nix @@ -0,0 +1,48 @@ +{ + lib, + fetchgit, + nix-update-script, + rustPlatform, + git, + makeWrapper, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "selfci"; + version = "0-unstable-2026-01-17"; + + src = fetchgit { + url = "https://radicle.dpc.pw/z2tDzYbAXxTQEKTGFVwiJPajkbeDU.git"; + rev = "83e693dada851ce0da32713869d3da02c52ed257"; + hash = "sha256-f0BfHvIQnhhiPie3a+9MeEGzZ+/KcgrbKBneu8Jo+xs="; + }; + + cargoHash = "sha256-Z3f35HIZiNeKeDNFPUVkFvL2OpMWzqRvxOL5/hUEzJw="; + + nativeBuildInputs = [ + makeWrapper + ]; + + patches = [ + ./Cargo.toml.patch + ]; + + doCheck = false; + + postInstall = '' + wrapProgram "$out"/bin/selfci \ + --prefix PATH : ${lib.makeBinPath [ git ]} + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Minimalistic local-first Unix-philosophy-abiding CI"; + homepage = "https://app.radicle.xyz/nodes/radicle.dpc.pw/rad%3Az2tDzYbAXxTQEKTGFVwiJPajkbeDU"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ + dvn0 + ]; + mainProgram = "selfci"; + }; +}) diff --git a/pkgs/by-name/se/server-box/git-hashes.json b/pkgs/by-name/se/server-box/git-hashes.json index a10caf0c8b05..88acaac055e3 100644 --- a/pkgs/by-name/se/server-box/git-hashes.json +++ b/pkgs/by-name/se/server-box/git-hashes.json @@ -2,7 +2,7 @@ "circle_chart": "sha256-BcnL/hRf+Yv2U8Nkl7pc8BtncBW+M2by86jO5IbFIRk=", "computer": "sha256-qaD6jn78zDyZBktwJ4WTQa8oCvCWQJOBDaozBVsXNb8=", "dartssh2": "sha256-Bl5eLrYU2YnpRcleff3wVXiTS9wuo2A1neiLUClvbGU=", - "fl_build": "sha256-e2BUk4WmwFzFrA2iHg4dG8fRqWhNt8KFuTEZgWL7H4g=", + "fl_build": "sha256-NLKmnx26FDuTRwdm4C/HxwpeRekmZkFypcPJVdvDS4U=", "fl_lib": "sha256-0Dg21LBVIyTH5MLt/v+kGzfOK8PFVYfNiK6P/jcy2jI=", "gtk": "sha256-nt7d2MvIfizxezWhQNm2/yHEzYuPKDvfHGM9Bnq3f04=", "plain_notification_token": "sha256-Cy1/S8bAtKCBnjfDEeW4Q2nP4jtwyCstAC1GH1efu8I=", diff --git a/pkgs/by-name/se/server-box/package.nix b/pkgs/by-name/se/server-box/package.nix index 77a93cc5449d..a123b962ab6b 100644 --- a/pkgs/by-name/se/server-box/package.nix +++ b/pkgs/by-name/se/server-box/package.nix @@ -13,13 +13,13 @@ }: let - version = "1.0.1276"; + version = "1.0.1291"; src = fetchFromGitHub { owner = "lollipopkit"; repo = "flutter_server_box"; tag = "v${version}"; - hash = "sha256-fmL03BNVi1aKhb0jV7MnEtRKTOEaLBGl6uMJtLr6cFk="; + hash = "sha256-5SEw0hNeZg2a4SaqFnkKASeEVXpLWVjQVNT2NlaJz9c="; }; in flutter338.buildFlutterApplication { diff --git a/pkgs/by-name/se/server-box/pubspec.lock.json b/pkgs/by-name/se/server-box/pubspec.lock.json index ffae6e8f4310..5b0dce994028 100644 --- a/pkgs/by-name/se/server-box/pubspec.lock.json +++ b/pkgs/by-name/se/server-box/pubspec.lock.json @@ -587,8 +587,8 @@ "dependency": "direct dev", "description": { "path": ".", - "ref": "v1.0.52", - "resolved-ref": "38e7d41ccd71bf44e286d86b4ad656f05c5c2548", + "ref": "v1.0.53", + "resolved-ref": "61ee37ea6f082592f5be56340b7746dce4ffbfda", "url": "https://github.com/lppcg/fl_build.git" }, "source": "git", @@ -1998,7 +1998,7 @@ "version": "2.2.2" }, "url_launcher": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "url_launcher", "sha256": "f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8", diff --git a/pkgs/by-name/sh/shell-gpt/package.nix b/pkgs/by-name/sh/shell-gpt/package.nix index 96d8144e83a2..aaf07d8d662c 100644 --- a/pkgs/by-name/sh/shell-gpt/package.nix +++ b/pkgs/by-name/sh/shell-gpt/package.nix @@ -52,7 +52,10 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/TheR1D/shell_gpt"; changelog = "https://github.com/TheR1D/shell_gpt/releases/tag/${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ SohamG ]; + maintainers = with lib.maintainers; [ + SohamG + mio + ]; mainProgram = "sgpt"; }; } diff --git a/pkgs/by-name/si/siege/package.nix b/pkgs/by-name/si/siege/package.nix index c45f19b4d2db..c3e5901b6477 100644 --- a/pkgs/by-name/si/siege/package.nix +++ b/pkgs/by-name/si/siege/package.nix @@ -33,6 +33,9 @@ stdenv.mkDerivation rec { "--with-zlib=${zlib.dev}" ]; + # Borrowed solution from homebrew: https://github.com/Homebrew/homebrew-core/blob/1c7c95183c0984a84b1680422afab6578c300a27/Formula/s/siege.rb#L31 + CFLAGS = lib.optionalString stdenv.cc.isClang "-Wno-int-conversion"; + meta = { description = "HTTP load tester"; homepage = "https://www.joedog.org/siege-home/"; diff --git a/pkgs/by-name/si/sigsum/package.nix b/pkgs/by-name/si/sigsum/package.nix index 06a931d16b5f..b1264add0f63 100644 --- a/pkgs/by-name/si/sigsum/package.nix +++ b/pkgs/by-name/si/sigsum/package.nix @@ -8,7 +8,7 @@ buildGoModule (finalAttrs: { pname = "sigsum"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitLab { domain = "git.glasklar.is"; @@ -16,7 +16,7 @@ buildGoModule (finalAttrs: { owner = "core"; repo = "sigsum-go"; tag = "v${finalAttrs.version}"; - hash = "sha256-GQ8ENsMc9vrAG23wHDPcWVadRVov3XOgR5WxnXtg94A="; + hash = "sha256-+opDvVUG2OVJ/V1lHPXl2rxk4CCaXxc+4xBguvGqO1o="; }; postPatch = '' @@ -24,7 +24,7 @@ buildGoModule (finalAttrs: { --replace-fail "info.Main.Version" '"${finalAttrs.version}"' ''; - vendorHash = "sha256-SWNvBEIV25G9lp95DsftFKa48iGUgBQ4RdplJ5D1xUg="; + vendorHash = "sha256-s5IUDGA/8Qv6XhvqJG396EZt7HTaG/BMknPj8uYhVZc="; ldflags = [ "-s" diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index 08c971917437..6e9f0c714c6b 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -36,20 +36,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "siyuan"; - version = "3.5.3"; + version = "3.5.4-dev2"; src = fetchFromGitHub { owner = "siyuan-note"; repo = "siyuan"; rev = "v${finalAttrs.version}"; - hash = "sha256-YAd7XVJLs66CAhb5ro8o5GrT5AhVpp/RHOpl1XkBBHU="; + hash = "sha256-D3vpbtGNeDP+PZIOUGYufZo0ZTq9/eZsesizNuvAHdE="; }; kernel = buildGoModule { name = "${finalAttrs.pname}-${finalAttrs.version}-kernel"; inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/kernel"; - vendorHash = "sha256-2O8gk6Y6odlMldUfanPf5MIiczfd5lH/yMX0IbIEVvc="; + vendorHash = "sha256-/VLI51s3CQSzaLhiO673chXgqDml2l0zVXGFvhiVbAs="; patches = [ (replaceVars ./set-pandoc-path.patch { diff --git a/pkgs/by-name/sj/sjasmplus/package.nix b/pkgs/by-name/sj/sjasmplus/package.nix index 50cd0a0ff972..7fee75f5899d 100644 --- a/pkgs/by-name/sj/sjasmplus/package.nix +++ b/pkgs/by-name/sj/sjasmplus/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sjasmplus"; - version = "1.21.0"; + version = "1.21.1"; src = fetchFromGitHub { owner = "z00m128"; repo = "sjasmplus"; tag = "v${finalAttrs.version}"; - hash = "sha256-iPtH/Uviw9m3tcbG44aZO+I6vR95/waXUejpwPPCpqo="; + hash = "sha256-wD31GT88hOKhsaXTKEiVIkmZO5sYYv7xb7CjiS2G1W0="; }; buildInputs = [ luabridge ]; diff --git a/pkgs/by-name/sl/slidev-cli/package.nix b/pkgs/by-name/sl/slidev-cli/package.nix index 760e0d0b090b..bd9f31e7eab0 100644 --- a/pkgs/by-name/sl/slidev-cli/package.nix +++ b/pkgs/by-name/sl/slidev-cli/package.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "slidev-cli"; - version = "52.11.2"; + version = "52.11.3"; src = fetchFromGitHub { owner = "slidevjs"; repo = "slidev"; tag = "v${finalAttrs.version}"; - hash = "sha256-dAGHcnHNSYtIQvcrn/jRbA2GF7YBJkYXbQbjkGtTUa0="; + hash = "sha256-Q1nfWxeu0u9/1mxTh+aKqZYMW2IXnT7+dB1ZVfEIMWE="; }; pnpmWorkspaces = [ "@slidev/cli..." ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmWorkspaces ; fetcherVersion = 3; - hash = "sha256-rHqrtK6eIqQ6SoZA1CtuUwDbHSZ9HSHikMdNrTtojHs="; + hash = "sha256-qdIpC+pDDinStTXVlHbuZZa2s9Sr5Nu9k/OAGxmXSuI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sn/snac2/package.nix b/pkgs/by-name/sn/snac2/package.nix index 9682a3715ac6..ed4e4871322d 100644 --- a/pkgs/by-name/sn/snac2/package.nix +++ b/pkgs/by-name/sn/snac2/package.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "snac2"; - version = "2.87"; + version = "2.88"; src = fetchFromGitea { domain = "codeberg.org"; owner = "grunfink"; repo = "snac2"; tag = finalAttrs.version; - hash = "sha256-CY4YfnIGQs7BcZrDRD8i+8Wq5eC1jbex6UR9bGgMw40="; + hash = "sha256-3IqPIIfU4MKXMMpOFYgI0RN+DZE+oTgLGOYIKwfKCsI="; }; buildInputs = [ diff --git a/pkgs/by-name/sn/snowcrash/package.nix b/pkgs/by-name/sn/snowcrash/package.nix index 2a2de3416d7a..253c059d057f 100644 --- a/pkgs/by-name/sn/snowcrash/package.nix +++ b/pkgs/by-name/sn/snowcrash/package.nix @@ -29,7 +29,6 @@ buildGoModule rec { homepage = "https://github.com/redcode-labs/SNOWCRASH"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ fab ]; - teams = [ lib.teams.redcodelabs ]; mainProgram = "SNOWCRASH"; }; } diff --git a/pkgs/by-name/sp/speakersafetyd/package.nix b/pkgs/by-name/sp/speakersafetyd/package.nix index bd845006d12c..eab22ba075df 100644 --- a/pkgs/by-name/sp/speakersafetyd/package.nix +++ b/pkgs/by-name/sp/speakersafetyd/package.nix @@ -65,7 +65,6 @@ rustPlatform.buildRustPackage (finalAttrs: { mainProgram = "speakersafetyd"; homepage = "https://github.com/AsahiLinux/speakersafetyd"; maintainers = with lib.maintainers; [ - normalcea flokli yuka ]; diff --git a/pkgs/by-name/sp/speed-dreams/package.nix b/pkgs/by-name/sp/speed-dreams/package.nix index b314ef9aeadc..f1c20be16c8b 100644 --- a/pkgs/by-name/sp/speed-dreams/package.nix +++ b/pkgs/by-name/sp/speed-dreams/package.nix @@ -152,7 +152,10 @@ stdenv.mkDerivation rec { description = "Car racing game - TORCS fork with more experimental approach"; homepage = "https://www.speed-dreams.net/"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ raskin ]; + maintainers = with lib.maintainers; [ + raskin + mio + ]; platforms = lib.platforms.linux; mainProgram = "speed-dreams"; }; diff --git a/pkgs/by-name/sq/sqlfluff/package.nix b/pkgs/by-name/sq/sqlfluff/package.nix index f5a17eb0c58c..38bd3102085a 100644 --- a/pkgs/by-name/sq/sqlfluff/package.nix +++ b/pkgs/by-name/sq/sqlfluff/package.nix @@ -22,31 +22,25 @@ python3Packages.buildPythonApplication rec { pythonRelaxDeps = [ "click" ]; - dependencies = - with python3Packages; - [ - appdirs - cached-property - chardet - click - colorama - configparser - diff-cover - jinja2 - oyaml - pathspec - platformdirs - pytest - regex - tblib - toml - tqdm - typing-extensions - ] - ++ lib.optionals (pythonOlder "3.8") [ - backports.cached-property - importlib_metadata - ]; + dependencies = with python3Packages; [ + appdirs + cached-property + chardet + click + colorama + configparser + diff-cover + jinja2 + oyaml + pathspec + platformdirs + pytest + regex + tblib + toml + tqdm + typing-extensions + ]; nativeCheckInputs = with python3Packages; [ hypothesis diff --git a/pkgs/by-name/ss/ssh-agent-mux/package.nix b/pkgs/by-name/ss/ssh-agent-mux/package.nix new file mode 100644 index 000000000000..d33864f444bd --- /dev/null +++ b/pkgs/by-name/ss/ssh-agent-mux/package.nix @@ -0,0 +1,30 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + openssh, +}: + +rustPlatform.buildRustPackage rec { + pname = "ssh-agent-mux"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "overhacked"; + repo = "ssh-agent-mux"; + rev = "v${version}"; + hash = "sha256-tIGrENlZcT9fGke6MRnsLsmm+kb0Mm3C6DckkZi8hpE="; + }; + + cargoHash = "sha256-u5kGYCYDvEhSuGOLnhdt9IpRwzllXbSJDwY1XzpHBCc="; + + nativeCheckInputs = [ openssh ]; + + meta = { + description = "A proxy that multiplexes SSH agent requests to multiple upstream agents"; + homepage = "https://github.com/overhacked/ssh-agent-mux"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.kalbasit ]; + mainProgram = "ssh-agent-mux"; + }; +} diff --git a/pkgs/by-name/ss/sshguard/package.nix b/pkgs/by-name/ss/sshguard/package.nix index 8c0a62b123d2..bb8f4a7a3f03 100644 --- a/pkgs/by-name/ss/sshguard/package.nix +++ b/pkgs/by-name/ss/sshguard/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://sshguard.net"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ sargon ]; + maintainers = [ ]; platforms = with lib.platforms; linux ++ darwin ++ freebsd ++ netbsd ++ openbsd; }; } diff --git a/pkgs/by-name/st/stac-validator/package.nix b/pkgs/by-name/st/stac-validator/package.nix index c3ed965e8e27..1ea6972fc9c2 100644 --- a/pkgs/by-name/st/stac-validator/package.nix +++ b/pkgs/by-name/st/stac-validator/package.nix @@ -8,7 +8,6 @@ python3Packages.buildPythonPackage rec { pname = "stac-validator"; version = "3.10.2"; pyproject = true; - disabled = python3Packages.pythonOlder "3.8"; src = fetchFromGitHub { owner = "stac-utils"; diff --git a/pkgs/by-name/st/stevia/package.nix b/pkgs/by-name/st/stevia/package.nix index 1cd8ace2671c..a92afb1ce03b 100644 --- a/pkgs/by-name/st/stevia/package.nix +++ b/pkgs/by-name/st/stevia/package.nix @@ -25,14 +25,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "stevia"; - version = "0.51.0"; + version = "0.52.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World/Phosh"; repo = "stevia"; tag = "v${finalAttrs.version}"; - hash = "sha256-dRygDUHXpXjEuwNNfgVy742jfIhT9erN7IcmaMImuYw="; + hash = "sha256-LE2+1RkxD8Sj2H/3NFzcYXZktlVGoNzWrE0UO5sJCAM="; }; mesonFlags = [ diff --git a/pkgs/by-name/st/stm32flash/package.nix b/pkgs/by-name/st/stm32flash/package.nix index 04bd951034aa..40824675e4c9 100644 --- a/pkgs/by-name/st/stm32flash/package.nix +++ b/pkgs/by-name/st/stm32flash/package.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { homepage = "https://sourceforge.net/projects/stm32flash/"; license = lib.licenses.gpl2; platforms = lib.platforms.all; # Should work on all platforms - maintainers = with lib.maintainers; [ elitak ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/su/sunxi-tools/package.nix b/pkgs/by-name/su/sunxi-tools/package.nix index b20be9e00960..8d1f3a567580 100644 --- a/pkgs/by-name/su/sunxi-tools/package.nix +++ b/pkgs/by-name/su/sunxi-tools/package.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation { homepage = "http://linux-sunxi.org/"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.elitak ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/sw/swt/package.nix b/pkgs/by-name/sw/swt/package.nix index ba3f00e5e95a..b08b779814ff 100644 --- a/pkgs/by-name/sw/swt/package.nix +++ b/pkgs/by-name/sw/swt/package.nix @@ -143,7 +143,7 @@ stdenv.mkDerivation (finalAttrs: { mpl11 mpl20 ]; - maintainers = [ ]; + maintainers = with lib.maintainers; [ mio ]; # The darwin src zip file holds simply a prebuilt swt.jar file sourceProvenance = lib.optionals stdenv.hostPlatform.isDarwin [ lib.sourceTypes.binaryNativeCode diff --git a/pkgs/by-name/t/t/package.nix b/pkgs/by-name/t/t/package.nix index ca029d36effe..f642ff0f2317 100644 --- a/pkgs/by-name/t/t/package.nix +++ b/pkgs/by-name/t/t/package.nix @@ -17,7 +17,6 @@ bundlerApp { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ offline - manveru nicknovitski ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/ta/taskjuggler/package.nix b/pkgs/by-name/ta/taskjuggler/package.nix index abddd388f617..76577e5097dc 100644 --- a/pkgs/by-name/ta/taskjuggler/package.nix +++ b/pkgs/by-name/ta/taskjuggler/package.nix @@ -29,7 +29,6 @@ bundlerApp { license = lib.licenses.gpl2; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ - manveru nicknovitski ]; }; diff --git a/pkgs/by-name/tc/tcld/package.nix b/pkgs/by-name/tc/tcld/package.nix index d8ddc11d38ea..3a7158460014 100644 --- a/pkgs/by-name/tc/tcld/package.nix +++ b/pkgs/by-name/tc/tcld/package.nix @@ -69,7 +69,9 @@ buildGoModule (finalAttrs: { homepage = "https://www.github.com/temporalio/tcld"; changelog = "https://github.com/temporalio/tcld/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; - teams = [ lib.teams.mercury ]; + maintainers = with lib.maintainers; [ + jkachmar + ]; mainProgram = "tcld"; }; }) diff --git a/pkgs/by-name/tc/tcpdump/package.nix b/pkgs/by-name/tc/tcpdump/package.nix index 9ad88b6d7a4f..c7d04ae911ca 100644 --- a/pkgs/by-name/tc/tcpdump/package.nix +++ b/pkgs/by-name/tc/tcpdump/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "tcpdump"; - version = "4.99.5"; + version = "4.99.6"; src = fetchurl { url = "https://www.tcpdump.org/release/tcpdump-${version}.tar.gz"; - hash = "sha256-jHWFbgCt3urfcNrWfJ/z3TaFNrK4Vjq/aFTXx2TNOts="; + hash = "sha256-WDmSGg9n19j6PazZzUHkTInMuGfoptshbWJijH/RSwk="; }; postPatch = '' diff --git a/pkgs/by-name/te/terraform-landscape/package.nix b/pkgs/by-name/te/terraform-landscape/package.nix index 87313745ff82..e2011a59fa9d 100644 --- a/pkgs/by-name/te/terraform-landscape/package.nix +++ b/pkgs/by-name/te/terraform-landscape/package.nix @@ -18,7 +18,6 @@ bundlerApp { license = with lib.licenses; asl20; maintainers = with lib.maintainers; [ mbode - manveru nicknovitski ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/ti/timetrap/package.nix b/pkgs/by-name/ti/timetrap/package.nix index 89c858219778..683a156579e6 100644 --- a/pkgs/by-name/ti/timetrap/package.nix +++ b/pkgs/by-name/ti/timetrap/package.nix @@ -55,7 +55,6 @@ stdenv.mkDerivation { license = lib.licenses.mit; maintainers = with lib.maintainers; [ jerith666 - manveru nicknovitski ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/tn/tnef/package.nix b/pkgs/by-name/tn/tnef/package.nix index e8322268836c..f80c31aec274 100644 --- a/pkgs/by-name/tn/tnef/package.nix +++ b/pkgs/by-name/tn/tnef/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, autoreconfHook, }: @@ -16,6 +17,15 @@ stdenv.mkDerivation rec { sha256 = "104g48mcm00bgiyzas2vf86331w7bnw7h3bc11ib4lp7rz6zqfck"; }; + patches = [ + # Fix gcc-15 build failure: https://github.com/verdammelt/tnef/pull/49 + (fetchpatch { + name = "gcc-15.patch"; + url = "https://github.com/verdammelt/tnef/commit/86bfa75cfacbe71c8d5282fa0065981b4544c5ad.patch"; + hash = "sha256-iWQop57riqwDLVi5Ba5s4f34lGXgvKO3ZMTgWbAoRIY="; + }) + ]; + doCheck = true; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/by-name/tr/triforce-lv2/package.nix b/pkgs/by-name/tr/triforce-lv2/package.nix index e52a62ef43c5..c3c8f3da2bc6 100644 --- a/pkgs/by-name/tr/triforce-lv2/package.nix +++ b/pkgs/by-name/tr/triforce-lv2/package.nix @@ -52,7 +52,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ - normalcea yuka ]; platforms = [ "aarch64-linux" ]; diff --git a/pkgs/by-name/ts/tsshd/package.nix b/pkgs/by-name/ts/tsshd/package.nix index 18ca7f3e237f..ce9d662d7a54 100644 --- a/pkgs/by-name/ts/tsshd/package.nix +++ b/pkgs/by-name/ts/tsshd/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "tsshd"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "trzsz"; repo = finalAttrs.pname; tag = "v${finalAttrs.version}"; - hash = "sha256-JNuLN0eA+HSG/Uv5kTgYmOVBSTIBDAJ6vqPa7z+JYTg="; + hash = "sha256-B5PTiz9luBxkDA9UMSkGYTcPbnXdL43rkFvbOUS5F6w="; }; - vendorHash = "sha256-XjPXbhrMUYObgw0BBYT4BxDoE6THEYXnAZ5y5rUKgh4="; + vendorHash = "sha256-dW05EoAVLqmiPRRG0R4KwKsSijZuxSe15iHkyCImtZY="; ldflags = [ "-s" diff --git a/pkgs/by-name/ts/tsx/package.nix b/pkgs/by-name/ts/tsx/package.nix index 9f836c1c5bdc..ac2e8a6ccd28 100644 --- a/pkgs/by-name/ts/tsx/package.nix +++ b/pkgs/by-name/ts/tsx/package.nix @@ -2,35 +2,36 @@ lib, stdenv, fetchFromGitHub, - pnpm_9, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, nodejs_22, versionCheckHook, + nix-update-script, }: let - pnpm' = pnpm_9.override { nodejs = nodejs_22; }; + pnpm' = pnpm_10.override { nodejs = nodejs_22; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tsx"; - version = "4.19.3"; + version = "4.21.0"; src = fetchFromGitHub { owner = "privatenumber"; repo = "tsx"; - tag = "v${version}"; - hash = "sha256-wdv2oqJNc6U0Fyv4jT+0LUcYaDfodHk1vQZGMdyFF/E="; + tag = "v${finalAttrs.version}"; + hash = "sha256-vlVRq637l84xi9Og0ryzYuu+1b/eBq13jQJIptY0u0o="; }; pnpmDeps = fetchPnpmDeps { - inherit + inherit (finalAttrs) pname version src ; pnpm = pnpm'; fetcherVersion = 1; - hash = "sha256-57KDZ9cHb7uqnypC0auIltmYMmIhs4PWyf0HTRWEFiU="; + hash = "sha256-6ZizQtZC43yXrz634VXksRCKGkDKryICvT3Q+JCuIEw="; }; nativeBuildInputs = [ @@ -54,7 +55,7 @@ stdenv.mkDerivation rec { # because tsx uses semantic-release, the package.json has a placeholder # version number. this patches it to match the version of the nix package, # which in turn is the release version in github. - substituteInPlace package.json --replace-fail "0.0.0-semantic-release" "${version}" + substituteInPlace package.json --replace-fail "0.0.0-semantic-release" "${finalAttrs.version}" runHook postPatch ''; @@ -62,7 +63,10 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - npm run build + pnpm run build + + # remove unneeded files + find dist -type f \( -name '*.cts' -or -name '*.mts' -or -name '*.ts' \) -delete # remove devDependencies that are only required to build # and package the typescript code @@ -93,11 +97,16 @@ stdenv.mkDerivation rec { ]; doInstallCheck = true; + passthru.updateScript = nix-update-script { }; + meta = { description = "TypeScript Execute (tsx): The easiest way to run TypeScript in Node.js"; homepage = "https://tsx.is"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.sdedovic ]; + maintainers = with lib.maintainers; [ + sdedovic + higherorderlogic + ]; mainProgram = "tsx"; }; -} +}) diff --git a/pkgs/by-name/un/unifi-protect-backup/package.nix b/pkgs/by-name/un/unifi-protect-backup/package.nix index 3cd927b62176..1f9a73c652ff 100644 --- a/pkgs/by-name/un/unifi-protect-backup/package.nix +++ b/pkgs/by-name/un/unifi-protect-backup/package.nix @@ -55,7 +55,10 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/ep1cman/unifi-protect-backup"; changelog = "https://github.com/ep1cman/unifi-protect-backup/blob/v${version}/CHANGELOG.md"; license = lib.licenses.mit; - teams = [ lib.teams.helsinki-systems ]; + maintainers = with lib.maintainers; [ + das_j + helsinki-Jo + ]; mainProgram = "unifi-protect-backup"; }; } diff --git a/pkgs/by-name/us/userborn/package.nix b/pkgs/by-name/us/userborn/package.nix index 61f4580b7d65..331b44575634 100644 --- a/pkgs/by-name/us/userborn/package.nix +++ b/pkgs/by-name/us/userborn/package.nix @@ -37,6 +37,7 @@ rustPlatform.buildRustPackage rec { userborn-mutable-etc userborn-immutable-users userborn-immutable-etc + userborn-static ; }; }; diff --git a/pkgs/by-name/va/vacuum-tube/package.nix b/pkgs/by-name/va/vacuum-tube/package.nix index 3f13265bb8bd..5965f2decbf9 100644 --- a/pkgs/by-name/va/vacuum-tube/package.nix +++ b/pkgs/by-name/va/vacuum-tube/package.nix @@ -10,16 +10,16 @@ buildNpmPackage rec { pname = "vacuum-tube"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "shy1132"; repo = "VacuumTube"; tag = "v${version}"; - hash = "sha256-OHjTccQNrZZoXf26ABn9sIOVzTsVmBKdcRLsXUvnS6k="; + hash = "sha256-b5OnDoMejnupeK4sWoXQo7vpFFD/y1p4vxMZTMMO25g="; }; - npmDepsHash = "sha256-1RfCyV0GSaI8UAnlPvepBU4LN2CkbvYt+JCtQy4B8LY="; + npmDepsHash = "sha256-NBsLgcYFHnj+hVELTKMreLsrJAu3S+RuhBcOTeIhQew="; makeCacheWritable = true; env = { diff --git a/pkgs/by-name/vc/vcs/package.nix b/pkgs/by-name/vc/vcs/package.nix index 28a27164dbe2..f9819bbf4f9f 100644 --- a/pkgs/by-name/vc/vcs/package.nix +++ b/pkgs/by-name/vc/vcs/package.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { description = "Generates contact sheets from video files"; homepage = "http://p.outlyer.net/vcs"; license = lib.licenses.lgpl21Plus; - maintainers = with lib.maintainers; [ elitak ]; + maintainers = [ ]; platforms = with lib.platforms; unix; mainProgram = "vcs"; }; diff --git a/pkgs/by-name/vi/virglrenderer/package.nix b/pkgs/by-name/vi/virglrenderer/package.nix index 6b63b76552e8..d66545cf1488 100644 --- a/pkgs/by-name/vi/virglrenderer/package.nix +++ b/pkgs/by-name/vi/virglrenderer/package.nix @@ -82,9 +82,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Virtual 3D GPU for use inside QEMU virtual machines"; homepage = "https://docs.mesa3d.org/drivers/virgl"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ - normalcea - ]; + maintainers = [ ]; mainProgram = "virgl_test_server"; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/vo/volk/package.nix b/pkgs/by-name/vo/volk/package.nix index ec9c48351f4a..747bcd322a66 100644 --- a/pkgs/by-name/vo/volk/package.nix +++ b/pkgs/by-name/vo/volk/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, cmake, python3, + removeReferencesTo, enableModTool ? true, }: @@ -25,8 +26,17 @@ stdenv.mkDerivation (finalAttrs: { cmake python3 python3.pkgs.mako + removeReferencesTo ]; + # Don't embed the path to stdenv.cc in the output, see: + # + # - https://github.com/gnuradio/volk/blob/v3.2.0/lib/constants.c.in#L37-L41 + # - https://github.com/gnuradio/volk/blob/v3.2.0/lib/CMakeLists.txt#L403-L405 + postInstall = '' + remove-references-to -t ${stdenv.cc} $(readlink -f "''${!outputLib}"/lib/libvolk${stdenv.hostPlatform.extensions.sharedLibrary}) + ''; + doCheck = true; meta = { diff --git a/pkgs/by-name/wa/wasm-bindgen-cli_0_2_108/package.nix b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_108/package.nix new file mode 100644 index 000000000000..9ec22500a2c3 --- /dev/null +++ b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_108/package.nix @@ -0,0 +1,19 @@ +{ + buildWasmBindgenCli, + fetchCrate, + rustPlatform, +}: + +buildWasmBindgenCli rec { + src = fetchCrate { + pname = "wasm-bindgen-cli"; + version = "0.2.108"; + hash = "sha256-UsuxILm1G6PkmVw0I/JF12CRltAfCJQFOaT4hFwvR8E="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit src; + inherit (src) pname version; + hash = "sha256-iqQiWbsKlLBiJFeqIYiXo3cqxGLSjNM8SOWXGM9u43E="; + }; +} diff --git a/pkgs/by-name/wa/wasmtime/package.nix b/pkgs/by-name/wa/wasmtime/package.nix index 5829e0e7004a..51cb918c4da9 100644 --- a/pkgs/by-name/wa/wasmtime/package.nix +++ b/pkgs/by-name/wa/wasmtime/package.nix @@ -13,20 +13,20 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "wasmtime"; - version = "40.0.0"; + version = "40.0.2"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wasmtime"; tag = "v${finalAttrs.version}"; - hash = "sha256-d5j+QSEWIVwVRMT/QGc6x3cVBTFZBpoxiBagmpLV1e8="; + hash = "sha256-4y9WpCdyuF/Tp2k/1d5rZxwYunWNdeibEsFgHcBC52Q="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-PIUJHkeGi8gao7n+SLzcxNYTl2KxKiwJZPW+sFYf0AY="; + cargoHash = "sha256-aTPgnuBvOIqg1+Sa2ZLdMTLujm8dKGK5xpZ3qHpr3f8="; cargoBuildFlags = [ "--package" "wasmtime-cli" diff --git a/pkgs/by-name/wa/wayback_machine_downloader/package.nix b/pkgs/by-name/wa/wayback_machine_downloader/package.nix index 31b8c481e41f..c1b54b83c8d9 100644 --- a/pkgs/by-name/wa/wayback_machine_downloader/package.nix +++ b/pkgs/by-name/wa/wayback_machine_downloader/package.nix @@ -14,7 +14,6 @@ bundlerApp { description = "Download websites from the Internet Archive Wayback Machine"; homepage = "https://github.com/hartator/wayback-machine-downloader"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.manveru ]; platforms = lib.platforms.all; mainProgram = "wayback_machine_downloader"; }; diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix index dc6ba744b26c..04749c37a459 100644 --- a/pkgs/by-name/we/weblate/package.nix +++ b/pkgs/by-name/we/weblate/package.nix @@ -18,13 +18,13 @@ let python = python3.override { packageOverrides = final: prev: { - django = prev.django_5_2; + django = prev.django_5; }; }; in python.pkgs.buildPythonApplication rec { pname = "weblate"; - version = "5.15.1"; + version = "5.15.2"; pyproject = true; @@ -37,7 +37,7 @@ python.pkgs.buildPythonApplication rec { owner = "WeblateOrg"; repo = "weblate"; tag = "weblate-${version}"; - hash = "sha256-9k6H9/XW7vbXix+zadxHCNl9UJ3yE1ONa/+VRvIGk28="; + hash = "sha256-qNv3aaPyQ/bOrPbK7u9vtq8R1MFqXLJzvLUZfVgjMK0="; }; build-system = with python.pkgs; [ setuptools ]; @@ -65,10 +65,7 @@ python.pkgs.buildPythonApplication rec { ''; pythonRelaxDeps = [ - "celery" "certifi" - "cyrtranslit" - "django-appconf" "urllib3" ]; @@ -142,6 +139,7 @@ python.pkgs.buildPythonApplication rec { translate-toolkit translation-finder unidecode + urllib3 user-agents weblate-language-data weblate-schemas diff --git a/pkgs/by-name/wi/wimboot/package.nix b/pkgs/by-name/wi/wimboot/package.nix index bb87666ae9c3..9ea5e4529067 100644 --- a/pkgs/by-name/wi/wimboot/package.nix +++ b/pkgs/by-name/wi/wimboot/package.nix @@ -41,7 +41,10 @@ stdenv.mkDerivation rec { homepage = "https://ipxe.org/wimboot"; description = "Windows Imaging Format bootloader"; license = lib.licenses.gpl2Plus; - teams = [ lib.teams.helsinki-systems ]; + maintainers = with lib.maintainers; [ + das_j + helsinki-Jo + ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/by-name/wo/wowup-cf/package.nix b/pkgs/by-name/wo/wowup-cf/package.nix index 8e9f2bdabce4..fb00c57ec04c 100644 --- a/pkgs/by-name/wo/wowup-cf/package.nix +++ b/pkgs/by-name/wo/wowup-cf/package.nix @@ -5,12 +5,12 @@ }: let - version = "2.20.0"; + version = "2.22.0"; pname = "wowup-cf"; src = fetchurl { url = "https://github.com/WowUp/WowUp.CF/releases/download/v${version}/WowUp-CF-${version}.AppImage"; - hash = "sha256-Fu0FqeWJip0cXSifu1QDktu73SsxGpkEU3cuYbFghxc="; + hash = "sha256-X5gDnj4YBZRBwJEeb8sVMNoGmWUI9iVdWOmsA20bWig="; }; appimageContents = appimageTools.extractType1 { inherit pname version src; }; diff --git a/pkgs/by-name/wp/wpscan/package.nix b/pkgs/by-name/wp/wpscan/package.nix index 591d97e753ca..a8e20cb03249 100644 --- a/pkgs/by-name/wp/wpscan/package.nix +++ b/pkgs/by-name/wp/wpscan/package.nix @@ -26,7 +26,6 @@ bundlerApp { license = lib.licenses.unfreeRedistributable; maintainers = with lib.maintainers; [ nyanloutre - manveru ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/wr/wraith/package.nix b/pkgs/by-name/wr/wraith/package.nix index 4a352652a438..30f5d63e7a58 100644 --- a/pkgs/by-name/wr/wraith/package.nix +++ b/pkgs/by-name/wr/wraith/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://wraith.botpack.net/"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ elitak ]; + maintainers = [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/wt/wttrbar/package.nix b/pkgs/by-name/wt/wttrbar/package.nix index a4964d0b2a09..b9a41a5055d9 100644 --- a/pkgs/by-name/wt/wttrbar/package.nix +++ b/pkgs/by-name/wt/wttrbar/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "wttrbar"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "bjesus"; repo = "wttrbar"; tag = finalAttrs.version; - hash = "sha256-TYWbC9TMHRWLPQ199SMbg2ROVVCFYbZDqB54IAbeTUQ="; + hash = "sha256-TDjEIrxFkh6d0x89LxaiarsP0BIzP5+rxu3YCdXIQ2U="; }; - cargoHash = "sha256-yqfg/tDLCEwkgSAD2B63y7tVNx7RLblfD2yvywPzbz0="; + cargoHash = "sha256-yiShp9k5oiGAtj59jGDEFsQKujDFajO+Nwq0bLh/PtA="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix index ab1c7d8b6ec2..f6f3d4ab7a9b 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix @@ -17,14 +17,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "xdg-desktop-portal-cosmic"; - version = "1.0.1"; + version = "1.0.2"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "xdg-desktop-portal-cosmic"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-f1I+2aYQtfE4EYzgx46pxyWEV8w1TVNFVcEui7xOOyo="; + hash = "sha256-Bx+tobtsevaBFB6Dqpj49Y3VUOmfEVNQJ5ll2bLk+VU="; }; cargoHash = "sha256-99MGWfZrDOav77SRI7c5V21JTfkq7ejC7x+ZiQ5J0Yw="; diff --git a/pkgs/by-name/y-/y-cruncher/package.nix b/pkgs/by-name/y-/y-cruncher/package.nix index 15bc83601618..57e4d45c8140 100644 --- a/pkgs/by-name/y-/y-cruncher/package.nix +++ b/pkgs/by-name/y-/y-cruncher/package.nix @@ -66,7 +66,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { bsd3 # Intel Cilk Run-Time Library ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; - maintainers = with lib.maintainers; [ normalcea ]; + maintainers = [ ]; mainProgram = "y-cruncher"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/zb/zbus-xmlgen/package.nix b/pkgs/by-name/zb/zbus-xmlgen/package.nix index af57cdaca2cf..2813bad39a43 100644 --- a/pkgs/by-name/zb/zbus-xmlgen/package.nix +++ b/pkgs/by-name/zb/zbus-xmlgen/package.nix @@ -8,14 +8,14 @@ rustPlatform.buildRustPackage rec { pname = "zbus_xmlgen"; - version = "5.1.0"; + version = "5.2.0"; src = fetchCrate { inherit pname version; - hash = "sha256-LHY4E2YemGksK8xJx0r3iTHnk3CqMl5abM08VSBPIfo="; + hash = "sha256-CFXOPUWjbzNkE8mb+AC4ZtdvV0MSb/eBr1C0WyreAoU="; }; - cargoHash = "sha256-g5GLyloeyVXcJgMVx21ePYlcYUj+NGFtVarpYeQN9rw="; + cargoHash = "sha256-ggKuTcsUMhfhY39i/iZj7oPrsFchRdcko1oDE+XQLfE="; nativeBuildInputs = [ makeBinaryWrapper ]; nativeCheckInputs = [ rustfmt ]; diff --git a/pkgs/by-name/zl/zluda/package.nix b/pkgs/by-name/zl/zluda/package.nix index 6dce56c92190..e8810be5aeed 100644 --- a/pkgs/by-name/zl/zluda/package.nix +++ b/pkgs/by-name/zl/zluda/package.nix @@ -14,16 +14,15 @@ stdenv, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "zluda"; - version = "4-unstable-2025-01-28"; + version = "6-preview.45"; src = fetchFromGitHub { owner = "vosen"; repo = "ZLUDA"; - # Cargo.lock introduced and major bug fixes in this commit - rev = "df5a96d935b014f88e30af4abc487882b0b54a76"; - hash = "sha256-T2pCZZzZbCLI01YSF0VguKtL3EDEdIoUyH4C9ccaCi8="; + rev = "v${finalAttrs.version}"; + hash = "sha256-796OuIM5a0saE0v1QHHAGRjUPT+YAIfUuEtAruMn8Mk="; fetchSubmodules = true; }; @@ -35,6 +34,7 @@ rustPlatform.buildRustPackage rec { rocmPackages.rocsolver rocmPackages.rocblas rocmPackages.hipblas + rocmPackages.hipblaslt rocmPackages.rocm-cmake rocmPackages.hipfft zlib @@ -50,7 +50,10 @@ rustPlatform.buildRustPackage rec { clang ]; - cargoHash = "sha256-hDQWjzkx7YdkgSmNKTzCa2VhBFvn6P9QANV9hJ7UiT8="; + cargoHash = "sha256-YNBeweZ/vfXGfM0lrZbAh71z6Rb0+B7nOuO8VL2BmCo="; + + # Tests require a GPU and segfault in the sandbox + doCheck = false; # xtask doesn't support passing --target, but nix hooks expect the folder structure from when it's set env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.cargoShortTarget; @@ -80,10 +83,10 @@ rustPlatform.buildRustPackage rec { meta = { description = "CUDA on non-Nvidia GPUs"; homepage = "https://github.com/vosen/ZLUDA"; - changelog = "https://github.com/vosen/ZLUDA/releases/tag/${src.rev}"; + changelog = "https://github.com/vosen/ZLUDA/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.mit; maintainers = [ lib.maintainers.errnoh ]; }; -} +}) diff --git a/pkgs/by-name/zu/zuban/package.nix b/pkgs/by-name/zu/zuban/package.nix index 04c3f51473ff..ee05e3b6331e 100644 --- a/pkgs/by-name/zu/zuban/package.nix +++ b/pkgs/by-name/zu/zuban/package.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "zuban"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "zubanls"; repo = "zuban"; tag = "v${finalAttrs.version}"; - hash = "sha256-RLJ5PX/4Fh3OWqhZD3UnS8P2aappNADK8Mb56aRcLng="; + hash = "sha256-3K2PHccGXLD4Jk+DhSoD8dbOG+n40tbiAPfEF27vukg="; fetchSubmodules = true; }; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildAndTestSubdir = "crates/zuban"; - cargoHash = "sha256-7gCUQjt1egnrDQ0TXElHXrwidQfFRS8VSGpUYuqv+bY="; + cargoHash = "sha256-2TlCwbGabJtIusfRVWSnQiZbv6UQIBXfcUBVQrrepYM="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index b7fe92c4597d..d89d7fa66851 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -275,7 +275,6 @@ let license = lib.licenses.asl20; maintainers = with lib.maintainers; [ david50407 - manveru peterhoeg donovanglover ]; diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 1e4f24cbc83f..6afe1faca5d6 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -27,9 +27,9 @@ let "20.1.8".officialRelease.sha256 = "sha256-ysyB/EYxi2qE9fD5x/F2zI4vjn8UDoo1Z9ukiIrjFGw="; "21.1.7".officialRelease.sha256 = "sha256-SaRJ7+iZMhhBdcUDuJpMAY4REQVhrvYMqI2aq3Kz08o="; "22.0.0-git".gitRelease = { - rev = "2c72af88213c0f9c507d9c8b34a39de8173a6fcc"; - rev-version = "22.0.0-unstable-2025-12-28"; - sha256 = "sha256-R7WcZLas5+a4gUDzG0EBLL1S56PvUBZM6c91nYhmEsQ="; + rev = "dcf8ae80289fd5e343b6ca172073388b6d227b62"; + rev-version = "22.0.0-unstable-2026-01-11"; + sha256 = "sha256-7IQ4v4K4onZZ/oBQKUy32LaZ6M7E7N/QIUYdjhOsbqc="; }; } // llvmVersions; diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 80ba3ff965b8..73896c892d47 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -350,7 +350,6 @@ let description = "Object-oriented language for quick and easy programming"; homepage = "https://www.ruby-lang.org/"; license = lib.licenses.ruby; - maintainers = with lib.maintainers; [ manveru ]; platforms = lib.platforms.all; mainProgram = "ruby"; knownVulnerabilities = op (lib.versionOlder ver.majMin "3.0") "This Ruby release has reached its end of life. See https://www.ruby-lang.org/en/downloads/branches/."; diff --git a/pkgs/development/libraries/gecode/3.nix b/pkgs/development/libraries/gecode/3.nix index 0f0f79584f60..134c17fa37c0 100644 --- a/pkgs/development/libraries/gecode/3.nix +++ b/pkgs/development/libraries/gecode/3.nix @@ -35,6 +35,5 @@ stdenv.mkDerivation rec { homepage = "https://www.gecode.org"; description = "Toolkit for developing constraint-based systems"; platforms = lib.platforms.all; - maintainers = [ lib.maintainers.manveru ]; }; } diff --git a/pkgs/development/libraries/tclap/1.4.nix b/pkgs/development/libraries/tclap/1.4.nix index d15356041523..60fbe1901849 100644 --- a/pkgs/development/libraries/tclap/1.4.nix +++ b/pkgs/development/libraries/tclap/1.4.nix @@ -43,7 +43,6 @@ stdenv.mkDerivation { description = "Templatized C++ Command Line Parser Library (v1.4)"; homepage = "https://tclap.sourceforge.net/"; license = lib.licenses.mit; - teams = [ lib.teams.deshaw ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index f5c399c324c6..0e820b93bcff 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -4608,15 +4608,15 @@ final: prev: { }: buildLuarocksPackage { pname = "rocks.nvim"; - version = "2.47.0-1"; + version = "2.47.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks.nvim-2.47.0-1.rockspec"; - sha256 = "0gbf79n2glnbcdccli9k555708dgwpjmki2wc8439d2q8l3g2ywm"; + url = "mirror://luarocks/rocks.nvim-2.47.2-1.rockspec"; + sha256 = "01h368ckrpdq8yrczb0lx6bmj3vv1hlj22y784p6isypxma5iyrf"; }).outPath; src = fetchzip { - url = "https://github.com/lumen-oss/rocks.nvim/archive/v2.47.0.zip"; - sha256 = "0m4cdyj1pbyi85l9vjmwj8qwrzqachpgjh6yhw8yin1hrqzr6d0k"; + url = "https://github.com/lumen-oss/rocks.nvim/archive/v2.47.2.zip"; + sha256 = "1kzhn02zhydb0shha6lhb2ddqhbvldjhpk3h4fmr0kcfv7sf0r99"; }; disabled = lua.luaversion != "5.1"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 8dfa3826fc77..4b9398c296ae 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -127,6 +127,10 @@ in } ]; + env = old.env // { + NIX_CFLAGS_COMPILE = "-std=gnu17"; # for gcc15 + }; + # Upstream rockspec is pointlessly broken into separate rockspecs, per Lua # version, which doesn't work well for us, so modify it postConfigure = @@ -997,6 +1001,27 @@ in ''; }; + rocks-nvim = prev.rocks-nvim.overrideAttrs (oa: { + + nativeCheckInputs = [ + final.nlua + final.busted + writableTmpDirAsHomeHook + ]; + + doCheck = lua.luaversion == "5.1"; + + nvimSkipModules = [ + "bootstrap" # tries to install luarocks from network + ]; + + checkPhase = '' + runHook preCheck + busted --run=offline + runHook postCheck + ''; + }); + rtp-nvim = prev.rtp-nvim.overrideAttrs { doCheck = lua.luaversion == "5.1"; nativeCheckInputs = [ diff --git a/pkgs/development/ocaml-modules/owl-base/default.nix b/pkgs/development/ocaml-modules/owl-base/default.nix index 864a3fa5b870..a9c1b14af8b6 100644 --- a/pkgs/development/ocaml-modules/owl-base/default.nix +++ b/pkgs/development/ocaml-modules/owl-base/default.nix @@ -2,17 +2,27 @@ lib, buildDunePackage, fetchurl, + fetchpatch, + applyPatches, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "owl-base"; version = "1.2"; - duneVersion = "3"; + src = applyPatches { + src = fetchurl { + url = "https://github.com/owlbarn/owl/releases/download/${finalAttrs.version}/owl-${finalAttrs.version}.tbz"; + hash = "sha256-OBei5DkZIsiiIltOM8qV2mgJJGmU5r8pGjAMgtjKxsU="; + }; - src = fetchurl { - url = "https://github.com/owlbarn/owl/releases/download/${version}/owl-${version}.tbz"; - hash = "sha256-OBei5DkZIsiiIltOM8qV2mgJJGmU5r8pGjAMgtjKxsU="; + patches = [ + # Compatibility with GCC 15 + (fetchpatch { + url = "https://github.com/owlbarn/owl/commit/3e66ccb0b1d21b73fa703f3d3f416ec0107860a4.patch"; + hash = "sha256-0bV0ogTvtDoO8kEvE5QcJFRWqOJ1qiXGjXY9Ekp30M0="; + }) + ]; }; minimalOCamlVersion = "4.10"; @@ -25,4 +35,4 @@ buildDunePackage rec { maintainers = [ lib.maintainers.bcdarwin ]; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/development/php-packages/imap/default.nix b/pkgs/development/php-packages/imap/default.nix index b37e6e6c6b28..522e751dfd56 100644 --- a/pkgs/development/php-packages/imap/default.nix +++ b/pkgs/development/php-packages/imap/default.nix @@ -12,7 +12,7 @@ }: let - version = "1.0.2"; + version = "1.0.3"; in buildPecl { inherit version; @@ -22,17 +22,9 @@ buildPecl { owner = "php"; repo = "pecl-mail-imap"; rev = version; - hash = "sha256-QVeimxm3rfWMvMpSgadhMKd24yPdDGVuhXIOs8668do="; + hash = "sha256-eDrznw5OtQXJZa7dR9roUiJyINXFZI5qmS+cyoaGHnk="; }; - patches = [ - # Fix compilation with PHP 8.4. - (fetchpatch { - url = "https://github.com/php/pecl-mail-imap/commit/4fc9970a29c205ec328f36edc8c119c158129324.patch"; - hash = "sha256-MxEaEe4YVeP7W5gDSNJb0thwAhxDj/yRr3qvjlJjRL4="; - }) - ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/development/php-packages/maxminddb/default.nix b/pkgs/development/php-packages/maxminddb/default.nix index d5c3eb8cf290..53fb02ff372d 100644 --- a/pkgs/development/php-packages/maxminddb/default.nix +++ b/pkgs/development/php-packages/maxminddb/default.nix @@ -28,8 +28,11 @@ buildPecl { description = "C extension that is a drop-in replacement for MaxMind\\Db\\Reader"; license = with lib.licenses; [ asl20 ]; homepage = "https://github.com/maxmind/MaxMind-DB-Reader-php"; + maintainers = with lib.maintainers; [ + das_j + helsinki-Jo + ]; teams = [ - lib.teams.helsinki-systems lib.teams.php ]; }; diff --git a/pkgs/development/php-packages/phan/default.nix b/pkgs/development/php-packages/phan/default.nix index f40573f3b965..18e33ed93875 100644 --- a/pkgs/development/php-packages/phan/default.nix +++ b/pkgs/development/php-packages/phan/default.nix @@ -2,21 +2,27 @@ lib, fetchFromGitHub, php, + versionCheckHook, }: -(php.withExtensions ({ enabled, all }: enabled ++ (with all; [ ast ]))).buildComposerProject +(php.withExtensions ({ enabled, all }: enabled ++ (with all; [ ast ]))).buildComposerProject2 (finalAttrs: { pname = "phan"; - version = "5.5.1"; + version = "6.0.0"; src = fetchFromGitHub { owner = "phan"; repo = "phan"; - rev = finalAttrs.version; - hash = "sha256-G17ORkHmu6nkfJ8UrGzcaybPOKPrq1Q+LXVS56aVOZ8="; + tag = finalAttrs.version; + hash = "sha256-1qRGNDptiAdcGc1x+iLrxe9TjLGaL8EM8xuTOUNB+Ww="; }; - vendorHash = "sha256-Ake5/7IyoweC2ONDuWt9jJSbG0JbnU9lmCRu2p6uUQM="; + vendorHash = "sha256-Ro5/lA72xVIkZyuRNix77Cpeyyj1GbW5J4DzjQMq0Rc="; + + composerStrictValidation = false; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; meta = { description = "Static analyzer for PHP"; @@ -27,7 +33,7 @@ and attempts to prove incorrectness rather than correctness. ''; mainProgram = "phan"; - maintainers = with lib.maintainers; [ apeschar ]; + maintainers = [ ]; teams = [ lib.teams.php ]; }; }) diff --git a/pkgs/development/php-packages/psalm/default.nix b/pkgs/development/php-packages/psalm/default.nix index 72a79eee851a..2d7e67e334f9 100644 --- a/pkgs/development/php-packages/psalm/default.nix +++ b/pkgs/development/php-packages/psalm/default.nix @@ -8,12 +8,12 @@ }: let - version = "6.13.1"; + version = "6.14.3"; # The PHAR file is only required to get the `composer.lock` file psalm-phar = fetchurl { url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar"; - hash = "sha256-bOxm5LYiQDCY0hU998Wnnp2+x44sidfCf/OqlQ+1gvA="; + hash = "sha256-dqRI73CdY51K1aitIK6R74Y2sLb68l4ndNuTzRv8qRE="; }; in php.buildComposerProject2 (finalAttrs: { @@ -24,14 +24,14 @@ php.buildComposerProject2 (finalAttrs: { owner = "vimeo"; repo = "psalm"; tag = finalAttrs.version; - hash = "sha256-QsANvg/QXJucjxwM6IF20mZu4DPw/RcBJV6+5tJkZB0="; + hash = "sha256-6MO16Ch3SR2kn48lTj64c/1DZDpsLjpZcFYmtiBhCCU="; }; composerLock = runCommand "composer.lock" { } '' ${lib.getExe php} -r '$phar = new Phar("${psalm-phar}"); $phar->extractTo(".", "composer.lock");' cp composer.lock $out ''; - vendorHash = "sha256-gtN3Gml/gNeg7FBNnr6I7IV0zF6iK4oWproRESPbK/4="; + vendorHash = "sha256-2LlP0D7b07yXVGc/+pJUUWYXF8rsc4HiErBUt5SfZmw="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/development/python-modules/accupy/default.nix b/pkgs/development/python-modules/accupy/default.nix index 08e7496cd6bb..531249d9d727 100644 --- a/pkgs/development/python-modules/accupy/default.nix +++ b/pkgs/development/python-modules/accupy/default.nix @@ -3,14 +3,12 @@ stdenv, buildPythonPackage, fetchFromGitHub, - pythonOlder, setuptools, mpmath, numpy, pybind11, pyfma, eigen, - importlib-metadata, pytestCheckHook, matplotlib, dufte, @@ -40,8 +38,7 @@ buildPythonPackage rec { mpmath numpy pyfma - ] - ++ lib.optional (pythonOlder "3.8") importlib-metadata; + ]; nativeCheckInputs = [ perfplot diff --git a/pkgs/development/python-modules/aiolifx-themes/default.nix b/pkgs/development/python-modules/aiolifx-themes/default.nix index 3f518fe0f54d..517e10840aba 100644 --- a/pkgs/development/python-modules/aiolifx-themes/default.nix +++ b/pkgs/development/python-modules/aiolifx-themes/default.nix @@ -11,9 +11,9 @@ pythonOlder, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiolifx-themes"; - version = "1.0.2"; + version = "1.0.3"; pyproject = true; disabled = pythonOlder "3.12"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Djelibeybi"; repo = "aiolifx-themes"; - tag = "v${version}"; - hash = "sha256-uJQWKgmlNwuvIXfK6fFHngaSncgaDJJ36vkOLGWB/lY="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Y92ze+zrkz+fxQNFFSR5V9sPJMN0/dfIRwT6UhXo0+U="; }; build-system = [ poetry-core ]; @@ -41,8 +41,8 @@ buildPythonPackage rec { meta = { description = "Color themes for LIFX lights running on aiolifx"; homepage = "https://github.com/Djelibeybi/aiolifx-themes"; - changelog = "https://github.com/Djelibeybi/aiolifx-themes/releases/tag/${src.tag}"; + changelog = "https://github.com/Djelibeybi/aiolifx-themes/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ lukegb ]; }; -} +}) diff --git a/pkgs/development/python-modules/aiomealie/default.nix b/pkgs/development/python-modules/aiomealie/default.nix index e3edcf10aaad..b892f151da65 100644 --- a/pkgs/development/python-modules/aiomealie/default.nix +++ b/pkgs/development/python-modules/aiomealie/default.nix @@ -15,16 +15,16 @@ yarl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiomealie"; - version = "1.1.1"; + version = "1.2.0"; pyproject = true; src = fetchFromGitHub { owner = "joostlek"; repo = "python-mealie"; - tag = "v${version}"; - hash = "sha256-qiLynV/nJkejUVyS3p12bcAR3+Oj+XKp7Z/zVpxb84I="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Q+8EZHZqbv5IEqhwCKhRPgr1Cfs/zVhLiwFgCZnNcW4="; }; build-system = [ poetry-core ]; @@ -50,8 +50,8 @@ buildPythonPackage rec { meta = { description = "Module to interact with Mealie"; homepage = "https://github.com/joostlek/python-mealie"; - changelog = "https://github.com/joostlek/python-mealie/releases/tag/${src.tag}"; + changelog = "https://github.com/joostlek/python-mealie/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/aiorwlock/default.nix b/pkgs/development/python-modules/aiorwlock/default.nix index 9139bd1de4ef..4266a374b7ee 100644 --- a/pkgs/development/python-modules/aiorwlock/default.nix +++ b/pkgs/development/python-modules/aiorwlock/default.nix @@ -5,6 +5,7 @@ pytest-asyncio, pytestCheckHook, poetry-core, + fetchpatch, }: buildPythonPackage rec { @@ -21,6 +22,15 @@ buildPythonPackage rec { build-system = [ poetry-core ]; + patches = [ + # Fix cross-event-loop race condition in lock acquisition + # https://github.com/aio-libs/aiorwlock/pull/503 + (fetchpatch { + url = "https://github.com/aio-libs/aiorwlock/commit/05608d401e4a68c69c6b9f421dd20535a9dbe523.patch?full_index=1"; + hash = "sha256-97c6Li6nq7ViNvUIdPL8f/ATOSsmiAMaJeBFj+jPJcM="; + }) + ]; + nativeCheckInputs = [ pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/aiosendspin/default.nix b/pkgs/development/python-modules/aiosendspin/default.nix index 752a8aeaf527..aba70a364c09 100644 --- a/pkgs/development/python-modules/aiosendspin/default.nix +++ b/pkgs/development/python-modules/aiosendspin/default.nix @@ -20,16 +20,22 @@ buildPythonPackage rec { pname = "aiosendspin"; - version = "1.2.0"; + version = "2.1.0"; pyproject = true; src = fetchFromGitHub { owner = "Sendspin"; repo = "aiosendspin"; tag = version; - hash = "sha256-3vTEfXeFqouPswRKST/9U7yg9ah7J9m2KAMoxaBZNR0="; + hash = "sha256-9VhNtfXH2r/cGkscz51PIK2/66pPOGv0S0IpO0wFvO4="; }; + # https://github.com/Sendspin/aiosendspin/blob/1.2.0/pyproject.toml#L7 + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'version = "0.0.0"' 'version = "${version}"' + ''; + build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aiosmtpd/default.nix b/pkgs/development/python-modules/aiosmtpd/default.nix index 64f60ba0fcd0..9b7b0254bb5d 100644 --- a/pkgs/development/python-modules/aiosmtpd/default.nix +++ b/pkgs/development/python-modules/aiosmtpd/default.nix @@ -8,7 +8,6 @@ pytestCheckHook, pythonOlder, setuptools, - typing-extensions, # for passthru.tests django, @@ -32,8 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ atpublic attrs - ] - ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + ]; nativeCheckInputs = [ pytest-mock diff --git a/pkgs/development/python-modules/aiosql/default.nix b/pkgs/development/python-modules/aiosql/default.nix index dae16cb778b2..511466c5c3ad 100644 --- a/pkgs/development/python-modules/aiosql/default.nix +++ b/pkgs/development/python-modules/aiosql/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, pg8000, @@ -50,6 +51,14 @@ buildPythonPackage rec { pythonImportsCheck = [ "aiosql" ]; + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ + # Tests that require port binding fail in darwin sandbox + # port_for.exceptions.PortForException: Can't select a port + "tests/test_pg8000.py" + "tests/test_apsycopg3.py" + "tests/test_psycopg3.py" + ]; + meta = { description = "Simple SQL in Python"; homepage = "https://nackjicholson.github.io/aiosql/"; diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix index 5fc148e73d09..99388853f391 100644 --- a/pkgs/development/python-modules/aioswitcher/default.nix +++ b/pkgs/development/python-modules/aioswitcher/default.nix @@ -16,7 +16,7 @@ time-machine, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aioswitcher"; version = "6.0.3"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "TomerFi"; repo = "aioswitcher"; - tag = version; + tag = finalAttrs.version; hash = "sha256-6wBeAbBiuAZW9kHq/bKC0FMJxkLxM6RZN7RLwbF1ig4="; }; @@ -62,9 +62,13 @@ buildPythonPackage rec { "test_schedule_parser_with_a_non_recurring_enabled_schedule_data" ] ++ lib.optionals (pythonAtLeast "3.12") [ - # ssertionError: Expected <'I' format requires 0 <= number <= 4294967295> to be equal to <argument out of range>, but was not. + # AssertionError: Expected <'I' format requires 0 <= number <= 4294967295> to be equal to <argument out of range>, but was not. "test_minutes_to_hexadecimal_seconds_with_a_negative_value_should_throw_an_error" "test_current_timestamp_to_hexadecimal_with_errornous_value_should_throw_an_error" + ] + ++ lib.optionals (pythonAtLeast "3.14") [ + # AssertionError: Expected <hour must be in 0..23, not -1> to be equal + "test_seconds_to_iso_time_with_a_nagative_value_should_throw_an_error" ]; pythonImportsCheck = [ "aioswitcher" ]; @@ -72,8 +76,8 @@ buildPythonPackage rec { meta = { description = "Python module to interact with Switcher water heater"; homepage = "https://github.com/TomerFi/aioswitcher"; - changelog = "https://github.com/TomerFi/aioswitcher/releases/tag/${src.tag}"; + changelog = "https://github.com/TomerFi/aioswitcher/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/amaranth/default.nix b/pkgs/development/python-modules/amaranth/default.nix index dbb725882385..83764d4dc228 100644 --- a/pkgs/development/python-modules/amaranth/default.nix +++ b/pkgs/development/python-modules/amaranth/default.nix @@ -1,14 +1,11 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, pdm-backend, jschon, pyvcd, jinja2, - importlib-resources, - importlib-metadata, git, # for tests @@ -43,9 +40,7 @@ buildPythonPackage rec { jschon jinja2 pyvcd - ] - ++ lib.optional (pythonOlder "3.9") importlib-resources - ++ lib.optional (pythonOlder "3.8") importlib-metadata; + ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/ansiconv/default.nix b/pkgs/development/python-modules/ansiconv/default.nix deleted file mode 100644 index 8944a73b01de..000000000000 --- a/pkgs/development/python-modules/ansiconv/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - pytest, -}: - -buildPythonPackage rec { - pname = "ansiconv"; - version = "1.0.0"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "ansible"; - repo = "ansiconv"; - rev = "v${version}"; - sha256 = "0ljfpl8x069arzginvpi1v6hlaq4x2qpjqj01qds2ylz33scq8r4"; - }; - - nativeCheckInputs = [ pytest ]; - - meta = { - description = "Module for converting ANSI coded text and converts it to either plain text or HTML"; - homepage = "https://github.com/ansible/ansiconv"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ psyanticy ]; - }; -} diff --git a/pkgs/development/python-modules/anywidget/default.nix b/pkgs/development/python-modules/anywidget/default.nix index e7954e34f841..9f94e0787eec 100644 --- a/pkgs/development/python-modules/anywidget/default.nix +++ b/pkgs/development/python-modules/anywidget/default.nix @@ -4,10 +4,8 @@ fetchPypi, pytestCheckHook, writableTmpDirAsHomeHook, - pythonOlder, hatch-jupyter-builder, hatchling, - importlib-metadata, ipykernel, ipywidgets, psygnal, @@ -43,8 +41,7 @@ buildPythonPackage rec { ipywidgets psygnal typing-extensions - ] - ++ lib.optional (pythonOlder "3.8") importlib-metadata; + ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/asdf-transform-schemas/default.nix b/pkgs/development/python-modules/asdf-transform-schemas/default.nix index 683b1760d0d0..f913e7e429b7 100644 --- a/pkgs/development/python-modules/asdf-transform-schemas/default.nix +++ b/pkgs/development/python-modules/asdf-transform-schemas/default.nix @@ -3,25 +3,23 @@ asdf-standard, buildPythonPackage, fetchPypi, - importlib-resources, - pythonOlder, setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "asdf-transform-schemas"; version = "0.6.0"; pyproject = true; src = fetchPypi { pname = "asdf_transform_schemas"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-D1D44Jb//S0UucgplZASZu8lsj0N/8MK1Bu6RoUalzI="; }; build-system = [ setuptools-scm ]; - dependencies = [ asdf-standard ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; + dependencies = [ asdf-standard ]; # Circular dependency on asdf doCheck = false; @@ -31,8 +29,8 @@ buildPythonPackage rec { meta = { description = "ASDF schemas for validating transform tags"; homepage = "https://github.com/asdf-format/asdf-transform-schemas"; - changelog = "https://github.com/asdf-format/asdf-transform-schemas/releases/tag/${version}"; + changelog = "https://github.com/asdf-format/asdf-transform-schemas/releases/tag/${finalAttrs.version}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/automate-home/default.nix b/pkgs/development/python-modules/automate-home/default.nix index a6bb1e91233e..5c612efc7144 100644 --- a/pkgs/development/python-modules/automate-home/default.nix +++ b/pkgs/development/python-modules/automate-home/default.nix @@ -8,7 +8,6 @@ hiredis, pytestCheckHook, pythonAtLeast, - pythonOlder, pytz, pyyaml, setuptools, @@ -20,7 +19,7 @@ buildPythonPackage rec { pyproject = true; # Typing issue - disabled = pythonOlder "3.8" || pythonAtLeast "3.12"; + disabled = pythonAtLeast "3.12"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/avro/default.nix b/pkgs/development/python-modules/avro/default.nix index 6c49c437bc97..30b7c1ed7694 100644 --- a/pkgs/development/python-modules/avro/default.nix +++ b/pkgs/development/python-modules/avro/default.nix @@ -1,10 +1,8 @@ { lib, buildPythonPackage, - pythonOlder, setuptools, fetchPypi, - typing-extensions, pytest7CheckHook, }: @@ -20,8 +18,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; - dependencies = lib.optionals (pythonOlder "3.8") [ typing-extensions ]; - nativeCheckInputs = [ pytest7CheckHook ]; disabledTests = [ diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index a29ea34f9104..21d108a035ab 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.59.0"; + version = "1.61.0"; pyproject = true; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-lambda-builders"; tag = "v${version}"; - hash = "sha256-US8NHNEvYlYJMurXjvlySIdKIgKjAwIws8PmnPF0J6Q="; + hash = "sha256-NdVZrc6996dlV0jSWuZH/dLQdJnXO+BQb8hk3G0oXmw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix index 266299989746..118e249ce4da 100644 --- a/pkgs/development/python-modules/aws-xray-sdk/default.nix +++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -7,13 +7,11 @@ django, fetchFromGitHub, httpx, - importlib-metadata, jsonpickle, pymysql, pytest-asyncio_0, pynamodb, pytestCheckHook, - pythonOlder, requests, setuptools, sqlalchemy, @@ -40,8 +38,7 @@ buildPythonPackage rec { jsonpickle requests wrapt - ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; nativeCheckInputs = [ aiohttp diff --git a/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix b/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix index e4b37c63bf29..360bd6c2bcc2 100644 --- a/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix @@ -2,12 +2,10 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, azure-common, azure-mgmt-core, isodate, setuptools, - typing-extensions, }: buildPythonPackage rec { @@ -28,8 +26,7 @@ buildPythonPackage rec { azure-common azure-mgmt-core isodate - ] - ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + ]; # no tests included doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-batchai/default.nix b/pkgs/development/python-modules/azure-mgmt-batchai/default.nix index ff366fa7286c..1525ea2b7118 100644 --- a/pkgs/development/python-modules/azure-mgmt-batchai/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-batchai/default.nix @@ -5,8 +5,6 @@ azure-common, azure-mgmt-core, isodate, - pythonOlder, - typing-extensions, }: buildPythonPackage rec { @@ -24,8 +22,7 @@ buildPythonPackage rec { isodate azure-common azure-mgmt-core - ] - ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + ]; pythonNamespaces = [ "azure.mgmt" ]; diff --git a/pkgs/development/python-modules/azure-mgmt-maps/default.nix b/pkgs/development/python-modules/azure-mgmt-maps/default.nix index 1f717cc37fa3..1bf20bdd1a14 100644 --- a/pkgs/development/python-modules/azure-mgmt-maps/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-maps/default.nix @@ -5,8 +5,6 @@ buildPythonPackage, fetchPypi, isodate, - pythonOlder, - typing-extensions, msrest, }: @@ -25,8 +23,7 @@ buildPythonPackage rec { azure-common azure-mgmt-core msrest - ] - ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + ]; pythonNamespaces = [ "azure.mgmt" ]; diff --git a/pkgs/development/python-modules/azure-mgmt-redis/default.nix b/pkgs/development/python-modules/azure-mgmt-redis/default.nix index aa02912d8a5a..9c0200e90eed 100644 --- a/pkgs/development/python-modules/azure-mgmt-redis/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-redis/default.nix @@ -5,8 +5,6 @@ buildPythonPackage, fetchPypi, isodate, - pythonOlder, - typing-extensions, }: buildPythonPackage rec { @@ -24,8 +22,7 @@ buildPythonPackage rec { isodate azure-common azure-mgmt-core - ] - ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + ]; # Module has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix index b37871080857..57bc7b355bda 100644 --- a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix @@ -6,8 +6,6 @@ msrest, azure-common, azure-mgmt-core, - typing-extensions, - pythonOlder, }: buildPythonPackage rec { @@ -27,8 +25,7 @@ buildPythonPackage rec { msrest azure-common azure-mgmt-core - ] - ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/backports-entry-points-selectable/default.nix b/pkgs/development/python-modules/backports-entry-points-selectable/default.nix index 2e07441c4d79..2f561f4ef4df 100644 --- a/pkgs/development/python-modules/backports-entry-points-selectable/default.nix +++ b/pkgs/development/python-modules/backports-entry-points-selectable/default.nix @@ -2,9 +2,7 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, setuptools-scm, - importlib-metadata, }: buildPythonPackage rec { @@ -20,8 +18,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - # no tests doCheck = false; diff --git a/pkgs/development/python-modules/backports-strenum/default.nix b/pkgs/development/python-modules/backports-strenum/default.nix index e967ea74b973..8cbd84c01adc 100644 --- a/pkgs/development/python-modules/backports-strenum/default.nix +++ b/pkgs/development/python-modules/backports-strenum/default.nix @@ -5,7 +5,6 @@ poetry-core, pytestCheckHook, pythonAtLeast, - pythonOlder, }: buildPythonPackage rec { @@ -13,7 +12,7 @@ buildPythonPackage rec { version = "1.3.1"; pyproject = true; - disabled = pythonOlder "3.8" || pythonAtLeast "3.11"; + disabled = pythonAtLeast "3.11"; src = fetchFromGitHub { owner = "clbarnes"; diff --git a/pkgs/development/python-modules/betterproto/default.nix b/pkgs/development/python-modules/betterproto/default.nix index 20b08f490367..d968849c4b95 100644 --- a/pkgs/development/python-modules/betterproto/default.nix +++ b/pkgs/development/python-modules/betterproto/default.nix @@ -109,6 +109,5 @@ buildPythonPackage (finalAttrs: { homepage = "https://github.com/danielgtaylor/python-betterproto"; changelog = "https://github.com/danielgtaylor/python-betterproto/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ nikstur ]; }; }) diff --git a/pkgs/development/python-modules/bitvector-for-humans/default.nix b/pkgs/development/python-modules/bitvector-for-humans/default.nix index b8ad10e587a0..725fd141fa4f 100644 --- a/pkgs/development/python-modules/bitvector-for-humans/default.nix +++ b/pkgs/development/python-modules/bitvector-for-humans/default.nix @@ -36,6 +36,9 @@ buildPythonPackage rec { homepage = "https://github.com/JnyJny/bitvector"; description = "This simple bit vector implementation aims to make addressing single bits a little less fiddly"; license = lib.licenses.asl20; - teams = [ lib.teams.helsinki-systems ]; + maintainers = with lib.maintainers; [ + das_j + helsinki-Jo + ]; }; } diff --git a/pkgs/development/python-modules/busylight-for-humans/default.nix b/pkgs/development/python-modules/busylight-for-humans/default.nix index 904978dc90f8..0ff201b1e4e7 100644 --- a/pkgs/development/python-modules/busylight-for-humans/default.nix +++ b/pkgs/development/python-modules/busylight-for-humans/default.nix @@ -71,7 +71,10 @@ buildPythonPackage rec { homepage = "https://github.com/JnyJny/busylight"; changelog = "https://github.com/JnyJny/busylight/releases/tag/${src.tag}"; license = lib.licenses.asl20; - teams = [ lib.teams.helsinki-systems ]; + maintainers = with lib.maintainers; [ + das_j + helsinki-Jo + ]; mainProgram = "busylight"; }; } diff --git a/pkgs/development/python-modules/catalogue/default.nix b/pkgs/development/python-modules/catalogue/default.nix index d98d84f8124f..7dd016dad87a 100644 --- a/pkgs/development/python-modules/catalogue/default.nix +++ b/pkgs/development/python-modules/catalogue/default.nix @@ -3,10 +3,7 @@ buildPythonPackage, fetchPypi, pytestCheckHook, - pythonOlder, setuptools, - typing-extensions, - zipp, }: buildPythonPackage rec { @@ -21,11 +18,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ - typing-extensions - zipp - ]; - nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "catalogue" ]; diff --git a/pkgs/development/python-modules/cccolutils/default.nix b/pkgs/development/python-modules/cccolutils/default.nix index a4d3c4974243..ee5895c411dc 100644 --- a/pkgs/development/python-modules/cccolutils/default.nix +++ b/pkgs/development/python-modules/cccolutils/default.nix @@ -36,6 +36,5 @@ buildPythonPackage rec { description = "Python Kerberos 5 Credential Cache Collection Utilities"; homepage = "https://pagure.io/cccolutils"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ disassembler ]; }; } diff --git a/pkgs/development/python-modules/celery-batches/default.nix b/pkgs/development/python-modules/celery-batches/default.nix index e129dcf10248..25aaca78bfac 100644 --- a/pkgs/development/python-modules/celery-batches/default.nix +++ b/pkgs/development/python-modules/celery-batches/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "celery-batches"; - version = "0.10"; + version = "0.11"; pyproject = true; src = fetchFromGitHub { owner = "clokep"; repo = "celery-batches"; tag = "v${version}"; - hash = "sha256-9RpM2aC3F88fJBoW8FDd6IN8KlZN+6ESrZFak9j0eNk="; + hash = "sha256-+1cpauali+MjDox0esw0+bveOEroIQ0DkuHQuwm/i4Q="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/cli-ui/default.nix b/pkgs/development/python-modules/cli-ui/default.nix index 5a0cafd7a7c9..1637d78749ee 100644 --- a/pkgs/development/python-modules/cli-ui/default.nix +++ b/pkgs/development/python-modules/cli-ui/default.nix @@ -2,7 +2,6 @@ lib, fetchFromGitHub, pytestCheckHook, - pythonOlder, poetry-core, colorama, tabulate, @@ -14,8 +13,6 @@ buildPythonPackage rec { version = "0.19.0"; pyproject = true; - disabled = pythonOlder "3.8.1"; - src = fetchFromGitHub { owner = "your-tools"; repo = "python-cli-ui"; diff --git a/pkgs/development/python-modules/cobs/default.nix b/pkgs/development/python-modules/cobs/default.nix index 8e893a90bb8d..1c7aa960017e 100644 --- a/pkgs/development/python-modules/cobs/default.nix +++ b/pkgs/development/python-modules/cobs/default.nix @@ -36,6 +36,5 @@ buildPythonPackage rec { ''; homepage = "https://github.com/cmcqueen/cobs-python/"; license = lib.licenses.mit; - teams = [ lib.teams.ororatech ]; }; } diff --git a/pkgs/development/python-modules/datefinder/default.nix b/pkgs/development/python-modules/datefinder/default.nix index ddb583767de7..953bd24bb409 100644 --- a/pkgs/development/python-modules/datefinder/default.nix +++ b/pkgs/development/python-modules/datefinder/default.nix @@ -34,6 +34,9 @@ buildPythonPackage rec { description = "Extract datetime objects from strings"; homepage = "https://github.com/akoumjian/datefinder"; license = lib.licenses.mit; - teams = [ lib.teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; } diff --git a/pkgs/development/python-modules/disposable-email-domains/default.nix b/pkgs/development/python-modules/disposable-email-domains/default.nix index 62d04dba8711..a894c457ef50 100644 --- a/pkgs/development/python-modules/disposable-email-domains/default.nix +++ b/pkgs/development/python-modules/disposable-email-domains/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "disposable-email-domains"; - version = "0.0.155"; + version = "0.0.156"; pyproject = true; # No tags on GitHub src = fetchPypi { pname = "disposable_email_domains"; inherit (finalAttrs) version; - hash = "sha256-ahYGxlERS2iQRLcubq/N1vwCk3s8NiCMLoDQu00nS1s="; + hash = "sha256-YoZI3nN8BeR/+zPnuJuHeWcoWeHX1mEDGrhhFvpj2/s="; }; build-system = [ diff --git a/pkgs/development/python-modules/django-configurations/default.nix b/pkgs/development/python-modules/django-configurations/default.nix index bbbd10a232f4..85713ee2cbd6 100644 --- a/pkgs/development/python-modules/django-configurations/default.nix +++ b/pkgs/development/python-modules/django-configurations/default.nix @@ -7,9 +7,7 @@ django, django-cache-url, fetchPypi, - importlib-metadata, mock, - pythonOlder, setuptools-scm, }: @@ -25,7 +23,7 @@ buildPythonPackage rec { buildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ django ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + propagatedBuildInputs = [ django ]; nativeCheckInputs = [ mock diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix index 572330c12ff7..e94b1ad88430 100644 --- a/pkgs/development/python-modules/django-import-export/default.nix +++ b/pkgs/development/python-modules/django-import-export/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "django-import-export"; - version = "4.3.14"; + version = "4.4.0"; pyproject = true; src = fetchFromGitHub { owner = "django-import-export"; repo = "django-import-export"; tag = version; - hash = "sha256-dY6utdWlzoQiODjFn7alJBBnDxq+1G9fdGvwu/2Ynfs="; + hash = "sha256-TIvgJL+JvRiEf05pyQCfCkahTg7ld8qFOn5VgCPxasY="; }; pythonRelaxDeps = [ "tablib" ]; diff --git a/pkgs/development/python-modules/django-otp/default.nix b/pkgs/development/python-modules/django-otp/default.nix index b4159f72f899..ff17b98a130a 100644 --- a/pkgs/development/python-modules/django-otp/default.nix +++ b/pkgs/development/python-modules/django-otp/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "django-otp"; - version = "1.6.3"; + version = "1.7.0"; pyproject = true; src = fetchFromGitHub { owner = "django-otp"; repo = "django-otp"; tag = "v${version}"; - hash = "sha256-sYwt41YWQQN6nKXGmrrZ75t/i1XNVjIgRKVElVaCGRc="; + hash = "sha256-Tqi6FHXJToOJsGETgIRl8rOUTfkn3kBkG5/bI8CxT24="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index 6a54a6e34180..a240dab9733c 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -5,7 +5,6 @@ fetchFromGitHub, fetchpatch, pythonAtLeast, - pythonOlder, replaceVars, # build @@ -48,7 +47,7 @@ buildPythonPackage rec { version = "4.2.27"; pyproject = true; - disabled = pythonOlder "3.8" || pythonAtLeast "3.13"; + disabled = pythonAtLeast "3.13"; src = fetchFromGitHub { owner = "django"; diff --git a/pkgs/development/python-modules/django/5_2.nix b/pkgs/development/python-modules/django/5.nix index d35469b1af38..d35469b1af38 100644 --- a/pkgs/development/python-modules/django/5_2.nix +++ b/pkgs/development/python-modules/django/5.nix diff --git a/pkgs/development/python-modules/dronecan/default.nix b/pkgs/development/python-modules/dronecan/default.nix index ce8184a4014e..19cd14017d5f 100644 --- a/pkgs/development/python-modules/dronecan/default.nix +++ b/pkgs/development/python-modules/dronecan/default.nix @@ -27,6 +27,5 @@ buildPythonPackage rec { ''; homepage = "https://dronecan.github.io/"; license = lib.licenses.mit; - teams = [ lib.teams.ororatech ]; }; } diff --git a/pkgs/development/python-modules/dscribe/default.nix b/pkgs/development/python-modules/dscribe/default.nix index 51d7a9498506..28598f530629 100644 --- a/pkgs/development/python-modules/dscribe/default.nix +++ b/pkgs/development/python-modules/dscribe/default.nix @@ -53,10 +53,15 @@ buildPythonPackage rec { "dscribe.ext" ]; - # Prevents python from loading dscribe from the current working directory instead of using $out - preCheck = '' - rm -rf dscribe - ''; + preCheck = + # Prevents python from loading dscribe from the current working directory instead of using $out + '' + rm -rf dscribe + '' + # Prevents 'Fatal Python error: Aborted' on darwin during checkPhase + + lib.optionalString stdenv.hostPlatform.isDarwin '' + export MPLBACKEND="Agg" + ''; nativeCheckInputs = [ pytestCheckHook @@ -72,12 +77,7 @@ buildPythonPackage rec { [ # AssertionError on a numerical test "test_cell_list" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # Fatal Python error: Aborted - # matplotlib/backend_bases.py", line 2654 in create_with_canvas - "test_examples" - ]; + ]; # Broken due to use of missing _get_constraints attr in ase >= 3.26.0 # https://github.com/SINGROUP/dscribe/issues/160 diff --git a/pkgs/development/python-modules/dt8852/default.nix b/pkgs/development/python-modules/dt8852/default.nix new file mode 100644 index 000000000000..521898d00a96 --- /dev/null +++ b/pkgs/development/python-modules/dt8852/default.nix @@ -0,0 +1,38 @@ +{ + lib, + fetchPypi, + buildPythonPackage, + setuptools, + pyserial, +}: + +buildPythonPackage rec { + pname = "dt8852"; + version = "1.1.0"; + pyproject = true; + + # Not using Codeberg because there's no tagged release there. + src = fetchPypi { + inherit pname version; + hash = "sha256-3WiHJQnlP39CGzxu/sZ1jWcP40tyr2G62H4yYuwS0wA="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + pyserial + ]; + + # No tests available on PyPi and Codeberg source. + doCheck = false; + + pythonImportsCheck = [ "dt8852" ]; + + meta = { + description = "Dt8852 is a cross-platform Python package and module for reading and controlling CEM DT-8852 and equivalent Sound Level Meter and Data Logger devices"; + homepage = "https://codeberg.org/randysimons/dt8852"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ drupol ]; + mainProgram = "dt8852"; + }; +} diff --git a/pkgs/development/python-modules/dufte/default.nix b/pkgs/development/python-modules/dufte/default.nix index fc701e9f8380..8cda01951587 100644 --- a/pkgs/development/python-modules/dufte/default.nix +++ b/pkgs/development/python-modules/dufte/default.nix @@ -2,8 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, - importlib-metadata, matplotlib, numpy, pytestCheckHook, @@ -27,8 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ matplotlib numpy - ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/development/python-modules/entsoe-apy/default.nix b/pkgs/development/python-modules/entsoe-apy/default.nix index 248ca09d0708..45db4bdf9b17 100644 --- a/pkgs/development/python-modules/entsoe-apy/default.nix +++ b/pkgs/development/python-modules/entsoe-apy/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "entsoe-apy"; - version = "0.7.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "berrij"; repo = "entsoe-apy"; tag = "v${version}"; - hash = "sha256-ui+F9EOz95yCfn52pSsxDs9p6d0a2g3VpxHd3WjU9W0="; + hash = "sha256-9bfGEBOXILO+bwkyFgnVFSY1k9gA6RmzWv9mEmJGOeM="; }; pyproject = true; diff --git a/pkgs/development/python-modules/evaluate/default.nix b/pkgs/development/python-modules/evaluate/default.nix index 30ca31579b9f..a5892b4359ca 100644 --- a/pkgs/development/python-modules/evaluate/default.nix +++ b/pkgs/development/python-modules/evaluate/default.nix @@ -2,12 +2,10 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, datasets, dill, fsspec, huggingface-hub, - importlib-metadata, multiprocess, numpy, packaging, @@ -44,8 +42,7 @@ buildPythonPackage rec { fsspec huggingface-hub packaging - ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; # most tests require internet access. doCheck = false; diff --git a/pkgs/development/python-modules/exdown/default.nix b/pkgs/development/python-modules/exdown/default.nix index 244266b05beb..0b1b0bf32747 100644 --- a/pkgs/development/python-modules/exdown/default.nix +++ b/pkgs/development/python-modules/exdown/default.nix @@ -3,9 +3,7 @@ buildPythonPackage, isPy27, fetchPypi, - pythonOlder, setuptools, - importlib-metadata, pytestCheckHook, }: @@ -24,8 +22,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "exdown" ]; diff --git a/pkgs/development/python-modules/fake-useragent/default.nix b/pkgs/development/python-modules/fake-useragent/default.nix index bd3db66e0bb9..83aa273913f4 100644 --- a/pkgs/development/python-modules/fake-useragent/default.nix +++ b/pkgs/development/python-modules/fake-useragent/default.nix @@ -2,7 +2,6 @@ lib, fetchFromGitHub, buildPythonPackage, - importlib-metadata, importlib-resources, setuptools, pythonOlder, @@ -27,9 +26,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - dependencies = - lib.optionals (pythonOlder "3.10") [ importlib-resources ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + dependencies = lib.optionals (pythonOlder "3.10") [ importlib-resources ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix index 9524059c7784..79037bcbb491 100644 --- a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix +++ b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "ffmpeg-progress-yield"; - version = "1.0.5"; + version = "1.1.1"; pyproject = true; src = fetchFromGitHub { owner = "slhck"; repo = "ffmpeg-progress-yield"; tag = "v${version}"; - hash = "sha256-L3q0Tyh0e1qBV13NRlFxjS/39uKfJWVeN/AGXH+Jss8="; + hash = "sha256-lAnTDA8YAqT7ZtRyxTtEZ8vK/OSz6mhpFXy6LURsU3E="; }; build-system = [ uv-build ]; diff --git a/pkgs/development/python-modules/ffmpy/default.nix b/pkgs/development/python-modules/ffmpy/default.nix index 7aabc9f56107..16d62090e03d 100644 --- a/pkgs/development/python-modules/ffmpy/default.nix +++ b/pkgs/development/python-modules/ffmpy/default.nix @@ -3,8 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch2, - pythonOlder, uv-build, pytestCheckHook, go, @@ -16,8 +14,6 @@ buildPythonPackage rec { version = "0.6.2"; pyproject = true; - disabled = pythonOlder "3.8.1"; - src = fetchFromGitHub { owner = "Ch00k"; repo = "ffmpy"; diff --git a/pkgs/development/python-modules/fickling/default.nix b/pkgs/development/python-modules/fickling/default.nix index 88a2bab3ea95..287b4a0d1519 100644 --- a/pkgs/development/python-modules/fickling/default.nix +++ b/pkgs/development/python-modules/fickling/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonOlder, hatchling, numpy, pytestCheckHook, @@ -10,16 +11,16 @@ torchvision, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "fickling"; - version = "0.1.6"; + version = "0.1.7"; pyproject = true; src = fetchFromGitHub { owner = "trailofbits"; repo = "fickling"; - tag = "v${version}"; - hash = "sha256-p2XkHKqheVHqLTQKmUApiYH7NIaHc091B/TjiCDYWtA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-uirVOJ6CI7gBu9lOoPtpjUZeBmIhBMI0tjSDI/ASy7w="; }; build-system = [ @@ -40,21 +41,21 @@ buildPythonPackage rec { ]; }; - nativeCheckInputs = [ pytestCheckHook ] ++ lib.concatAttrValues optional-dependencies; + nativeCheckInputs = [ + pytestCheckHook + ] + ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies; - disabledTestPaths = [ - # https://github.com/trailofbits/fickling/issues/162 - # AttributeError: module 'numpy.lib.format' has no attribute... - "test/test_polyglot.py" - ]; + # Tests fail upstream in pytorch under python 3.14 + doCheck = pythonOlder "3.14"; pythonImportsCheck = [ "fickling" ]; meta = { description = "Python pickling decompiler and static analyzer"; homepage = "https://github.com/trailofbits/fickling"; - changelog = "https://github.com/trailofbits/fickling/releases/tag/${src.tag}"; + changelog = "https://github.com/trailofbits/fickling/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ sarahec ]; }; -} +}) diff --git a/pkgs/development/python-modules/flask-mongoengine/default.nix b/pkgs/development/python-modules/flask-mongoengine/default.nix index 1d81c726ae23..10b3531a71d1 100644 --- a/pkgs/development/python-modules/flask-mongoengine/default.nix +++ b/pkgs/development/python-modules/flask-mongoengine/default.nix @@ -7,10 +7,8 @@ flask-wtf, markupsafe, mongoengine, - pythonOlder, setuptools, setuptools-scm, - typing-extensions, wtforms, }: @@ -38,8 +36,7 @@ buildPythonPackage rec { flask flask-wtf mongoengine - ] - ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + ]; optional-dependencies = { wtf = [ diff --git a/pkgs/development/python-modules/garth/default.nix b/pkgs/development/python-modules/garth/default.nix index 6d1dbe25da26..39e4fd0030b9 100644 --- a/pkgs/development/python-modules/garth/default.nix +++ b/pkgs/development/python-modules/garth/default.nix @@ -10,14 +10,14 @@ requests-oauthlib, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "garth"; - version = "0.5.20"; + version = "0.5.21"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-dqn/SeLQMT+6XOr65hlavZf1zdHnICKm9VCFh9DMLpk="; + inherit (finalAttrs) pname version; + hash = "sha256-jZeVldHU6iOhtGarSmCVXRObcfiG9GSQvhQPzuWE2rQ="; }; pythonRelaxDeps = [ "requests-oauthlib" ]; @@ -55,8 +55,8 @@ buildPythonPackage rec { meta = { description = "Garmin SSO auth and connect client"; homepage = "https://github.com/matin/garth"; - changelog = "https://github.com/matin/garth/releases/tag/${version}"; + changelog = "https://github.com/matin/garth/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/gentools/default.nix b/pkgs/development/python-modules/gentools/default.nix index 6c2cde3bc597..570fb4b5e8e7 100644 --- a/pkgs/development/python-modules/gentools/default.nix +++ b/pkgs/development/python-modules/gentools/default.nix @@ -2,10 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, - importlib-metadata, poetry-core, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { @@ -22,8 +20,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "gentools" ]; diff --git a/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix b/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix index 687d040b37c9..a00381b785ad 100644 --- a/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix +++ b/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix @@ -12,15 +12,15 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-network-connectivity"; - version = "2.11.0"; + version = "2.12.0"; pyproject = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "google_cloud_network_connectivity"; - hash = "sha256-PBqFMVGTn7si4UgAc4zk/97M9mWSnVJMX9gZk0eXpSY="; + hash = "sha256-4CF79YGR8Ean5PoGLjhWAME+0VYSS3YOPVp9uGeUjaY="; }; build-system = [ setuptools ]; @@ -47,8 +47,8 @@ buildPythonPackage rec { meta = { description = "API Client library for Google Cloud Network Connectivity Center"; homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-network-connectivity"; - changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-network-connectivity-v${version}/packages/google-cloud-network-connectivity/CHANGELOG.md"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-network-connectivity-v${finalAttrs.version}/packages/google-cloud-network-connectivity/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ aksiksi ]; }; -} +}) diff --git a/pkgs/development/python-modules/gptcache/default.nix b/pkgs/development/python-modules/gptcache/default.nix index 7b79d8d9d261..2815ecef5615 100644 --- a/pkgs/development/python-modules/gptcache/default.nix +++ b/pkgs/development/python-modules/gptcache/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, cachetools, numpy, - pythonOlder, redis, redis-om, requests, @@ -15,8 +14,6 @@ buildPythonPackage rec { version = "0.1.44"; format = "setuptools"; - disabled = pythonOlder "3.8.1"; - src = fetchFromGitHub { owner = "zilliztech"; repo = "GPTCache"; diff --git a/pkgs/development/python-modules/graphql-relay/default.nix b/pkgs/development/python-modules/graphql-relay/default.nix index 8d414efe7fa3..a007d735ca66 100644 --- a/pkgs/development/python-modules/graphql-relay/default.nix +++ b/pkgs/development/python-modules/graphql-relay/default.nix @@ -3,14 +3,11 @@ buildPythonPackage, fetchPypi, - pythonOlder, - # build poetry-core, # runtime graphql-core, - typing-extensions, # tests pytest-asyncio, @@ -41,7 +38,7 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ graphql-core ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + propagatedBuildInputs = [ graphql-core ]; nativeCheckInputs = [ pytest-asyncio diff --git a/pkgs/development/python-modules/growattserver/default.nix b/pkgs/development/python-modules/growattserver/default.nix index a1ced89cd953..719ce3bd7989 100644 --- a/pkgs/development/python-modules/growattserver/default.nix +++ b/pkgs/development/python-modules/growattserver/default.nix @@ -6,16 +6,16 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "growattserver"; - version = "1.7.1"; + version = "1.8.0"; pyproject = true; src = fetchFromGitHub { owner = "indykoning"; repo = "PyPi_GrowattServer"; - tag = version; - hash = "sha256-rob2+uXuBD5Gf05rNFFEW210JxrTbWN7knk9Tnz7wOE="; + tag = finalAttrs.version; + hash = "sha256-2Jgz/wN0k6ni+4PbQwfDg3uMvYxv5N3BVgdARHqQ0Yc="; }; build-system = [ setuptools ]; @@ -30,8 +30,8 @@ buildPythonPackage rec { meta = { description = "Python package to retrieve information from Growatt units"; homepage = "https://github.com/indykoning/PyPi_GrowattServer"; - changelog = "https://github.com/indykoning/PyPi_GrowattServer/releases/tag/${src.tag}"; + changelog = "https://github.com/indykoning/PyPi_GrowattServer/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/grpclib/default.nix b/pkgs/development/python-modules/grpclib/default.nix index fcf657b3a6b5..58802844660c 100644 --- a/pkgs/development/python-modules/grpclib/default.nix +++ b/pkgs/development/python-modules/grpclib/default.nix @@ -50,6 +50,5 @@ buildPythonPackage rec { homepage = "https://github.com/vmagamedov/grpclib"; changelog = "https://github.com/vmagamedov/grpclib/blob/v${version}/docs/changelog/index.rst"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ nikstur ]; }; } diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index 28f5609fd34c..9e58d5641a00 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -2,7 +2,6 @@ lib, fetchPypi, buildPythonPackage, - pythonOlder, setuptools, numpy, hdf5, @@ -12,7 +11,6 @@ openssh, pytestCheckHook, pytest-mpi, - cached-property, }: assert hdf5.mpiSupport -> mpi4py != null && hdf5.mpi == mpi4py.mpi; @@ -71,8 +69,7 @@ buildPythonPackage rec { ++ lib.optionals mpiSupport [ mpi4py openssh - ] - ++ lib.optionals (pythonOlder "3.8") [ cached-property ]; + ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix b/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix index 88ef35aee8be..b25ec89a35f9 100644 --- a/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix +++ b/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix @@ -7,7 +7,6 @@ build, hatchling, tomli, - typing-extensions, }: buildPythonPackage rec { @@ -26,8 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ hatchling ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ] - ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + ++ lib.optionals (pythonOlder "3.11") [ tomli ]; nativeCheckInputs = [ build diff --git a/pkgs/development/python-modules/hdfury/default.nix b/pkgs/development/python-modules/hdfury/default.nix index 3401e62ea7aa..f03a7c4524f8 100644 --- a/pkgs/development/python-modules/hdfury/default.nix +++ b/pkgs/development/python-modules/hdfury/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "hdfury"; - version = "1.3.1"; + version = "1.4.1"; pyproject = true; src = fetchFromGitHub { owner = "glenndehaan"; repo = "python-hdfury"; tag = finalAttrs.version; - hash = "sha256-vEIlDhDWC7My9mqXxHseDpvW/vWe9jWkYzcgz3xFhyQ="; + hash = "sha256-cL6KE3qkOgG61ewgIInbaIw6ygb5jWVrjl8ooFrCv+k="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/hyperlink/default.nix b/pkgs/development/python-modules/hyperlink/default.nix index f449c9673585..05f774c3dc43 100644 --- a/pkgs/development/python-modules/hyperlink/default.nix +++ b/pkgs/development/python-modules/hyperlink/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { homepage = "https://github.com/python-hyper/hyperlink"; license = lib.licenses.mit; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ apeschar ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix index 31c4f183d4fe..9a311c66a90c 100644 --- a/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/pkgs/development/python-modules/importlib-metadata/default.nix @@ -2,10 +2,8 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, setuptools, setuptools-scm, - typing-extensions, toml, zipp, @@ -32,8 +30,7 @@ buildPythonPackage rec { dependencies = [ toml zipp - ] - ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + ]; # Cyclic dependencies due to pyflakefs doCheck = false; diff --git a/pkgs/development/python-modules/ipykernel/tests.nix b/pkgs/development/python-modules/ipykernel/tests.nix index c1d7d1d7606b..3e4191104769 100644 --- a/pkgs/development/python-modules/ipykernel/tests.nix +++ b/pkgs/development/python-modules/ipykernel/tests.nix @@ -2,7 +2,6 @@ lib, stdenv, buildPythonPackage, - pythonOlder, flaky, ipykernel, ipyparallel, @@ -45,29 +44,15 @@ buildPythonPackage { # traitlets.config.configurable.MultipleInstanceError: An incompatible siblin... "test_install_kernelspec" ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - [ - # see https://github.com/NixOS/nixpkgs/issues/76197 - "test_subprocess_print" - "test_subprocess_error" - "test_ipython_start_kernel_no_userns" - - # https://github.com/ipython/ipykernel/issues/506 - "test_unc_paths" - ] - ++ lib.optionals (pythonOlder "3.8") [ - # flaky test https://github.com/ipython/ipykernel/issues/485 - "test_shutdown" - - # test regression https://github.com/ipython/ipykernel/issues/486 - "test_sys_path_profile_dir" - "test_save_history" - "test_help_output" - "test_write_kernel_spec" - "test_ipython_start_kernel_userns" - "ZMQDisplayPublisherTests" - ] - ); + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # see https://github.com/NixOS/nixpkgs/issues/76197 + "test_subprocess_print" + "test_subprocess_error" + "test_ipython_start_kernel_no_userns" + + # https://github.com/ipython/ipykernel/issues/506 + "test_unc_paths" + ]; # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/iterable-io/default.nix b/pkgs/development/python-modules/iterable-io/default.nix index 02d25109df51..dd07c69333f4 100644 --- a/pkgs/development/python-modules/iterable-io/default.nix +++ b/pkgs/development/python-modules/iterable-io/default.nix @@ -6,16 +6,16 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "iterable-io"; - version = "1.0.0"; + version = "1.0.1"; pyproject = true; src = fetchFromGitHub { owner = "pR0Ps"; repo = "iterable-io"; - tag = "v${version}"; - hash = "sha256-+PSINKS7/FeGHYvkOASA5m+1pBpKfURfylZ8CwKijgA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-mS8x3M0DNnwW6Ov3TG8b2J702rjOnZT9r38fsIUXkro="; }; nativeBuildInputs = [ setuptools ]; @@ -27,8 +27,8 @@ buildPythonPackage rec { meta = { description = "Library to adapt iterables to a file-like interface"; homepage = "https://github.com/pR0Ps/iterable-io"; - changelog = "https://github.com/pR0Ps/iterable-io/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/pR0Ps/iterable-io/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.lgpl3Only; maintainers = [ lib.maintainers.mjoerg ]; }; -} +}) diff --git a/pkgs/development/python-modules/jenkinsapi/default.nix b/pkgs/development/python-modules/jenkinsapi/default.nix index f3a545f9b7b8..5ae93e9731f5 100644 --- a/pkgs/development/python-modules/jenkinsapi/default.nix +++ b/pkgs/development/python-modules/jenkinsapi/default.nix @@ -55,8 +55,11 @@ buildPythonPackage rec { meta = { description = "Python API for accessing resources on a Jenkins continuous-integration server"; homepage = "https://github.com/salimfadhley/jenkinsapi"; - maintainers = with lib.maintainers; [ drets ]; - teams = [ lib.teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + drets + ]; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/knx-frontend/default.nix b/pkgs/development/python-modules/knx-frontend/default.nix index 9855ac6f65fa..06c7f3043833 100644 --- a/pkgs/development/python-modules/knx-frontend/default.nix +++ b/pkgs/development/python-modules/knx-frontend/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "knx-frontend"; - version = "2025.12.30.151231"; + version = "2026.1.15.112308"; pyproject = true; # TODO: source build, uses yarn.lock src = fetchPypi { pname = "knx_frontend"; inherit version; - hash = "sha256-3KRufDLB1p+k2pmY9Mivvd2DmxWCZHZSIPhUZImKZIY="; + hash = "sha256-Q+9BUS0A/e0hIBq8J2hRZi/L7LKhf7vSEIFkPI0RMj0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/krb5/default.nix b/pkgs/development/python-modules/krb5/default.nix index 0ade85e05e84..0d8cd32055a9 100644 --- a/pkgs/development/python-modules/krb5/default.nix +++ b/pkgs/development/python-modules/krb5/default.nix @@ -39,7 +39,10 @@ buildPythonPackage rec { description = "Kerberos API bindings for Python"; homepage = "https://github.com/jborean93/pykrb5"; license = lib.licenses.mit; - teams = [ lib.teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; broken = stdenv.hostPlatform.isDarwin; # TODO: figure out how to build on Darwin }; } diff --git a/pkgs/development/python-modules/langchain-mongodb/default.nix b/pkgs/development/python-modules/langchain-mongodb/default.nix index e47503549425..88bf6a9556d5 100644 --- a/pkgs/development/python-modules/langchain-mongodb/default.nix +++ b/pkgs/development/python-modules/langchain-mongodb/default.nix @@ -33,19 +33,19 @@ gitUpdater, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "langchain-mongodb"; - version = "0.9.0"; + version = "0.10.0"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain-mongodb"; - tag = "libs/langchain-mongodb/v${version}"; - hash = "sha256-g2FEowzGvP7a/zx/qn8EUxj5s6j/miMlzkRJEE64G0k="; + tag = "libs/langchain-mongodb/v${finalAttrs.version}"; + hash = "sha256-MRvj6RJ6N+u1wA+zkyWhe4tnGaC4FduPl+k7AhBIwLI="; }; - sourceRoot = "${src.name}/libs/langchain-mongodb"; + sourceRoot = "${finalAttrs.src.name}/libs/langchain-mongodb"; build-system = [ hatchling ]; @@ -104,7 +104,7 @@ buildPythonPackage rec { }; meta = { - changelog = "https://github.com/langchain-ai/langchain-mongodb/releases/tag/${src.tag}"; + changelog = "https://github.com/langchain-ai/langchain-mongodb/releases/tag/${finalAttrs.src.tag}"; description = "Integration package connecting MongoDB and LangChain"; homepage = "https://github.com/langchain-ai/langchain-mongodb"; license = lib.licenses.mit; @@ -113,4 +113,4 @@ buildPythonPackage rec { sarahec ]; }; -} +}) diff --git a/pkgs/development/python-modules/langgraph-sdk/default.nix b/pkgs/development/python-modules/langgraph-sdk/default.nix index 37c75b631fe8..59f280501c07 100644 --- a/pkgs/development/python-modules/langgraph-sdk/default.nix +++ b/pkgs/development/python-modules/langgraph-sdk/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "langgraph-sdk"; - version = "0.3.1"; + version = "0.3.2"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; tag = "sdk==${version}"; - hash = "sha256-pIQuvOYyjXajPxqoRDHuolxNgaBeSmJvPRskinXkkDo="; + hash = "sha256-PGQjIxdd4aDh2t9p1gttMlREBxqMOR9Ghtb10wL0gBI="; }; sourceRoot = "${src.name}/libs/sdk-py"; diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index 2d336e2bdbbc..c6d4eb68507d 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.5.1"; + version = "0.6.4"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langsmith-sdk"; tag = "v${version}"; - hash = "sha256-6iJk8JfGIhrAcEXrsJKWn0G2jJ2kitWjx/YJCWcGNfY="; + hash = "sha256-325A2kEx2UrykxVRzp6WQCPrg92Vy+6R1CfgnCLV2V8="; }; sourceRoot = "${src.name}/python"; diff --git a/pkgs/development/python-modules/libpcap/default.nix b/pkgs/development/python-modules/libpcap/default.nix index 488ec0daefca..05f448396531 100644 --- a/pkgs/development/python-modules/libpcap/default.nix +++ b/pkgs/development/python-modules/libpcap/default.nix @@ -62,6 +62,5 @@ buildPythonPackage rec { homepage = "https://github.com/karpierz/libpcap/"; changelog = "https://github.com/karpierz/libpcap/blob/${version}/CHANGES.rst"; license = lib.licenses.bsd3; - teams = [ lib.teams.ororatech ]; }; } diff --git a/pkgs/development/python-modules/line-profiler/default.nix b/pkgs/development/python-modules/line-profiler/default.nix index 0d113cfe39c6..6b04151f1eb1 100644 --- a/pkgs/development/python-modules/line-profiler/default.nix +++ b/pkgs/development/python-modules/line-profiler/default.nix @@ -7,7 +7,6 @@ ipython, scikit-build, cmake, - pythonOlder, pytestCheckHook, ubelt, }: @@ -17,7 +16,7 @@ buildPythonPackage rec { version = "5.0.0"; format = "setuptools"; - disabled = pythonOlder "3.8" || isPyPy; + disabled = isPyPy; src = fetchPypi { pname = "line_profiler"; diff --git a/pkgs/development/python-modules/logilab/common.nix b/pkgs/development/python-modules/logilab/common.nix index dc60c2846029..5ca97bffebe9 100644 --- a/pkgs/development/python-modules/logilab/common.nix +++ b/pkgs/development/python-modules/logilab/common.nix @@ -2,11 +2,9 @@ lib, buildPythonPackage, fetchPypi, - importlib-metadata, mypy-extensions, pytestCheckHook, pythonAtLeast, - pythonOlder, pytz, setuptools, typing-extensions, @@ -33,8 +31,7 @@ buildPythonPackage rec { setuptools mypy-extensions typing-extensions - ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index 74594ae40a5f..b50e649d644c 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -40,16 +40,16 @@ gitUpdater, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "magic-wormhole"; - version = "0.21.1"; + version = "0.22.0"; pyproject = true; src = fetchFromGitHub { owner = "magic-wormhole"; repo = "magic-wormhole"; - tag = version; - hash = "sha256-HZ6ZS2dkJoW+yL6F3U9WguUHicfG2KWnk4/YuNPwpUc="; + tag = finalAttrs.version; + hash = "sha256-22UFwBcpuutFDRPFJAS9MBwoTdIx2xW0DSpR44DJ1lU="; }; postPatch = @@ -103,7 +103,7 @@ buildPythonPackage rec { pytestCheckHook pytest-twisted ] - ++ optional-dependencies.dilation + ++ finalAttrs.finalPackage.optional-dependencies.dilation ++ lib.optionals stdenv.hostPlatform.isDarwin [ unixtools.locale ]; __darwinAllowLocalNetworking = true; @@ -112,7 +112,7 @@ buildPythonPackage rec { install -Dm644 docs/wormhole.1 $out/share/man/man1/wormhole.1 # https://github.com/magic-wormhole/magic-wormhole/issues/619 - installShellCompletion --cmd ${meta.mainProgram} \ + installShellCompletion --cmd ${finalAttrs.meta.mainProgram} \ --bash wormhole_complete.bash \ --fish wormhole_complete.fish \ --zsh wormhole_complete.zsh @@ -122,11 +122,11 @@ buildPythonPackage rec { passthru.updateScript = gitUpdater { }; meta = { - changelog = "https://github.com/magic-wormhole/magic-wormhole/blob/${version}/NEWS.md"; + changelog = "https://github.com/magic-wormhole/magic-wormhole/blob/${finalAttrs.src.rev}/NEWS.md"; description = "Securely transfer data between computers"; homepage = "https://magic-wormhole.readthedocs.io/"; license = lib.licenses.mit; maintainers = [ lib.maintainers.mjoerg ]; mainProgram = "wormhole"; }; -} +}) diff --git a/pkgs/development/python-modules/mailmanclient/default.nix b/pkgs/development/python-modules/mailmanclient/default.nix index b15cd1ab25e7..b00661f89d09 100644 --- a/pkgs/development/python-modules/mailmanclient/default.nix +++ b/pkgs/development/python-modules/mailmanclient/default.nix @@ -2,9 +2,7 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, requests, - typing-extensions, }: buildPythonPackage rec { @@ -17,7 +15,7 @@ buildPythonPackage rec { hash = "sha256-Y1gcYEyn6sAhSJwVqsygaklY63b2ZXTG+rBerGVN2Fc="; }; - propagatedBuildInputs = [ requests ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + propagatedBuildInputs = [ requests ]; # Tests require a running Mailman instance doCheck = false; diff --git a/pkgs/development/python-modules/markups/default.nix b/pkgs/development/python-modules/markups/default.nix index 5e4573cc152a..18766012b963 100644 --- a/pkgs/development/python-modules/markups/default.nix +++ b/pkgs/development/python-modules/markups/default.nix @@ -3,12 +3,10 @@ buildPythonPackage, docutils, fetchFromGitHub, - importlib-metadata, markdown, pygments, pytestCheckHook, python-markdown-math, - pythonOlder, pyyaml, setuptools, textile, @@ -35,8 +33,7 @@ buildPythonPackage rec { python-markdown-math pyyaml textile - ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index 8296ca891374..8817d524e4ee 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -10,22 +10,22 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "neo4j"; - version = "6.0.3"; + version = "6.1.0"; pyproject = true; src = fetchFromGitHub { owner = "neo4j"; repo = "neo4j-python-driver"; - tag = version; - hash = "sha256-KhPxwj5MmhNpd4d64dN0d1wOP6nAac/DsRQ8zoT03/A="; + tag = finalAttrs.version; + hash = "sha256-1Ef9SMJid0q+tI8hceriNu2vsLAyW4Jxt53ifcmi5VA="; }; postPatch = '' substituteInPlace pyproject.toml \ --replace-fail "setuptools ==" "setuptools >=" \ - --replace-fail 'dynamic = ["version"]' 'version = "${version}"' + --replace-fail 'dynamic = ["version"]' 'version = "${finalAttrs.version}"' ''; build-system = [ setuptools ]; @@ -49,8 +49,8 @@ buildPythonPackage rec { meta = { description = "Neo4j Bolt Driver for Python"; homepage = "https://github.com/neo4j/neo4j-python-driver"; - changelog = "https://github.com/neo4j/neo4j-python-driver/releases/tag/${src.tag}"; + changelog = "https://github.com/neo4j/neo4j-python-driver/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/netbox-routing/default.nix b/pkgs/development/python-modules/netbox-routing/default.nix index 0849c0946b9f..ffccac2914cd 100644 --- a/pkgs/development/python-modules/netbox-routing/default.nix +++ b/pkgs/development/python-modules/netbox-routing/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "netbox-routing"; - version = "0.3.1"; + version = "0.3.2"; pyproject = true; src = fetchFromGitHub { owner = "DanSheps"; repo = "netbox-routing"; tag = "v${version}"; - hash = "sha256-qtGzZDRo80pdmt3CbM+HG/S7uLvLS7V6lHNB8sM6bcA="; + hash = "sha256-HB07q6VO/PjbLLzKmHPMK91ZnppFtm9woQwdJIOFs5s="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix index ddd8221f021c..07d4d53b75a4 100644 --- a/pkgs/development/python-modules/netcdf4/default.nix +++ b/pkgs/development/python-modules/netcdf4/default.nix @@ -13,7 +13,6 @@ numpy, oldest-supported-numpy, python, - pythonOlder, setuptools-scm, stdenv, wheel, @@ -30,7 +29,7 @@ buildPythonPackage { inherit version; pyproject = true; - disabled = isPyPy || pythonOlder "3.8"; + disabled = isPyPy; src = fetchFromGitHub { owner = "Unidata"; diff --git a/pkgs/development/python-modules/niaarm/default.nix b/pkgs/development/python-modules/niaarm/default.nix index a324761df895..15078af0a068 100644 --- a/pkgs/development/python-modules/niaarm/default.nix +++ b/pkgs/development/python-modules/niaarm/default.nix @@ -52,15 +52,14 @@ buildPythonPackage rec { ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + # Prevents 'Fatal Python error: Aborted' on darwin during checkPhase + MPLBACKEND = "Agg"; + }; + disabledTests = [ # Test requires extra nltk data dependency "test_text_mining" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # Fatal Python error: Aborted - # matplotlib/backend_bases.py", line 2654 in create_with_canvas - "test_hill_slopes" - "test_two_key_plot" ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/nifty8/default.nix b/pkgs/development/python-modules/nifty8/default.nix index 687306ee4658..46c05bb3f2f4 100644 --- a/pkgs/development/python-modules/nifty8/default.nix +++ b/pkgs/development/python-modules/nifty8/default.nix @@ -70,22 +70,16 @@ buildPythonPackage rec { openssh ]; - disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ - # Fatal Python error: Aborted - # matplotlib/backend_bases.py", line 2654 in create_with_canvas - "test_optimize_kl_domain_expansion" - "test_plot_priorsamples" + # Prevents 'Fatal Python error: Aborted' on darwin during checkPhase + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' + export MPLBACKEND="Agg" + ''; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # [XPASS(strict)] np.vdot inaccurate for single precision "test_vdot" ]; - disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ - # Fatal Python error: Aborted - # matplotlib/backend_bases.py", line 2654 in create_with_canvas - "test/test_plot.py" - ]; - __darwinAllowLocalNetworking = true; postCheck = lib.optionalString diff --git a/pkgs/development/python-modules/onedrive-personal-sdk/default.nix b/pkgs/development/python-modules/onedrive-personal-sdk/default.nix index b024b3cd442b..3e3610ab82b4 100644 --- a/pkgs/development/python-modules/onedrive-personal-sdk/default.nix +++ b/pkgs/development/python-modules/onedrive-personal-sdk/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "onedrive-personal-sdk"; - version = "0.0.17"; + version = "0.1.0"; pyproject = true; src = fetchFromGitHub { owner = "zweckj"; repo = "onedrive-personal-sdk"; tag = "v${version}"; - hash = "sha256-dJ8cFZKnSN8sQxe2wMqwPXf7CaFKUP6TZbS/J4Z0qa0="; + hash = "sha256-97gIkMaX/iBPtEPdE7yjGN3LeknxmVUDPMZGZAKX6q8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/openidc-client/default.nix b/pkgs/development/python-modules/openidc-client/default.nix index ee7b57a9c807..b5d05ab5b894 100644 --- a/pkgs/development/python-modules/openidc-client/default.nix +++ b/pkgs/development/python-modules/openidc-client/default.nix @@ -22,6 +22,5 @@ buildPythonPackage rec { description = "CLI python OpenID Connect client with token caching and management"; homepage = "https://github.com/puiterwijk"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ disassembler ]; }; } diff --git a/pkgs/development/python-modules/opentelemetry-api/default.nix b/pkgs/development/python-modules/opentelemetry-api/default.nix index 72776449fafb..eb4afad2436f 100644 --- a/pkgs/development/python-modules/opentelemetry-api/default.nix +++ b/pkgs/development/python-modules/opentelemetry-api/default.nix @@ -65,7 +65,6 @@ let changelog = "https://github.com/open-telemetry/opentelemetry-python/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.natsukium ]; - teams = [ lib.teams.deshaw ]; }; }; in diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix index e178836f6fc0..80c5e8536de1 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix @@ -56,6 +56,5 @@ buildPythonPackage rec { changelog = "https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v${version}"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.natsukium ]; - teams = [ lib.teams.deshaw ]; }; } diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix index ee240ced4d4d..48c9a87e0a8b 100644 --- a/pkgs/development/python-modules/optuna/default.nix +++ b/pkgs/development/python-modules/optuna/default.nix @@ -84,10 +84,15 @@ buildPythonPackage rec { ]; }; - # grpc tests are racy - preCheck = '' - sed -i '/"grpc",/d' optuna/testing/storages.py - ''; + preCheck = + # grpc tests are racy + '' + sed -i '/"grpc",/d' optuna/testing/storages.py + '' + # Prevents 'Fatal Python error: Aborted' on darwin during checkPhase + + lib.optionalString stdenv.hostPlatform.isDarwin '' + export MPLBACKEND="Agg" + ''; nativeCheckInputs = [ addBinToPathHook @@ -117,24 +122,6 @@ buildPythonPackage rec { "test_plot_intermediate_values" "test_plot_rank" "test_plot_terminator_improvement" - - # Fatal Python error: Aborted - # matplotlib/backend_bases.py", line 2654 in create_with_canvas - "test_edf_plot_no_trials" - "test_get_timeline_plot" - "test_plot_contour" - "test_plot_contour_customized_target_name" - "test_plot_edf_with_multiple_studies" - "test_plot_edf_with_target" - "test_plot_parallel_coordinate" - "test_plot_parallel_coordinate_customized_target_name" - "test_plot_param_importances" - "test_plot_param_importances_customized_target_name" - "test_plot_param_importances_multiobjective_all_objectives_displayed" - "test_plot_slice" - "test_plot_slice_customized_target_name" - "test_target_is_none_and_study_is_multi_obj" - "test_visualizations_with_single_objectives" ]; disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/development/python-modules/ormar/default.nix b/pkgs/development/python-modules/ormar/default.nix index 9e0ff13a17f7..291bc5fd2ff8 100644 --- a/pkgs/development/python-modules/ormar/default.nix +++ b/pkgs/development/python-modules/ormar/default.nix @@ -10,7 +10,6 @@ fastapi, fetchFromGitHub, httpx, - importlib-metadata, mysqlclient, nest-asyncio, orjson, @@ -20,9 +19,7 @@ pymysql, pytest-asyncio, pytestCheckHook, - pythonOlder, sqlalchemy, - typing-extensions, }: buildPythonPackage rec { @@ -53,10 +50,6 @@ buildPythonPackage rec { pydantic sqlalchemy psycopg2 - ] - ++ lib.optionals (pythonOlder "3.8") [ - typing-extensions - importlib-metadata ]; optional-dependencies = { diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix index 1c96cda8a4da..156fae9d96d0 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -65,6 +65,5 @@ buildPythonPackage rec { between python scripts. All major ciphers and hash methods are supported. SFTP client and server mode are both supported too. ''; - teams = [ lib.teams.helsinki-systems ]; }; } diff --git a/pkgs/development/python-modules/pep517/default.nix b/pkgs/development/python-modules/pep517/default.nix index 65f806d6778b..c289334dc2ca 100644 --- a/pkgs/development/python-modules/pep517/default.nix +++ b/pkgs/development/python-modules/pep517/default.nix @@ -4,9 +4,6 @@ fetchPypi, flit-core, tomli, - pythonOlder, - importlib-metadata, - zipp, pytestCheckHook, setuptools, testpath, @@ -28,10 +25,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ tomli - ] - ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata - zipp ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index d56bffbf8239..61347f3b20ac 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -2,10 +2,8 @@ lib, buildPythonPackage, fetchPypi, - importlib-metadata, passlib, python-dateutil, - pythonOlder, scramp, hatchling, versioningit, @@ -30,8 +28,7 @@ buildPythonPackage rec { passlib python-dateutil scramp - ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; # Tests require a running PostgreSQL instance doCheck = false; diff --git a/pkgs/development/python-modules/pipdate/default.nix b/pkgs/development/python-modules/pipdate/default.nix index 3e9cd16b4b7c..313b63fcca83 100644 --- a/pkgs/development/python-modules/pipdate/default.nix +++ b/pkgs/development/python-modules/pipdate/default.nix @@ -3,9 +3,7 @@ appdirs, buildPythonPackage, fetchPypi, - importlib-metadata, packaging, - pythonOlder, requests, rich, setuptools, @@ -30,8 +28,7 @@ buildPythonPackage rec { requests rich setuptools - ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; # Tests require network access and pythonImportsCheck requires configuration file doCheck = false; diff --git a/pkgs/development/python-modules/pkg-about/default.nix b/pkgs/development/python-modules/pkg-about/default.nix index 14122e60969b..25dea6cce199 100644 --- a/pkgs/development/python-modules/pkg-about/default.nix +++ b/pkgs/development/python-modules/pkg-about/default.nix @@ -52,6 +52,5 @@ buildPythonPackage rec { homepage = "https://github.com/karpierz/pkg_about/"; changelog = "https://github.com/karpierz/pkg_about/blob/${version}/CHANGES.rst"; license = lib.licenses.zlib; - teams = [ lib.teams.ororatech ]; }; } diff --git a/pkgs/development/python-modules/plantuml-markdown/default.nix b/pkgs/development/python-modules/plantuml-markdown/default.nix index e5998caeb092..3f203385238a 100644 --- a/pkgs/development/python-modules/plantuml-markdown/default.nix +++ b/pkgs/development/python-modules/plantuml-markdown/default.nix @@ -65,6 +65,5 @@ buildPythonPackage rec { homepage = "https://github.com/mikitex70/plantuml-markdown"; changelog = "https://github.com/mikitex70/plantuml-markdown/releases/tag/${src.tag}"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ nikstur ]; }; } diff --git a/pkgs/development/python-modules/plantuml/default.nix b/pkgs/development/python-modules/plantuml/default.nix index 29d89e69935e..e2c46cf32417 100644 --- a/pkgs/development/python-modules/plantuml/default.nix +++ b/pkgs/development/python-modules/plantuml/default.nix @@ -33,6 +33,5 @@ buildPythonPackage { description = "Python interface to a plantuml web service instead of having to run java locally"; homepage = "https://github.com/dougn/python-plantuml"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ nikstur ]; }; } diff --git a/pkgs/development/python-modules/pony/default.nix b/pkgs/development/python-modules/pony/default.nix index 834558d81c44..f32e33bbc61d 100644 --- a/pkgs/development/python-modules/pony/default.nix +++ b/pkgs/development/python-modules/pony/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, pytestCheckHook, pythonAtLeast, - pythonOlder, setuptools, }: @@ -13,7 +12,7 @@ buildPythonPackage rec { version = "0.7.19"; pyproject = true; - disabled = pythonOlder "3.8" || pythonAtLeast "3.13"; + disabled = pythonAtLeast "3.13"; src = fetchFromGitHub { owner = "ponyorm"; diff --git a/pkgs/development/python-modules/py-opensonic/default.nix b/pkgs/development/python-modules/py-opensonic/default.nix index 63688ca8b028..5a3f34d650dc 100644 --- a/pkgs/development/python-modules/py-opensonic/default.nix +++ b/pkgs/development/python-modules/py-opensonic/default.nix @@ -3,25 +3,27 @@ buildPythonPackage, fetchFromGitHub, setuptools, + aiohttp, mashumaro, requests, }: buildPythonPackage rec { pname = "py-opensonic"; - version = "7.0.4"; + version = "8.1.1"; pyproject = true; src = fetchFromGitHub { owner = "khers"; repo = "py-opensonic"; tag = "v${version}"; - hash = "sha256-5wsisIfYW+0uh0khUzt9wKFxBf/ZXVsKpNF/Dcrj2wI="; + hash = "sha256-/P/7ytA0YHuJZEq7KQosPBQM2vo6VAss1G8pTIEswJA="; }; build-system = [ setuptools ]; dependencies = [ + aiohttp mashumaro requests ]; diff --git a/pkgs/development/python-modules/pycyphal/default.nix b/pkgs/development/python-modules/pycyphal/default.nix index c2c4cb48ff79..2fe0735a56f4 100644 --- a/pkgs/development/python-modules/pycyphal/default.nix +++ b/pkgs/development/python-modules/pycyphal/default.nix @@ -101,6 +101,5 @@ buildPythonPackage rec { homepage = "https://opencyphal.org/"; changelog = "https://github.com/OpenCyphal/pycyphal/blob/${version}/CHANGELOG.rst"; license = lib.licenses.mit; - teams = [ lib.teams.ororatech ]; }; } diff --git a/pkgs/development/python-modules/pyfma/default.nix b/pkgs/development/python-modules/pyfma/default.nix index 946a5f7892e1..f27b9e8d504a 100644 --- a/pkgs/development/python-modules/pyfma/default.nix +++ b/pkgs/development/python-modules/pyfma/default.nix @@ -3,11 +3,9 @@ buildPythonPackage, fetchFromGitHub, fetchpatch, - importlib-metadata, numpy, pybind11, pytestCheckHook, - pythonOlder, setuptools, }: @@ -35,7 +33,7 @@ buildPythonPackage rec { buildInputs = [ pybind11 ]; - dependencies = [ numpy ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + dependencies = [ numpy ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyld/default.nix b/pkgs/development/python-modules/pyld/default.nix index b57aa91ba5aa..805db3a686c1 100644 --- a/pkgs/development/python-modules/pyld/default.nix +++ b/pkgs/development/python-modules/pyld/default.nix @@ -58,6 +58,6 @@ buildPythonPackage rec { description = "Python implementation of the JSON-LD API"; homepage = "https://github.com/digitalbazaar/pyld"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ apeschar ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index 38f1a7e95e3c..c3a42c082a73 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -133,6 +133,10 @@ buildPythonPackage rec { # ensure tests can find these '' export PMG_TEST_FILES_DIR="$(realpath ./tests/files)" + '' + # Prevents 'Fatal Python error: Aborted' on darwin during checkPhase + + lib.optionalString stdenv.hostPlatform.isDarwin '' + export MPLBACKEND="Agg" ''; disabledTests = [ @@ -147,25 +151,6 @@ buildPythonPackage rec { "test_mean_field" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # Fatal Python error: Aborted - # matplotlib/backend_bases.py", line 2654 in create_with_canvas - # https://github.com/materialsproject/pymatgen/issues/4452 - "test_angle" - "test_as_dict_from_dict" - "test_attributes" - "test_basic" - "test_core_state_eigen" - "test_eos_func" - "test_get_info_cohps_to_neighbors" - "test_get_plot" - "test_get_point_group_operations" - "test_matplotlib_plots" - "test_ph_plot_w_gruneisen" - "test_plot" - "test_proj_bandstructure_plot" - "test_structure" - "test_structure_environments" - # attempt to insert nil object from objects[1] "test_timer_10_2_7" "test_timer" diff --git a/pkgs/development/python-modules/pymicro-vad/default.nix b/pkgs/development/python-modules/pymicro-vad/default.nix new file mode 100644 index 000000000000..8c796390bf15 --- /dev/null +++ b/pkgs/development/python-modules/pymicro-vad/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + pybind11, + setuptools, + + # tests + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "pymicro-vad"; + version = "1.0.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "rhasspy"; + repo = "pymicro-vad"; + tag = version; + hash = "sha256-yKy/oD6nl2qZW64+aAHZRAEFextCXT6RpMfPThB8DXE="; + }; + + build-system = [ + pybind11 + setuptools + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "pymicro_vad" ]; + + meta = { + changelog = "https://github.com/rhasspy/pymicro-vad/releases/tag/${version}"; + description = "Self-contained voice activity detector"; + homepage = "https://github.com/rhasspy/pymicro-vad"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/pypdfium2/default.nix b/pkgs/development/python-modules/pypdfium2/default.nix index 4d3684d3e025..d75e17abb52d 100644 --- a/pkgs/development/python-modules/pypdfium2/default.nix +++ b/pkgs/development/python-modules/pypdfium2/default.nix @@ -36,14 +36,14 @@ let in buildPythonPackage rec { pname = "pypdfium2"; - version = "5.2.0"; + version = "5.3.0"; pyproject = true; src = fetchFromGitHub { owner = "pypdfium2-team"; repo = "pypdfium2"; tag = version; - hash = "sha256-A/NNyEmGXk21r5eXOYqIx6LXceOKnj2jUQFhUJbl7nU="; + hash = "sha256-HXJv7GCb+r1rE9Jh0wHm/LCfr8eHJA7qtCk0YhbE+24="; }; build-system = [ diff --git a/pkgs/development/python-modules/pytest-grpc/default.nix b/pkgs/development/python-modules/pytest-grpc/default.nix index ccb040464e93..7e0589c7a835 100644 --- a/pkgs/development/python-modules/pytest-grpc/default.nix +++ b/pkgs/development/python-modules/pytest-grpc/default.nix @@ -24,6 +24,5 @@ buildPythonPackage rec { description = "Pytest plugin for grpc"; homepage = "https://github.com/MobileDynasty/pytest-env"; license = lib.licenses.mit; - teams = [ lib.teams.deshaw ]; }; } diff --git a/pkgs/development/python-modules/pytest-isort/default.nix b/pkgs/development/python-modules/pytest-isort/default.nix index 9a1e7bfd0e20..70073d214f76 100644 --- a/pkgs/development/python-modules/pytest-isort/default.nix +++ b/pkgs/development/python-modules/pytest-isort/default.nix @@ -2,12 +2,10 @@ lib, buildPythonPackage, fetchFromGitHub, - importlib-metadata, isort, poetry-core, pytest, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { @@ -26,7 +24,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; - propagatedBuildInputs = [ isort ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + propagatedBuildInputs = [ isort ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/python-miio/default.nix b/pkgs/development/python-modules/python-miio/default.nix index 12b8e76d37a9..0deb0563e8b5 100644 --- a/pkgs/development/python-modules/python-miio/default.nix +++ b/pkgs/development/python-modules/python-miio/default.nix @@ -11,14 +11,12 @@ defusedxml, fetchPypi, fetchpatch, - importlib-metadata, micloud, netifaces, poetry-core, pytest-asyncio, pytest-mock, pytestCheckHook, - pythonOlder, pytz, pyyaml, tqdm, @@ -67,8 +65,7 @@ buildPythonPackage rec { pyyaml tqdm zeroconf - ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; nativeCheckInputs = [ pytest-asyncio diff --git a/pkgs/development/python-modules/python-pooldose/default.nix b/pkgs/development/python-modules/python-pooldose/default.nix index 14fadd6d424b..568e140c7a56 100644 --- a/pkgs/development/python-modules/python-pooldose/default.nix +++ b/pkgs/development/python-modules/python-pooldose/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "python-pooldose"; - version = "0.8.1"; + version = "0.8.2"; pyproject = true; src = fetchFromGitHub { owner = "lmaertin"; repo = "python-pooldose"; tag = version; - hash = "sha256-NhUl9wFUuMhkarswVSM4I98rkCFV/iPYoq49Hl59i00="; + hash = "sha256-zhEUsbHIe31PQt4p0VhrZN3Y2ifE94br/D2ksRSh6Pg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-rabbitair/default.nix b/pkgs/development/python-modules/python-rabbitair/default.nix index 29738685812b..bc6702cae441 100644 --- a/pkgs/development/python-modules/python-rabbitair/default.nix +++ b/pkgs/development/python-modules/python-rabbitair/default.nix @@ -5,9 +5,7 @@ fetchFromGitHub, pytest-asyncio, pytestCheckHook, - pythonOlder, setuptools, - typing-extensions, zeroconf, }: @@ -28,8 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cryptography zeroconf - ] - ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + ]; nativeCheckInputs = [ pytest-asyncio diff --git a/pkgs/development/python-modules/pythonfinder/default.nix b/pkgs/development/python-modules/pythonfinder/default.nix index 615b2fc3379b..9fcec324a51c 100644 --- a/pkgs/development/python-modules/pythonfinder/default.nix +++ b/pkgs/development/python-modules/pythonfinder/default.nix @@ -1,14 +1,12 @@ { lib, buildPythonPackage, - cached-property, click, fetchFromGitHub, packaging, pytest-cov-stub, pytest-timeout, pytestCheckHook, - pythonOlder, setuptools, }: @@ -26,7 +24,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ packaging ] ++ lib.optionals (pythonOlder "3.8") [ cached-property ]; + propagatedBuildInputs = [ packaging ]; optional-dependencies = { cli = [ click ]; diff --git a/pkgs/development/python-modules/pytransportnswv2/default.nix b/pkgs/development/python-modules/pytransportnswv2/default.nix index 2174054962b6..ee6144753ad0 100644 --- a/pkgs/development/python-modules/pytransportnswv2/default.nix +++ b/pkgs/development/python-modules/pytransportnswv2/default.nix @@ -8,14 +8,14 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytransportnswv2"; - version = "2.2.0"; + version = "2.2.1"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-gQhXq2ZnpXMYdicDN3QWenF+kezbA9ByrzATVdybMNM="; + inherit (finalAttrs) pname version; + hash = "sha256-tTbwbT1320kdr4pm9KyPXIdrZknJENPzPrbzEuCxb2k="; }; build-system = [ setuptools ]; @@ -37,4 +37,4 @@ buildPythonPackage rec { license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/pyvo/default.nix b/pkgs/development/python-modules/pyvo/default.nix index d820df9f40e8..2de315b4662f 100644 --- a/pkgs/development/python-modules/pyvo/default.nix +++ b/pkgs/development/python-modules/pyvo/default.nix @@ -4,7 +4,6 @@ fetchPypi, astropy, pillow, - pythonOlder, pytestCheckHook, pytest-astropy, requests, @@ -18,8 +17,6 @@ buildPythonPackage rec { version = "1.8"; pyproject = true; - disabled = pythonOlder "3.8"; # according to setup.cfg - src = fetchPypi { inherit pname version; hash = "sha256-ZvSIn9jjnd30b+SYYV02FW1JT2or7FOIa68cLFQyKGE="; diff --git a/pkgs/development/python-modules/quandl/default.nix b/pkgs/development/python-modules/quandl/default.nix index d07931c724b0..5a6cef69983b 100644 --- a/pkgs/development/python-modules/quandl/default.nix +++ b/pkgs/development/python-modules/quandl/default.nix @@ -5,7 +5,6 @@ faker, fetchPypi, httpretty, - importlib-metadata, inflection, jsondate, mock, @@ -15,7 +14,6 @@ parameterized, pytestCheckHook, python-dateutil, - pythonOlder, requests, six, }: @@ -41,8 +39,7 @@ buildPythonPackage rec { python-dateutil six more-itertools - ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; nativeCheckInputs = [ factory-boy diff --git a/pkgs/development/python-modules/rpmfluff/default.nix b/pkgs/development/python-modules/rpmfluff/default.nix index 8c5f88e89df1..920b153b5577 100644 --- a/pkgs/development/python-modules/rpmfluff/default.nix +++ b/pkgs/development/python-modules/rpmfluff/default.nix @@ -22,6 +22,5 @@ buildPythonPackage rec { description = "Lightweight way of building RPMs, and sabotaging them"; homepage = "https://pagure.io/rpmfluff"; license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ disassembler ]; }; } diff --git a/pkgs/development/python-modules/scrapy-fake-useragent/default.nix b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix deleted file mode 100644 index cd34f8771591..000000000000 --- a/pkgs/development/python-modules/scrapy-fake-useragent/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ - lib, - buildPythonPackage, - setuptools, - fake-useragent, - faker, - fetchFromGitHub, - pytest-cov-stub, - pytest-mock, - pytestCheckHook, - scrapy, -}: - -buildPythonPackage { - pname = "scrapy-fake-useragent"; - version = "1.4.4"; - pyproject = true; - - # PyPi tarball is corrupted - src = fetchFromGitHub { - owner = "alecxe"; - repo = "scrapy-fake-useragent"; - rev = "59c20d38c58c76618164760d546aa5b989a79b8b"; # no tags - hash = "sha256-khQMOQrrdHokvNqfaMWqXV7AzwGxTuxaLsZoLkNpZ3k="; - }; - - postPatch = '' - substituteInPlace pytest.ini \ - --replace-fail " --fulltrace" "" - ''; - - build-system = [ setuptools ]; - - dependencies = [ - fake-useragent - faker - ]; - - nativeCheckInputs = [ - pytest-cov-stub - pytest-mock - pytestCheckHook - scrapy - ]; - - pythonImportsCheck = [ "scrapy_fake_useragent" ]; - - disabledTests = [ - # AttributeError: 'RetryUserAgentMiddleware' object has no attribute 'EXCEPTIONS_TO_RETRY' - "test_random_ua_set_on_exception" - ]; - - meta = { - description = "Random User-Agent middleware based on fake-useragent"; - homepage = "https://github.com/alecxe/scrapy-fake-useragent"; - changelog = "https://github.com/alecxe/scrapy-fake-useragent/blob/master/CHANGELOG.rst"; - license = lib.licenses.mit; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/python-modules/scrapy-splash/default.nix b/pkgs/development/python-modules/scrapy-splash/default.nix index a6491a8d3d17..2d060b70fc12 100644 --- a/pkgs/development/python-modules/scrapy-splash/default.nix +++ b/pkgs/development/python-modules/scrapy-splash/default.nix @@ -43,5 +43,8 @@ buildPythonPackage rec { homepage = "https://github.com/scrapy-plugins/scrapy-splash"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ evanjs ]; + # incompatible with scrapy >= 2.14 + # also deprecated by scrapy committers, see https://github.com/scrapy-plugins/scrapy-splash/issues/327 + broken = true; }; } diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 09389ba51f2b..0bc10158095b 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -19,9 +19,13 @@ pexpect, protego, pydispatcher, + pyftpdlib, pyopenssl, + pytest-asyncio, + pytest-twisted, pytest-xdist, pytestCheckHook, + pythonAtLeast, queuelib, service-identity, setuptools, @@ -36,14 +40,14 @@ buildPythonPackage rec { pname = "scrapy"; - version = "2.13.4"; + version = "2.14.1"; pyproject = true; src = fetchFromGitHub { owner = "scrapy"; repo = "scrapy"; tag = version; - hash = "sha256-ZWiJmve1EhtwP9xo39N4f24g0KQMTPKJ43sDSfzi6r8="; + hash = "sha256-KDci1Z5TZ+3svotYXkEG1s+bPWtxzIfQQwOgvI0k8w0="; }; pythonRelaxDeps = [ @@ -59,7 +63,7 @@ buildPythonPackage rec { setuptools ]; - propagatedBuildInputs = [ + dependencies = [ cryptography cssselect defusedxml @@ -84,7 +88,10 @@ buildPythonPackage rec { glibcLocales jmespath pexpect + pytest-asyncio + pytest-twisted pytest-xdist + pyftpdlib pytestCheckHook sybil testfixtures @@ -93,6 +100,11 @@ buildPythonPackage rec { LC_ALL = "en_US.UTF-8"; + pytestFlags = [ + # DeprecationWarning: There is no current event loop + "-Wignore::DeprecationWarning" + ]; + disabledTestPaths = [ "tests/test_proxy_connect.py" "tests/test_utils_display.py" @@ -111,6 +123,9 @@ buildPythonPackage rec { # Don't test the documentation "docs" + ] + ++ lib.optionals (pythonAtLeast "3.14") [ + "tests/test_feedexport.py" ]; disabledTests = [ @@ -121,14 +136,20 @@ buildPythonPackage rec { "test_custom_asyncio_loop_enabled_true" "test_custom_loop_asyncio" "test_custom_loop_asyncio_deferred_signal" - "FileFeedStoragePreFeedOptionsTest" # https://github.com/scrapy/scrapy/issues/5157 + # "FileFeedStoragePreFeedOptionsTest" # https://github.com/scrapy/scrapy/issues/5157 "test_persist" "test_timeout_download_from_spider_nodata_rcvd" "test_timeout_download_from_spider_server_hangs" "test_unbounded_response" "CookiesMiddlewareTest" + "test_asyncio_enabled_reactor_same_loop" + "test_response_ip_address" # Test fails on Hydra "test_start_requests_laziness" + + # Fails due to different path structure on NixOS + "test_start_deprecated_super" + "test_file_path" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_xmliter_encoding" @@ -139,6 +160,9 @@ buildPythonPackage rec { # flaky on darwin-aarch64 "test_fixed_delay" "test_start_requests_laziness" + ] + ++ lib.optionals (pythonAtLeast "3.14") [ + "test_non_pickable_object" ]; postInstall = '' diff --git a/pkgs/development/python-modules/signedjson/default.nix b/pkgs/development/python-modules/signedjson/default.nix index efcbb87009e8..a7f31be0f5f3 100644 --- a/pkgs/development/python-modules/signedjson/default.nix +++ b/pkgs/development/python-modules/signedjson/default.nix @@ -3,12 +3,9 @@ buildPythonPackage, canonicaljson, fetchPypi, - importlib-metadata, pynacl, pytestCheckHook, - pythonOlder, setuptools-scm, - typing-extensions, unpaddedbase64, }: @@ -28,10 +25,6 @@ buildPythonPackage rec { canonicaljson unpaddedbase64 pynacl - ] - ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata - typing-extensions ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix index a675939ff93b..ba52464aee85 100644 --- a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix @@ -2,8 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, - importlib-metadata, sphinx, pyenchant, setuptools, @@ -32,8 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ sphinx pyenchant - ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; # No tests included doCheck = false; diff --git a/pkgs/development/python-modules/statmake/default.nix b/pkgs/development/python-modules/statmake/default.nix index ba9179ab18d3..8518632fcae6 100644 --- a/pkgs/development/python-modules/statmake/default.nix +++ b/pkgs/development/python-modules/statmake/default.nix @@ -7,7 +7,6 @@ fetchFromGitHub, fonttools, fs, - importlib-metadata, poetry-core, pytestCheckHook, pythonOlder, @@ -43,8 +42,7 @@ buildPythonPackage rec { # required by fonttools[ufo] fs ] - ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix index fcb33980d7de..a59295d5d6fb 100644 --- a/pkgs/development/python-modules/streamlit/default.nix +++ b/pkgs/development/python-modules/streamlit/default.nix @@ -25,19 +25,17 @@ watchdog, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "streamlit"; - version = "1.52.2"; + version = "1.53.0"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-ZKTdqLxc3Te/1JDpO7U9o1qu+Ub8/Cg6eYDazfFlEIs="; + inherit (finalAttrs) pname version; + hash = "sha256-ARQRbTRYny5lK/Ssc1o6ymmAfmWfkvmcmOe2INAAg48="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; pythonRelaxDeps = [ "packaging" ]; @@ -74,7 +72,7 @@ buildPythonPackage rec { meta = { homepage = "https://streamlit.io/"; - changelog = "https://github.com/streamlit/streamlit/releases/tag/${version}"; + changelog = "https://github.com/streamlit/streamlit/releases/tag/${finalAttrs.version}"; description = "Fastest way to build custom ML tools"; mainProgram = "streamlit"; maintainers = with lib.maintainers; [ @@ -83,4 +81,4 @@ buildPythonPackage rec { ]; license = lib.licenses.asl20; }; -} +}) diff --git a/pkgs/development/python-modules/tinygrad/default.nix b/pkgs/development/python-modules/tinygrad/default.nix index 56c29e669db5..09028ce8733a 100644 --- a/pkgs/development/python-modules/tinygrad/default.nix +++ b/pkgs/development/python-modules/tinygrad/default.nix @@ -264,6 +264,11 @@ buildPythonPackage (finalAttrs: { # Files under this directory are not considered as tests by upstream and should be skipped "extra/" ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + # Fatal Python error: Aborted + # in ...onnxruntime/capi/_pybind_state.py", line 32 in <module> + "test/models/test_onnx.py" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # urllib.error.URLError: <urlopen error [SSL: CERTIFICATE_VERIFY_FAILED] # certificate verify failed: self-signed certificate in certificate chain (_ssl.c:1032)> diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix index aedebf4bd799..6f89bbe7a957 100644 --- a/pkgs/development/python-modules/tldextract/default.nix +++ b/pkgs/development/python-modules/tldextract/default.nix @@ -14,16 +14,16 @@ syrupy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tldextract"; - version = "5.3.0"; + version = "5.3.1"; pyproject = true; src = fetchFromGitHub { owner = "john-kurkowski"; repo = "tldextract"; - tag = version; - hash = "sha256-PCDjceBU4cjAqRes/yWt/mbM/aWxjYtNl+qN+49OjA8="; + tag = finalAttrs.version; + hash = "sha256-WPf996EVVEKxD+ZFDB8nIrrd1Sxr+IOI8I19J+KMPRg="; }; nativeBuildInputs = [ @@ -54,9 +54,9 @@ buildPythonPackage rec { from the registered domain and subdomains of a URL. ''; homepage = "https://github.com/john-kurkowski/tldextract"; - changelog = "https://github.com/john-kurkowski/tldextract/blob/${src.tag}/CHANGELOG.md"; - license = with lib.licenses; [ bsd3 ]; + changelog = "https://github.com/john-kurkowski/tldextract/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fab ]; mainProgram = "tldextract"; }; -} +}) diff --git a/pkgs/development/python-modules/translate-toolkit/default.nix b/pkgs/development/python-modules/translate-toolkit/default.nix index 3031c3843208..61aef0c3ec6d 100644 --- a/pkgs/development/python-modules/translate-toolkit/default.nix +++ b/pkgs/development/python-modules/translate-toolkit/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "translate-toolkit"; - version = "3.17.5"; + version = "3.18.0"; pyproject = true; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "translate"; repo = "translate"; tag = version; - hash = "sha256-I0HpVL/bH78oFGDWkXyRvZejXzjDHXFfdPu/+iMgAQw="; + hash = "sha256-wc8bSXdFHVSzm4CWZ9b27zEYNH0rbEXf0i947VNTg/8="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/troposphere/default.nix b/pkgs/development/python-modules/troposphere/default.nix index cdb909b505a8..ef626df9bd36 100644 --- a/pkgs/development/python-modules/troposphere/default.nix +++ b/pkgs/development/python-modules/troposphere/default.nix @@ -4,8 +4,6 @@ buildPythonPackage, cfn-flip, fetchFromGitHub, - pythonOlder, - typing-extensions, unittestCheckHook, }: @@ -21,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-s7eb8W/QjD+lNmq3bPhCP3tH8VV/xNf3cE2dGzWAgFk="; }; - propagatedBuildInputs = [ cfn-flip ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + propagatedBuildInputs = [ cfn-flip ]; nativeCheckInputs = [ awacs diff --git a/pkgs/development/python-modules/types-regex/default.nix b/pkgs/development/python-modules/types-regex/default.nix index fd6ddb3c846f..31474f561da8 100644 --- a/pkgs/development/python-modules/types-regex/default.nix +++ b/pkgs/development/python-modules/types-regex/default.nix @@ -5,24 +5,23 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "types-regex"; - version = "2025.11.3.20251106"; + version = "2026.1.15.20260116"; pyproject = true; src = fetchPypi { pname = "types_regex"; - inherit version; - hash = "sha256-X5go7TmlpScntjf5P38PkJ1W+iIRYE7MIT/Ou1CbnVA="; + inherit (finalAttrs) version; + hash = "sha256-cVGpvMW7+ez8z4M1xFGsqCBPWgmS4GIqr69IKHbO5Pc="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - pythonImportsCheck = [ - "regex-stubs" - ]; + pythonImportsCheck = [ "regex-stubs" ]; + + # Module has no tests + doCheck = false; meta = { description = "Typing stubs for regex"; @@ -30,4 +29,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ dwoffinden ]; }; -} +}) diff --git a/pkgs/development/python-modules/unstructured-client/default.nix b/pkgs/development/python-modules/unstructured-client/default.nix index f6fb1b8cce11..afec345dacc8 100644 --- a/pkgs/development/python-modules/unstructured-client/default.nix +++ b/pkgs/development/python-modules/unstructured-client/default.nix @@ -19,16 +19,16 @@ typing-inspection, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "unstructured-client"; - version = "0.42.6"; + version = "0.42.8"; pyproject = true; src = fetchFromGitHub { owner = "Unstructured-IO"; repo = "unstructured-python-client"; - tag = "v${version}"; - hash = "sha256-94d4OBaQTMacbOaRniNlaDVE3jZ+g28Hl3xbTmvY8L8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-BXHJOkTZdAnpf38WdHugcwYyWuURylbYTjaKoPt7O5A="; }; preBuild = '' @@ -66,15 +66,16 @@ buildPythonPackage rec { enabledTestPaths = [ "_test_unstructured_client" ]; + enabledTests = [ "unit" ]; meta = { - changelog = "https://github.com/Unstructured-IO/unstructured-python-client/blob/${src.tag}/RELEASES.md"; + changelog = "https://github.com/Unstructured-IO/unstructured-python-client/blob/${finalAttrs.src.tag}/RELEASES.md"; description = "Python Client SDK for Unstructured API"; homepage = "https://github.com/Unstructured-IO/unstructured-python-client"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; }; -} +}) diff --git a/pkgs/development/python-modules/vncdo/default.nix b/pkgs/development/python-modules/vncdo/default.nix index d56dbbdad6cc..5fdcf62d14e1 100644 --- a/pkgs/development/python-modules/vncdo/default.nix +++ b/pkgs/development/python-modules/vncdo/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { homepage = "https://github.com/sibson/vncdotool"; changelog = "https://github.com/sibson/vncdotool/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ elitak ]; + maintainers = [ ]; mainProgram = "vncdo"; platforms = with lib.platforms; linux ++ darwin; }; diff --git a/pkgs/development/python-modules/weblate-language-data/default.nix b/pkgs/development/python-modules/weblate-language-data/default.nix index eb59391a7dc6..8d87dd524416 100644 --- a/pkgs/development/python-modules/weblate-language-data/default.nix +++ b/pkgs/development/python-modules/weblate-language-data/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "weblate-language-data"; - version = "2025.10"; + version = "2026.1"; pyproject = true; src = fetchPypi { pname = "weblate_language_data"; inherit version; - hash = "sha256-pSMeuIDUGYbAetXugmahtTeGIIXxPPPiYt2Jb80vxoQ="; + hash = "sha256-qImbiZzsNk3oSljSwdsK+uk/1ZUygwltTCkGNKxBeN4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ydiff/default.nix b/pkgs/development/python-modules/ydiff/default.nix index 34a9a80e670a..3e5fc98c2614 100644 --- a/pkgs/development/python-modules/ydiff/default.nix +++ b/pkgs/development/python-modules/ydiff/default.nix @@ -55,6 +55,9 @@ buildPythonPackage rec { ''; homepage = "https://github.com/ymattw/ydiff"; license = lib.licenses.bsd3; - teams = [ lib.teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; } diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index df78ab1250b1..5e54e69137c8 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -958,7 +958,7 @@ let rustc ]; vdiffr = [ pkgs.libpng.dev ]; - V8 = [ pkgs.nodejs.libv8 ]; + V8 = [ pkgs.nodejs_22.libv8 ]; # when unpinning the version, don't forget about the other usages later xactonomial = with pkgs; [ cargo rustc @@ -2514,8 +2514,9 @@ let ''; preConfigure = '' - export INCLUDE_DIR=${pkgs.nodejs.libv8}/include - export LIB_DIR=${pkgs.nodejs.libv8}/lib + # when unpinning the version, don't forget about the other usage earlier + export INCLUDE_DIR=${pkgs.nodejs_22.libv8}/include + export LIB_DIR=${pkgs.nodejs_22.libv8}/lib patchShebangs configure ''; diff --git a/pkgs/development/rocm-modules/6/composable_kernel/avoid-extra-host-compile.patch b/pkgs/development/rocm-modules/6/composable_kernel/avoid-extra-host-compile.patch deleted file mode 100644 index b1ba9929b64f..000000000000 --- a/pkgs/development/rocm-modules/6/composable_kernel/avoid-extra-host-compile.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 6ac72ec84269737626b1f5e43e64729f0922d182 Mon Sep 17 00:00:00 2001 -From: "Ding, Yi" <yi.ding@amd.com> -Date: Wed, 9 Jul 2025 03:12:39 +0000 -Subject: [PATCH] Avoid compile kernel in host pass - ---- - include/ck_tile/host/kernel_launch.hpp | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/include/ck_tile/host/kernel_launch.hpp b/include/ck_tile/host/kernel_launch.hpp -index 9770e99738..f6ccb6968b 100644 ---- a/include/ck_tile/host/kernel_launch.hpp -+++ b/include/ck_tile/host/kernel_launch.hpp -@@ -4,11 +4,12 @@ - #pragma once - - #include "ck_tile/core/config.hpp" --#include "ck_tile/host/stream_config.hpp" -+#include "ck_tile/core/utility/ignore.hpp" - #include "ck_tile/host/hip_check_error.hpp" -+#include "ck_tile/host/stream_config.hpp" - #include "ck_tile/host/timer.hpp" --#include <hip/hip_runtime.h> - #include <cstddef> -+#include <hip/hip_runtime.h> - - namespace ck_tile { - -@@ -24,7 +25,11 @@ __launch_bounds__(MaxThreadPerBlock, MinBlockPerCu) - #endif - __global__ void kentry(Args... args) - { -+#if defined(__HIP_DEVICE_COMPILE__) - Kernel{}(args...); -+#else -+ (..., (ignore = args, 0)); -+#endif - } - - // diff --git a/pkgs/development/rocm-modules/6/hipcc/0001-hipcc-Remove-extra-definition-of-hipBinUtilPtr_-in-d.patch b/pkgs/development/rocm-modules/6/hipcc/0001-hipcc-Remove-extra-definition-of-hipBinUtilPtr_-in-d.patch deleted file mode 100644 index bfc386c620cb..000000000000 --- a/pkgs/development/rocm-modules/6/hipcc/0001-hipcc-Remove-extra-definition-of-hipBinUtilPtr_-in-d.patch +++ /dev/null @@ -1,39 +0,0 @@ -From f259eca77c592813e11752a46c4e1f9a74c64091 Mon Sep 17 00:00:00 2001 -From: Luna Nova <git@lunnova.dev> -Date: Fri, 11 Oct 2024 02:56:22 -0700 -Subject: [PATCH] [hipcc] Remove extra definition of hipBinUtilPtr_ in derived - platforms - -Fixes UB when hipBinUtilPtr_ is used. ---- - amd/hipcc/src/hipBin_amd.h | 1 - - amd/hipcc/src/hipBin_nvidia.h | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/amd/hipcc/src/hipBin_amd.h b/amd/hipcc/src/hipBin_amd.h -index 0a782d1beab9..36cd625ae8bc 100644 ---- a/src/hipBin_amd.h -+++ b/src/hipBin_amd.h -@@ -42,7 +42,6 @@ THE SOFTWARE. - - class HipBinAmd : public HipBinBase { - private: -- HipBinUtil* hipBinUtilPtr_; - string hipClangPath_ = ""; - string roccmPathEnv_, hipRocclrPathEnv_, hsaPathEnv_; - PlatformInfo platformInfoAMD_; -diff --git a/amd/hipcc/src/hipBin_nvidia.h b/amd/hipcc/src/hipBin_nvidia.h -index ff142cc1cea2..09b7b80979c7 100644 ---- a/src/hipBin_nvidia.h -+++ b/src/hipBin_nvidia.h -@@ -31,7 +31,6 @@ THE SOFTWARE. - - class HipBinNvidia : public HipBinBase { - private: -- HipBinUtil* hipBinUtilPtr_; - string cudaPath_ = ""; - PlatformInfo platformInfoNV_; - string hipCFlags_, hipCXXFlags_, hipLdFlags_; --- -2.46.0 - diff --git a/pkgs/development/rocm-modules/6/rccl/enable-mscclpp-on-all-gfx9.diff b/pkgs/development/rocm-modules/6/rccl/enable-mscclpp-on-all-gfx9.diff deleted file mode 100644 index 6fc375921064..000000000000 --- a/pkgs/development/rocm-modules/6/rccl/enable-mscclpp-on-all-gfx9.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/init.cc b/src/init.cc -index 738f756..1b0e4fc 100644 ---- a/src/init.cc -+++ b/src/init.cc -@@ -2049,7 +2049,7 @@ static ncclResult_t ncclCommInitRankFunc(struct ncclAsyncJob* job_) { - if (mscclEnabled() && (comm->topo->mscclEnabled || mscclForceEnabled()) && mscclppCommCompatible(comm)) { - hipDeviceProp_t devProp; - CUDACHECK(hipGetDeviceProperties(&devProp, cudaDev)); -- comm->mscclppCompatible = IsArchMatch(devProp.gcnArchName, "gfx94"); -+ comm->mscclppCompatible = IsArchMatch(devProp.gcnArchName, "gfx9"); - if (comm->mscclppCompatible) { - bool mapContainsId = (mscclpp_uniqueIdMap.count(job->commId) > 0); - auto& mscclppUniqueId = mscclpp_uniqueIdMap[job->commId]; diff --git a/pkgs/development/rocm-modules/6/rccl/fix-mainline-support-and-ub.diff b/pkgs/development/rocm-modules/6/rccl/fix-mainline-support-and-ub.diff deleted file mode 100644 index e65b23940c4c..000000000000 --- a/pkgs/development/rocm-modules/6/rccl/fix-mainline-support-and-ub.diff +++ /dev/null @@ -1,172 +0,0 @@ -diff --git a/src/include/bootstrap.h b/src/include/bootstrap.h -index 8c5f081..9922b79 100644 ---- a/src/include/bootstrap.h -+++ b/src/include/bootstrap.h -@@ -10,11 +10,13 @@ - #include "nccl.h" - #include "comm.h" - -+// this is accessed through unaligned ptrs because ncclUniqueId is a typedef of char[128] - struct ncclBootstrapHandle { - uint64_t magic; - union ncclSocketAddress addr; - }; - static_assert(sizeof(struct ncclBootstrapHandle) <= sizeof(ncclUniqueId), "Bootstrap handle is too large to fit inside NCCL unique ID"); -+static_assert(alignof(struct ncclBootstrapHandle) == alignof(ncclUniqueId), "Bootstrap handle must have same alignment as NCCL unique ID to avoid UB"); - - ncclResult_t bootstrapNetInit(); - ncclResult_t bootstrapCreateRoot(struct ncclBootstrapHandle* handle, bool idFromEnv); -diff --git a/src/misc/rocmwrap.cc b/src/misc/rocmwrap.cc -index b3063d5..464b80d 100644 ---- a/src/misc/rocmwrap.cc -+++ b/src/misc/rocmwrap.cc -@@ -131,9 +131,12 @@ static void initOnceFunc() { - //format and store the kernel conf file location - snprintf(kernel_conf_file, sizeof(kernel_conf_file), "/boot/config-%s", utsname.release); - fp = fopen(kernel_conf_file, "r"); -- if (fp == NULL) INFO(NCCL_INIT,"Could not open kernel conf file"); -+ if (fp == NULL) { -+ INFO(NCCL_INIT,"Could not open kernel conf file, will assume CONFIG_DMABUF_MOVE_NOTIFY and CONFIG_PCI_P2PDMA are enabled"); -+ } - //look for kernel_opt1 and kernel_opt2 in the conf file and check -- while (fgets(buf, sizeof(buf), fp) != NULL) { -+ // FIXME: This check is broken, CONFIG_DMABUF_MOVE_NOTIFY could be across a buf boundary. -+ while (fp && fgets(buf, sizeof(buf), fp) != NULL) { - if (strstr(buf, kernel_opt1) != NULL) { - found_opt1 = 1; - INFO(NCCL_INIT,"CONFIG_DMABUF_MOVE_NOTIFY=y in /boot/config-%s", utsname.release); -@@ -143,11 +146,12 @@ static void initOnceFunc() { - INFO(NCCL_INIT,"CONFIG_PCI_P2PDMA=y in /boot/config-%s", utsname.release); - } - } -- if (!found_opt1 || !found_opt2) { -+ if (fp && (!found_opt1 || !found_opt2)) { - dmaBufSupport = 0; - INFO(NCCL_INIT, "CONFIG_DMABUF_MOVE_NOTIFY and CONFIG_PCI_P2PDMA should be set for DMA_BUF in /boot/config-%s", utsname.release); - INFO(NCCL_INIT, "DMA_BUF_SUPPORT Failed due to OS kernel support"); - } -+ if (fp) fclose(fp); - - if(dmaBufSupport) INFO(NCCL_INIT, "DMA_BUF Support Enabled"); - else goto error; -diff --git a/src/nccl.h.in b/src/nccl.h.in -index 1d127b0..6296073 100644 ---- a/src/nccl.h.in -+++ b/src/nccl.h.in -@@ -39,7 +39,7 @@ typedef struct ncclComm* ncclComm_t; - #define NCCL_UNIQUE_ID_BYTES 128 - /*! @brief Opaque unique id used to initialize communicators - @details The ncclUniqueId must be passed to all participating ranks */ --typedef struct { char internal[NCCL_UNIQUE_ID_BYTES]; /*!< Opaque array>*/} ncclUniqueId; -+typedef struct alignas(int64_t) { char internal[NCCL_UNIQUE_ID_BYTES]; /*!< Opaque array>*/} ncclUniqueId; - - /*! @defgroup rccl_result_code Result Codes - @details The various result codes that RCCL API calls may return -diff --git a/src/proxy.cc b/src/proxy.cc -index 50e5437..51bb401 100644 ---- a/src/proxy.cc -+++ b/src/proxy.cc -@@ -965,7 +965,11 @@ struct ncclProxyConnectionPool { - - static ncclResult_t ncclProxyNewConnection(struct ncclProxyConnectionPool* pool, int* id) { - if (pool->offset == NCCL_PROXY_CONN_POOL_SIZE) { -- NCCLCHECK(ncclRealloc(&pool->pools, pool->banks, pool->banks+1)); -+ if (pool->pools) { -+ NCCLCHECK(ncclRealloc(&pool->pools, pool->banks, pool->banks+1)); -+ } else { -+ NCCLCHECK(ncclCalloc(&pool->pools, pool->banks+1)); -+ } - NCCLCHECK(ncclCalloc(pool->pools+pool->banks, NCCL_PROXY_CONN_POOL_SIZE)); - pool->banks++; - pool->offset = 0; -diff --git a/src/transport/net_ib.cc b/src/transport/net_ib.cc -index 6d77784..49762d3 100644 ---- a/src/transport/net_ib.cc -+++ b/src/transport/net_ib.cc -@@ -573,7 +573,7 @@ ncclResult_t ncclIbGdrSupport() { - // Requires support from NIC driver modules - // Use ONLY for debugging! - moduleLoaded = 1; -- INFO(NCCL_INIT, "RCCL_FORCE_ENABLE_GDRDMA = 1, so explicitly setting moduleLoaded = 1"); -+ INFO(NCCL_INIT, "ncclIbGdrSupport: RCCL_FORCE_ENABLE_GDRDMA = 1, so explicitly setting moduleLoaded = 1"); - } - - if (moduleLoaded == -1) { -@@ -586,9 +586,9 @@ ncclResult_t ncclIbGdrSupport() { - int i = 0; - - while (memory_peers_paths[i]) { - if (access(memory_peers_paths[i], F_OK) == 0) { - moduleLoaded = 1; -- INFO(NCCL_INIT,"Found %s", memory_peers_paths[i]); -+ INFO(NCCL_INIT,"ncclIbGdrSupport: Found %s", memory_peers_paths[i]); - break; - } else { - moduleLoaded = 0; -@@ -612,22 +613,23 @@ ncclResult_t ncclIbGdrSupport() { - if (moduleLoaded == 0) { - // Check for `ib_register_peer_memory_client` symbol in `/proc/kallsyms` - // if your system uses native OS ib_peer module -- char buf[256]; -- FILE *fp = NULL; -- fp = fopen("/proc/kallsyms", "r"); -+ FILE *fp = fopen("/proc/kallsyms", "r"); -+ char *line = NULL; -+ size_t len = 0; - - if (fp == NULL) { -- INFO(NCCL_INIT,"Could not open /proc/kallsyms"); -+ INFO(NCCL_INIT,"ncclIbGdrSupport: Could not open /proc/kallsyms to check for ib_register_peer_memory_client"); - } else { -- while (fgets(buf, sizeof(buf), fp) != NULL) { -- if (strstr(buf, "t ib_register_peer_memory_client") != NULL || -- strstr(buf, "T ib_register_peer_memory_client") != NULL) { -+ while (getline(&line, &len, fp) > 0) { -+ if (line && strstr(line, "ib_register_peer_memory_client") != NULL) { - moduleLoaded = 1; -- INFO(NCCL_INIT,"Found ib_register_peer_memory_client in /proc/kallsyms"); -+ INFO(NCCL_INIT,"ncclIbGdrSupport: Found ib_register_peer_memory_client in /proc/kallsyms"); - break; - } - } - } -+ if (line) free(line); -+ if (fp) fclose(fp); - } - #else - // Check for the nv_peer_mem module being loaded -@@ -637,7 +639,7 @@ ncclResult_t ncclIbGdrSupport() { - #endif - } - if (moduleLoaded == 0) { -- INFO(NCCL_INIT,"GDRDMA not enabled. Could not find memory_peers directory or peer_memory symbol"); -+ INFO(NCCL_INIT,"ncclIbGdrSupport: GDRDMA not enabled. Could not find memory_peers directory or peer_memory symbol"); - return ncclSystemError; - } - return ncclSuccess; -diff --git a/tools/ib-test/include/nccl.h b/tools/ib-test/include/nccl.h -index 2c86c33..5801c61 100755 ---- a/tools/ib-test/include/nccl.h -+++ b/tools/ib-test/include/nccl.h -@@ -31,7 +31,7 @@ extern "C" { - typedef struct ncclComm* ncclComm_t; - - #define NCCL_UNIQUE_ID_BYTES 128 --typedef struct { char internal[NCCL_UNIQUE_ID_BYTES]; } ncclUniqueId; -+typedef struct alignas(int64_t) { char internal[NCCL_UNIQUE_ID_BYTES]; } ncclUniqueId; - - /* Error type */ - typedef enum { ncclSuccess = 0, -diff --git a/tools/topo_expl/include/nccl.h b/tools/topo_expl/include/nccl.h -index 729561b..4e4bdd9 100644 ---- a/tools/topo_expl/include/nccl.h -+++ b/tools/topo_expl/include/nccl.h -@@ -35,7 +35,7 @@ typedef struct ncclComm* ncclComm_t; - #define NCCL_COMM_NULL NULL - - #define NCCL_UNIQUE_ID_BYTES 128 --typedef struct { char internal[NCCL_UNIQUE_ID_BYTES]; } ncclUniqueId; -+typedef struct alignas(int64_t) { char internal[NCCL_UNIQUE_ID_BYTES]; } ncclUniqueId; - - /*! @brief Error type */ - typedef enum { ncclSuccess = 0, diff --git a/pkgs/development/rocm-modules/6/rocm-smi/cmake.patch b/pkgs/development/rocm-modules/6/rocm-smi/cmake.patch deleted file mode 100644 index 2634ea46a1f8..000000000000 --- a/pkgs/development/rocm-modules/6/rocm-smi/cmake.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff --git a/rocm_smi-backward-compat.cmake b/rocm_smi-backward-compat.cmake -index aa8fd9c..59afce5 100644 ---- a/rocm_smi-backward-compat.cmake -+++ b/rocm_smi-backward-compat.cmake -@@ -72,7 +72,12 @@ function(generate_wrapper_header) - set(include_guard "${include_guard}COMGR_WRAPPER_INCLUDE_${INC_GAURD_NAME}_H") - #set #include statement - get_filename_component(file_name ${header_file} NAME) -- set(include_statements "${include_statements}#include \"../../../${CMAKE_INSTALL_INCLUDEDIR}/${ROCM_SMI}/${file_name}\"\n") -+ if(IS_ABSOLUTE ${CMAKE_INSTALL_INCLUDEDIR}) -+ set(include_dir "${CMAKE_INSTALL_INCLUDEDIR}") -+ else() -+ set(include_dir "../../../${CMAKE_INSTALL_INCLUDEDIR}") -+ endif() -+ set(include_statements "${include_statements}#include \"${include_dir}/${ROCM_SMI}/${file_name}\"\n") - configure_file(${RSMI_WRAPPER_DIR}/header.hpp.in ${RSMI_WRAPPER_INC_DIR}/${file_name}) - unset(include_guard) - unset(include_statements) -@@ -90,7 +95,12 @@ function(generate_wrapper_header) - set(include_guard "${include_guard}COMGR_WRAPPER_INCLUDE_${INC_GAURD_NAME}_H") - #set #include statement - get_filename_component(file_name ${header_file} NAME) -- set(include_statements "${include_statements}#include \"../../../${CMAKE_INSTALL_INCLUDEDIR}/${OAM_TARGET_NAME}/${file_name}\"\n") -+ if(IS_ABSOLUTE ${CMAKE_INSTALL_INCLUDEDIR}) -+ set(include_dir "${CMAKE_INSTALL_INCLUDEDIR}") -+ else() -+ set(include_dir "../../../${CMAKE_INSTALL_INCLUDEDIR}") -+ endif() -+ set(include_statements "${include_statements}#include \"${include_dir}/${OAM_TARGET_NAME}/${file_name}\"\n") - configure_file(${RSMI_WRAPPER_DIR}/header.hpp.in ${OAM_WRAPPER_INC_DIR}/${file_name}) - unset(include_guard) - unset(include_statements) -@@ -123,11 +133,16 @@ function(create_library_symlink) - set(library_files "${LIB_RSMI}") - endif() - -+ if(IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR}) -+ set(install_libdir "${CMAKE_INSTALL_LIBDIR}") -+ else() -+ set(install_libdir "../../${CMAKE_INSTALL_LIBDIR}") -+ endif() - foreach(file_name ${library_files}) - add_custom_target(link_${file_name} ALL - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMAND ${CMAKE_COMMAND} -E create_symlink -- ../../${CMAKE_INSTALL_LIBDIR}/${file_name} ${RSMI_WRAPPER_LIB_DIR}/${file_name}) -+ ${install_libdir}/${file_name} ${RSMI_WRAPPER_LIB_DIR}/${file_name}) - endforeach() - - file(MAKE_DIRECTORY ${OAM_WRAPPER_LIB_DIR}) -@@ -151,11 +166,16 @@ function(create_library_symlink) - set(library_files "${LIB_OAM}") - endif() - -+ if(IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR}) -+ set(install_libdir "${CMAKE_INSTALL_LIBDIR}") -+ else() -+ set(install_libdir "../../${CMAKE_INSTALL_LIBDIR}") -+ endif() - foreach(file_name ${library_files}) - add_custom_target(link_${file_name} ALL - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMAND ${CMAKE_COMMAND} -E create_symlink -- ../../${CMAKE_INSTALL_LIBDIR}/${file_name} ${OAM_WRAPPER_LIB_DIR}/${file_name}) -+ ${install_libdir}/${file_name} ${OAM_WRAPPER_LIB_DIR}/${file_name}) - endforeach() - - endfunction() -diff --git a/rocm_smi/CMakeLists.txt b/rocm_smi/CMakeLists.txt -index c594eeb..d3ed39d 100755 ---- a/rocm_smi/CMakeLists.txt -+++ b/rocm_smi/CMakeLists.txt -@@ -105,10 +105,15 @@ endif () - #file reorganization changes - #rocm_smi.py moved to libexec/rocm_smi. so creating rocm-smi symlink - file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin) -+if(IS_ABSOLUTE ${CMAKE_INSTALL_LIBEXECDIR}) -+ set(install_libexecdir "${CMAKE_INSTALL_LIBEXECDIR}") -+else() -+ set(install_libexecdir "../${CMAKE_INSTALL_LIBEXECDIR}") -+endif() - add_custom_target(link-rocm-smi ALL - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMAND ${CMAKE_COMMAND} -E create_symlink -- ../${CMAKE_INSTALL_LIBEXECDIR}/${ROCM_SMI}/rocm_smi.py ${CMAKE_CURRENT_BINARY_DIR}/bin/rocm-smi) -+ ${install_libexecdir}/${ROCM_SMI}/rocm_smi.py ${CMAKE_CURRENT_BINARY_DIR}/bin/rocm-smi) - - ## Add the install directives for the runtime library. - install(TARGETS ${ROCM_SMI_TARGET} diff --git a/pkgs/development/rocm-modules/6/amdsmi/default.nix b/pkgs/development/rocm-modules/amdsmi/default.nix index df9125aa40c8..eb33b7608604 100644 --- a/pkgs/development/rocm-modules/6/amdsmi/default.nix +++ b/pkgs/development/rocm-modules/amdsmi/default.nix @@ -21,12 +21,12 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "amdsmi"; - version = "6.4.3"; + version = "7.0.2"; src = fetchFromGitHub { owner = "rocm"; repo = "amdsmi"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-9O29O4HGkQxFDglAhHKv5KWA7p97RwMGG2x/fkOS2jE="; + hash = "sha256-1xQD68mrG1g9Bpw5/vxn+XxDM5HuAyEHyALyBixqR1s="; }; postPatch = '' @@ -44,11 +44,6 @@ stdenv.mkDerivation (finalAttrs: { patches = [ (fetchpatch { - name = "esmi-to-tag-4.2.patch"; - url = "https://github.com/ROCm/amdsmi/commit/49aa2af045a4bc688e6f3ee0545f12afc45c1efe.patch"; - hash = "sha256-5dH9N4m+2mJIGVEB86SvdK3uAYyGFTfbCBJ8e09iQ3w="; - }) - (fetchpatch { name = "fix-build-with-gcc15.patch"; url = "https://github.com/ROCm/amdsmi/commit/902667db3cafe72e2009287cb96b160854ab9d81.patch"; hash = "sha256-MoOY5q6tQ7Q+bgm/600Etz+cxRk4L2ujkarnBjnfANw="; diff --git a/pkgs/development/rocm-modules/6/aotriton/default.nix b/pkgs/development/rocm-modules/aotriton/default.nix index 99d0c1d46bda..03d6e3f6c30c 100644 --- a/pkgs/development/rocm-modules/6/aotriton/default.nix +++ b/pkgs/development/rocm-modules/aotriton/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "aotriton${lib.optionalString (!anySupportedTargets) "-shim"}"; - version = "0.10b"; + version = "0.11.1b"; src = fetchFromGitHub { owner = "ROCm"; repo = "aotriton"; tag = finalAttrs.version; - hash = "sha256-stAHnsqChkNv69wjlhM/qUetrJpNwI1i7rGnPMwsNz0="; + hash = "sha256-F7JjyS+6gMdCpOFLldTsNJdVzzVwd6lwW7+V8ZOZfig="; leaveDotGit = true; # fetch all submodules except unused triton submodule that is ~500MB postFetch = '' @@ -65,9 +65,11 @@ stdenv.mkDerivation (finalAttrs: { requiredSystemFeatures = if anySupportedTargets then [ "big-parallel" ] else [ ]; env = { + AOTRITON_CI_SUPPLIED_SHA1 = finalAttrs.version; ROCM_PATH = "${clr}"; CFLAGS = "-w -g1 -gz -Wno-c++11-narrowing"; CXXFLAGS = finalAttrs.env.CFLAGS; + TRITON_STORE_BINARY_ONLY = 1; # reduce triton disk space usage }; nativeBuildInputs = [ @@ -97,14 +99,6 @@ stdenv.mkDerivation (finalAttrs: { triton ]); - patches = [ - # CMakeLists.txt: AOTRITON_INHERIT_SYSTEM_SITE_TRITON flag - (fetchpatch { - url = "https://github.com/ROCm/aotriton/commit/9734c3e999c412a07d2b35671998650942b26ed4.patch"; - hash = "sha256-tBmjjhRJmLv3K6F2+4OcMuwf8dH7efPPECMQjh6QdUA="; - }) - ]; - # Excerpt from README: # Note: do not run ninja separately, due to the limit of the current build system, # ninja install will run the whole build process unconditionally. @@ -126,8 +120,8 @@ stdenv.mkDerivation (finalAttrs: { # picked if nix-shell is used against this package preConfigure = '' cmakeFlagsArray+=( - "-DVENV_DIR=$(pwd)/aotriton-venv/" - "-DVENV_BIN_PYTHON=$(pwd)/aotriton-venv/bin/python" + "-DVENV_DIR=$(pwd)/build/venv/" + "-DVENV_BIN_PYTHON=$(pwd)/build/venv/bin/python" ) ''; @@ -136,6 +130,8 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "AOTRITON_NOIMAGE_MODE" (!anySupportedTargets)) # Use preinstalled triton from our python's site-packages (lib.cmakeBool "AOTRITON_INHERIT_SYSTEM_SITE_TRITON" true) + # Circular dependency + (lib.cmakeBool "AOTRITON_USE_TORCH" false) # FP32 kernels are optional, turn them off to speed up builds and save space # Perf sensitive code should be using BF16 or F16 (lib.cmakeBool "AOTRITON_ENABLE_FP32_INPUTS" false) diff --git a/pkgs/development/rocm-modules/6/aqlprofile/default.nix b/pkgs/development/rocm-modules/aqlprofile/default.nix index d44da400200f..97fa65abfd56 100644 --- a/pkgs/development/rocm-modules/6/aqlprofile/default.nix +++ b/pkgs/development/rocm-modules/aqlprofile/default.nix @@ -8,15 +8,13 @@ stdenv.mkDerivation { pname = "aqlprofile"; - version = "6.4.3"; + version = "7.0.2"; src = fetchFromGitHub { - # TODO: Will move to rocm-systems repo and have proper tags in 7.x - # pinned to oddly named tag for now owner = "ROCm"; repo = "aqlprofile"; - tag = "rocm-42"; - hash = "sha256-avL78ZfB+rJ1TYaejSUzU6i5L9JeMawMwIxaTQINQdE="; + tag = "rocm-7.0.2"; + hash = "sha256-A17SAkEUf3yAGwvZUWSdL7Tn5YAXB0YlD3T1DLTjDSg="; }; env.CXXFLAGS = "-DROCP_LD_AQLPROFILE=1"; diff --git a/pkgs/development/rocm-modules/6/clr/cmake-find-x11-libgl.patch b/pkgs/development/rocm-modules/clr/cmake-find-x11-libgl.patch index 5a36a2c2c74d..5a36a2c2c74d 100644 --- a/pkgs/development/rocm-modules/6/clr/cmake-find-x11-libgl.patch +++ b/pkgs/development/rocm-modules/clr/cmake-find-x11-libgl.patch diff --git a/pkgs/development/rocm-modules/6/clr/default.nix b/pkgs/development/rocm-modules/clr/default.nix index 4b0fad82e7ef..79070cb3ffba 100644 --- a/pkgs/development/rocm-modules/6/clr/default.nix +++ b/pkgs/development/rocm-modules/clr/default.nix @@ -70,7 +70,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "clr"; - version = "6.4.3"; + version = "7.0.2"; outputs = [ "out" @@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "clr"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-DOAAuC9TN1//v56GXyUMJwQHgOuctC+WsC5agrgL+QM="; + hash = "sha256-zajb/iTtF/ECRScdcQ85HPgq8DdIGqSinJoVyyi89bw="; }; nativeBuildInputs = [ @@ -148,24 +148,13 @@ stdenv.mkDerivation (finalAttrs: { ./cmake-find-x11-libgl.patch (fetchpatch { # [PATCH] improve rocclr isa compatibility check - sha256 = "sha256-oj1loBEuqzuMihOKoN0wR92Wo25AshN5MpBuTq/9TMw="; - url = "https://github.com/GZGavinZhao/clr/commit/f675b9b46d9f7bb8e003f4f47f616fa86a0b7a5e.patch"; + sha256 = "sha256-/QpB3Wqdhcq6lzyO/zOWzwQC0oYpesCICxnVx5CqbWg="; + url = "https://github.com/GZGavinZhao/clr/commit/733ee38ef8ad5c84926970981821f446dfcb00af.patch"; }) (fetchpatch { # [PATCH] improve hipamd isa compatibility check - sha256 = "sha256-E3ERoVjUVWCiYHuE1GaVY5jMrAVx3B1cAVHM4/HPuaQ="; - url = "https://github.com/GZGavinZhao/clr/commit/aec0fc56ee2d10a2bc269c418fa847da2ee9969a.patch"; - }) - (fetchpatch { - # [PATCH] SWDEV-507104 - Removes alignment requirement for Semaphore class to resolve runtime misaligned memory issues - sha256 = "sha256-nStJ22B/CM0fzQTvYjbHDbQt0GlE8DXxVK+UDU9BAx4="; - url = "https://github.com/ROCm/clr/commit/21d764518363d74187deaef2e66c1a127bc5aa64.patch"; - }) - (fetchpatch { - # CMake 4 compat - # [PATCH] SWDEV-509213 - make cmake_minimum_required consistent across clr - url = "https://github.com/ROCm/clr/commit/fcaefe97b862afe12aaac0147f1004e6dc595fce.patch"; - hash = "sha256-hRZXbASbIOOETe+T4mDyyiRWLXd6RDKRieN2ns1w/rs="; + sha256 = "sha256-FvZInw8PqB68ePxAGu45cWT/whD1xmprIA5wZb5OLcE="; + url = "https://github.com/GZGavinZhao/clr/commit/1f0b54ee9b0de08f4dc8cd38b6728928b180048a.patch"; }) ]; @@ -198,7 +187,7 @@ stdenv.mkDerivation (finalAttrs: { cp ${amdclang}/bin/* $out/bin/ cp ${amdclangxx}/bin/* $out/bin/ - for prog in hip{cc,config}{,.pl}; do + for prog in hip{cc,config}; do wrapProgram $out/bin/$prog ${lib.concatStringsSep " " wrapperArgs} done @@ -280,6 +269,33 @@ stdenv.mkDerivation (finalAttrs: { opencl-example = callPackage ./test-opencl-example.nix { clr = finalAttrs.finalPackage; }; + generic-arch = callPackage ./test-isa-compat.nix { + clr = finalAttrs.finalPackage; + name = "generic-arch"; + offloadArches = [ + "gfx9-generic" + "gfx10-1-generic" + "gfx10-3-generic" + "gfx11-generic" + "gfx12-generic" + ]; + }; + isa-compat = callPackage ./test-isa-compat.nix { + clr = finalAttrs.finalPackage; + name = "isa-compat"; + offloadArches = [ + "gfx900" + "gfx1010" + "gfx1030" + ]; + }; + spirv = callPackage ./test-isa-compat.nix { + clr = finalAttrs.finalPackage; + name = "spirv"; + offloadArches = [ + "amdgcnspirv" + ]; + }; }; selectGpuTargets = diff --git a/pkgs/development/rocm-modules/clr/test-isa-compat.nix b/pkgs/development/rocm-modules/clr/test-isa-compat.nix new file mode 100644 index 000000000000..2eca8edbff3d --- /dev/null +++ b/pkgs/development/rocm-modules/clr/test-isa-compat.nix @@ -0,0 +1,74 @@ +{ + lib, + stdenv, + makeImpureTest, + fetchFromGitHub, + clr, + rocm-smi, + name, + offloadArches, +}: + +let + # TODO: swap to another tiny test if this breaks; upstream is archived but fine for now + vectoradd = stdenv.mkDerivation { + pname = "rocm-hip-vectoradd"; + version = "2024-04-11"; + + src = fetchFromGitHub { + owner = "ROCm"; + repo = "HIP-Examples"; + rev = "cdf9d101acd9a3fc89ee750f73c1f1958cbd5cc3"; + hash = "sha256-/I1KmOBFbEZIjA1vRE+2tPTtEKtOgazjCbnZtr+87E0="; + }; + + nativeBuildInputs = [ + clr + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + amdclang++ -x hip -o $out/bin/vectoradd \ + ${lib.concatMapStringsSep " " (arch: "--offload-arch=${arch}") offloadArches} \ + vectorAdd/vectoradd_hip.cpp + + runHook postInstall + ''; + + meta = { + description = "vectorAdd HIP example for ROCm"; + homepage = "https://github.com/ROCm/HIP-Examples"; + license = lib.licenses.unfree; + platforms = lib.platforms.linux; + teams = [ lib.teams.rocm ]; + }; + }; + +in +makeImpureTest { + inherit name; + testedPackage = "rocmPackages.clr"; + + sandboxPaths = [ + "/sys" + "/dev/dri" + "/dev/kfd" + ]; + + nativeBuildInputs = [ + vectoradd + rocm-smi + ]; + + testScript = '' + rocm-smi + + vectoradd + ''; + + meta = { + teams = [ lib.teams.rocm ]; + }; +} diff --git a/pkgs/development/rocm-modules/6/clr/test-opencl-example.nix b/pkgs/development/rocm-modules/clr/test-opencl-example.nix index c09093946c67..34b97755a7bf 100644 --- a/pkgs/development/rocm-modules/6/clr/test-opencl-example.nix +++ b/pkgs/development/rocm-modules/clr/test-opencl-example.nix @@ -61,7 +61,7 @@ let in makeImpureTest { name = "opencl-example"; - testedPackage = "rocmPackages_6.clr"; + testedPackage = "rocmPackages.clr"; sandboxPaths = [ "/sys" diff --git a/pkgs/development/rocm-modules/6/clr/test-rocm-smi.nix b/pkgs/development/rocm-modules/clr/test-rocm-smi.nix index acdbc1928d35..e03655907c7b 100644 --- a/pkgs/development/rocm-modules/6/clr/test-rocm-smi.nix +++ b/pkgs/development/rocm-modules/clr/test-rocm-smi.nix @@ -8,7 +8,7 @@ makeImpureTest { name = "rocm-smi"; - testedPackage = "rocmPackages_6.clr"; + testedPackage = "rocmPackages.clr"; nativeBuildInputs = [ clinfo rocm-smi diff --git a/pkgs/development/rocm-modules/6/composable_kernel/base.nix b/pkgs/development/rocm-modules/composable_kernel/base.nix index 60127e37eadc..5c51c4208d40 100644 --- a/pkgs/development/rocm-modules/6/composable_kernel/base.nix +++ b/pkgs/development/rocm-modules/composable_kernel/base.nix @@ -15,6 +15,11 @@ zstd, buildTests ? false, buildExamples ? false, + # limits prebuilt kernel selection to those needed for MIOPEN (currently "*conv*") + # Other kernels can still be used if treating CK as a header only library + # and building specific instances, as done with ck4inductor/torch + miOpenReqLibsOnly ? true, + withDeprecatedKernels ? false, gpuTargets ? ( clr.localGpuTargets or [ "gfx900" @@ -22,20 +27,14 @@ "gfx908" "gfx90a" "gfx942" - "gfx1030" - "gfx1100" - "gfx1101" - "gfx1102" - "gfx1200" - "gfx1201" + "gfx950" + "gfx10-3-generic" + "gfx11-generic" + "gfx12-generic" ] ), }: -# TODO: in 7.x CK is likely to gain support for -# a) miopen kernel only build (MIOPEN_REQ_LIBS_ONLY) -# b) header only build (useful for torch) https://github.com/ROCm/composable_kernel/issues/2030 -# that will likely allow us to get rid of this complicated split part build! stdenv.mkDerivation (finalAttrs: { preBuild = '' echo "This derivation isn't intended to be built directly and only exists to be overridden and built in chunks"; @@ -43,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { ''; pname = "composable_kernel_base"; - version = "6.4-unstable-2025-05-22"; + version = "7.0.2"; outputs = [ "out" @@ -58,9 +57,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ROCm"; repo = "composable_kernel"; - # Using a dev snapshot, trying to get MIOpen to work - rev = "bc2551ac3b27edc31f20863e3a873508fb73aad2"; - hash = "sha256-bfmwbgR1ya+zkME3wOyaZX/e+1+ie0sSlugK/kozLsI="; + rev = "rocm-${finalAttrs.version}"; + hash = "sha256-Wql7PD3kg85AFXn7UaTKxhURyDPfVe/OUbR+udrqDc8="; }; nativeBuildInputs = [ @@ -87,10 +85,14 @@ stdenv.mkDerivation (finalAttrs: { env.ROCM_PATH = clr; cmakeFlags = [ + (lib.cmakeBool "MIOPEN_REQ_LIBS_ONLY" miOpenReqLibsOnly) + (lib.cmakeBool "BUILD_MHA_LIB" (!miOpenReqLibsOnly)) + (lib.cmakeBool "DISABLE_DL_KERNELS" true) + (lib.cmakeBool "DISABLE_DPP_KERNELS" true) + (lib.cmakeBool "CK_TIME_KERNEL" false) "-DCMAKE_MODULE_PATH=${clr}/hip/cmake" - "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_POLICY_DEFAULT_CMP0069=NEW" - # "-DDL_KERNELS=ON" # Not needed, slow to build + "-DDL_KERNELS=OFF" # CK_USE_CODEGEN Required for migraphx which uses device_gemm_multiple_d.hpp # but migraphx requires an incompatible fork of CK and fails anyway # "-DCK_USE_CODEGEN=ON" @@ -122,11 +124,6 @@ stdenv.mkDerivation (finalAttrs: { "-DGOOGLETEST_DIR=${gtest.src}" # Custom linker names ]; - patches = [ - # Significant build performance improvement - ./avoid-extra-host-compile.patch - ]; - # No flags to build selectively it seems... postPatch = # Reduce configure time by preventing thousands of clang-tidy targets being added @@ -139,12 +136,10 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "add_subdirectory(profiler)" "" substituteInPlace cmake/EnableCompilerWarnings.cmake \ --replace-fail "-Werror" "" - - # Apply equivalent change to https://github.com/ROCm/composable_kernel/pull/2564 - # TODO: Remove after ROCm 7.1 - find include/ck/tensor_operation/ -type f -name "*.hpp" -exec sed -i \ - -e 's/!defined(__HIP_DEVICE_COMPILE__)/false/g' \ - {} + + '' + + lib.optionalString (!withDeprecatedKernels) '' + substituteInPlace include/ck/ck.hpp \ + --replace-fail "CK_BUILD_DEPRECATED 1" "CK_BUILD_DEPRECATED 0" '' # Optionally remove tests + lib.optionalString (!buildTests) '' @@ -170,7 +165,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - inherit gpuTargets; + inherit gpuTargets miOpenReqLibsOnly; updateScript = rocmUpdateScript { name = finalAttrs.pname; inherit (finalAttrs.src) owner; diff --git a/pkgs/development/rocm-modules/6/composable_kernel/ck4inductor.nix b/pkgs/development/rocm-modules/composable_kernel/ck4inductor.nix index 8d12893d2b27..ce3d9363e9d2 100644 --- a/pkgs/development/rocm-modules/6/composable_kernel/ck4inductor.nix +++ b/pkgs/development/rocm-modules/composable_kernel/ck4inductor.nix @@ -14,8 +14,7 @@ buildPythonPackage { setuptools setuptools-scm ]; - version = "6.4.3"; - inherit (composable_kernel) src; + inherit (composable_kernel) version src; pythonImportsCheck = [ "ck4inductor" "ck4inductor.universal_gemm.gen_instances" diff --git a/pkgs/development/rocm-modules/6/composable_kernel/default.nix b/pkgs/development/rocm-modules/composable_kernel/default.nix index 42c634f0aa94..0a9dac5db87a 100644 --- a/pkgs/development/rocm-modules/6/composable_kernel/default.nix +++ b/pkgs/development/rocm-modules/composable_kernel/default.nix @@ -5,8 +5,10 @@ }: let + inherit (composable_kernel_base) miOpenReqLibsOnly; parts = { _mha = { + enabled = !miOpenReqLibsOnly; # mha takes ~3hrs on 64 cores on an EPYC milan system at ~2.5GHz # big-parallel builders are one gen newer and clocked ~30% higher but only 24 cores # Should be <10h timeout but might be cutting it close @@ -20,6 +22,7 @@ let extraCmakeFlags = [ "-DHIP_CLANG_NUM_PARALLEL_JOBS=2" ]; }; gemm_multiply_multiply = { + enabled = !miOpenReqLibsOnly; targets = [ "device_gemm_multiply_multiply_instance" ]; @@ -30,6 +33,7 @@ let ]; }; gemm_multiply_multiply_wp = { + enabled = !miOpenReqLibsOnly; targets = [ "device_gemm_multiply_multiply_wp_instance" ]; @@ -50,7 +54,8 @@ let targets = [ "device_grouped_conv1d_fwd_instance" "device_grouped_conv2d_fwd_instance" - "device_grouped_conv2d_fwd_bias_relu_instance" + "device_grouped_conv2d_fwd_bias_clamp_instance" + "device_grouped_conv2d_fwd_clamp_instance" "device_grouped_conv2d_fwd_dynamic_op_instance" ]; }; @@ -71,7 +76,8 @@ let grouped_conv_fwd_3d1 = { targets = [ "device_grouped_conv3d_fwd_instance" - "device_grouped_conv3d_fwd_bias_relu_instance" + "device_grouped_conv3d_fwd_clamp_instance" + "device_grouped_conv3d_fwd_bias_clamp_instance" "device_grouped_conv3d_fwd_bilinear_instance" "device_grouped_conv3d_fwd_convinvscale_instance" "device_grouped_conv3d_fwd_convscale_instance" @@ -87,7 +93,13 @@ let "device_grouped_conv3d_fwd_scaleadd_scaleadd_relu_instance" ]; }; + grouped_conv_fwd_nd = { + targets = [ + "device_grouped_convnd_bwd_weight_instance" + ]; + }; batched_gemm1 = { + enabled = !miOpenReqLibsOnly; targets = [ "device_batched_gemm_instance" "device_batched_gemm_b_scale_instance" @@ -100,6 +112,7 @@ let ]; }; batched_gemm2 = { + enabled = !miOpenReqLibsOnly; targets = [ "device_batched_gemm_softmax_gemm_permute_instance" "device_grouped_gemm_instance" @@ -111,18 +124,21 @@ let ]; }; gemm_universal1 = { + enabled = !miOpenReqLibsOnly; targets = [ "device_gemm_universal_instance" "device_gemm_universal_batched_instance" ]; }; gemm_universal2 = { + enabled = !miOpenReqLibsOnly; targets = [ "device_gemm_universal_reduce_instance" "device_gemm_universal_streamk_instance" ]; }; gemm_other1 = { + enabled = !miOpenReqLibsOnly; targets = [ "device_gemm_instance" "device_gemm_b_scale_instance" @@ -135,6 +151,7 @@ let ]; }; gemm_other2 = { + enabled = !miOpenReqLibsOnly; targets = [ "device_gemm_add_relu_add_layernorm_instance" "device_gemm_add_silu_instance" @@ -159,6 +176,7 @@ let ]; }; pool = { + enabled = !miOpenReqLibsOnly; targets = [ "device_avg_pool2d_bwd_instance" "device_avg_pool3d_bwd_instance" @@ -167,7 +185,13 @@ let "device_max_pool_bwd_instance" ]; }; + other0 = { + targets = [ + "device_quantization_instance" + ]; + }; other1 = { + enabled = !miOpenReqLibsOnly; targets = [ "device_batchnorm_instance" "device_contraction_bilinear_instance" @@ -177,15 +201,16 @@ let ]; }; other2 = { + enabled = !miOpenReqLibsOnly; targets = [ "device_column_to_image_instance" "device_image_to_column_instance" "device_permute_scale_instance" - "device_quantization_instance" "device_reduce_instance" ]; }; other3 = { + enabled = !miOpenReqLibsOnly; targets = [ "device_normalization_bwd_data_instance" "device_normalization_bwd_gamma_beta_instance" @@ -201,11 +226,13 @@ let targets, extraCmakeFlags ? [ ], requiredSystemFeatures ? [ "big-parallel" ], + enabled ? true, onlyFor ? [ ], }: let supported = - onlyFor == [ ] || (lib.lists.intersectLists composable_kernel_base.gpuTargets onlyFor) != [ ]; + enabled + && (onlyFor == [ ] || (lib.lists.intersectLists composable_kernel_base.gpuTargets onlyFor) != [ ]); in if supported then (composable_kernel_base.overrideAttrs (old: { diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/default.nix index 44454b36958a..cf9e9815eb83 100644 --- a/pkgs/development/rocm-modules/6/default.nix +++ b/pkgs/development/rocm-modules/default.nix @@ -213,6 +213,7 @@ let ucx = prev.ucx.override { enableCuda = false; enableRocm = true; + rocmPackages = self; }; in { diff --git a/pkgs/development/rocm-modules/6/half/default.nix b/pkgs/development/rocm-modules/half/default.nix index ca3a3ab58f17..54a2bdc7054e 100644 --- a/pkgs/development/rocm-modules/6/half/default.nix +++ b/pkgs/development/rocm-modules/half/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "half"; - version = "6.4.3"; + version = "7.0.2"; src = fetchFromGitHub { owner = "ROCm"; repo = "half"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-H8Ogm4nxaxDB0WHx+KhRjUO3vzp3AwCqrIQ6k8R+xkc="; + hash = "sha256-If9O5BEeymsLN+C0drZsPSxEWXpJTxeDBGNHNXSumm4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/hip-common/default.nix b/pkgs/development/rocm-modules/hip-common/default.nix index b915e0b93827..365ffc146c82 100644 --- a/pkgs/development/rocm-modules/6/hip-common/default.nix +++ b/pkgs/development/rocm-modules/hip-common/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hip-common"; - version = "6.4.3"; + version = "7.0.2"; src = fetchFromGitHub { owner = "ROCm"; repo = "HIP"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-B4Gc119iff3ak9tmpz3rUJBtCk5T1AA8z67K9PshTLQ="; + hash = "sha256-9VQrCed5EKVXu41Qrnf2m2jXveWt5Y/SlSxlUmjZS0M="; }; dontConfigure = true; diff --git a/pkgs/development/rocm-modules/6/hipblas-common/default.nix b/pkgs/development/rocm-modules/hipblas-common/default.nix index 20dc26075c5d..adf9c331de39 100644 --- a/pkgs/development/rocm-modules/6/hipblas-common/default.nix +++ b/pkgs/development/rocm-modules/hipblas-common/default.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "hipblas-common"; - version = "6.4.3"; + version = "7.0.2"; src = fetchFromGitHub { owner = "ROCm"; repo = "hipBLAS-common"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-eTwoAXH2HGdSAOLTZHJUFHF+c2wWHixqeMqr60KxJrc="; + hash = "sha256-NXSMVtfjei4vIjU9y4o3Px/fplq7C7ziY1R8YqnY2LQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/hipblas/default.nix b/pkgs/development/rocm-modules/hipblas/default.nix index e27185ef5b4b..6f1682110652 100644 --- a/pkgs/development/rocm-modules/6/hipblas/default.nix +++ b/pkgs/development/rocm-modules/hipblas/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, rocmUpdateScript, cmake, rocm-cmake, @@ -25,7 +24,7 @@ # Can also use cuBLAS stdenv.mkDerivation (finalAttrs: { pname = "hipblas"; - version = "6.4.3"; + version = "7.0.2"; outputs = [ "out" @@ -44,19 +43,9 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "hipBLAS"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-lQv8Ik6+0ldqyeJ05CSGB0309nIpzlRL3CRYeQxVfd0="; + hash = "sha256-SoszZBbk8sM3yjgahs1UrPCsEbGmTYTpdOw+Ah/z8H8="; }; - patches = [ - (fetchpatch { - # Subject: [PATCH] Add gfx1150, gfx1150, gfx1200, gfx1201 support (#1055) - # This was merged to release/rocm-rel-6.4 but AMD forgot to tag it for 6.4.3 - name = "release-6.4-arch-extra.patch"; - url = "https://github.com/ROCm/hipBLAS/commit/0100b32ccff9a0f12134694315b4e44884e25a8e.patch"; - hash = "sha256-BmktlLJpYaTcogHzEKpZdCnksIIysEO47WMezXoxvCs="; - }) - ]; - postPatch = '' substituteInPlace library/CMakeLists.txt \ --replace-fail "find_package(Git REQUIRED)" "" diff --git a/pkgs/development/rocm-modules/6/hipblaslt/Tensile-interning.patch b/pkgs/development/rocm-modules/hipblaslt/Tensile-interning.patch index acf44437520d..acf44437520d 100644 --- a/pkgs/development/rocm-modules/6/hipblaslt/Tensile-interning.patch +++ b/pkgs/development/rocm-modules/hipblaslt/Tensile-interning.patch diff --git a/pkgs/development/rocm-modules/6/hipblaslt/TensileCreateLibrary-refactor.patch b/pkgs/development/rocm-modules/hipblaslt/TensileCreateLibrary-refactor.patch index eb50942a095d..eb50942a095d 100644 --- a/pkgs/development/rocm-modules/6/hipblaslt/TensileCreateLibrary-refactor.patch +++ b/pkgs/development/rocm-modules/hipblaslt/TensileCreateLibrary-refactor.patch diff --git a/pkgs/development/rocm-modules/6/hipblaslt/default.nix b/pkgs/development/rocm-modules/hipblaslt/default.nix index 2c6c5679f817..f19734394f0e 100644 --- a/pkgs/development/rocm-modules/6/hipblaslt/default.nix +++ b/pkgs/development/rocm-modules/hipblaslt/default.nix @@ -70,7 +70,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "hipblaslt${clr.gpuArchSuffix}"; - version = "6.5-unstable-2025-08-21"; + version = "7.0.2"; src = fetchFromGitHub { owner = "ROCm"; diff --git a/pkgs/development/rocm-modules/6/hipblaslt/messagepack-compression-support.patch b/pkgs/development/rocm-modules/hipblaslt/messagepack-compression-support.patch index ace6b2b728ad..ace6b2b728ad 100644 --- a/pkgs/development/rocm-modules/6/hipblaslt/messagepack-compression-support.patch +++ b/pkgs/development/rocm-modules/hipblaslt/messagepack-compression-support.patch diff --git a/pkgs/development/rocm-modules/6/hipblaslt/parallel-buildSourceCodeObjectFile.diff b/pkgs/development/rocm-modules/hipblaslt/parallel-buildSourceCodeObjectFile.diff index 019e7a6123b1..019e7a6123b1 100644 --- a/pkgs/development/rocm-modules/6/hipblaslt/parallel-buildSourceCodeObjectFile.diff +++ b/pkgs/development/rocm-modules/hipblaslt/parallel-buildSourceCodeObjectFile.diff diff --git a/pkgs/development/rocm-modules/6/hipcc/default.nix b/pkgs/development/rocm-modules/hipcc/default.nix index 1ed7dd6f4271..ac8ab20eb637 100644 --- a/pkgs/development/rocm-modules/6/hipcc/default.nix +++ b/pkgs/development/rocm-modules/hipcc/default.nix @@ -23,12 +23,6 @@ stdenv.mkDerivation (finalAttrs: { llvm.clang-unwrapped ]; - patches = [ - # https://github.com/ROCm/llvm-project/pull/183 - # Fixes always-invoked UB in hipcc - ./0001-hipcc-Remove-extra-definition-of-hipBinUtilPtr_-in-d.patch - ]; - postPatch = '' substituteInPlace src/hipBin_amd.h \ --replace-fail "/usr/bin/lsb_release" "${lsb-release}/bin/lsb_release" diff --git a/pkgs/development/rocm-modules/6/hipcub/default.nix b/pkgs/development/rocm-modules/hipcub/default.nix index 6348947d8433..d0a7f7815bf4 100644 --- a/pkgs/development/rocm-modules/6/hipcub/default.nix +++ b/pkgs/development/rocm-modules/hipcub/default.nix @@ -17,7 +17,7 @@ # CUB can also be used as a backend instead of rocPRIM. stdenv.mkDerivation (finalAttrs: { pname = "hipcub"; - version = "6.4.3"; + version = "7.0.2"; outputs = [ "out" @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "hipCUB"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-yRJxhYFZYiKNR2xrn5fif/+vjHKKcKdn0JKPi972g+0="; + hash = "sha256-Vx9h/DTZo7RfQrflVwXOCKiA7rt6dQQw/P/bllgtq8w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/hipfft/default.nix b/pkgs/development/rocm-modules/hipfft/default.nix index 449c9e7c1dc6..0439197337cd 100644 --- a/pkgs/development/rocm-modules/6/hipfft/default.nix +++ b/pkgs/development/rocm-modules/hipfft/default.nix @@ -21,7 +21,7 @@ # Can also use cuFFT stdenv.mkDerivation (finalAttrs: { pname = "hipfft"; - version = "6.4.3"; + version = "7.0.2"; outputs = [ "out" @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "hipFFT"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-4W93OOKTqNteoQ4GKycr06cjvGy5NF7RR08F+rfn+0o="; + hash = "sha256-cozwHUlqACq0IM3YToc/xFB694DJ3rPiEPUCTo0xuHY="; fetchSubmodules = true; }; diff --git a/pkgs/development/rocm-modules/6/hipfort/default.nix b/pkgs/development/rocm-modules/hipfort/default.nix index 7e86a1b0ef12..c13345965c2f 100644 --- a/pkgs/development/rocm-modules/6/hipfort/default.nix +++ b/pkgs/development/rocm-modules/hipfort/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hipfort"; - version = "6.4.3"; + version = "7.0.2"; src = fetchFromGitHub { owner = "ROCm"; repo = "hipfort"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-Nks1+0X8bLtZ9HqZXJOtrAWQlJquMH+feuu1stf/9Vo="; + hash = "sha256-s/VOaU5IKZYH0Vhtjl/UZTrnpLsJ7zWFTvAJY2x3AcA="; }; patches = [ diff --git a/pkgs/development/rocm-modules/6/hipify/default.nix b/pkgs/development/rocm-modules/hipify/default.nix index 15a436814ef0..22fd712c2983 100644 --- a/pkgs/development/rocm-modules/6/hipify/default.nix +++ b/pkgs/development/rocm-modules/hipify/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hipify"; - version = "6.4.3"; + version = "7.0.2"; src = fetchFromGitHub { owner = "ROCm"; repo = "HIPIFY"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-uj25WmGCpwouS1yzW9Oil5Vyrbyj5yRITvWF9WaGozM="; + hash = "sha256-xcWUYfZvbTHs4BvDiXAOLONfLiCq9uEGOHSK/hOWg7c="; }; strictDeps = true; @@ -52,10 +52,12 @@ stdenv.mkDerivation (finalAttrs: { }; postInstall = '' + rm $out/bin/hipify-perl chmod +x $out/bin/* chmod +x $out/libexec/* patchShebangs $out/bin/ patchShebangs $out/libexec/ + ln -s $out/{libexec/hipify,bin}/hipify-perl ''; meta = { diff --git a/pkgs/development/rocm-modules/6/hiprand/default.nix b/pkgs/development/rocm-modules/hiprand/default.nix index d72e86b5ef08..8854b4dc4827 100644 --- a/pkgs/development/rocm-modules/6/hiprand/default.nix +++ b/pkgs/development/rocm-modules/hiprand/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "hiprand"; - version = "6.4.3"; + version = "7.0.2"; outputs = [ "out" @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "hipRAND"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-f/AWDV7vkjt8BnjhLwT2m1Y6dlZy054+z6J0UW9Glg8="; + hash = "sha256-yOLdFQ4/OGGfX75A/ElY1xD+4nkcqT8tZx2bQZgXTx4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/hiprt/default.nix b/pkgs/development/rocm-modules/hiprt/default.nix index d856477a01cc..bd2a9f6f11fd 100644 --- a/pkgs/development/rocm-modules/6/hiprt/default.nix +++ b/pkgs/development/rocm-modules/hiprt/default.nix @@ -9,17 +9,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "hiprt"; - version = "2.5.a21e075.3"; + version = "3.0.3.a1525e7"; src = fetchFromGitHub { owner = "GPUOpen-LibrariesAndSDKs"; repo = "HIPRT"; tag = finalAttrs.version; - sha256 = "sha256-3yGhwIsFHlFMCEzuYnXuXNzs99m7f2LTkYaTGs0GEcI="; + hash = "sha256-7r7KO+WuXOeQQhYLYpJRrD4ZqVsBOqaD2NGD15CWnoo="; }; postPatch = '' - rm -rf contrib/easy-encrypt # contains prebuilt easy-encrypt binaries, we disable encryption substituteInPlace contrib/Orochi/contrib/hipew/src/hipew.cpp --replace-fail '"/opt/rocm/hip/lib/' '"${clr}/lib' substituteInPlace hiprt/hiprt_libpath.h --replace-fail '"/opt/rocm/hip/lib/' '"${clr}/lib/' ''; @@ -40,8 +39,6 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "PRECOMPILE" true) # needs accelerator (lib.cmakeBool "NO_UNITTEST" true) - # we have no need to support baking encrypted kernels into object files - (lib.cmakeBool "NO_ENCRYPT" true) (lib.cmakeBool "FORCE_DISABLE_CUDA" true) ]; diff --git a/pkgs/development/rocm-modules/6/hipsolver/default.nix b/pkgs/development/rocm-modules/hipsolver/default.nix index b5f8395be608..48f1149d60f6 100644 --- a/pkgs/development/rocm-modules/6/hipsolver/default.nix +++ b/pkgs/development/rocm-modules/hipsolver/default.nix @@ -21,7 +21,7 @@ # Can also use cuSOLVER stdenv.mkDerivation (finalAttrs: { pname = "hipsolver"; - version = "6.4.3"; + version = "7.0.2"; outputs = [ "out" @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "hipSOLVER"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-YP88fSM27Do0/tZ676Pvv2tr+lnlQa4vr3UnVNaVpLA="; + hash = "sha256-IZAVdu+VpSrJ/EZXymOzvrGnRLBpxUgVeaj1U+ux02M="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/hipsparse/default.nix b/pkgs/development/rocm-modules/hipsparse/default.nix index cf96ecfd234e..033250e16725 100644 --- a/pkgs/development/rocm-modules/6/hipsparse/default.nix +++ b/pkgs/development/rocm-modules/hipsparse/default.nix @@ -19,7 +19,7 @@ # This can also use cuSPARSE as a backend instead of rocSPARSE stdenv.mkDerivation (finalAttrs: { pname = "hipsparse"; - version = "6.4.3"; + version = "7.0.2"; outputs = [ "out" @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "hipSPARSE"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-fbh9fKlzxuIBTeCV/bEQbUS3lO6O3KoGF7/tTqRaCpE="; + hash = "sha256-hfC+QsOfDNKIZROgTZZsGbAG0yghc27PyVwCDr8MEJ8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/llvm/clang-bodge-ignore-systemwide-incls.diff b/pkgs/development/rocm-modules/llvm/clang-bodge-ignore-systemwide-incls.diff index 5f44dbe15655..5f44dbe15655 100644 --- a/pkgs/development/rocm-modules/6/llvm/clang-bodge-ignore-systemwide-incls.diff +++ b/pkgs/development/rocm-modules/llvm/clang-bodge-ignore-systemwide-incls.diff diff --git a/pkgs/development/rocm-modules/6/llvm/clang-log-jobs.diff b/pkgs/development/rocm-modules/llvm/clang-log-jobs.diff index 3a3a712c8bba..3a3a712c8bba 100644 --- a/pkgs/development/rocm-modules/6/llvm/clang-log-jobs.diff +++ b/pkgs/development/rocm-modules/llvm/clang-log-jobs.diff diff --git a/pkgs/development/rocm-modules/6/llvm/default.nix b/pkgs/development/rocm-modules/llvm/default.nix index c4ee2ce75d10..3d5db0710d41 100644 --- a/pkgs/development/rocm-modules/6/llvm/default.nix +++ b/pkgs/development/rocm-modules/llvm/default.nix @@ -2,7 +2,7 @@ lib, stdenv, # LLVM version closest to ROCm fork to override - llvmPackages_19, + llvmPackages_20, overrideCC, lndir, rocm-device-libs, @@ -11,7 +11,6 @@ symlinkJoin, rdfind, zstd, - zlib, gcc-unwrapped, glibc, replaceVars, @@ -34,12 +33,12 @@ }: let - version = "6.4.3"; + version = "7.0.2"; # major version of this should be the clang version ROCm forked from - rocmLlvmVersion = "19.0.0-rocm"; + rocmLlvmVersion = "20.0.0-rocm"; # llvmPackages_base version should match rocmLlvmVersion # so libllvm's bitcode is compatible with the built toolchain - llvmPackages_base = llvmPackages_19; + llvmPackages_base = llvmPackages_20; llvmPackagesNoBintools = llvmPackages_base.override { bootBintools = null; bootBintoolsNoLibc = null; @@ -116,7 +115,7 @@ let owner = "ROCm"; repo = "llvm-project"; rev = "rocm-${version}"; - hash = "sha256-12ftH5fMPAsbcEBmhADwW1YY/Yxo/MAK1FafKczITMg="; + hash = "sha256-gJlDFbCRsiwHgRzmwm36C3WvGfWwgPrtBNUHYmZHTB8="; }; llvmMajorVersion = lib.versions.major rocmLlvmVersion; # An llvmPackages (pkgs/development/compilers/llvm/) built from ROCm LLVM's source tree @@ -229,9 +228,8 @@ let commonCmakeFlags = [ llvmTargetsFlag # Compression support is required for compressed offload kernels - # Set FORCE_ON so that failure to find the compression libs will be a build error + # Set FORCE_ON so that failure to find the compression lib will be a build error (lib.cmakeFeature "LLVM_ENABLE_ZSTD" "FORCE_ON") - (lib.cmakeFeature "LLVM_ENABLE_ZLIB" "FORCE_ON") # required for threaded ThinLTO to work (lib.cmakeBool "LLVM_ENABLE_THREADS" true) # LLVM tries to call git to embed VCS info if FORCE_VC_ aren't set @@ -271,6 +269,7 @@ let "-g1" ] ); + inherit (llvmPackagesRocm) libcxx; in overrideLlvmPackagesRocm (s: { libllvm = (s.prev.libllvm.override { }).overrideAttrs (old: { @@ -282,13 +281,6 @@ overrideLlvmPackagesRocm (s: { hash = "sha256-yly93PvGIXOnFeDGZ2W+W6SyhdWFM6iwA+qOeaptrh0="; relative = "llvm"; }) - (fetchpatch { - # fix tools/llvm-exegesis/X86/latency/ failing with glibc 2.4+ - name = "exegesis-latency-glibc-fix.patch"; - sha256 = "sha256-CjKxQlYwHXTM0mVnv8k/ssg5OXuKpJxRvBZGXjrFZAg="; - url = "https://github.com/llvm/llvm-project/commit/1e8df9e85a1ff213e5868bd822877695f27504ad.patch"; - relative = "llvm"; - }) ./perf-increase-namestring-size.patch # TODO: consider reapplying "Don't include aliases in RegisterClassInfo::IgnoreCSRForAllocOrder" # it was reverted as it's a pessimization for non-GPU archs, but this compiler @@ -299,7 +291,6 @@ overrideLlvmPackagesRocm (s: { nativeBuildInputs = old.nativeBuildInputs ++ [ removeReferencesTo ]; buildInputs = old.buildInputs ++ [ zstd - zlib ]; preFixup = '' moveToOutput "lib/lib*.a" "$dev" @@ -329,7 +320,6 @@ overrideLlvmPackagesRocm (s: { ]; buildInputs = old.buildInputs ++ [ zstd - zlib ]; env = (old.env or { }) // { NIX_CFLAGS_COMPILE = "${(old.env or { }).NIX_CFLAGS_COMPILE or ""} ${llvmExtraCflags}"; @@ -351,25 +341,7 @@ overrideLlvmPackagesRocm (s: { passthru = old.passthru // { inherit gcc-prefix; }; - patches = [ - (fetchpatch { - # [PATCH] [clang] Install scan-build-py into plain "lib" directory - # Backported so 19/clang/gnu-install-dirs patch applies to AMD's LLVM fork - hash = "sha256-bOqAjBwRKcERpQkiBpuojGs6ddd5Ht3zL5l3TuJK2w8="; - url = "https://github.com/llvm/llvm-project/commit/816fde1cbb700ebcc8b3df81fb93d675c04c12cd.patch"; - relative = "clang"; - }) - (fetchpatch { - # [PATCH] Reapply "[CUDA][HIP] Add a __device__ version of std::__glibcxx_assert_fail()" - # Fix errors with gcc15 - # https://github.com/ROCm/composable_kernel/issues/2887 - hash = "sha256-liowyS6FTsDhH8mJYXsanK7GEIlXFhd68GRDf/7Y6gg="; - url = "https://github.com/llvm/llvm-project/commit/8ec0552a7f1f50986dda6d13eae310d121d7e3ba.patch"; - relative = "clang"; - }) - ] - ++ old.patches - ++ [ + patches = old.patches ++ [ # Never add FHS include paths ./clang-bodge-ignore-systemwide-incls.diff # Prevents builds timing out if a single compiler invocation is very slow but @@ -390,7 +362,6 @@ overrideLlvmPackagesRocm (s: { ]; buildInputs = old.buildInputs ++ [ zstd - zlib ]; env = (old.env or { }) // { NIX_CFLAGS_COMPILE = "${(old.env or { }).NIX_CFLAGS_COMPILE or ""} ${llvmExtraCflags}"; @@ -465,20 +436,6 @@ overrideLlvmPackagesRocm (s: { isGNU = false; }; compiler-rt-libc = s.prev.compiler-rt-libc.overrideAttrs (old: { - patches = old.patches ++ [ - (fetchpatch { - name = "Fix-missing-main-function-in-float16-bfloat16-support-checks.patch"; - url = "https://github.com/ROCm/llvm-project/commit/68d8b3846ab1e6550910f2a9a685690eee558af2.patch"; - hash = "sha256-Db+L1HFMWVj4CrofsGbn5lnMoCzEcU+7q12KKFb17/g="; - relative = "compiler-rt"; - }) - (fetchpatch { - # Fixes fortify hardening compile error related to openat usage - hash = "sha256-pgpN1q1vIQrPXHPxNSZ6zfgV2EflHO5Amzl+2BDjXbs="; - url = "https://github.com/llvm/llvm-project/commit/155b7a12820ec45095988b6aa6e057afaf2bc892.patch"; - relative = "compiler-rt"; - }) - ]; meta = old.meta // llvmMeta; }); compiler-rt = s.final.compiler-rt-libc; @@ -509,11 +466,14 @@ overrideLlvmPackagesRocm (s: { ]; buildInputs = old.buildInputs ++ [ clang-unwrapped - zlib zstd libxml2 libffi ]; + postFixup = '' + ${old.postFixup or ""} + ln -s $out/lib/libomp.so $dev/lib/libomp.so + ''; }); # AMD has a separate MLIR impl which we package under rocmPackages.rocmlir # It would be an error to rely on the original mlir package from this scope diff --git a/pkgs/development/rocm-modules/6/llvm/opt-offload-compress-on-by-default.patch b/pkgs/development/rocm-modules/llvm/opt-offload-compress-on-by-default.patch index 5b43528c3271..5b43528c3271 100644 --- a/pkgs/development/rocm-modules/6/llvm/opt-offload-compress-on-by-default.patch +++ b/pkgs/development/rocm-modules/llvm/opt-offload-compress-on-by-default.patch diff --git a/pkgs/development/rocm-modules/6/llvm/perf-increase-namestring-size.patch b/pkgs/development/rocm-modules/llvm/perf-increase-namestring-size.patch index 84046a588630..84046a588630 100644 --- a/pkgs/development/rocm-modules/6/llvm/perf-increase-namestring-size.patch +++ b/pkgs/development/rocm-modules/llvm/perf-increase-namestring-size.patch diff --git a/pkgs/development/rocm-modules/6/llvm/perf-shorten-gcclib-include-paths.patch b/pkgs/development/rocm-modules/llvm/perf-shorten-gcclib-include-paths.patch index a973851725d8..a973851725d8 100644 --- a/pkgs/development/rocm-modules/6/llvm/perf-shorten-gcclib-include-paths.patch +++ b/pkgs/development/rocm-modules/llvm/perf-shorten-gcclib-include-paths.patch diff --git a/pkgs/development/rocm-modules/6/migraphx/default.nix b/pkgs/development/rocm-modules/migraphx/default.nix index 98ebed7c916c..afce720b4f23 100644 --- a/pkgs/development/rocm-modules/6/migraphx/default.nix +++ b/pkgs/development/rocm-modules/migraphx/default.nix @@ -59,7 +59,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "migraphx"; - version = "6.4.3"; + version = "7.0.2"; outputs = [ "out" @@ -75,17 +75,11 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "AMDMIGraphX"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-8iOBoRBygTvn9eX5f9cG0kBHKgKSeflqHkV6Qwh/ruA="; + hash = "sha256-P3jiq6i7jpfpL9/S7mc1CiNRwAt8fzy3waHKhyuYIXI="; }; patches = [ ./msgpack-6-compat.patch - # Backport "Add quantize_bf16 to C api output" - # Required for onnxruntime 1.23+ - (fetchpatch { - url = "https://github.com/ROCm/AMDMIGraphX/commit/f33afac654dfc4558f4d9867c2d28a2d98cf49b4.patch"; - hash = "sha256-5O4UanmyhQ9Te830SISaquM4TdG/gEY3wfWSaU/cS30="; - }) ]; nativeBuildInputs = [ @@ -159,6 +153,12 @@ stdenv.mkDerivation (finalAttrs: { # `error: '__clang_hip_runtime_wrapper.h' file not found [clang-diagnostic-error]` substituteInPlace CMakeLists.txt \ --replace "set(MIGRAPHX_TIDY_ERRORS ALL)" "" + + # Fix Unicode minus sign (U+2212) in comment that breaks EMBED_USE=CArrays + # The embed mechanism generates char[] arrays that can't store unicode − + # which has values >127 + substituteInPlace src/targets/gpu/kernels/include/migraphx/kernels/bit.hpp \ + --replace-fail "// popcount(~(x | −x))" "// popcount(~(x | -x))" '' + lib.optionalString (!buildDocs) '' substituteInPlace CMakeLists.txt \ diff --git a/pkgs/development/rocm-modules/6/migraphx/msgpack-6-compat.patch b/pkgs/development/rocm-modules/migraphx/msgpack-6-compat.patch index 5c4890a02ce2..5c4890a02ce2 100644 --- a/pkgs/development/rocm-modules/6/migraphx/msgpack-6-compat.patch +++ b/pkgs/development/rocm-modules/migraphx/msgpack-6-compat.patch diff --git a/pkgs/development/rocm-modules/6/miopen/default.nix b/pkgs/development/rocm-modules/miopen/default.nix index a4b00cc2a744..512a24a85685 100644 --- a/pkgs/development/rocm-modules/6/miopen/default.nix +++ b/pkgs/development/rocm-modules/miopen/default.nix @@ -37,13 +37,13 @@ gpuTargets ? clr.localGpuTargets or clr.gpuTargets, buildDocs ? false, # Needs internet because of rocm-docs-core buildTests ? false, - withComposableKernel ? composable_kernel.anyMfmaTarget, + withComposableKernel ? true, }: let # FIXME: cmake files need patched to include this properly cFlags = "-Wno-documentation-pedantic --offload-compress -I${hipblas-common}/include -I${hipblas}/include -I${roctracer}/include -I${nlohmann_json}/include -I${sqlite.dev}/include -I${rocrand}/include"; - version = "6.4.3"; + version = "7.0.2"; # Targets outside this list will get # error: use of undeclared identifier 'CK_BUFFER_RESOURCE_3RD_DWORD' @@ -69,7 +69,7 @@ let owner = "ROCm"; repo = "MIOpen"; rev = "rocm-${version}"; - hash = "sha256-DEcVj2vOwIYYyNKEKFqZ0fb9o+/QRpwiSksxwnmgEMc="; + hash = "sha256-PJj2LzU5naAku+FOnMl+Ymad2beYYSS81/K/CR+l2UA="; fetchLFS = true; fetchSubmodules = true; # WORKAROUND: .lfsconfig is incorrectly set to exclude everything upstream diff --git a/pkgs/development/rocm-modules/6/miopen/skip-preexisting-dbs.patch b/pkgs/development/rocm-modules/miopen/skip-preexisting-dbs.patch index 89be2f4076cb..89be2f4076cb 100644 --- a/pkgs/development/rocm-modules/6/miopen/skip-preexisting-dbs.patch +++ b/pkgs/development/rocm-modules/miopen/skip-preexisting-dbs.patch diff --git a/pkgs/development/rocm-modules/6/miopen/test-frugally-deep-model-loading.cpp b/pkgs/development/rocm-modules/miopen/test-frugally-deep-model-loading.cpp index 6b64b8099985..6b64b8099985 100644 --- a/pkgs/development/rocm-modules/6/miopen/test-frugally-deep-model-loading.cpp +++ b/pkgs/development/rocm-modules/miopen/test-frugally-deep-model-loading.cpp diff --git a/pkgs/development/rocm-modules/6/miopen/test-frugally-deep-model-loading.nix b/pkgs/development/rocm-modules/miopen/test-frugally-deep-model-loading.nix index 7f82083d2349..7f82083d2349 100644 --- a/pkgs/development/rocm-modules/6/miopen/test-frugally-deep-model-loading.nix +++ b/pkgs/development/rocm-modules/miopen/test-frugally-deep-model-loading.nix diff --git a/pkgs/development/rocm-modules/6/mivisionx/0001-set-__STDC_CONSTANT_MACROS-to-make-rocAL-compile.patch b/pkgs/development/rocm-modules/mivisionx/0001-set-__STDC_CONSTANT_MACROS-to-make-rocAL-compile.patch index 18946835e12e..18946835e12e 100644 --- a/pkgs/development/rocm-modules/6/mivisionx/0001-set-__STDC_CONSTANT_MACROS-to-make-rocAL-compile.patch +++ b/pkgs/development/rocm-modules/mivisionx/0001-set-__STDC_CONSTANT_MACROS-to-make-rocAL-compile.patch diff --git a/pkgs/development/rocm-modules/6/mivisionx/default.nix b/pkgs/development/rocm-modules/mivisionx/default.nix index fd0f16ec05f6..40107372e408 100644 --- a/pkgs/development/rocm-modules/6/mivisionx/default.nix +++ b/pkgs/development/rocm-modules/mivisionx/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation (finalAttrs: { "cpu" ); - version = "6.4.3"; + version = "7.0.2"; src = fetchFromGitHub { owner = "ROCm"; repo = "MIVisionX"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-07MivgCYmKLnhGDjOYsFBfwIxEoQLYNoRbOo3MPpVzE="; + hash = "sha256-SO0rE86UmX9f574ALdnnBDFceKGKTvJDQ8Lf7iSlJtA="; }; patches = [ diff --git a/pkgs/development/rocm-modules/6/mscclpp/default.nix b/pkgs/development/rocm-modules/mscclpp/default.nix index b7fa373e80a7..b7fa373e80a7 100644 --- a/pkgs/development/rocm-modules/6/mscclpp/default.nix +++ b/pkgs/development/rocm-modules/mscclpp/default.nix diff --git a/pkgs/development/rocm-modules/6/rccl/default.nix b/pkgs/development/rocm-modules/rccl/default.nix index af55ded29c50..757cffedc610 100644 --- a/pkgs/development/rocm-modules/6/rccl/default.nix +++ b/pkgs/development/rocm-modules/rccl/default.nix @@ -13,6 +13,7 @@ perl, hipify, python3, + fmt, gtest, chrpath, roctracer, @@ -39,7 +40,7 @@ in # infiniband ib_peer_mem support isn't in the mainline kernel but is carried by some distros stdenv.mkDerivation (finalAttrs: { pname = "rccl${clr.gpuArchSuffix}"; - version = "6.4.3"; + version = "7.0.2"; outputs = [ "out" @@ -49,8 +50,6 @@ stdenv.mkDerivation (finalAttrs: { ]; patches = [ - ./fix-mainline-support-and-ub.diff - ./enable-mscclpp-on-all-gfx9.diff ./rccl-test-missing-iomanip.diff ./fix_hw_reg_hw_id_gt_gfx10.patch ]; @@ -59,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rccl"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-XpD+UjgdbAoGYK5UvvTX3f8rny4tiEDH/vYoCdZhtjo="; + hash = "sha256-ByKz6TNdGVbh65ZH5PtgUbAj4qNVmOBmZ9SrOjkTbWU="; }; nativeBuildInputs = [ @@ -75,6 +74,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ rocm-smi + fmt gtest roctracer rocprofiler diff --git a/pkgs/development/rocm-modules/6/rccl/fix_hw_reg_hw_id_gt_gfx10.patch b/pkgs/development/rocm-modules/rccl/fix_hw_reg_hw_id_gt_gfx10.patch index c69000814a8a..c69000814a8a 100644 --- a/pkgs/development/rocm-modules/6/rccl/fix_hw_reg_hw_id_gt_gfx10.patch +++ b/pkgs/development/rocm-modules/rccl/fix_hw_reg_hw_id_gt_gfx10.patch diff --git a/pkgs/development/rocm-modules/6/rccl/rccl-test-missing-iomanip.diff b/pkgs/development/rocm-modules/rccl/rccl-test-missing-iomanip.diff index 3cc54a83c142..3cc54a83c142 100644 --- a/pkgs/development/rocm-modules/6/rccl/rccl-test-missing-iomanip.diff +++ b/pkgs/development/rocm-modules/rccl/rccl-test-missing-iomanip.diff diff --git a/pkgs/development/rocm-modules/6/rdc/default.nix b/pkgs/development/rocm-modules/rdc/default.nix index 48fa4c203661..8d25a239f168 100644 --- a/pkgs/development/rocm-modules/6/rdc/default.nix +++ b/pkgs/development/rocm-modules/rdc/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, rocmUpdateScript, cmake, + pkg-config, amdsmi, rocm-smi, rocm-runtime, @@ -48,7 +49,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rdc"; - version = "6.4.3"; + version = "7.0.2"; outputs = [ "out" @@ -64,11 +65,19 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rdc"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-zILZPW9Lx5T+cMDqTg/zWy3ro+Nypzc9bDNTupZjt4s="; + hash = "sha256-ztInmK3oCbvnLe7XQ55/hUHRyhuZ2M2XVTG1NcVHtGs="; }; + patches = [ + # https://github.com/ROCm/rocm-systems/pull/2423 + ./fix-cmake-cxxflags.patch + # https://github.com/ROCm/rocm-systems/pull/2424 + ./fix-libcap-pkgconfig.patch + ]; + nativeBuildInputs = [ cmake + pkg-config protobuf ] ++ lib.optionals buildDocs [ @@ -90,10 +99,8 @@ stdenv.mkDerivation (finalAttrs: { gtest ]; - CXXFLAGS = "-I${libcap.dev}/include"; - cmakeFlags = [ - "-DCMAKE_VERBOSE_MAKEFILE=OFF" + "-DCMAKE_VERBOSE_MAKEFILE=ON" "-DRDC_INSTALL_PREFIX=${placeholder "out"}" "-DBUILD_RVS=OFF" # TODO: Needs RVS package "-DBUILD_ROCRTEST=ON" @@ -114,7 +121,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace CMakeLists.txt \ - --replace "file(STRINGS /etc/os-release LINUX_DISTRO LIMIT_COUNT 1 REGEX \"NAME=\")" "set(LINUX_DISTRO \"NixOS\")" + --replace-fail "file(STRINGS /etc/os-release LINUX_DISTRO LIMIT_COUNT 1 REGEX \"NAME=\")" "set(LINUX_DISTRO \"NixOS\")" ''; postInstall = '' diff --git a/pkgs/development/rocm-modules/rdc/fix-cmake-cxxflags.patch b/pkgs/development/rocm-modules/rdc/fix-cmake-cxxflags.patch new file mode 100644 index 000000000000..bf7f3dbb0eef --- /dev/null +++ b/pkgs/development/rocm-modules/rdc/fix-cmake-cxxflags.patch @@ -0,0 +1,217 @@ +From 92f25181dbf722cb749e445851580df4ea779299 Mon Sep 17 00:00:00 2001 +From: Luna Nova <git@lunnova.dev> +Date: Sun, 21 Dec 2025 08:01:08 -0800 +Subject: [PATCH 1/2] fix(rdc): set CMAKE_CXX_FLAGS after project() to avoid + clobbering env + +CMAKE_CXX_FLAGS' initial value is set from $CXXFLAGS on project() call +so the previous location ignored CXXFLAGS from env or CMake toolchain +config. + +Ref: https://cmake.org/cmake/help/v4.2/variable/CMAKE_LANG_FLAGS_INIT.html +Fixes: 874a7b438f ("CMAKE - Fix build types") +--- + CMakeLists.txt | 48 +++++++++++++++++++------------------ + 1 file changed, 25 insertions(+), 23 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 907c9fbff42..8b386c7be3d 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -55,29 +55,6 @@ set_property( + PROPERTY STRINGS "Debug" "Release" "RelWithDebInfo" "MinSizeRel" + ) + +-# Set compile flags +-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -m64 -msse -msse2") +-set(CMAKE_CXX_FLAGS_DEBUG +- "${CMAKE_CXX_FLAGS_DEBUG} -O0 -ggdb -DDEBUG" +- CACHE STRING +- "Flags for Debug builds" +-) +-set(CMAKE_CXX_FLAGS_RELEASE +- "${CMAKE_CXX_FLAGS_RELEASE} -O2 -s -DNDEBUG" +- CACHE STRING +- "Flags for Release builds" +-) +-set(CMAKE_CXX_FLAGS_RELWITHDEBINFO +- "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O2 -g -DNDEBUG" +- CACHE STRING +- "Flags for RelWithDebInfo builds" +-) +-set(CMAKE_CXX_FLAGS_MINSIZEREL +- "${CMAKE_CXX_FLAGS_MINSIZEREL} -Os -DNDEBUG" +- CACHE STRING +- "Flags for MinSizeRel builds" +-) +- + set(CMAKE_MODULE_PATH + "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/" + CACHE INTERNAL +@@ -155,6 +132,31 @@ project(${RDC} VERSION "${VERSION_STRING}" HOMEPAGE_URL "https://github.com/Rade + # this must go after project() + include(GNUInstallDirs) + ++# NB: CMAKE_<LANG>_FLAGS are initialized from environment (CXXFLAGS et al.) ++# during project(). Setting them before project() discards env and toolchain ++# defaults. Cf. CMAKE_<LANG>_FLAGS_INIT for toolchain overrides. ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -m64 -msse -msse2") ++set(CMAKE_CXX_FLAGS_DEBUG ++ "${CMAKE_CXX_FLAGS_DEBUG} -O0 -ggdb -DDEBUG" ++ CACHE STRING ++ "Flags for Debug builds" ++) ++set(CMAKE_CXX_FLAGS_RELEASE ++ "${CMAKE_CXX_FLAGS_RELEASE} -O2 -s -DNDEBUG" ++ CACHE STRING ++ "Flags for Release builds" ++) ++set(CMAKE_CXX_FLAGS_RELWITHDEBINFO ++ "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O2 -g -DNDEBUG" ++ CACHE STRING ++ "Flags for RelWithDebInfo builds" ++) ++set(CMAKE_CXX_FLAGS_MINSIZEREL ++ "${CMAKE_CXX_FLAGS_MINSIZEREL} -Os -DNDEBUG" ++ CACHE STRING ++ "Flags for MinSizeRel builds" ++) ++ + set(COMMON_DIR "${CMAKE_CURRENT_SOURCE_DIR}/common") + + set(GRPC_ROOT_DEFAULT "/usr") + +From 0c8710c3570963b29c709b1cd1f78b15fd73a950 Mon Sep 17 00:00:00 2001 +From: Luna Nova <git@lunnova.dev> +Date: Sun, 21 Dec 2025 08:13:04 -0800 +Subject: [PATCH 2/2] fix(rdc): don't reimplement CMake default build type flag + logic + +The previous approach was overly complicated and added nothing. CMake already defaults +similar flags for each of the default supported build types. +Additionally, the previous flags broke AArch64 as -m64 -msse are incompatible. +It's not necessary to explicitly set this with modern toolchains. + +Fixes: 874a7b438f ("CMAKE - Fix build types") +Fixes: bc7f01e992 ("Initial RDC commit") +--- + CMakeLists.txt | 25 +--------------------- + example/CMakeLists.txt | 26 ++--------------------- + tests/example/CMakeLists.txt | 24 +-------------------- + 3 files changed, 4 insertions(+), 71 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8b386c7be3d..251fcddd653 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -132,30 +132,7 @@ project(${RDC} VERSION "${VERSION_STRING}" HOMEPAGE_URL "https://github.com/Rade + # this must go after project() + include(GNUInstallDirs) + +-# NB: CMAKE_<LANG>_FLAGS are initialized from environment (CXXFLAGS et al.) +-# during project(). Setting them before project() discards env and toolchain +-# defaults. Cf. CMAKE_<LANG>_FLAGS_INIT for toolchain overrides. +-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -m64 -msse -msse2") +-set(CMAKE_CXX_FLAGS_DEBUG +- "${CMAKE_CXX_FLAGS_DEBUG} -O0 -ggdb -DDEBUG" +- CACHE STRING +- "Flags for Debug builds" +-) +-set(CMAKE_CXX_FLAGS_RELEASE +- "${CMAKE_CXX_FLAGS_RELEASE} -O2 -s -DNDEBUG" +- CACHE STRING +- "Flags for Release builds" +-) +-set(CMAKE_CXX_FLAGS_RELWITHDEBINFO +- "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O2 -g -DNDEBUG" +- CACHE STRING +- "Flags for RelWithDebInfo builds" +-) +-set(CMAKE_CXX_FLAGS_MINSIZEREL +- "${CMAKE_CXX_FLAGS_MINSIZEREL} -Os -DNDEBUG" +- CACHE STRING +- "Flags for MinSizeRel builds" +-) ++add_compile_options(-Wall -Wextra) + + set(COMMON_DIR "${CMAKE_CURRENT_SOURCE_DIR}/common") + +diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt +index 378a2005818..7c51307ec38 100755 +--- a/example/CMakeLists.txt ++++ b/example/CMakeLists.txt +@@ -31,30 +31,6 @@ cmake_minimum_required(VERSION 3.15) + option(CMAKE_VERBOSE_MAKEFILE "Enable verbose output" ON) + option(CMAKE_EXPORT_COMPILE_COMMANDS "Export compile commands for linters and autocompleters" ON) + +-# Set compile flags +-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -m64 -msse -msse2") +-set(CMAKE_CXX_FLAGS_DEBUG +- "${CMAKE_CXX_FLAGS_DEBUG} -O0 -ggdb -DDEBUG" +- CACHE STRING +- "Flags for Debug builds" +-) +-# note: no '-s' here unlike other CMakeLists.txt +-set(CMAKE_CXX_FLAGS_RELEASE +- "${CMAKE_CXX_FLAGS_RELEASE} -O2 -DNDEBUG" +- CACHE STRING +- "Flags for Release builds" +-) +-set(CMAKE_CXX_FLAGS_RELWITHDEBINFO +- "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O2 -g -DNDEBUG" +- CACHE STRING +- "Flags for RelWithDebInfo builds" +-) +-set(CMAKE_CXX_FLAGS_MINSIZEREL +- "${CMAKE_CXX_FLAGS_MINSIZEREL} -Os -DNDEBUG" +- CACHE STRING +- "Flags for MinSizeRel builds" +-) +- + set(CMAKE_CXX_STANDARD 17 CACHE STRING "The C++ standard to use") + set(CMAKE_CXX_STANDARD_REQUIRED ON) + set(CMAKE_CXX_EXTENSIONS OFF) +@@ -66,6 +42,8 @@ endif() + + project(RDC_example) + ++add_compile_options(-Wall -Wextra) ++ + # provides cmake_print_variables(VAR) + include(CMakePrintHelpers) + +diff --git a/tests/example/CMakeLists.txt b/tests/example/CMakeLists.txt +index d5614f387bd..13c2f3857a1 100755 +--- a/tests/example/CMakeLists.txt ++++ b/tests/example/CMakeLists.txt +@@ -22,29 +22,7 @@ message("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&") + message(" Cmake Example Lib ") + message("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&") + +-# Set compile flags +-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -m64 -msse -msse2") +-set(CMAKE_CXX_FLAGS_DEBUG +- "${CMAKE_CXX_FLAGS_DEBUG} -O0 -ggdb -DDEBUG" +- CACHE STRING +- "Flags for Debug builds" +-) +-# note: no '-s' here unlike other CMakeLists.txt +-set(CMAKE_CXX_FLAGS_RELEASE +- "${CMAKE_CXX_FLAGS_RELEASE} -O2 -DNDEBUG" +- CACHE STRING +- "Flags for Release builds" +-) +-set(CMAKE_CXX_FLAGS_RELWITHDEBINFO +- "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O2 -g -DNDEBUG" +- CACHE STRING +- "Flags for RelWithDebInfo builds" +-) +-set(CMAKE_CXX_FLAGS_MINSIZEREL +- "${CMAKE_CXX_FLAGS_MINSIZEREL} -Os -DNDEBUG" +- CACHE STRING +- "Flags for MinSizeRel builds" +-) ++add_compile_options(-Wall -Wextra) + + # Required Defines first: + diff --git a/pkgs/development/rocm-modules/rdc/fix-libcap-pkgconfig.patch b/pkgs/development/rocm-modules/rdc/fix-libcap-pkgconfig.patch new file mode 100644 index 000000000000..54e7303ce88f --- /dev/null +++ b/pkgs/development/rocm-modules/rdc/fix-libcap-pkgconfig.patch @@ -0,0 +1,57 @@ +From 299f2c770ff0abf07b8f394f154168d2aa78aa60 Mon Sep 17 00:00:00 2001 +From: Luna Nova <git@lunnova.dev> +Date: Sun, 21 Dec 2025 08:23:01 -0800 +Subject: [PATCH] fix(rdc): use pkg-config to find libcap + +If libcap isn't available in system wide FHS include paths building would fail. +Fix this by using pkg-config to find libcap which provides both the library +to link and include dirs. +--- + CMakeLists.txt | 6 +++--- + rdc_libs/rdc/CMakeLists.txt | 2 +- + server/CMakeLists.txt | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 907c9fbff42..00e0a9dd87d 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -192,9 +192,9 @@ mark_as_advanced( + CPACK_GENERATOR + ) + +-# check if libcap exists +-# needed for sys/capabilities.h +-find_library(LIB_CAP NAMES cap REQUIRED) ++# needed for sys/capability.h ++find_package(PkgConfig REQUIRED) ++pkg_check_modules(LIBCAP REQUIRED IMPORTED_TARGET libcap) + + if(BUILD_STANDALONE AND GRPC_ROOT STREQUAL GRPC_ROOT_DEFAULT) + message( +diff --git a/rdc_libs/rdc/CMakeLists.txt b/rdc_libs/rdc/CMakeLists.txt +index d4e368edca5..f9a3ac4c487 100644 +--- a/rdc_libs/rdc/CMakeLists.txt ++++ b/rdc_libs/rdc/CMakeLists.txt +@@ -71,7 +71,7 @@ set(RDC_LIB_INC_LIST + message("RDC_LIB_INC_LIST=${RDC_LIB_INC_LIST}") + + add_library(${RDC_LIB} SHARED ${RDC_LIB_SRC_LIST} ${RDC_LIB_INC_LIST}) +-target_link_libraries(${RDC_LIB} ${BOOTSTRAP_LIB} pthread amd_smi cap) ++target_link_libraries(${RDC_LIB} ${BOOTSTRAP_LIB} pthread amd_smi PkgConfig::LIBCAP) + target_include_directories( + ${RDC_LIB} + PRIVATE "${PROJECT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/include" "${AMD_SMI_INCLUDE_DIR}" +diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt +index baf0d851c86..0a6e71dda1c 100755 +--- a/server/CMakeLists.txt ++++ b/server/CMakeLists.txt +@@ -97,7 +97,7 @@ target_link_libraries( + pthread + rt + gRPC::grpc++ +- cap ++ PkgConfig::LIBCAP + dl + amd_smi + rdc_bootstrap diff --git a/pkgs/development/rocm-modules/6/release-attrPaths-gen.nix b/pkgs/development/rocm-modules/release-attrPaths-gen.nix index 0c6bcb43d19d..074cf2fe4c9d 100644 --- a/pkgs/development/rocm-modules/6/release-attrPaths-gen.nix +++ b/pkgs/development/rocm-modules/release-attrPaths-gen.nix @@ -2,7 +2,7 @@ variant, }: let - pkgs = import ../../../../. { config.allowAliases = false; }; + pkgs = import ../../../. { config.allowAliases = false; }; lib = pkgs.lib; optionalsWithSuccess = toTry: next: diff --git a/pkgs/development/rocm-modules/6/release-attrPaths-gen.sh b/pkgs/development/rocm-modules/release-attrPaths-gen.sh index 81ac83cfa4cc..81ac83cfa4cc 100755 --- a/pkgs/development/rocm-modules/6/release-attrPaths-gen.sh +++ b/pkgs/development/rocm-modules/release-attrPaths-gen.sh diff --git a/pkgs/development/rocm-modules/6/release-attrPaths.json b/pkgs/development/rocm-modules/release-attrPaths.json index 286734db1920..ba0e760fa06a 100644 --- a/pkgs/development/rocm-modules/6/release-attrPaths.json +++ b/pkgs/development/rocm-modules/release-attrPaths.json @@ -1,5 +1,5 @@ { - "__generatedBy": "pkgs/development/rocm-modules/6/release-attrPaths-gen.sh", + "__generatedBy": "pkgs/development/rocm-modules/release-attrPaths-gen.sh", "attrPaths": [ "adaptivecpp", "adios2", @@ -16,13 +16,16 @@ "appcsxcad", "arpack-mpi", "audiobookshelf", + "auto-editor", "babeldoc", "backgroundremover", "blender", + "blendfarm", "btop", "btop-cuda", "c3d", "calibre", + "calibre-no-speech", "catalyst", "chatd", "cloudcompare", @@ -79,7 +82,6 @@ "hdf5-mpi", "hieroglyphic", "highfive-mpi", - "home-assistant-component-tests.tami4", "hp2p", "hpcg", "hpl", @@ -129,6 +131,7 @@ "mpvScripts.autosubsync-mpv", "mrtrix", "mumps-mpi", + "mvapich", "nest-mpi", "netcdf-mpi", "netgen", @@ -142,6 +145,7 @@ "onnxruntime", "openai-whisper", "openems", + "openllm", "openmpi", "openseeface", "opensplat", @@ -165,6 +169,7 @@ "piper-tts", "pnetcdf", "pnfft", + "pocket-tts", "precice", "printrun", "python3Packages.accelerate", @@ -178,11 +183,14 @@ "python3Packages.argos-translate-files", "python3Packages.argostranslate", "python3Packages.array-api-compat", + "python3Packages.arviz", + "python3Packages.arviz-plots", "python3Packages.asteroid-filterbanks", "python3Packages.attacut", "python3Packages.auditok", "python3Packages.augmax", "python3Packages.ax-platform", + "python3Packages.bambi", "python3Packages.baselines", "python3Packages.bitsandbytes", "python3Packages.blackjax", @@ -191,6 +199,7 @@ "python3Packages.brax", "python3Packages.captum", "python3Packages.catalyst", + "python3Packages.causal-conv1d", "python3Packages.chromadb", "python3Packages.clean-fid", "python3Packages.cleanvision", @@ -203,6 +212,7 @@ "python3Packages.compressai", "python3Packages.compressed-tensors", "python3Packages.conduit-mpi", + "python3Packages.corner", "python3Packages.crewai", "python3Packages.ctranslate2", "python3Packages.curated-transformers", @@ -215,10 +225,10 @@ "python3Packages.deepface", "python3Packages.deepsearch-toolkit", "python3Packages.deepwave", - "python3Packages.depyf", "python3Packages.detectron2", "python3Packages.dicom2nifti", "python3Packages.diffusers", + "python3Packages.distrax", "python3Packages.dm-sonnet", "python3Packages.docling-core", "python3Packages.docling-ibm-models", @@ -231,7 +241,6 @@ "python3Packages.evosax", "python3Packages.executorch", "python3Packages.experiment-utilities", - "python3Packages.ezyrb", "python3Packages.f3d", "python3Packages.facenet-pytorch", "python3Packages.fairscale", @@ -246,6 +255,7 @@ "python3Packages.firedrake", "python3Packages.flammkuchen", "python3Packages.flax", + "python3Packages.flowjax", "python3Packages.flyingsquid", "python3Packages.funsor", "python3Packages.fvcore", @@ -261,7 +271,6 @@ "python3Packages.gradio", "python3Packages.gradio-client", "python3Packages.gradio-pdf", - "python3Packages.graphrag", "python3Packages.graphtage", "python3Packages.gruut", "python3Packages.gstools", @@ -308,7 +317,6 @@ "python3Packages.llama-index-embeddings-huggingface", "python3Packages.llama-index-embeddings-ollama", "python3Packages.llama-index-embeddings-openai", - "python3Packages.llama-index-graph-stores-nebula", "python3Packages.llama-index-graph-stores-neo4j", "python3Packages.llama-index-graph-stores-neptune", "python3Packages.llama-index-indices-managed-llama-cloud", @@ -352,6 +360,7 @@ "python3Packages.minari", "python3Packages.mlcroissant", "python3Packages.mlflow", + "python3Packages.mlx-lm", "python3Packages.mmcv", "python3Packages.mmengine", "python3Packages.mne", @@ -365,10 +374,12 @@ "python3Packages.napari-nifti", "python3Packages.nest", "python3Packages.netgen-mesher", - "python3Packages.neuronpy", "python3Packages.nianet", "python3Packages.nifty8", "python3Packages.noisereduce", + "python3Packages.numpyro", + "python3Packages.nutpie", + "python3Packages.nvdlfw-inspect", "python3Packages.onnxruntime", "python3Packages.open-clip-torch", "python3Packages.openai-whisper", @@ -381,6 +392,7 @@ "python3Packages.osqp", "python3Packages.outlines", "python3Packages.outlines-core", + "python3Packages.paddlepaddle", "python3Packages.pandantic", "python3Packages.pandas-stubs", "python3Packages.pandera", @@ -394,16 +406,16 @@ "python3Packages.pgmpy", "python3Packages.piano-transcription-inference", "python3Packages.piper-phonemize", + "python3Packages.pocket-tts", "python3Packages.pomegranate", "python3Packages.pyannote-audio", "python3Packages.pyannote-pipeline", - "python3Packages.pydmd", "python3Packages.pydub", "python3Packages.pyglet", "python3Packages.pykrige", "python3Packages.pylance", "python3Packages.pymanopt", - "python3Packages.pymatgen", + "python3Packages.pymc", "python3Packages.pymedio", "python3Packages.pymoo", "python3Packages.pyotb", @@ -413,9 +425,8 @@ "python3Packages.pyrender", "python3Packages.pyro-ppl", "python3Packages.pyseries", - "python3Packages.pysilero-vad", + "python3Packages.pytensor", "python3Packages.python-csxcad", - "python3Packages.python-openems", "python3Packages.pytmx", "python3Packages.pytorch-bench", "python3Packages.pytorch-lightning", @@ -436,6 +447,7 @@ "python3Packages.rerun-sdk", "python3Packages.resize-right", "python3Packages.retinaface", + "python3Packages.rlax", "python3Packages.rlcard", "python3Packages.roma", "python3Packages.rotary-embedding-torch", @@ -446,12 +458,10 @@ "python3Packages.scikit-bio", "python3Packages.scikit-survival", "python3Packages.sentence-transformers", - "python3Packages.sfepy", "python3Packages.shap", "python3Packages.shimmy", "python3Packages.simpleitk", "python3Packages.sirius", - "python3Packages.skorch", "python3Packages.skrl", "python3Packages.slepc4py", "python3Packages.slicer", @@ -468,14 +478,13 @@ "python3Packages.stanza", "python3Packages.staticvectors", "python3Packages.stytra", - "python3Packages.sumo", "python3Packages.syne-tune", "python3Packages.tables", "python3Packages.tami4edgeapi", "python3Packages.tensorboardx", "python3Packages.tensordict", "python3Packages.tensorflow-datasets", - "python3Packages.test-tube", + "python3Packages.tensorflow-probability", "python3Packages.textacy", "python3Packages.textnets", "python3Packages.tf2onnx", @@ -560,6 +569,7 @@ "stable-diffusion-cpp-vulkan", "superlu_dist", "tabby", + "tests.home-assistant-component-tests.tami4", "tests.pkg-config.defaultPkgConfigPackages.ompi", "tests.pkg-config.defaultPkgConfigPackages.ompi-c", "tests.pkg-config.defaultPkgConfigPackages.ompi-cxx", @@ -586,6 +596,7 @@ "ucx", "unbook", "unstructured-api", + "vcmi", "vectorcode", "vimPlugins.aider-nvim", "vimPlugins.vectorcode-nvim", diff --git a/pkgs/development/rocm-modules/6/rocalution/default.nix b/pkgs/development/rocm-modules/rocalution/default.nix index b83aed0a86ce..e40b0598a856 100644 --- a/pkgs/development/rocm-modules/6/rocalution/default.nix +++ b/pkgs/development/rocm-modules/rocalution/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocalution"; - version = "6.4.3"; + version = "7.0.2"; outputs = [ "out" @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocALUTION"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-bZx1Cc2jcIfysohKCKzj5mowM3IeCelRhVaBU73KnTo="; + hash = "sha256-/Tcb11/63MWnUTyigDrL2slwqL8C553hG5OKRYZan7s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/rocblas/default.nix b/pkgs/development/rocm-modules/rocblas/default.nix index c7523b883d7f..309858960511 100644 --- a/pkgs/development/rocm-modules/6/rocblas/default.nix +++ b/pkgs/development/rocm-modules/rocblas/default.nix @@ -40,13 +40,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rocblas${clr.gpuArchSuffix}"; - version = "6.4.3"; + version = "7.0.2"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocBLAS"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-FCzo/BOk4xLEFkdOdqcCXh4a9t3/OIIBEy8oz6oOMWg="; + hash = "sha256-528jAdhWtZbbw76dfUgpMr5px0T7q4Oj76jp0z0lh3A="; }; outputs = [ "out" ] ++ lib.optional buildBenchmarks "benchmark" ++ lib.optional buildTests "test"; @@ -122,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals buildTensile [ "-DCPACK_SET_DESTDIR=OFF" "-DLINK_BLIS=ON" - "-DBLIS_LIB=${amd-blis}/lib/libblis-mt.so" + "-DBLAS_LIBRARY=${amd-blis}/lib/libblis-mt.so" "-DBLIS_INCLUDE_DIR=${amd-blis}/include/blis/" "-DBLA_PREFER_PKGCONFIG=ON" "-DTensile_CODE_OBJECT_VERSION=default" @@ -136,23 +136,27 @@ stdenv.mkDerivation (finalAttrs: { patches = [ (fetchpatch { name = "Extend-rocBLAS-HIP-ISA-compatibility.patch"; - url = "https://github.com/GZGavinZhao/rocBLAS/commit/89b75ff9cc731f71f370fad90517395e117b03bb.patch"; - hash = "sha256-W/ohOOyNCcYYLOiQlPzsrTlNtCBdJpKVxO8s+4G7sjo="; + url = "https://github.com/GZGavinZhao/rocm-libraries/commit/2850f22f80f90c9e498f520608a82989a4932ec3.patch"; + hash = "sha256-SPsdEwGe+r8bQudkChRzBDAgu3tPQWFweZCgzh+4nOE="; + stripLen = 2; }) - ./hiplaslt-unstable-compat.patch ]; # Pass $NIX_BUILD_CORES to Tensile postPatch = '' substituteInPlace cmake/build-options.cmake \ --replace-fail 'Tensile_CPU_THREADS ""' 'Tensile_CPU_THREADS "$ENV{NIX_BUILD_CORES}"' - substituteInPlace CMakeLists.txt \ - --replace-fail "4.43.0" "4.44.0" \ - --replace-fail '0.10' '1.0' + '' + # Workaround: libblis detection uses broken absolute paths + # TODO: upstream a proper fix + + '' + substituteInPlace clients/CMakeLists.txt \ + --replace-fail "if ( NOT WIN32 )" "if(OFF)" \ + --replace-fail "else() # WIN32" "elseif(OFF)" '' # Fixes sh: line 1: /usr/bin/diff: No such file or directory # /build/source/clients/gtest/../include/testing_logging.hpp:1117: Failure - + lib.optionals buildTests '' + + lib.optionalString buildTests '' substituteInPlace clients/include/testing_logging.hpp \ --replace-fail "/usr/bin/diff" "${lib.getExe' diffutils "diff"}" ''; diff --git a/pkgs/development/rocm-modules/6/rocblas/hiplaslt-unstable-compat.patch b/pkgs/development/rocm-modules/rocblas/hiplaslt-unstable-compat.patch index 4d8c885c8d39..4d8c885c8d39 100644 --- a/pkgs/development/rocm-modules/6/rocblas/hiplaslt-unstable-compat.patch +++ b/pkgs/development/rocm-modules/rocblas/hiplaslt-unstable-compat.patch diff --git a/pkgs/development/rocm-modules/6/rocdbgapi/default.nix b/pkgs/development/rocm-modules/rocdbgapi/default.nix index ca760ec933a0..7103a988c146 100644 --- a/pkgs/development/rocm-modules/6/rocdbgapi/default.nix +++ b/pkgs/development/rocm-modules/rocdbgapi/default.nix @@ -47,7 +47,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rocdbgapi"; - version = "6.4.3"; + version = "7.0.2"; outputs = [ "out" @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "ROCdbgapi"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-Rr8+SNeFps0rjk4Jn2+rFmtRJfL42l0tNOz13oZQy+I="; + hash = "sha256-adzHfTd4O59YKqkPL1oZnM8qiuGjlWefbl50MI2Z7co="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/rocfft/default.nix b/pkgs/development/rocm-modules/rocfft/default.nix index 4b5cae75a206..c132b7952656 100644 --- a/pkgs/development/rocm-modules/6/rocfft/default.nix +++ b/pkgs/development/rocm-modules/rocfft/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocfft${clr.gpuArchSuffix}"; - version = "6.4.3"; + version = "7.0.2"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocFFT"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-yaOjBF2aJkCBlxkydyOsrfT4lNZ0BVkS2jJC0fEiBug="; + hash = "sha256-VVRZSmMma/sjSj2obRrwP118v/FasS30ZU0nFsEp9rw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/rocfft/log-every-n-aot-jobs.patch b/pkgs/development/rocm-modules/rocfft/log-every-n-aot-jobs.patch index 266f495d3e7c..266f495d3e7c 100644 --- a/pkgs/development/rocm-modules/6/rocfft/log-every-n-aot-jobs.patch +++ b/pkgs/development/rocm-modules/rocfft/log-every-n-aot-jobs.patch diff --git a/pkgs/development/rocm-modules/6/rocgdb/default.nix b/pkgs/development/rocm-modules/rocgdb/default.nix index 9453e6292fc3..3cc5a4a410a5 100644 --- a/pkgs/development/rocm-modules/6/rocgdb/default.nix +++ b/pkgs/development/rocm-modules/rocgdb/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocgdb"; - version = "6.4.3"; + version = "7.0.2"; src = fetchFromGitHub { owner = "ROCm"; repo = "ROCgdb"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-evDWg2w2FHv6OU5BQOCAXTlDm7JpwdJ3Wh5a2i5r1gQ="; + hash = "sha256-IYdhYYJGTXBIftTEpvi+lvdhtYgdFWSpdNbtTBh0l9s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/rocm-bandwidth-test/default.nix b/pkgs/development/rocm-modules/rocm-bandwidth-test/default.nix index 43708495442a..43708495442a 100644 --- a/pkgs/development/rocm-modules/6/rocm-bandwidth-test/default.nix +++ b/pkgs/development/rocm-modules/rocm-bandwidth-test/default.nix diff --git a/pkgs/development/rocm-modules/6/rocm-cmake/default.nix b/pkgs/development/rocm-modules/rocm-cmake/default.nix index c8dfc1539076..a30a34c74b03 100644 --- a/pkgs/development/rocm-modules/6/rocm-cmake/default.nix +++ b/pkgs/development/rocm-modules/rocm-cmake/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-cmake"; - version = "6.4.3"; + version = "7.0.2"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocm-cmake"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-wAipNWAB66YNf7exLSNPAzg3NgkGD9LPKfKiulL5yak="; + hash = "sha256-Gu+w+2dXKXcJtdmpODByxQaZbYMkoAeX9/0tOcGy5Es="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/rocm-modules/6/rocm-comgr/default.nix b/pkgs/development/rocm-modules/rocm-comgr/default.nix index ed824ad5a94d..ed824ad5a94d 100644 --- a/pkgs/development/rocm-modules/6/rocm-comgr/default.nix +++ b/pkgs/development/rocm-modules/rocm-comgr/default.nix diff --git a/pkgs/development/rocm-modules/6/rocm-core/default.nix b/pkgs/development/rocm-modules/rocm-core/default.nix index 54955d0064d2..242c9bfa7d92 100644 --- a/pkgs/development/rocm-modules/6/rocm-core/default.nix +++ b/pkgs/development/rocm-modules/rocm-core/default.nix @@ -17,13 +17,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rocm-core"; - version = "6.4.3"; + version = "7.0.2"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocm-core"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-Z21k+0vi/P35WTHGAdfUAX7/jVv+d9g5YBo+HTi1Mpk="; + hash = "sha256-TKHNtY3XoLznOi1aVHdxFk3bedtLKkrFy0NVm0ad6ZY="; }; patches = [ diff --git a/pkgs/development/rocm-modules/6/rocm-core/env-rocm-path.patch b/pkgs/development/rocm-modules/rocm-core/env-rocm-path.patch index a40fa33b90ce..a40fa33b90ce 100644 --- a/pkgs/development/rocm-modules/6/rocm-core/env-rocm-path.patch +++ b/pkgs/development/rocm-modules/rocm-core/env-rocm-path.patch diff --git a/pkgs/development/rocm-modules/6/rocm-device-libs/cmake.patch b/pkgs/development/rocm-modules/rocm-device-libs/cmake.patch index 500ff37a9905..500ff37a9905 100644 --- a/pkgs/development/rocm-modules/6/rocm-device-libs/cmake.patch +++ b/pkgs/development/rocm-modules/rocm-device-libs/cmake.patch diff --git a/pkgs/development/rocm-modules/6/rocm-device-libs/default.nix b/pkgs/development/rocm-modules/rocm-device-libs/default.nix index b66fe0bbe1f8..b66fe0bbe1f8 100644 --- a/pkgs/development/rocm-modules/6/rocm-device-libs/default.nix +++ b/pkgs/development/rocm-modules/rocm-device-libs/default.nix diff --git a/pkgs/development/rocm-modules/6/rocm-docs-core/default.nix b/pkgs/development/rocm-modules/rocm-docs-core/default.nix index b50cea3fe088..b50cea3fe088 100644 --- a/pkgs/development/rocm-modules/6/rocm-docs-core/default.nix +++ b/pkgs/development/rocm-modules/rocm-docs-core/default.nix diff --git a/pkgs/development/rocm-modules/6/rocm-runtime/default.nix b/pkgs/development/rocm-modules/rocm-runtime/default.nix index 809a094e2752..98b2bded9d9e 100644 --- a/pkgs/development/rocm-modules/6/rocm-runtime/default.nix +++ b/pkgs/development/rocm-modules/rocm-runtime/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-runtime"; - version = "6.4.3"; + version = "7.0.2"; src = fetchFromGitHub { owner = "ROCm"; repo = "ROCR-Runtime"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-zs0nydwYUY+8uiPyJxgTfAiV7spUMbESb0jUUvFf+AU="; + hash = "sha256-oz2UCR4XEhNm1uDlCeDnDJrmysWKA6GKxlEuFu21es0="; }; cmakeBuildType = "RelWithDebInfo"; @@ -60,11 +60,6 @@ stdenv.mkDerivation (finalAttrs: { }) # Patches for UB at runtime https://github.com/ROCm/ROCR-Runtime/issues/272 (fetchpatch { - # [PATCH] hsa-runtime: set underlying type of hsa_region_info_t and hsa_amd_region_info_t to int - url = "https://github.com/ROCm/ROCR-Runtime/commit/39a6a168fa07e289a10f6e20e6ead4e303e99ba0.patch"; - hash = "sha256-CshJJDvII1nNyNmt+YjwMwfBHUTlrdsxkhwfgBwO+WE="; - }) - (fetchpatch { # [PATCH] queues: fix UB due to 1 << 31 url = "https://github.com/ROCm/ROCR-Runtime/commit/9b8a0f5dbee1903fa990a7d8accc1c5fbc549636.patch"; hash = "sha256-KlZWjfngH8yKly08iwC+Bzpvp/4dkaTpRIKdFYwRI+U="; @@ -79,12 +74,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/ROCm/ROCR-Runtime/commit/41bfc66aef437a5b349f71105fa4b907cc7e17d5.patch"; hash = "sha256-A7VhPR3eSsmjq2cTBSjBIz9i//WiNjoXm0EsRKtF+ns="; }) - # Fix build with gcc15 - (fetchpatch { - # [PATCH] rocr:Add missing cstdint include - url = "https://github.com/ROCm/ROCR-Runtime/commit/5cc61b714d5b59ed5405639a37a582d839e6ebe9.patch"; - hash = "sha256-IPxDShpoFB0PjCG+zwFbnW9IBTCG3G2o9sfITGs+bN4="; - }) # This causes a circular dependency, aqlprofile relies on hsa-runtime64 # which is part of rocm-runtime # Worked around by having rocprofiler load aqlprofile directly diff --git a/pkgs/development/rocm-modules/6/rocm-runtime/remove-hsa-aqlprofile-dep.patch b/pkgs/development/rocm-modules/rocm-runtime/remove-hsa-aqlprofile-dep.patch index b8ed57d049bc..b8ed57d049bc 100644 --- a/pkgs/development/rocm-modules/6/rocm-runtime/remove-hsa-aqlprofile-dep.patch +++ b/pkgs/development/rocm-modules/rocm-runtime/remove-hsa-aqlprofile-dep.patch diff --git a/pkgs/development/rocm-modules/6/rocm-smi/default.nix b/pkgs/development/rocm-modules/rocm-smi/default.nix index 26107f9de3f6..f10d5da21474 100644 --- a/pkgs/development/rocm-modules/6/rocm-smi/default.nix +++ b/pkgs/development/rocm-modules/rocm-smi/default.nix @@ -11,19 +11,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-smi"; - version = "6.4.3"; + version = "7.0.2"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocm_smi_lib"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-yJ3Bf+tM39JWbY+A0NlpHNkvythdAdz6ZVp1AvLcXhk="; + hash = "sha256-LzWKWiHmMDGO2ejvcT0BBg22HbYD9q0fxK/bq6JvcnQ="; }; - patches = [ - ./cmake.patch - ]; - propagatedBuildInputs = [ libdrm ]; @@ -39,6 +35,7 @@ stdenv.mkDerivation (finalAttrs: { # See: https://github.com/NixOS/nixpkgs/pull/197838 "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_LIBEXECDIR=libexec" "-DCMAKE_INSTALL_INCLUDEDIR=include" ]; diff --git a/pkgs/development/rocm-modules/6/rocm-tests/default.nix b/pkgs/development/rocm-modules/rocm-tests/default.nix index 794915893917..794915893917 100644 --- a/pkgs/development/rocm-modules/6/rocm-tests/default.nix +++ b/pkgs/development/rocm-modules/rocm-tests/default.nix diff --git a/pkgs/development/rocm-modules/6/rocminfo/default.nix b/pkgs/development/rocm-modules/rocminfo/default.nix index 9a149e58a9b2..620c63cb1ec6 100644 --- a/pkgs/development/rocm-modules/6/rocminfo/default.nix +++ b/pkgs/development/rocm-modules/rocminfo/default.nix @@ -12,14 +12,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "6.4.3"; + version = "7.0.2"; pname = "rocminfo"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocminfo"; rev = "rocm-${finalAttrs.version}"; - sha256 = "sha256-YscZ5sFsLOVBg98w2X6vTzniTvl9NfCkIE+HAH6vv5Y="; + sha256 = "sha256-wE1/golRQm5uggXRQ1BucxV3laypSOUCvjTFx5N2yTE="; }; strictDeps = true; diff --git a/pkgs/development/rocm-modules/6/rocmlir/default.nix b/pkgs/development/rocm-modules/rocmlir/default.nix index 487c3b460a96..5ed107d458db 100644 --- a/pkgs/development/rocm-modules/6/rocmlir/default.nix +++ b/pkgs/development/rocm-modules/rocmlir/default.nix @@ -39,7 +39,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rocmlir${suffix}"; - version = "6.4.3"; + version = "7.0.2"; outputs = [ "out" @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocMLIR"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-p/gvr1Z6yZtO5N+ecSouXiCrf520jt1HMOy/tohUHfI="; + hash = "sha256-0+vZ/Lkh1fC9oKyy83YjIX4xuMJEWErd8UpZZuaaXdI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/rocprim/default.nix b/pkgs/development/rocm-modules/rocprim/default.nix index 690f1415df34..f1769f266292 100644 --- a/pkgs/development/rocm-modules/6/rocprim/default.nix +++ b/pkgs/development/rocm-modules/rocprim/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocprim"; - version = "6.4.3"; + version = "7.0.2"; outputs = [ "out" @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocPRIM"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-lH4MlBEkVJocq1VliGBtb7VvWfS6p/uIKWR239fSjRY="; + hash = "sha256-uOlrN/FvEBBCHsPeJOWs9NNqVwrcxVExfs5wp03PH0U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/rocprofiler-register/default.nix b/pkgs/development/rocm-modules/rocprofiler-register/default.nix index 97de42a61e61..5e23901f4c09 100644 --- a/pkgs/development/rocm-modules/6/rocprofiler-register/default.nix +++ b/pkgs/development/rocm-modules/rocprofiler-register/default.nix @@ -18,22 +18,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocprofiler-register"; - version = "6.4.3"; + version = "7.0.2"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocprofiler-register"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-HaN4XMHuCRDfKOpfuZ2SkOEQfAZKouh6luqbtATUYm0="; + hash = "sha256-hK7k4tg7/5rYCSTFKsFRsRYfVevkCARcDyxlexrXbts="; fetchSubmodules = true; }; - # vendored glog is too old and breaks on CMake 4, gets bumped in ROCm 7.0 - postPatch = '' - substituteInPlace external/glog/cmake/GetCacheVariables.cmake \ - --replace-fail "(VERSION 3.3)" "(VERSION 3.5)" - ''; - nativeBuildInputs = [ cmake clang diff --git a/pkgs/development/rocm-modules/6/rocprofiler/default.nix b/pkgs/development/rocm-modules/rocprofiler/default.nix index 82d974d990aa..a8aeefc12886 100644 --- a/pkgs/development/rocm-modules/6/rocprofiler/default.nix +++ b/pkgs/development/rocm-modules/rocprofiler/default.nix @@ -44,13 +44,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rocprofiler"; - version = "6.4.3"; + version = "7.0.2"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocprofiler"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-CgW8foM4W3K19kUK/l8IsH2Q9DHi/z88viXTxhNqlHQ="; + hash = "sha256-p2VwMm9Ltx/SFDIFk42nY9Too0Rp/IrqfuH8cQnhoGA="; fetchSubmodules = true; }; diff --git a/pkgs/development/rocm-modules/6/rocr-debug-agent/default.nix b/pkgs/development/rocm-modules/rocr-debug-agent/default.nix index 6a76b9c7e5b9..aebee50302ba 100644 --- a/pkgs/development/rocm-modules/6/rocr-debug-agent/default.nix +++ b/pkgs/development/rocm-modules/rocr-debug-agent/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, rocmUpdateScript, cmake, + python3, clr, rocdbgapi, elfutils, @@ -11,18 +12,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocr-debug-agent"; - version = "6.4.3"; + version = "7.0.2"; src = fetchFromGitHub { owner = "ROCm"; repo = "rocr_debug_agent"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-otoxZ2NHkPDIFhvn4/nvaQ/W4LF38Nx9MZ9IYEf1DyY="; + hash = "sha256-twoihis1OrCQ4K3rjDgjSErq+qktqz2xwkLLxBJIJ90="; }; nativeBuildInputs = [ cmake clr + python3 # TODO: check for scripts that need patchShebangs in output ]; buildInputs = [ diff --git a/pkgs/development/rocm-modules/6/rocrand/default.nix b/pkgs/development/rocm-modules/rocrand/default.nix index b691ca6db264..8d952d3e10b8 100644 --- a/pkgs/development/rocm-modules/6/rocrand/default.nix +++ b/pkgs/development/rocm-modules/rocrand/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocrand${clr.gpuArchSuffix}"; - version = "6.4.3"; + version = "7.0.2"; outputs = [ "out" @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocRAND"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-pZAwmsWup0byGxJ5ADbztco8svBpIjBWITjs+OgKvQc="; + hash = "sha256-O7YCQBtFSa0xiHbbAXX2FyE6uRywEaMaJyX85875Yd0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/rocsolver/default.nix b/pkgs/development/rocm-modules/rocsolver/default.nix index a47da7a68a2a..cbad72ab2328 100644 --- a/pkgs/development/rocm-modules/6/rocsolver/default.nix +++ b/pkgs/development/rocm-modules/rocsolver/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocsolver${clr.gpuArchSuffix}"; - version = "6.4.3"; + version = "7.0.2"; outputs = [ "out" @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocSOLVER"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-JthNY5rkrrm9bf1fgkO9HnARdX6H0kiF9EW1jMbBmj4="; + hash = "sha256-/JFGqNA4weVgFuVtszYAxq65/+oZjiKC8zSxwvp964M="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/rocsparse/default.nix b/pkgs/development/rocm-modules/rocsparse/default.nix index dc7ca260d293..df695fb09d6c 100644 --- a/pkgs/development/rocm-modules/6/rocsparse/default.nix +++ b/pkgs/development/rocm-modules/rocsparse/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocsparse${clr.gpuArchSuffix}"; - version = "6.4.3"; + version = "7.0.2"; outputs = [ "out" @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocSPARSE"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-PrLyqHMAJYACkBMz97iBfwCaQ9Kf1IBL7IEf1IF1/m0="; + hash = "sha256-0KFzrVGScCQDbOdlX016ymZ4lgCimd9XK4auK9V5p3k="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/rocsparse/deps.nix b/pkgs/development/rocm-modules/rocsparse/deps.nix index e39b6de39673..e39b6de39673 100644 --- a/pkgs/development/rocm-modules/6/rocsparse/deps.nix +++ b/pkgs/development/rocm-modules/rocsparse/deps.nix diff --git a/pkgs/development/rocm-modules/6/rocthrust/default.nix b/pkgs/development/rocm-modules/rocthrust/default.nix index 298f2149e6a9..940bedc8fa83 100644 --- a/pkgs/development/rocm-modules/6/rocthrust/default.nix +++ b/pkgs/development/rocm-modules/rocthrust/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocthrust"; - version = "6.4.3"; + version = "7.0.2"; outputs = [ "out" @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocThrust"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-IfMBVISClD1dk7FnAakP2GIpyZFrCnAloFRTaNdSKyw="; + hash = "sha256-tbGEZ8NXu7euPN8CaRYOjcmTmYq1SUP7LNKOjO0RICE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/roctracer/default.nix b/pkgs/development/rocm-modules/roctracer/default.nix index 43e161df0f27..fd71442c4c58 100644 --- a/pkgs/development/rocm-modules/6/roctracer/default.nix +++ b/pkgs/development/rocm-modules/roctracer/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "roctracer"; - version = "6.4.3"; + version = "7.0.2"; outputs = [ "out" @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "roctracer"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-Dwk5cBZLysmsVA2kwpQM0FQt2KXOGcaZcAw/d8VUaXw="; + hash = "sha256-8DMwaMtzdBuAAV5KhQfqLfTtSyvPiwZxc1lAAoeXGus="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/rocwmma/0000-dont-fetch-googletest.patch b/pkgs/development/rocm-modules/rocwmma/0000-dont-fetch-googletest.patch index fa47a3c42249..fa47a3c42249 100644 --- a/pkgs/development/rocm-modules/6/rocwmma/0000-dont-fetch-googletest.patch +++ b/pkgs/development/rocm-modules/rocwmma/0000-dont-fetch-googletest.patch diff --git a/pkgs/development/rocm-modules/6/rocwmma/default.nix b/pkgs/development/rocm-modules/rocwmma/default.nix index daffc4407560..6b3800c83b12 100644 --- a/pkgs/development/rocm-modules/6/rocwmma/default.nix +++ b/pkgs/development/rocm-modules/rocwmma/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocwmma"; - version = "6.4.3"; + version = "7.0.2"; outputs = [ "out" @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ROCm"; repo = "rocWMMA"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-fjyxMrzt74rE7Gf4v4WawYltuw1fvahwZUpauMIE3qc="; + hash = "sha256-xCLoYvbKiAgAxDCbEopNxYBs3V3EJBmO3NpONiveXvE="; }; patches = lib.optionals (buildTests || buildBenchmarks) [ diff --git a/pkgs/development/rocm-modules/6/rpp/default.nix b/pkgs/development/rocm-modules/rpp/default.nix index 65909ee616fb..bfa3849a3987 100644 --- a/pkgs/development/rocm-modules/6/rpp/default.nix +++ b/pkgs/development/rocm-modules/rpp/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { "cpu" ); - version = "6.4.3"; + version = "7.0.2"; src = fetchFromGitHub { owner = "ROCm"; repo = "rpp"; rev = "rocm-${finalAttrs.version}"; - hash = "sha256-rccVjSrOVIe4ZDtloCoCCI3u9UIcUqdirHIzS7ffAas="; + hash = "sha256-oysmF9TS1tm37x9DNoZ2KqHKP1wJDoFY+IuL1WkIz0o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/rocm-modules/6/tensile/default.nix b/pkgs/development/rocm-modules/tensile/default.nix index c8a7593d2698..b4d150b357f3 100644 --- a/pkgs/development/rocm-modules/6/tensile/default.nix +++ b/pkgs/development/rocm-modules/tensile/default.nix @@ -18,16 +18,14 @@ buildPythonPackage rec { pname = "tensile"; - # Using a specific commit which has compression support from after the 6.4 release - # Without compression packages are too large for hydra - version = "6.4-unstable-2025-06-12"; + version = "7.0.2"; pyproject = true; src = fetchFromGitHub { owner = "ROCm"; repo = "Tensile"; - rev = "1ce87a9fe73610ffb962082f0a882360cd39b103"; - hash = "sha256-qIuoIbmridy1HQVV10qPTzbccuxNJPsOvePaQQnClZc="; + rev = "rocm-${version}"; + hash = "sha256-1G6qp/VBJL67QW9t2VB5KK5lwn+PbY0hqHq8DzyK2fg="; }; # TODO: It should be possible to run asm caps test ONCE for all supported arches diff --git a/pkgs/development/rocm-modules/6/tensile/tensile-create-library-dont-copy-twice.diff b/pkgs/development/rocm-modules/tensile/tensile-create-library-dont-copy-twice.diff index 2b680241d9e4..2b680241d9e4 100644 --- a/pkgs/development/rocm-modules/6/tensile/tensile-create-library-dont-copy-twice.diff +++ b/pkgs/development/rocm-modules/tensile/tensile-create-library-dont-copy-twice.diff diff --git a/pkgs/development/rocm-modules/6/tensile/tensile-solutionstructs-perf-fix.diff b/pkgs/development/rocm-modules/tensile/tensile-solutionstructs-perf-fix.diff index 7157238042ec..7157238042ec 100644 --- a/pkgs/development/rocm-modules/6/tensile/tensile-solutionstructs-perf-fix.diff +++ b/pkgs/development/rocm-modules/tensile/tensile-solutionstructs-perf-fix.diff diff --git a/pkgs/development/rocm-modules/6/update.nix b/pkgs/development/rocm-modules/update.nix index 69a45f9d4cd4..6e2068a8b112 100644 --- a/pkgs/development/rocm-modules/6/update.nix +++ b/pkgs/development/rocm-modules/update.nix @@ -51,12 +51,12 @@ let >&2 echo parsed version "$version_arr" from "$version" - if (( ''${version_arr[0]} > 6 )); then - echo "'rocmPackages_6.${pname}' is already at its maximum allowed version.''\nAny further upgrades should go into 'rocmPackages_X.${pname}'." >&2 + if (( ''${version_arr[0]} > 7 )); then + echo "'rocmPackages.${pname}' is already at its maximum allowed version.''\nAny further upgrades should go into 'rocmPackages_X.${pname}'." >&2 exit 1 fi - update-source-version rocmPackages_6.${pname} "$version" --ignore-same-hash + update-source-version rocmPackages.${pname} "$version" --ignore-same-hash ''; in [ updateScript ] diff --git a/pkgs/development/tools/build-managers/drake/default.nix b/pkgs/development/tools/build-managers/drake/default.nix index a96c917ea3b9..7c6b88ae334b 100644 --- a/pkgs/development/tools/build-managers/drake/default.nix +++ b/pkgs/development/tools/build-managers/drake/default.nix @@ -16,7 +16,6 @@ bundlerApp { homepage = "http://quix.github.io/rake/"; maintainers = with lib.maintainers; [ romildo - manveru nicknovitski ]; license = lib.licenses.mit; diff --git a/pkgs/development/tools/compass/default.nix b/pkgs/development/tools/compass/default.nix index f30e4bce5aea..696547325b94 100644 --- a/pkgs/development/tools/compass/default.nix +++ b/pkgs/development/tools/compass/default.nix @@ -20,7 +20,6 @@ bundlerEnv { license = with lib.licenses; mit; maintainers = with lib.maintainers; [ offline - manveru nicknovitski ]; mainProgram = "compass"; diff --git a/pkgs/development/tools/haskell/vaultenv/default.nix b/pkgs/development/tools/haskell/vaultenv/default.nix index ad645ef016ec..edfc0afe2f22 100644 --- a/pkgs/development/tools/haskell/vaultenv/default.nix +++ b/pkgs/development/tools/haskell/vaultenv/default.nix @@ -88,6 +88,5 @@ mkDerivation rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ lnl7 - manveru ]; } diff --git a/pkgs/development/tools/misc/yakut/default.nix b/pkgs/development/tools/misc/yakut/default.nix index 3c9900c24196..b4dcd5ef7dd5 100644 --- a/pkgs/development/tools/misc/yakut/default.nix +++ b/pkgs/development/tools/misc/yakut/default.nix @@ -55,6 +55,5 @@ buildPythonApplication rec { ''; homepage = "https://github.com/OpenCyphal/yakut/"; license = lib.licenses.mit; - teams = [ lib.teams.ororatech ]; }; } diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 9d8494c2be6d..1d98124cfc82 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -5,8 +5,8 @@ "lts": false }, "6.1": { - "version": "6.1.160", - "hash": "sha256:15l4s87vyv4rnf5yagl6x7kz4yrlalh191ssxwbvwn3m8fl4d18f", + "version": "6.1.161", + "hash": "sha256:0aasgrq6mv5nj7b8ashzx0pxlaah5y0f3sq7d8w00di2lyync5ml", "lts": true }, "5.15": { @@ -20,18 +20,18 @@ "lts": true }, "6.6": { - "version": "6.6.120", - "hash": "sha256:08fwwi9wjnhaj4ig0n0ycppzw384djh0gzv3i3blzp7fb4nk6p20", + "version": "6.6.121", + "hash": "sha256:1fhl9pr02s10j4b5nli0isy7ps644cpbmjqzkwf5mk14rr7rvbvn", "lts": true }, "6.12": { - "version": "6.12.65", - "hash": "sha256:1h9rl62lffwxan5ggz1vi9wmyzzsclg330gwdk80wp7kg9k55s2l", + "version": "6.12.66", + "hash": "sha256:1bvfadb5149sh927f8cbr1rnypn7v0h6znjdrc1mmc30q2hrff5s", "lts": true }, "6.18": { - "version": "6.18.5", - "hash": "sha256:0h6r5w7755gd8ys18zi9rgw95wrd2yalbq0h88ihv3ggki01z78q", + "version": "6.18.6", + "hash": "sha256:06x3z649mzwwkb1hvsy0yh7j5jk9qrnwqcmwy7dx8s1ggccrf927", "lts": false } } diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 53ce5d864945..6e868a43bdad 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -16,9 +16,9 @@ let variants = { # ./update-zen.py zen zen = { - version = "6.18.4"; # zen + version = "6.18.5"; # zen suffix = "zen1"; # zen - sha256 = "08zx7zs3vs8y27pg7fqd25gdh30hn79kwwclnpxh0g3nr3hix783"; # zen + sha256 = "1slclm2mgv7z3s0lcjrhqhzhbas4yq9yxkdjr27hlx7madplwbmi"; # zen isLqx = false; }; # ./update-zen.py lqx diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix index 3822cbef1605..da786fbcef6f 100644 --- a/pkgs/servers/home-assistant/appdaemon.nix +++ b/pkgs/servers/home-assistant/appdaemon.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "appdaemon"; - version = "4.5.12"; + version = "4.5.13"; pyproject = true; src = fetchFromGitHub { owner = "AppDaemon"; repo = "appdaemon"; tag = version; - hash = "sha256-lcGQQz+kPefHSyc2RNQ4gHgraRJPvn/FcgMJGvCtC48="; + hash = "sha256-uVlrLyj8GZo1T8AKBxpVTPPqUrwxmyMbgaopmEGZiR4="; }; pythonRelaxDeps = true; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 20e2f7121b94..b35dccf0ef82 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2026.1.1"; + version = "2026.1.2"; components = { "3_day_blinds" = ps: with ps; [ @@ -33,8 +33,8 @@ home-assistant-intents ifaddr mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise zeroconf ]; @@ -157,8 +157,8 @@ home-assistant-intents ifaddr mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise zeroconf ]; @@ -298,7 +298,7 @@ hassil home-assistant-intents mutagen - pysilero-vad + pymicro-vad pyspeex-noise ]; "anwb_energie" = @@ -386,8 +386,8 @@ home-assistant-intents ifaddr mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise zeroconf ]; @@ -428,7 +428,7 @@ hassil home-assistant-intents mutagen - pysilero-vad + pymicro-vad pyspeex-noise ]; "assist_satellite" = @@ -437,7 +437,7 @@ hassil home-assistant-intents mutagen - pysilero-vad + pymicro-vad pyspeex-noise ]; "asuswrt" = @@ -469,7 +469,7 @@ hassil home-assistant-intents mutagen - pysilero-vad + pymicro-vad pyspeex-noise python-matter-server pyturbojpeg @@ -658,8 +658,8 @@ home-assistant-intents ifaddr mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise zeroconf ]; @@ -705,8 +705,8 @@ home-assistant-intents ifaddr mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise zeroconf ]; @@ -731,8 +731,8 @@ home-assistant-intents ifaddr mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise zeroconf ]; @@ -832,8 +832,8 @@ home-assistant-intents ifaddr mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise zeroconf ]; @@ -889,7 +889,7 @@ plexauth plexwebsocket pychromecast - pysilero-vad + pymicro-vad pyspeex-noise python-matter-server pyturbojpeg @@ -952,7 +952,7 @@ hassil home-assistant-intents mutagen - pysilero-vad + pymicro-vad pyspeex-noise python-matter-server pyturbojpeg @@ -1153,9 +1153,9 @@ numpy pillow psutil-home-assistant + pymicro-vad pynacl pyserial - pysilero-vad pyspeex-noise python-matter-server pyturbojpeg @@ -1313,8 +1313,8 @@ ifaddr mutagen py-dormakaba-dkey + pymicro-vad pyserial - pysilero-vad pyspeex-noise zeroconf ]; @@ -1605,8 +1605,8 @@ home-assistant-intents ifaddr mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise zeroconf ]; @@ -1636,8 +1636,8 @@ home-assistant-intents ifaddr mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise zeroconf ]; @@ -1675,8 +1675,8 @@ home-assistant-intents ifaddr mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise zeroconf ]; @@ -1824,8 +1824,8 @@ home-assistant-intents ifaddr mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise zeroconf ]; @@ -2013,8 +2013,8 @@ home-assistant-intents ifaddr mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise zeroconf ]; @@ -2153,7 +2153,7 @@ hassil home-assistant-intents mutagen - pysilero-vad + pymicro-vad pyspeex-noise ]; "google_mail" = @@ -2217,8 +2217,8 @@ home-assistant-intents ifaddr mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise zeroconf ]; @@ -2478,9 +2478,9 @@ home-assistant-intents ifaddr mutagen + pymicro-vad pyroute2 pyserial - pysilero-vad pyspeex-noise python-otbr-api zeroconf @@ -2551,8 +2551,8 @@ hueble ifaddr mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise zeroconf ]; @@ -2597,8 +2597,8 @@ home-assistant-intents ifaddr mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise zeroconf ]; @@ -2653,8 +2653,8 @@ ibeacon-ble ifaddr mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise zeroconf ]; @@ -2684,8 +2684,8 @@ idasen-ha ifaddr mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise zeroconf ]; @@ -2763,8 +2763,8 @@ ifaddr mutagen py-improv-ble-client + pymicro-vad pyserial - pysilero-vad pyspeex-noise zeroconf ]; @@ -2808,8 +2808,8 @@ ifaddr inkbird-ble mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise zeroconf ]; @@ -2922,9 +2922,9 @@ home-assistant-intents ifaddr mutagen + pymicro-vad pynecil pyserial - pysilero-vad pyspeex-noise zeroconf ]; @@ -3052,8 +3052,8 @@ ifaddr kegtron-ble mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise zeroconf ]; @@ -3086,9 +3086,9 @@ home-assistant-intents ifaddr mutagen + pymicro-vad pymicrobot pyserial - pysilero-vad pyspeex-noise zeroconf ]; @@ -3166,8 +3166,8 @@ ifaddr mutagen pykulersky + pymicro-vad pyserial - pysilero-vad pyspeex-noise zeroconf ]; @@ -3208,8 +3208,8 @@ ifaddr mutagen pylamarzocco + pymicro-vad pyserial - pysilero-vad pyspeex-noise zeroconf ]; @@ -3269,8 +3269,8 @@ ifaddr ld2410-ble mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise zeroconf ]; @@ -3296,8 +3296,8 @@ ifaddr leaone-ble mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise zeroconf ]; @@ -3323,8 +3323,8 @@ ifaddr led-ble mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise zeroconf ]; @@ -3481,7 +3481,7 @@ home-assistant-intents loqedapi mutagen - pysilero-vad + pymicro-vad pyspeex-noise python-matter-server pyturbojpeg @@ -3621,8 +3621,8 @@ ifaddr medcom-ble mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise zeroconf ]; @@ -3673,8 +3673,8 @@ ifaddr melnor-bluetooth mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise zeroconf ]; @@ -3795,8 +3795,8 @@ ifaddr moat-ble mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise zeroconf ]; @@ -3810,8 +3810,8 @@ home-assistant-intents mutagen pillow + pymicro-vad pynacl - pysilero-vad pyspeex-noise python-matter-server pyturbojpeg @@ -3882,8 +3882,8 @@ ifaddr mopeka-iot-ble mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise zeroconf ]; @@ -3914,8 +3914,8 @@ ifaddr motionblindsble mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise zeroconf ]; @@ -4056,7 +4056,7 @@ home-assistant-intents mutagen pyatmo - pysilero-vad + pymicro-vad pyspeex-noise python-matter-server pyturbojpeg @@ -4270,7 +4270,7 @@ home-assistant-intents mutagen ollama - pysilero-vad + pymicro-vad pyspeex-noise ]; "ombi" = @@ -4301,7 +4301,7 @@ home-assistant-intents mutagen onedrive-personal-sdk - pysilero-vad + pymicro-vad pyspeex-noise python-matter-server pyturbojpeg @@ -4333,7 +4333,7 @@ home-assistant-intents mutagen openai - pysilero-vad + pymicro-vad pyspeex-noise python-open-router ]; @@ -4344,7 +4344,7 @@ home-assistant-intents mutagen openai - pysilero-vad + pymicro-vad pyspeex-noise ]; "openalpr_cloud" = @@ -4434,8 +4434,8 @@ ifaddr mutagen oralb-ble + pymicro-vad pyserial - pysilero-vad pyspeex-noise zeroconf ]; @@ -4494,7 +4494,7 @@ hassil home-assistant-intents mutagen - pysilero-vad + pymicro-vad pyspeex-noise python-matter-server python-overseerr @@ -4515,8 +4515,8 @@ home-assistant-intents mutagen paho-mqtt + pymicro-vad pynacl - pysilero-vad pyspeex-noise python-matter-server pyturbojpeg @@ -4639,8 +4639,8 @@ hassil home-assistant-intents mutagen + pymicro-vad pyplaato - pysilero-vad pyspeex-noise python-matter-server pyturbojpeg @@ -4722,8 +4722,8 @@ home-assistant-intents ifaddr mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise zeroconf ]; @@ -4748,9 +4748,9 @@ home-assistant-intents ifaddr mutagen + pymicro-vad pyprobeplus pyserial - pysilero-vad pyspeex-noise zeroconf ]; @@ -4885,8 +4885,8 @@ home-assistant-intents ifaddr mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise qingping-ble zeroconf @@ -4938,7 +4938,7 @@ hassil home-assistant-intents mutagen - pysilero-vad + pymicro-vad pyspeex-noise python-matter-server pyturbojpeg @@ -5005,8 +5005,8 @@ home-assistant-intents ifaddr mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise rapt-ble zeroconf @@ -5047,7 +5047,7 @@ home-assistant-frontend home-assistant-intents mutagen - pysilero-vad + pymicro-vad pyspeex-noise python-matter-server pyturbojpeg @@ -5251,8 +5251,8 @@ home-assistant-intents ifaddr mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise ruuvitag-ble zeroconf @@ -5378,8 +5378,8 @@ home-assistant-intents ifaddr mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise sensirion-ble zeroconf @@ -5414,8 +5414,8 @@ home-assistant-intents ifaddr mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise sensorpro-ble zeroconf @@ -5441,8 +5441,8 @@ home-assistant-intents ifaddr mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise sensorpush-ble zeroconf @@ -5702,8 +5702,8 @@ home-assistant-intents ifaddr mutagen + pymicro-vad pyserial - pysilero-vad pysnooz pyspeex-noise zeroconf @@ -5944,8 +5944,8 @@ home-assistant-intents ifaddr mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise pyswitchbot zeroconf @@ -6139,8 +6139,8 @@ home-assistant-intents ifaddr mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise thermobeacon-ble zeroconf @@ -6169,8 +6169,8 @@ home-assistant-intents ifaddr mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise thermopro-ble zeroconf @@ -6236,8 +6236,8 @@ home-assistant-intents ifaddr mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise tilt-ble zeroconf @@ -6302,7 +6302,7 @@ hassil home-assistant-intents mutagen - pysilero-vad + pymicro-vad pyspeex-noise python-matter-server pyturbojpeg @@ -6630,8 +6630,8 @@ home-assistant-intents ifaddr mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise zeroconf ]; # missing inputs: victron-ble-ha-parser @@ -6673,7 +6673,7 @@ home-assistant-intents ifaddr mutagen - pysilero-vad + pymicro-vad pyspeex-noise voip-utils ]; @@ -6731,7 +6731,7 @@ hassil home-assistant-intents mutagen - pysilero-vad + pymicro-vad pyspeex-noise python-matter-server pyturbojpeg @@ -6822,7 +6822,7 @@ hassil home-assistant-intents mutagen - pysilero-vad + pymicro-vad pyspeex-noise python-matter-server pyturbojpeg @@ -6872,7 +6872,7 @@ hassil home-assistant-intents mutagen - pysilero-vad + pymicro-vad pyspeex-noise wyoming ]; @@ -6916,8 +6916,8 @@ home-assistant-intents ifaddr mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise xiaomi-ble zeroconf @@ -6950,7 +6950,7 @@ hassil home-assistant-intents mutagen - pysilero-vad + pymicro-vad pyspeex-noise python-matter-server pyturbojpeg @@ -6983,8 +6983,8 @@ home-assistant-intents ifaddr mutagen + pymicro-vad pyserial - pysilero-vad pyspeex-noise yalexs-ble zeroconf diff --git a/pkgs/servers/home-assistant/custom-components/adaptive_lighting/package.nix b/pkgs/servers/home-assistant/custom-components/adaptive_lighting/package.nix index 96799442e2d5..17d5ee5b79e6 100644 --- a/pkgs/servers/home-assistant/custom-components/adaptive_lighting/package.nix +++ b/pkgs/servers/home-assistant/custom-components/adaptive_lighting/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "basnijholt"; domain = "adaptive_lighting"; - version = "1.30.0"; + version = "1.30.1"; src = fetchFromGitHub { owner = "basnijholt"; repo = "adaptive-lighting"; tag = "v${version}"; - hash = "sha256-rKqn6HnSrI0YWCxSIMqI4kQbpxeYwRNTPOi0xfU3CzU="; + hash = "sha256-pmI0jZxIjSiA9P5+0hRCujHE53WprvkAo6jp/IOpJ88="; }; dependencies = [ diff --git a/pkgs/servers/home-assistant/custom-components/lednetwf_ble/package.nix b/pkgs/servers/home-assistant/custom-components/lednetwf_ble/package.nix index 08d40442471e..1a28b2f0ce19 100644 --- a/pkgs/servers/home-assistant/custom-components/lednetwf_ble/package.nix +++ b/pkgs/servers/home-assistant/custom-components/lednetwf_ble/package.nix @@ -8,7 +8,7 @@ nix-update-script, }: let - version = "1.0.0"; + version = "2.0.0"; in buildHomeAssistantComponent { owner = "8none1"; @@ -19,7 +19,7 @@ buildHomeAssistantComponent { owner = "8none1"; repo = "lednetwf_ble"; tag = "v${version}"; - hash = "sha256-YASoOuB2LvceE/DphmXb9nEGTd+pVP52/HOpV+6dCjM="; + hash = "sha256-Keb2Eph2DvS0zsg7wa30LrfqkmmccLl9okfdd0OTpqc="; }; dependencies = [ diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.nix index 8f71dcce88bf..e1abe02afce2 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.nix @@ -1,36 +1,50 @@ { lib, stdenv, - fetchYarnDeps, fetchFromGitHub, - yarnBuildHook, - yarnConfigHook, + fetchPnpmDeps, nodejs, + pnpm_9, + pnpmConfigHook, nix-update-script, }: +let + pnpm = pnpm_9; +in + stdenv.mkDerivation (finalAttrs: { pname = "atomic-calendar-revive"; - version = "10.0.0"; + version = "10.2.0"; src = fetchFromGitHub { owner = "totaldebug"; repo = "atomic-calendar-revive"; tag = "v${finalAttrs.version}"; - hash = "sha256-TaxvxAUcewQH0IMJ0/VjW4+T6squ1tuZIFGn3PE3jhU="; + hash = "sha256-cqtXhBSFuEuh8IH/6S0qZN3+SrdCt0WXrBJlBcDUujY="; }; - offlineCache = fetchYarnDeps { - inherit (finalAttrs) src; - hash = "sha256-d3lk3mwgaWMPFl/EDUWH/tUlAC7OfhNycOLbi1GzkfM="; + pnpmDeps = fetchPnpmDeps { + inherit (finalAttrs) pname version src; + inherit pnpm; + fetcherVersion = 3; + hash = "sha256-fhi1ysI2ygMfPTSiu40tt713fA/dy7r28Xyk0HxSvXE="; }; nativeBuildInputs = [ - yarnConfigHook - yarnBuildHook + pnpmConfigHook + pnpm nodejs ]; + buildPhase = '' + runHook preBuild + + pnpm run build + + runHook postBuild + ''; + installPhase = '' runHook preInstall diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 1f20086586b9..c41d1d010d3b 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -293,7 +293,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2026.1.1"; + hassVersion = "2026.1.2"; in python.pkgs.buildPythonApplication rec { @@ -314,13 +314,13 @@ python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; tag = version; - hash = "sha256-l2/mi/WfZ3PbuB7LEhpWkubsY1xMyUjeolxPDHYEXWU="; + hash = "sha256-+H+ujcJ7uYLNFfm05V7FBdogGGUSkC1b6PaWJ5Zu24k="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-Ll1wwcdkH/A2N8M1ZuE1RvjNFRu6ipEyuy4Th34s/Uo="; + hash = "sha256-uWcSCmarOtfYIVYPz8wAgO8tx15MJcEP1Wv3h8YT0xI="; }; build-system = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index c2c7980c05ed..eab45abb9f81 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20260107.1"; + version = "20260107.2"; format = "wheel"; src = fetchPypi { @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-P/7ZKtNwZZN7klPNISxOjfsdbk2KzFzGbTM5H44we7I="; + hash = "sha256-NPgtoNS4HgCBhRfHHJ835I5IvOCAggCnR81ieH/ItI0="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix index d62af48af2f1..226ab2f0217e 100644 --- a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix +++ b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pytest-homeassistant-custom-component"; - version = "0.13.306"; + version = "0.13.307"; pyproject = true; disabled = pythonOlder "3.13"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "MatthewFlamm"; repo = "pytest-homeassistant-custom-component"; tag = version; - hash = "sha256-RcUI15/+0nu453mcrRzMo2VvJAn3Up336LiuJygJaM0="; + hash = "sha256-E3kZEwyEmUxeRzwXQgI769mikyL1FkazmZXQFaknvlA="; }; build-system = [ setuptools ]; diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 64f559dbf1c4..9f11580de57e 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2026.1.1"; + version = "2026.1.2"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; tag = version; - hash = "sha256-owl8Twq1FtRtWm9QZlhx/ZgsaOVaPX3W+oxiP0ZCPQg="; + hash = "sha256-f1decOoOyavabUC2KnScB+bnuernkyKMnKwnilViuRQ="; }; build-system = [ diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 75745d5b9365..cffe00f39527 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -314,11 +314,10 @@ stdenv.mkDerivation { broken = lib.any (m: m.meta.broken or false) modules; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ + das_j fpletz + helsinki-Jo raitobezarius ]; - teams = with lib.teams; [ - helsinki-systems - ]; }; } diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 584f2793cceb..87d9c905ee51 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -800,7 +800,10 @@ let description = "SPNEGO HTTP Authentication Module"; homepage = "https://github.com/stnoonan/spnego-http-auth-nginx-module"; license = with lib.licenses; [ bsd2 ]; - teams = [ lib.teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; }; diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix index 06666e5884df..56f11a325080 100644 --- a/pkgs/servers/icingaweb2/default.nix +++ b/pkgs/servers/icingaweb2/default.nix @@ -38,7 +38,10 @@ stdenvNoCC.mkDerivation rec { ''; homepage = "https://www.icinga.com/products/icinga-web-2/"; license = lib.licenses.gpl2Plus; - teams = [ lib.teams.helsinki-systems ]; + maintainers = with lib.maintainers; [ + das_j + helsinki-Jo + ]; mainProgram = "icingacli"; platforms = lib.platforms.all; }; diff --git a/pkgs/servers/icingaweb2/ipl.nix b/pkgs/servers/icingaweb2/ipl.nix index 7b29f0ee3ef3..e068d379e3e7 100644 --- a/pkgs/servers/icingaweb2/ipl.nix +++ b/pkgs/servers/icingaweb2/ipl.nix @@ -28,6 +28,9 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/Icinga/icinga-php-library"; license = lib.licenses.mit; platforms = lib.platforms.all; - teams = [ lib.teams.helsinki-systems ]; + maintainers = with lib.maintainers; [ + das_j + helsinki-Jo + ]; }; } diff --git a/pkgs/servers/icingaweb2/thirdparty.nix b/pkgs/servers/icingaweb2/thirdparty.nix index 0e1a61a7e50a..b3321039b135 100644 --- a/pkgs/servers/icingaweb2/thirdparty.nix +++ b/pkgs/servers/icingaweb2/thirdparty.nix @@ -28,6 +28,9 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/Icinga/icinga-php-thirdparty"; license = lib.licenses.mit; platforms = lib.platforms.all; - teams = [ lib.teams.helsinki-systems ]; + maintainers = with lib.maintainers; [ + das_j + helsinki-Jo + ]; }; } diff --git a/pkgs/servers/mail/nullmailer/default.nix b/pkgs/servers/mail/nullmailer/default.nix index 6276035dc3e0..bd5a7ae90918 100644 --- a/pkgs/servers/mail/nullmailer/default.nix +++ b/pkgs/servers/mail/nullmailer/default.nix @@ -53,6 +53,6 @@ stdenv.mkDerivation rec { ''; license = lib.licenses.gpl2Plus; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ sargon ]; + maintainers = [ ]; }; } diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index ce006b56011c..3d641de72490 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -26,7 +26,6 @@ in python.pkgs.buildPythonPackage rec { pname = "mautrix-telegram"; version = "0.15.3"; - disabled = python.pythonOlder "3.8"; src = fetchFromGitHub { owner = "mautrix"; diff --git a/pkgs/servers/monitoring/icinga2/default.nix b/pkgs/servers/monitoring/icinga2/default.nix index e73d178f88a0..21b39213e5ea 100644 --- a/pkgs/servers/monitoring/icinga2/default.nix +++ b/pkgs/servers/monitoring/icinga2/default.nix @@ -128,6 +128,9 @@ stdenv.mkDerivation rec { homepage = "https://www.icinga.com"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; - teams = [ lib.teams.helsinki-systems ]; + maintainers = with lib.maintainers; [ + das_j + helsinki-Jo + ]; }; } diff --git a/pkgs/servers/monitoring/prometheus/fastly-exporter.nix b/pkgs/servers/monitoring/prometheus/fastly-exporter.nix index 7ce2f93e0660..fee7411e6dff 100644 --- a/pkgs/servers/monitoring/prometheus/fastly-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/fastly-exporter.nix @@ -26,7 +26,6 @@ buildGoModule rec { description = "Prometheus exporter for the Fastly Real-time Analytics API"; homepage = "https://github.com/fastly/fastly-exporter"; license = lib.licenses.asl20; - teams = [ lib.teams.deshaw ]; mainProgram = "fastly-exporter"; }; } diff --git a/pkgs/servers/nextcloud/notify_push.nix b/pkgs/servers/nextcloud/notify_push.nix index cff3a1f469bf..30349d77d741 100644 --- a/pkgs/servers/nextcloud/notify_push.nix +++ b/pkgs/servers/nextcloud/notify_push.nix @@ -63,6 +63,9 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/nextcloud/notify_push"; license = lib.licenses.agpl3Plus; platforms = lib.platforms.linux; - teams = [ lib.teams.helsinki-systems ]; + maintainers = with lib.maintainers; [ + das_j + helsinki-Jo + ]; }; } diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix index f80358ee0aac..15c00f4e8794 100644 --- a/pkgs/servers/search/elasticsearch/7.x.nix +++ b/pkgs/servers/search/elasticsearch/7.x.nix @@ -92,7 +92,6 @@ stdenv.mkDerivation rec { license = lib.licenses.elastic20; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ - apeschar basvandijk ]; }; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 9c26ce8bb6e5..6a37823626de 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -220,8 +220,12 @@ let description = "Enhanced, drop-in replacement for MySQL"; homepage = "https://mariadb.org/"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ thoughtpolice ]; - teams = [ lib.teams.helsinki-systems ]; + maintainers = with lib.maintainers; [ + conni2461 + das_j + helsinki-Jo + thoughtpolice + ]; platforms = lib.platforms.all; }; }; diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix index 3e307a566b17..2ba8bc689fcd 100644 --- a/pkgs/servers/varnish/packages.nix +++ b/pkgs/servers/varnish/packages.nix @@ -3,9 +3,10 @@ callPackage, varnish60, varnish77, + lib, }: { - varnish60Packages = rec { + varnish60Packages = lib.recurseIntoAttrs rec { varnish = varnish60; modules = (callPackages ./modules.nix { inherit varnish; }).modules15; digest = callPackage ./digest.nix { @@ -19,7 +20,7 @@ sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk"; }; }; - varnish77Packages = rec { + varnish77Packages = lib.recurseIntoAttrs rec { varnish = varnish77; modules = (callPackages ./modules.nix { inherit varnish; }).modules26; }; diff --git a/pkgs/stdenv/custom/default.nix b/pkgs/stdenv/custom/default.nix index c8f1bc66a06c..4520f0c9905a 100644 --- a/pkgs/stdenv/custom/default.nix +++ b/pkgs/stdenv/custom/default.nix @@ -31,7 +31,10 @@ bootStages stdenv = assert vanillaPackages.stdenv.hostPlatform == localSystem; assert vanillaPackages.stdenv.targetPlatform == localSystem; - config.replaceStdenv { pkgs = vanillaPackages; }; + let + fn = config.replaceStdenv or null; + in + if fn == null then vanillaPackages.stdenv else fn { pkgs = vanillaPackages; }; }) ] diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index be7ee98212b3..283e96ec9690 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -254,4 +254,6 @@ in prefer-remote-fetch = recurseIntoAttrs ( callPackages ../build-support/prefer-remote-fetch/tests.nix { } ); + + home-assistant-component-tests = recurseIntoAttrs pkgs.home-assistant.tests.components; } diff --git a/pkgs/test/haskell/incremental/default.nix b/pkgs/test/haskell/incremental/default.nix index c9ade36deb2a..329346d9ce83 100644 --- a/pkgs/test/haskell/incremental/default.nix +++ b/pkgs/test/haskell/incremental/default.nix @@ -33,7 +33,11 @@ let }) temporary; in temporary-incremental-build.overrideAttrs (old: { - meta = { - teams = [ lib.teams.mercury ]; + meta = old.meta // { + maintainers = old.meta.maintainers or [ ] ++ [ + lib.maintainers._9999years + lib.maintainers.Gabriella439 + lib.maintainers.lf- + ]; }; }) diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix index 6a8297fea01f..6e628997f0f8 100644 --- a/pkgs/test/stdenv/default.nix +++ b/pkgs/test/stdenv/default.nix @@ -452,6 +452,8 @@ in stdenv' = bootStdenv; }; + tests-stdenv-gcc-stageCompare = pkgs.callPackage ./gcc-stageCompare.nix { }; + ensure-no-execve-in-setup-sh = derivation { name = "ensure-no-execve-in-setup-sh"; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 6e95321b3de1..29bdb80eebf1 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -30,10 +30,11 @@ in ]; extraMeta = { maintainers = with lib.maintainers; [ - philiptaron + das_j + helsinki-Jo numinit + philiptaron ]; - teams = [ lib.teams.helsinki-systems ]; }; }; diff --git a/pkgs/tools/package-management/fpm/default.nix b/pkgs/tools/package-management/fpm/default.nix index 640eba252bea..a855b9f4b044 100644 --- a/pkgs/tools/package-management/fpm/default.nix +++ b/pkgs/tools/package-management/fpm/default.nix @@ -16,7 +16,6 @@ bundlerApp { homepage = "https://github.com/jordansissel/fpm"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ - manveru nicknovitski ]; platforms = lib.platforms.unix; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index f50f99b9dfc7..6a7315cd589d 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -167,34 +167,17 @@ lib.makeExtensible ( nix_2_30 = addTests "nix_2_30" self.nixComponents_2_30.nix-everything; - nixComponents_2_31 = - (nixDependencies.callPackage ./modular/packages.nix rec { - version = "2.31.2"; - inherit (self.nix_2_30.meta) teams; - otherSplices = generateSplicesForNixComponents "nixComponents_2_31"; - src = fetchFromGitHub { - owner = "NixOS"; - repo = "nix"; - tag = version; - hash = "sha256-NLGXPLjENLeKVOg3OZgHXZ+1x6sPIKq9FHH8pxbCrDI="; - }; - }).appendPatches - ( - [ - (fetchpatch2 { - name = "nix-2.31-14692-mdbook-0.5-support.patch"; - url = "https://github.com/NixOS/nix/commit/a4f5f365090980a6eeb2ef483e49c04bdefd71a8.patch"; - hash = "sha256-GOWZtHSzHovnD8iUknr61bo7y85i0BKdw3kVBGDfBX0="; - }) - ] - ++ - # issues on darwin: https://github.com/NixOS/nixpkgs/pull/468208#issuecomment-3626314109 - lib.optional stdenv.isLinux (fetchpatch2 { - name = "nix-2.31-14240-sri-error-message.patch"; - url = "https://github.com/NixOS/nix/commit/56751b1cd2c4700c71c545f2246adf602c97fdf5.patch"; - hash = "sha256-CerSBAI+H2RqPp9jsCP0QIM2rZYx3yBZHVVUAztgc18="; - }) - ); + nixComponents_2_31 = nixDependencies.callPackage ./modular/packages.nix rec { + version = "2.31.3"; + inherit (self.nix_2_30.meta) teams; + otherSplices = generateSplicesForNixComponents "nixComponents_2_31"; + src = fetchFromGitHub { + owner = "NixOS"; + repo = "nix"; + tag = version; + hash = "sha256-oe0YWe8f+pwQH4aYD2XXLW5iEHyXNUddurqJ5CUVCIk="; + }; + }; nix_2_31 = addTests "nix_2_31" self.nixComponents_2_31.nix-everything; diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index 3a39749b5a1c..ecbd00ec0094 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -83,6 +83,9 @@ stdenv.mkDerivation rec { description = "Commands for showing the differences between files (diff, cmp, etc.)"; license = lib.licenses.gpl3; platforms = lib.platforms.unix; - maintainers = lib.teams.helsinki-systems.members; + maintainers = with lib.maintainers; [ + das_j + helsinki-Jo + ]; }; } diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index 015b2409e115..bf9b9b3fba52 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -112,7 +112,10 @@ stdenv.mkDerivation rec { ''; license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix ++ lib.platforms.windows; - teams = [ lib.teams.helsinki-systems ]; + maintainers = with lib.maintainers; [ + das_j + helsinki-Jo + ]; mainProgram = "gawk"; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f3250fc6c11c..b554df37753b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -526,6 +526,7 @@ mapAliases { curl-impersonate-chrome = warnAlias "curl-impersonate-chrome has been renamed to curl-impersonate" curl-impersonate; # Added 2025-11-02 curl-impersonate-ff = throw "curl-impersonate-ff has been removed because it is unmaintained upstream and has vulnerable dependencies. Use curl-impersonate instead."; # Added 2025-11-02 curlHTTP3 = warnAlias "'curlHTTP3' has been removed, as 'curl' now has HTTP/3 support enabled by default" curl; # Added 2025-08-22 + cwe-client-cli = throw "cwe-client-cli has been removed because it is archived and has unclear licensing"; # Added 2026-01-10 cyber = throw "cyber has been removed, as it does not build with supported Zig versions"; # Added 2025-08-09 dale = throw "dale has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10 daq = throw "'daq' has been removed as it is unmaintained and broken. Snort2 has also been removed, which depended on this"; # Added 2025-05-21 @@ -664,6 +665,7 @@ mapAliases { fusee-launcher = throw "'fusee-launcher' was removed as upstream removed the original source repository fearing legal repercussions"; # Added 2025-07-05 futuresql = throw "'futuresql' has been renamed to/replaced by 'libsForQt5.futuresql'"; # Converted to throw 2025-10-27 fx_cast_bridge = throw "'fx_cast_bridge' has been renamed to/replaced by 'fx-cast-bridge'"; # Converted to throw 2025-10-27 + fzf-zsh = throw "'fzf-zsh' has been removed because it was superseed by its builtin equivalent and archived upstream."; # Added 2026-01-17 g4music = throw "'g4music' has been renamed to/replaced by 'gapless'"; # Converted to throw 2025-10-27 gamecube-tools = throw "gamecube-tools was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23 gandi-cli = throw "'gandi-cli' has been removed as it is unmaintained upstream"; # Added 2026-01-11 @@ -1582,6 +1584,7 @@ mapAliases { spago = spago-legacy; # Added 2025-09-23, pkgs.spago should become spago@next which hasn't been packaged yet spark2014 = throw "'spark2014' has been renamed to/replaced by 'gnatprove'"; # Converted to throw 2025-10-27 sparkle = throw "'sparkle' has been removed because upstream repository source code has been deleted"; # Added 2025-12-29 + speed_dreams = speed-dreams; # Added 2026-01-19 spidermonkey_91 = throw "'spidermonkey_91 is EOL since 2022/09"; # Added 2025-08-26 spoof = throw "'spoof' has been removed, as it is broken with the latest MacOS versions and is unmaintained upstream"; # Added 2025-11-14 spotify-unwrapped = throw "'spotify-unwrapped' has been renamed to/replaced by 'spotify'"; # Converted to throw 2025-10-27 @@ -1766,7 +1769,7 @@ mapAliases { warmux = throw "'warmux' has been removed as it is unmaintained and broken"; # Added 2025-11-03 warsow = throw "'warsow' has been removed as it is unmaintained and is broken"; # Added 2025-10-09 warsow-engine = throw "'warsow-engine' has been removed as it is unmaintained and is broken"; # Added 2025-10-09 - wasm-bindgen-cli = wasm-bindgen-cli_0_2_106; + wasm-bindgen-cli = wasm-bindgen-cli_0_2_108; wasm-strip = throw "'wasm-strip' has been removed due to upstream deprecation. Use 'wabt' instead."; # Added 2025-11-06 wavebox = throw "'wavebox' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-24 wavm = throw "wavm has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 52daaab4b810..45b43e5a3a73 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1565,9 +1565,7 @@ with pkgs; gams = callPackage ../tools/misc/gams (config.gams or { }); - gancioPlugins = recurseIntoAttrs ( - callPackage ../by-name/ga/gancio/plugins.nix { inherit (gancio) nodejs; } - ); + gancioPlugins = recurseIntoAttrs (callPackage ../by-name/ga/gancio/plugins.nix { }); github-changelog-generator = callPackage ../development/tools/github-changelog-generator { }; @@ -2429,8 +2427,7 @@ with pkgs; kramdown-asciidoc = callPackage ../tools/typesetting/kramdown-asciidoc { }; - rocmPackages = recurseIntoAttrs rocmPackages_6; - rocmPackages_6 = callPackage ../development/rocm-modules/6 { }; + rocmPackages = recurseIntoAttrs (callPackage ../development/rocm-modules { }); tsm-client-withGui = callPackage ../by-name/ts/tsm-client/package.nix { enableGui = true; }; @@ -2780,10 +2777,6 @@ with pkgs; haste-client = callPackage ../tools/misc/haste-client { }; - halide = callPackage ../development/compilers/halide { - llvmPackages = llvmPackages_19; - }; - hareThirdParty = recurseIntoAttrs (callPackage ./hare-third-party.nix { }); hdf5 = callPackage ../tools/misc/hdf5 { @@ -4105,6 +4098,7 @@ with pkgs; colmapWithCuda = colmap.override { cudaSupport = true; }; + opensplatWithRocm = opensplat.override { rocmSupport = true; }; opensplatWithCuda = opensplat.override { cudaSupport = true; }; chickenPackages_4 = recurseIntoAttrs (callPackage ../development/compilers/chicken/4 { }); @@ -8788,8 +8782,6 @@ with pkgs; home-assistant-cli = callPackage ../servers/home-assistant/cli.nix { }; - home-assistant-component-tests = recurseIntoAttrs home-assistant.tests.components; - icingaweb2-ipl = callPackage ../servers/icingaweb2/ipl.nix { }; icingaweb2-thirdparty = callPackage ../servers/icingaweb2/thirdparty.nix { }; icingaweb2 = callPackage ../servers/icingaweb2 { }; @@ -11823,8 +11815,6 @@ with pkgs; twmn = libsForQt5.callPackage ../applications/misc/twmn { }; - tests-stdenv-gcc-stageCompare = callPackage ../test/stdenv/gcc-stageCompare.nix { }; - twinkle = qt5.callPackage ../applications/networking/instant-messengers/twinkle { }; linphonePackages = recurseIntoAttrs ( diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e15319aa85d9..112db2c2d0be 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2724,7 +2724,10 @@ with self; meta = { description = "BSD process resource limit and priority functions"; license = with lib.licenses; [ artistic2 ]; - teams = [ teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; }; @@ -4967,7 +4970,6 @@ with self; artistic1 gpl1Plus ]; - teams = [ teams.deshaw ]; }; }; @@ -5982,7 +5984,10 @@ with self; artistic1 gpl1Plus ]; - teams = [ teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; }; @@ -13427,7 +13432,10 @@ with self; artistic1 gpl1Plus ]; - teams = [ teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; }; @@ -13458,7 +13466,10 @@ with self; artistic1 gpl1Plus ]; - teams = [ teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; }; @@ -13773,7 +13784,10 @@ with self; artistic1 gpl1Plus ]; - teams = [ teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; }; @@ -14018,7 +14032,10 @@ with self; artistic1 gpl1Plus ]; - teams = [ teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; }; @@ -14036,7 +14053,10 @@ with self; artistic1 gpl1Plus ]; - teams = [ teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; }; @@ -14742,7 +14762,10 @@ with self; meta = { description = "This is the Git.pm, plus the other files in the perl/Git directory, from github's git/git"; license = with lib.licenses; [ gpl2Plus ]; - teams = [ teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; }; @@ -15271,7 +15294,10 @@ with self; artistic1 gpl1Plus ]; - teams = [ teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; }; @@ -18917,7 +18943,10 @@ with self; artistic1 gpl1Plus ]; - teams = [ teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; }; @@ -20409,7 +20438,10 @@ with self; artistic1 gpl1Plus ]; - teams = [ teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; }; @@ -26712,8 +26744,11 @@ with self; description = "Perl extension for Apache ZooKeeper"; homepage = "https://github.com/mark-5/p5-net-zookeeper"; license = with lib.licenses; [ asl20 ]; - maintainers = [ maintainers.ztzg ]; - teams = [ teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ztzg + ]; }; }; @@ -27084,7 +27119,6 @@ with self; artistic1 gpl1Plus ]; - teams = [ teams.deshaw ]; }; }; @@ -27272,7 +27306,10 @@ with self; artistic1 gpl1Plus ]; - teams = [ teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; }; @@ -27964,7 +28001,6 @@ with self; artistic1 gpl1Plus ]; - teams = [ teams.deshaw ]; }; }; @@ -28037,7 +28073,6 @@ with self; artistic1 gpl1Plus ]; - teams = [ teams.deshaw ]; mainProgram = "ppkg-config"; }; }; @@ -28457,7 +28492,10 @@ with self; artistic1 gpl1Plus ]; - teams = [ teams.deshaw ]; + maintainers = with lib.maintainers; [ + de11n + despsyched + ]; }; }; @@ -28475,7 +28513,6 @@ with self; artistic1 gpl1Plus ]; - teams = [ teams.deshaw ]; mainProgram = "poe-gen-tests"; }; }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index bbecf82f65b8..42dec1460948 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -62,6 +62,7 @@ mapAliases { amazon-kclpy = throw "amazon-kclpy has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03 amazon_kclpy = throw "'amazon_kclpy' has been renamed to/replaced by 'amazon-kclpy'"; # Converted to throw 2025-10-29 amqplib = throw "amqplib has been removed as it was unmaintained upstream"; # Added 2025-11-22 + ansiconv = throw "ansiconv has been removed because it was archived upstream"; # Added 2026-01-14 ansiwrap = throw "ansiwrap has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03 apkit = throw "apkit was removed because it is unmaintained upstream and different from apkit on PyPI"; # added 2025-09-13 APScheduler = throw "'APScheduler' has been renamed to/replaced by 'apscheduler'"; # Converted to throw 2025-10-29 @@ -119,6 +120,7 @@ mapAliases { django-crispy-bootstrap5 = crispy-bootstrap5; # added 2025-06-11 django_3 = throw "Django 3 has reached it's EOL in 2024-04 and has therefore been removed."; # added 2025-01-25 django_5_1 = throw "Django 5.1 has reached it's EOL in 2025-12 and has therefore been removed."; # added 2025-11-30" + django_5_2 = django_5; # added 2026-01-18 django_appconf = throw "'django_appconf' has been renamed to/replaced by 'django-appconf'"; # Converted to throw 2025-10-29 django_classytags = throw "'django_classytags' has been renamed to/replaced by 'django-classy-tags'"; # Converted to throw 2025-10-29 django_colorful = throw "'django_colorful' has been renamed to/replaced by 'django-colorful'"; # Converted to throw 2025-10-29 @@ -351,7 +353,6 @@ mapAliases { pylit = throw "'pylit' has been removed as it was broken and unmaintained upstream"; # Added 2025-11-29 pymc3 = throw "'pymc3' has been renamed to/replaced by 'pymc'"; # Converted to throw 2025-10-29 pymelcloud = throw "'pymelcloud' has been renamed to/replaced by 'python-melcloud'"; # Converted to throw 2025-10-29 - pymicro-vad = throw "'pymicro-vad' was removed because Home Assistant switched to 'pysilero-vad'"; # added 2026-01-08 PyMVGLive = throw "'PyMVGLive' has been renamed to/replaced by 'pymvglive'"; # Converted to throw 2025-10-29 pymyq = throw "'pymyq' has been renamed to/replaced by 'python-myq'"; # Converted to throw 2025-10-29 pyobject = throw "'pyobject' has been removed because it was only supporting python 2"; # Added 2026-01-24 @@ -450,6 +451,7 @@ mapAliases { schemainspect = throw "schemainspect has been removed because it has transitively been marked broken since May 2024, and is unmaintained upstream."; # Added 2025-10-11 scikitimage = throw "'scikitimage' has been renamed to/replaced by 'scikit-image'"; # Converted to throw 2025-10-29 scikitlearn = throw "'scikitlearn' has been renamed to/replaced by 'scikit-learn'"; # Converted to throw 2025-10-29 + scrapy-fake-useragent = throw "scrapy-fake-useragent has been removed because it is incompatible with scrapy >= 2.14"; # Added 2026-01-14 seaserv = throw "seaserv has been removed as it is unmaintained"; # Added 2025-08-21 sentry-sdk_2 = throw "'sentry-sdk_2' has been renamed to/replaced by 'sentry-sdk'"; # Converted to throw 2025-10-29 setuptools_dso = throw "'setuptools_dso' has been renamed to/replaced by 'setuptools-dso'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a470c5d9cb20..23bf968e1134 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -776,8 +776,6 @@ self: super: with self; { ansicolors = callPackage ../development/python-modules/ansicolors { }; - ansiconv = callPackage ../development/python-modules/ansiconv { }; - ansimarkup = callPackage ../development/python-modules/ansimarkup { }; ansitable = callPackage ../development/python-modules/ansitable { }; @@ -4370,9 +4368,7 @@ self: super: with self; { # LTS in extended support phase django_4 = callPackage ../development/python-modules/django/4.nix { }; - django_5 = self.django_5_2; - - django_5_2 = callPackage ../development/python-modules/django/5_2.nix { }; + django_5 = callPackage ../development/python-modules/django/5.nix { }; djangocms-admin-style = callPackage ../development/python-modules/djangocms-admin-style { }; @@ -4662,6 +4658,8 @@ self: super: with self; { dsnap = callPackage ../development/python-modules/dsnap { }; + dt8852 = callPackage ../development/python-modules/dt8852 { }; + dtfabric = callPackage ../development/python-modules/dtfabric { }; dtlssocket = callPackage ../development/python-modules/dtlssocket { }; @@ -13951,6 +13949,8 @@ self: super: with self; { pymfy = callPackage ../development/python-modules/pymfy { }; + pymicro-vad = callPackage ../development/python-modules/pymicro-vad { }; + pymicrobot = callPackage ../development/python-modules/pymicrobot { }; pymiele = callPackage ../development/python-modules/pymiele { }; @@ -17005,8 +17005,6 @@ self: super: with self; { scrapy-deltafetch = callPackage ../development/python-modules/scrapy-deltafetch { }; - scrapy-fake-useragent = callPackage ../development/python-modules/scrapy-fake-useragent { }; - scrapy-splash = callPackage ../development/python-modules/scrapy-splash { }; screed = callPackage ../development/python-modules/screed { }; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 5370cc028964..e7b89beed282 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -175,5 +175,5 @@ in xfsprogs = linux; xkeyboard_config = linux; zip = all; - tests-stdenv-gcc-stageCompare = linux; + tests.stdenv.tests-stdenv-gcc-stageCompare = linux; }) |