diff --git a/ci/OWNERS b/ci/OWNERS index e2153236ced0..2d1a46e2ccff 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -41,7 +41,7 @@ /lib/meta.nix @alyssais @NixOS/stdenv @llakala /lib/meta-types.nix @infinisil @adisbladis @NixOS/stdenv @llakala /lib/source-types.nix @alyssais @NixOS/stdenv @llakala -/lib/systems @alyssais @NixOS/stdenv @llakala +/lib/systems @alyssais @NixOS/stdenv ## Libraries / Module system /lib/modules.nix @infinisil @roberth @hsjobeki @llakala /lib/types.nix @infinisil @roberth @hsjobeki @llakala @@ -260,7 +260,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /pkgs/applications/editors/jetbrains @leona-ya @theCapypara # Licenses -/lib/licenses @alyssais @emilazy @jopejoe1 @llakala +/lib/licenses @alyssais @emilazy @jopejoe1 # Qt /pkgs/development/libraries/qt-5 @K900 @NickCao @SuperSandro2000 diff --git a/ci/github-script/bot.js b/ci/github-script/bot.js index 8e0043d5505c..684e3e33179a 100644 --- a/ci/github-script/bot.js +++ b/ci/github-script/bot.js @@ -395,6 +395,13 @@ module.exports = async ({ github, context, core, dry }) => { pull_number, per_page: 100, }) + + // label llm-assisted PRs accordingly + const assistedByPattern = /Assisted-by: (?!nix-init)/i + evalLabels['llm-assisted'] = prCommits.some((c) => + assistedByPattern.test(c.commit.message), + ) + const commitSubjects = prCommits.map( (c) => c.commit.message.split('\n')[0], ) diff --git a/doc/build-helpers/fixed-point-arguments.chapter.md b/doc/build-helpers/fixed-point-arguments.chapter.md index 197aea8136d5..38601a64eae4 100644 --- a/doc/build-helpers/fixed-point-arguments.chapter.md +++ b/doc/build-helpers/fixed-point-arguments.chapter.md @@ -143,3 +143,4 @@ lib.extendMkDerivation { }); } ``` +::: diff --git a/doc/build-helpers/trivial-build-helpers.chapter.md b/doc/build-helpers/trivial-build-helpers.chapter.md index aa57779cb1b2..d4c1ca026342 100644 --- a/doc/build-helpers/trivial-build-helpers.chapter.md +++ b/doc/build-helpers/trivial-build-helpers.chapter.md @@ -165,7 +165,7 @@ They are useful for creating files from Nix expressions, and are all implemented Each of these functions will cause a derivation to be produced. When you coerce the result of each of these functions to a string with [string interpolation](https://nixos.org/manual/nix/stable/language/string-interpolation) or [`toString`](https://nixos.org/manual/nix/stable/language/builtins#builtins-toString), it will evaluate to the [store path](https://nixos.org/manual/nix/stable/store/store-path) of this derivation. -:::: {.note} +::: {.note} Some of these functions will put the resulting files within a directory inside the [derivation output](https://nixos.org/manual/nix/stable/language/derivations#attr-outputs). If you need to refer to the resulting files somewhere else in a Nix expression, append their path to the derivation's store path. @@ -190,7 +190,7 @@ writeShellScript "evaluate-my-file.sh" '' cat ${my-file}/share/my-file '' ``` -:::: +::: ### `makeDesktopItem` {#trivial-builder-makeDesktopItem} diff --git a/doc/languages-frameworks/rocq.section.md b/doc/languages-frameworks/rocq.section.md index 056394056797..b93a2b62e33e 100644 --- a/doc/languages-frameworks/rocq.section.md +++ b/doc/languages-frameworks/rocq.section.md @@ -59,7 +59,7 @@ The recommended way of defining a derivation for a Rocq library, is to use the ` * `releaseRev` (optional, defaults to `(v: v)`), provides a default mapping from release names to revision hashes/branch names/tags, * `releaseArtifact` (optional, defaults to `(v: null)`), provides a default mapping from release names to artifact names (only works for github artifact for now), * `displayVersion` (optional), provides a way to alter the computation of `name` from `pname`, by explaining how to display version numbers, -* `namePrefix` (optional, defaults to `[ "rocq-core" ]`), provides a way to alter the computation of `name` from `pname`, by explaining which dependencies must occur in `name`, +* `namePrefix` (optional, defaults to `[ "rocq" ]`), provides a way to alter the computation of `name` from `pname`, by explaining which dependencies must occur in `name`, * `nativeBuildInputs` (optional), is a list of executables that are required to build the current derivation, in addition to the default ones (namely `which`, `dune` and `ocaml` depending on whether `useDune`, `useDuneifVersion` and `mlPlugin` are set). * `extraNativeBuildInputs` (optional, deprecated), an additional list of derivation to add to `nativeBuildInputs`, * `overrideNativeBuildInputs` (optional) replaces the default list of derivation to which `nativeBuildInputs` and `extraNativeBuildInputs` adds extra elements, diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md index 3df6dcba2037..9470fc019244 100644 --- a/doc/release-notes/rl-2611.section.md +++ b/doc/release-notes/rl-2611.section.md @@ -46,11 +46,15 @@ - `mcphost` has been removed, as it was archived upstream and declared unmaintained. +- `fflogs` has been removed because it was no longer functional. Users should switch to `archon-lite`. + - `services.mysql` now sets `root@localhost` authentication to `auth_socket` when used with `mysql` or `percona-server`. Existing deployments will also be adjusted if possible. See the [security advisory GHSA-6qxx-6rg8-c4p8](https://github.com/NixOS/nixpkgs/security/advisories/GHSA-6qxx-6rg8-c4p8) for more information. - `zerofs` has been updated from `1.x` to `2.x` which is a breaking change. Volumes created by earlier releases are refused at open with a clear error. There is no migration tool; older volumes remain readable and writable by the release that created them. +- `keycloak.plugins.keycloak-metrics-spi` has been removed. Keycloak exposes Prometheus metrics natively on its management interface; enable them with the `metrics-enabled` setting (and `event-metrics-user-enabled` for login and event counters). See [Gaining insights with metrics](https://www.keycloak.org/observability/configuration-metrics). + - `alps` has been rewritten upstream, see [upstream repository](https://github.com/migadu/alps) for documentation. - `uhttpmock` providing 0.0 ABI was removed. `uhttpmock_1_0` providing 1.0 ABI was renamed to `uhttpmock` and `uhttpmock_1_0` was kept as an alias. @@ -92,6 +96,8 @@ - `texlive.combine` is deprecated and scheduled for removal in 27.05. Please migrate to `texliveSmall.withPackages` (see [](#sec-language-texlive-user-guide)). +- `keycloak` was updated to >= 26.7.0 and includes some breaking internal (API) changes. See the [upstream migration guide](https://www.keycloak.org/docs/latest/upgrading/#migrating-to-26-7-0) for more information. + - `librest` providing 0.7 ABI was removed. `librest_1_0` providing 1.0 ABI was renamed to `librest` and `librest_1_0` was kept as an alias. - `pnpm_10` was upgraded to version 10.34.1+, which introduced stricter integrity checks. If you encounter `ERR_PNPM_MISSING_TARBALL_INTEGRITY`, you can fall back to the older `pnpm_10_34_0`. @@ -140,8 +146,7 @@ ### Breaking changes {#sec-nixpkgs-release-26.11-lib-breaking} -- Create the first release note entry in this section! - +- `fittrackee` 1.0.0 now requires postgres with postgis. The [upgrade guide](https://docs.fittrackee.org/en/upgrading-to-1.0.0.html) has steps to prepare for this upgrade. ### Deprecations {#sec-nixpkgs-release-26.11-lib-deprecations} diff --git a/doc/using/platform-support.chapter.md b/doc/using/platform-support.chapter.md index 061c1b128d42..4422694e6288 100644 --- a/doc/using/platform-support.chapter.md +++ b/doc/using/platform-support.chapter.md @@ -1,16 +1,16 @@ # Platform Support {#chap-platform-support} -Packages receive varying degrees of support, both in terms of maintainer attention and available computation resources for continuous integration (CI). We have 7 defined tiers denoting how well supported each platform is. +Packages receive varying degrees of support, both in terms of maintainer and security team attention and available computation resources for continuous integration (CI). We have 7 defined tiers denoting how well supported each platform is. ## Tiers {#sec-platform-tiers} ### Tier 1 {#sec-platform-tier1} -[Tier 1](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-1) platforms receive the highest level of support where problems can block updates, platform-specific patches are freely applied, and most packages are expected to work. +[Tier 1](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-1) platforms receive the highest level of support where problems can block updates, security fixes are treated with urgency, platform-specific patches are freely applied, and most packages are expected to work. ### Tier 2 {#sec-platform-tier2} -[Tier 2](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-2) platforms are expected to remain functional with updates, receive platform-specific patches as needed, and have many packages built by Hydra with full ofBorg support. +[Tier 2](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-2) platforms are expected to remain functional and secure with updates, receive platform-specific patches as needed, and have many packages built by Hydra with full ofBorg support. ### Tier 3 {#sec-platform-tier3} @@ -22,25 +22,25 @@ Platform Tiers [4 through 7](https://github.com/NixOS/rfcs/blob/master/rfcs/0046 ## Breakdown {#sec-platform-breakdown} -| Triple | Support Tier | Channel Blockers | Hydra Support | Ofborg Support | Bootstrap Tarballs | Cross Compiling Support | -| ------------------------------------- | ------------ | ---------------- | ------------- | -------------- | ------------------ | ----------------------- | -| `x86_64-unknown-linux-gnu` | [Tier 1](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-1) | Many | ✔️ | ✔️ | ✔️ | ✔️ | -| `aarch64-unknown-linux-gnu` | [Tier 2](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-2) | Some | ✔️ | ✔️ | ✔️ | ✔️ | -| `x86_64-unknown-linux-musl` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | Limited | ❌ | ✔️ | ✔️ | -| `aarch64-unknown-linux-musl` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | Limited | ❌ | ✔️ | ✔️ | -| `x86_64-unknown-unknown-freebsd` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ | -| `arm64-apple-darwin` | [Tier 2](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-2) | Some | ✔️ | ✔️ | ✔️ | ❌ | -| `i686-unknown-linux-gnu` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | Limited | ❌ | ✔️ | ✔️ | -| `riscv32-unknown-linux-gnu` | [Tier 4](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-4) | None | ❌ | ❌ | ❌ | ✔️ | -| `riscv64-unknown-linux-gnu` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ | -| `loongarch64-unknown-linux-gnu` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ | -| `armv6l-unknown-linux-gnueabihf` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ | -| `armv6l-unknown-linux-musleabihf` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ | -| `armv7l-unknown-linux-gnueabihf` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ | -| `armv5tel-unknown-linux-gnueabi` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ | -| `mips64el-unknown-linux-gnuabi64` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ | -| `mips64el-unknown-linux-gnuabin32` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ | -| `mipsel-unknown-linux-gnu` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ | -| `powerpc64-unknown-linux-gnuabielfv2` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ | -| `powerpc64le-unknown-linux-gnu` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ | -| `s390x-unknown-linux-gnu` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ | +| Triple | Support Tier | Channel Blockers | Hydra Support | Security Support | Ofborg Support | Bootstrap Tarballs | Cross Compiling Support | +|---------------------------------------|------------------------------------------------------------------------------------------------|------------------|---------------|------------------|----------------|--------------------|-------------------------| +| `x86_64-unknown-linux-gnu` | [Tier 1](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-1) | Many | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | +| `aarch64-unknown-linux-gnu` | [Tier 2](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-2) | Some | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | +| `x86_64-unknown-linux-musl` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | Limited | ❌ | ❌ | ✔️ | ✔️ | +| `aarch64-unknown-linux-musl` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | Limited | ❌ | ❌ | ✔️ | ✔️ | +| `x86_64-unknown-unknown-freebsd` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ❌ | ✔️ | ✔️ | +| `arm64-apple-darwin` | [Tier 2](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-2) | Some | ✔️ | ✔️ | ✔️ | ✔️ | ❌ | +| `i686-unknown-linux-gnu` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | Limited | ❌ | ❌ | ✔️ | ✔️ | +| `riscv32-unknown-linux-gnu` | [Tier 4](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-4) | None | ❌ | ❌ | ❌ | ❌ | ✔️ | +| `riscv64-unknown-linux-gnu` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ❌ | ✔️ | ✔️ | +| `loongarch64-unknown-linux-gnu` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ❌ | ✔️ | ✔️ | +| `armv6l-unknown-linux-gnueabihf` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ❌ | ✔️ | ✔️ | +| `armv6l-unknown-linux-musleabihf` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ❌ | ✔️ | ✔️ | +| `armv7l-unknown-linux-gnueabihf` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ❌ | ✔️ | ✔️ | +| `armv5tel-unknown-linux-gnueabi` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ❌ | ✔️ | ✔️ | +| `mips64el-unknown-linux-gnuabi64` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ❌ | ✔️ | ✔️ | +| `mips64el-unknown-linux-gnuabin32` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ❌ | ✔️ | ✔️ | +| `mipsel-unknown-linux-gnu` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ❌ | ✔️ | ✔️ | +| `powerpc64-unknown-linux-gnuabielfv2` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ❌ | ✔️ | ✔️ | +| `powerpc64le-unknown-linux-gnu` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ❌ | ✔️ | ✔️ | +| `s390x-unknown-linux-gnu` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ❌ | ✔️ | ✔️ | diff --git a/lib/attrsets.nix b/lib/attrsets.nix index ed2fa9770410..d006ed79a2ae 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -1140,7 +1140,7 @@ rec { For a function that gives you control over what counts as a leaf, see `mapAttrsRecursiveCond`. - :::{#map-attrs-recursive-example .example} + ::: {.example #map-attrs-recursive-example} # Map over leaf attributes ```nix @@ -1165,7 +1165,7 @@ rec { If the predicate returns false, `mapAttrsRecursiveCond` does not recurse, but instead applies the mapping function. If the predicate returns true, it does recurse, and does not apply the mapping function. - :::{#map-attrs-recursive-cond-example .example} + ::: {.example #map-attrs-recursive-cond-example} # Map over an leaf attributes defined by a condition Map derivations to their `name` attribute. diff --git a/lib/customisation.nix b/lib/customisation.nix index 9bb7e01d8f13..883f99928a49 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -564,7 +564,7 @@ rec { # Examples - :::{#ex-makeScope .example} + :::{.example #ex-makeScope} # Create an interdependent package set on top of `pkgs` The functions in `foo.nix` and `bar.nix` can depend on each other, in the sense that `foo.nix` can contain a function that expects `bar` as an attribute in its argument. @@ -593,7 +593,7 @@ rec { ``` ::: - :::{#ex-makeScope-callPackage .example} + :::{.example #ex-makeScope-callPackage} # Using `callPackage` from a scope ```nix diff --git a/lib/licenses/licenses.nix b/lib/licenses/licenses.nix index 0bf1ff573bf8..01f530fa8044 100644 --- a/lib/licenses/licenses.nix +++ b/lib/licenses/licenses.nix @@ -310,6 +310,11 @@ lib.mapAttrs mkLicense ( redistributable = true; }; + buddy = { + spdxId = "Buddy"; + fullName = "Buddy License"; + }; + bzip2 = { spdxId = "bzip2-1.0.6"; fullName = "bzip2 and libbzip2 License v1.0.6"; @@ -382,6 +387,13 @@ lib.mapAttrs mkLicense ( free = false; }; + cc-by-nc-30-igo = { + # Currently does not have a spdxID will get one in the future https://github.com/spdx/license-list-XML/issues/2845 + # spdxId = "CC-BY-NC-3.0-IGO"; + fullName = "Creative Commons Attribution Non Commercial 3.0 IGO"; + free = false; + }; + cc-by-nc-40 = { spdxId = "CC-BY-NC-4.0"; fullName = "Creative Commons Attribution Non Commercial 4.0 International"; @@ -926,6 +938,11 @@ lib.mapAttrs mkLicense ( free = false; }; + jpl-image = { + fullName = "JPL Image Use Policy"; + spdxId = "JPL-image"; + }; + knuth = { fullName = "Knuth CTAN License"; spdxId = "Knuth-CTAN"; @@ -1173,6 +1190,11 @@ lib.mapAttrs mkLicense ( fullName = "Nethack General Public License"; }; + ngrep = { + spdxId = "ngrep"; + fullName = "ngrep License"; + }; + nistSoftware = { spdxId = "NIST-Software"; fullName = "NIST Software License"; @@ -1606,6 +1628,11 @@ lib.mapAttrs mkLicense ( url = "https://fedoraproject.org/wiki/Licensing:Wadalab?rd=Licensing/Wadalab"; }; + wordnet = { + spdxId = "WordNet"; + fullName = "WordNet License"; + }; + wtfpl = { spdxId = "WTFPL"; fullName = "Do What The F*ck You Want To Public License"; diff --git a/lib/options.nix b/lib/options.nix index accbb56ff34a..6e5383fab455 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -90,12 +90,12 @@ rec { `defaultText` : Substitute for documenting the `default`, if evaluating the default value during documentation rendering is not possible. : Can be any nix value that evaluates. - : Usage with `lib.literalMD` or `lib.literalExpression` is supported + : Usage with `lib.literalMD`, `lib.literalExpression`, or `lib.literalCode` is supported `example` : Optional example value used in the manual. : Can be any nix value that evaluates. - : Usage with `lib.literalMD` or `lib.literalExpression` is supported + : Usage with `lib.literalMD`, `lib.literalExpression`, or `lib.literalCode` is supported `description` : Optional string describing the option. This is required if option documentation is generated. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7667360d7624..fbc686a01017 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1629,12 +1629,6 @@ githubId = 382798; name = "amfl"; }; - amiddelk = { - email = "amiddelk@gmail.com"; - github = "amiddelk"; - githubId = 1358320; - name = "Arie Middelkoop"; - }; aminechikhaoui = { email = "amine.chikhaoui91@gmail.com"; github = "AmineChikhaoui"; @@ -2007,6 +2001,12 @@ githubId = 14838767; name = "Jacopo Scannella"; }; + antoineco = { + email = "hello@acotten.com"; + github = "antoineco"; + githubId = 3299086; + name = "Antoine Cotten"; + }; anton-4 = { name = "Anton"; github = "Anton-4"; @@ -4432,6 +4432,12 @@ { fingerprint = "8916 F727 734E 77AB 437F A33A 19AB 76F5 CEE1 1392"; } ]; }; + caguiclajmg = { + email = "jmg.caguicla@guarandoo.me"; + github = "caguiclajmg"; + githubId = 32662060; + name = "John Mark Gabriel Caguicla"; + }; CaiqueFigueiredo = { email = "public@caiquefigueiredo.me"; github = "caiquefigueiredo"; @@ -5607,6 +5613,11 @@ githubId = 5953003; name = "Connor Nelson"; }; + conny = { + github = "ConstantConstantin"; + githubId = 162139822; + name = "Constantin-Paul Hertel"; + }; conradmearns = { email = "conradmearns+github@pm.me"; github = "ConradMearns"; @@ -6252,6 +6263,12 @@ github = "darkyzhou"; githubId = 7220778; }; + darshancode2005 = { + name = "Darshan Thakare"; + email = "darshanthakaregsoc2023@gmail.com"; + github = "DarshanCode2005"; + githubId = 143271270; + }; daru-san = { name = "Daru"; email = "zadarumaka@proton.me"; @@ -6791,6 +6808,13 @@ githubId = 77843198; name = "Vasilis Manetas"; }; + Deric-W = { + email = "robo-eric@gmx.de"; + github = "Deric-W"; + githubId = 42873573; + name = "Eric Wolf"; + keys = [ { fingerprint = "ADAA B6F3 A955 5589 D66C CE61 80D2 DA42 8A4A 537F"; } ]; + }; DerickEddington = { email = "derick.eddington@pm.me"; github = "DerickEddington"; @@ -9101,6 +9125,12 @@ githubId = 41450706; name = "fin-w"; }; + fiona = { + email = "mail@fiona.hamburg"; + github = "Fiona42069"; + githubId = 260108682; + name = "fiona"; + }; fionera = { email = "nix@fionera.de"; github = "fionera"; @@ -10042,12 +10072,6 @@ name = "Will Owens"; keys = [ { fingerprint = "8E98 BB01 BFF8 AEA4 E303 FC4C 8074 09C9 2CE2 3033"; } ]; }; - ghuntley = { - email = "ghuntley@ghuntley.com"; - github = "ghuntley"; - githubId = 127353; - name = "Geoffrey Huntley"; - }; gibbert = { email = "gbjgms@gmail.com"; github = "zgibberish"; @@ -11890,12 +11914,6 @@ name = "Silvan Mosberger"; keys = [ { fingerprint = "6C2B 55D4 4E04 8266 6B7D DA1A 422E 9EDA E015 7170"; } ]; }; - iniw = { - email = "git@vini.cat"; - github = "iniw"; - githubId = 30220881; - name = "Vinicius Deolindo"; - }; insipx = { email = "github@andrewplaza.dev"; github = "insipx"; @@ -16406,6 +16424,11 @@ githubId = 83420438; name = "Lewis"; }; + lubsch = { + github = "lubsch"; + githubId = 33580245; + name = "Benjamin Lohmar"; + }; luc65r = { email = "lucas@ransan.fr"; github = "luc65r"; @@ -21201,12 +21224,6 @@ githubId = 19862; name = "KJ Ørbekk"; }; - orbitz = { - email = "mmatalka@gmail.com"; - github = "orbitz"; - githubId = 75299; - name = "Malcolm Matalka"; - }; orhun = { email = "orhunparmaksiz@gmail.com"; github = "orhun"; @@ -24404,6 +24421,12 @@ githubId = 20300874; name = "Mohammad Rafiq"; }; + rsahwe = { + email = "rsahwe@gmx.net"; + github = "rsahwe"; + githubId = 201613730; + name = "rsahwe"; + }; rseichter = { email = "nixos.org@seichter.de"; github = "rseichter"; @@ -25962,6 +25985,12 @@ name = "Nikolay Korotkiy"; keys = [ { fingerprint = "ADF4 C13D 0E36 1240 BD01 9B51 D1DE 6D7F 6936 63A5"; } ]; }; + silicalet = { + name = "Mr. why"; + email = "silicalet@outlook.com"; + github = "silicalet"; + githubId = 188071249; + }; silky = { name = "Noon van der Silk"; email = "noonsilk+nixpkgs@gmail.com"; @@ -26632,12 +26661,6 @@ github = "spreetin"; githubId = 7392173; }; - sprock = { - email = "rmason@mun.ca"; - github = "sprock"; - githubId = 6391601; - name = "Roger Mason"; - }; sputn1ck = { email = "kon@kon.ninja"; github = "sputn1ck"; @@ -30300,6 +30323,12 @@ githubId = 22803888; name = "Lu Hongxu"; }; + wini = { + email = "dev@vini.cat"; + github = "iniw"; + githubId = 30220881; + name = "Vinicius Deolindo"; + }; winpat = { email = "patrickwinter@posteo.ch"; github = "winpat"; diff --git a/maintainers/scripts/update.py b/maintainers/scripts/update.py index ca35f04d1285..bf52c01bb56f 100644 --- a/maintainers/scripts/update.py +++ b/maintainers/scripts/update.py @@ -307,7 +307,7 @@ async def commit_changes( commit_message = "{attrPath}: {oldVersion} -> {newVersion}".format(**change) if "commitMessage" in change: commit_message = change["commitMessage"] - elif "commitBody" in change: + if "commitBody" in change: commit_message = commit_message + "\n\n" + change["commitBody"] await check_subprocess_output( "git", diff --git a/nixos/doc/manual/configuration/file-systems.chapter.md b/nixos/doc/manual/configuration/file-systems.chapter.md index 8a63a2b849cd..8b6a06c5720a 100644 --- a/nixos/doc/manual/configuration/file-systems.chapter.md +++ b/nixos/doc/manual/configuration/file-systems.chapter.md @@ -41,5 +41,6 @@ and non-critical by adding `options = [ "nofail" ];`. ```{=include=} sections luks-file-systems.section.md sshfs-file-systems.section.md +nfs-file-systems.section.md overlayfs.section.md ``` diff --git a/nixos/doc/manual/configuration/nfs-file-systems.section.md b/nixos/doc/manual/configuration/nfs-file-systems.section.md new file mode 100644 index 000000000000..3ac6792e0167 --- /dev/null +++ b/nixos/doc/manual/configuration/nfs-file-systems.section.md @@ -0,0 +1,52 @@ +# NFS File Systems {#sec-nfs-file-systems} + +[NFS][nfs] (Network File System) allows you to mount directories from remote machines over the network. + +[nfs]: https://en.wikipedia.org/wiki/Network_File_System +[nfs-man]: https://man7.org/linux/man-pages/man5/nfs.5.html + +To mount NFS filesystems persistently, use the `fileSystems` option: + +```nix +{ + fileSystems."/mnt/data" = { + device = "server.example.com:/export/data"; + fsType = "nfs"; + }; +} +``` + +## Automounting {#sec-nfs-automount} + +To have NFS filesystems mounted on-demand instead of at boot, add the `noauto` and `x-systemd.automount` options: + +```nix +{ + fileSystems."/mnt/data" = { + device = "server.example.com:/export/data"; + fsType = "nfs"; + options = [ + "noauto" + "x-systemd.automount" + ]; + }; +} +``` + +## Ad-hoc Mounting {#sec-nfs-adhoc} + +To mount NFS filesystems ad-hoc using the `mount` command, enable NFS and required RPC services: + +```nix +{ + boot.supportedFilesystems = [ "nfs" ]; +} +``` + +Then you can mount filesystems manually: + +```shell +$ sudo mount -t nfs server.example.com:/export/data /mnt/data +``` + +For more information on NFS mount options, see the [nfs(5) man page][nfs-man]. diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json index f767735f9e37..12cfdd1d9063 100644 --- a/nixos/doc/manual/redirects.json +++ b/nixos/doc/manual/redirects.json @@ -619,6 +619,15 @@ "sec-luks-file-systems-fido2-systemd": [ "index.html#sec-luks-file-systems-fido2-systemd" ], + "sec-nfs-file-systems": [ + "index.html#sec-nfs-file-systems" + ], + "sec-nfs-automount": [ + "index.html#sec-nfs-automount" + ], + "sec-nfs-adhoc": [ + "index.html#sec-nfs-adhoc" + ], "sec-sshfs-file-systems": [ "index.html#sec-sshfs-file-systems" ], diff --git a/nixos/doc/manual/release-notes/rl-2611.section.md b/nixos/doc/manual/release-notes/rl-2611.section.md index 5eec5286eb9f..d9de29b0c06e 100644 --- a/nixos/doc/manual/release-notes/rl-2611.section.md +++ b/nixos/doc/manual/release-notes/rl-2611.section.md @@ -142,6 +142,8 @@ - The `newuidmap` and `newgidmap` security wrappers are now installed with `cap_setuid`/`cap_setgid` file capabilities instead of the setuid-root bit, matching shadow's `--with-fcaps` install mode and other major distributions. Rootless containers (podman, docker-rootless, unprivileged user namespaces) are unaffected. The only behavioural change is that mapping host uid 0 via `/etc/subuid` (which NixOS never configures by default) additionally requires `cap_setfcap`; users who explicitly grant uid 0 in a subuid range can restore the previous behaviour with `security.wrappers.newuidmap.capabilities = lib.mkForce "cap_setuid,cap_setfcap+ep";`. +- The `authelia` module now uses systemd's `LoadCredential` to load all files defined in `secrets`. As such, these files no longer need to be readable by the authelia user and group: they can for example be set to be only readable by the root user. + - `zoneminder` has been updated to 1.38.x release. See [upstream release note](https://github.com/ZoneMinder/zoneminder/releases/tag/1.38.0). While database migration should happen automatically, it's recommended that you make a backup of the database before upgrading your system. - The latest available version of Nextcloud is v34 (available as `pkgs.nextcloud34`). The installation logic is as follows: diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index a1c6cedf8a41..de6172266d5e 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1861,6 +1861,7 @@ ./services/web-servers/nginx/tailscale-auth.nix ./services/web-servers/phpfpm/default.nix ./services/web-servers/pomerium.nix + ./services/web-servers/rustfs.nix ./services/web-servers/rustus.nix ./services/web-servers/send.nix ./services/web-servers/stargazer.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index aff53c5526ac..54664ae769ba 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -511,7 +511,7 @@ in services.simplesamlphp has been vulnerable and unmaintained in nixpkgs. '') (mkRemovedOptionModule [ "security" "pam" "enableEcryptfs" ] '' - security.pam.enableFscrypt was removed since it was unmaintained in nixpkgs. + security.pam.enableEcryptfs was removed since it was unmaintained in nixpkgs. '') (mkRemovedOptionModule [ "security" "rngd" ] '' rngd is not necessary for any device that the kernel recognises diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix index 12e634c5e2d9..341c343adb44 100644 --- a/nixos/modules/security/apparmor.nix +++ b/nixos/modules/security/apparmor.nix @@ -241,7 +241,7 @@ in { Type = "oneshot"; RemainAfterExit = "yes"; - ExecStartPre = "${pkgs.apparmor-utils}/bin/aa-teardown"; + ExecStartPre = lib.getExe' pkgs.apparmor-init "aa-teardown"; ExecStart = lib.mapAttrsToList ( n: p: "${pkgs.apparmor-parser}/bin/apparmor_parser --add ${commonOpts n p}" ) enabledPolicies; @@ -262,7 +262,7 @@ in # Optionally kill the processes which are unconfined but now have a profile loaded # (because AppArmor can only start to confine new processes). lib.optional cfg.killUnconfinedConfinables killUnconfinedConfinables; - ExecStop = "${pkgs.apparmor-utils}/bin/aa-teardown"; + ExecStop = lib.getExe' pkgs.apparmor-init "aa-teardown"; CacheDirectory = [ "apparmor" "apparmor/logprof" diff --git a/nixos/modules/services/desktops/seatd.nix b/nixos/modules/services/desktops/seatd.nix index bedcc9a43120..939b9f338af9 100644 --- a/nixos/modules/services/desktops/seatd.nix +++ b/nixos/modules/services/desktops/seatd.nix @@ -40,7 +40,6 @@ in config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ seatd - sdnotify-wrapper ]; users.groups.seat = lib.mkIf (cfg.group == "seat") { }; @@ -55,7 +54,7 @@ in Type = "notify"; NotifyAccess = "all"; SyslogIdentifier = "seatd"; - ExecStart = "${pkgs.sdnotify-wrapper}/bin/sdnotify-wrapper ${pkgs.seatd.bin}/bin/seatd -n 1 -u ${cfg.user} -g ${cfg.group} -l ${cfg.logLevel}"; + ExecStart = "${lib.getExe' pkgs.s6 "s6-notify-socket-from-fd"} ${pkgs.seatd.bin}/bin/seatd -n 1 -u ${cfg.user} -g ${cfg.group} -l ${cfg.logLevel}"; RestartSec = 1; Restart = "always"; }; diff --git a/nixos/modules/services/matrix/matrix-authentication-service.nix b/nixos/modules/services/matrix/matrix-authentication-service.nix index 4b57643e4090..ee3c1a5d8232 100644 --- a/nixos/modules/services/matrix/matrix-authentication-service.nix +++ b/nixos/modules/services/matrix/matrix-authentication-service.nix @@ -45,7 +45,9 @@ let pruned; configFile = format.generate "config.yaml" finalSettings; - extraConfigFiles = lib.imap0 (i: _: "%d/config-${toString i}") cfg.extraConfigFiles; + extraConfigFiles = lib.imap0 ( + i: _: "\${CREDENTIALS_DIRECTORY}/config-${toString i}" + ) cfg.extraConfigFiles; runtimeConfig = "/run/matrix-authentication-service/config.yaml"; in { diff --git a/nixos/modules/services/misc/graphical-desktop.nix b/nixos/modules/services/misc/graphical-desktop.nix index e26050c123de..906601d1fc0c 100644 --- a/nixos/modules/services/misc/graphical-desktop.nix +++ b/nixos/modules/services/misc/graphical-desktop.nix @@ -22,17 +22,23 @@ in config = lib.mkIf cfg.enable { environment = { - # localectl looks into 00-keyboard.conf - etc."X11/xorg.conf.d/00-keyboard.conf".text = '' - Section "InputClass" - Identifier "Keyboard catchall" - MatchIsKeyboard "on" - Option "XkbModel" "${xcfg.xkb.model}" - Option "XkbLayout" "${xcfg.xkb.layout}" - Option "XkbOptions" "${xcfg.xkb.options}" - Option "XkbVariant" "${xcfg.xkb.variant}" - EndSection - ''; + # systemd-localed looks into 00-keyboard.conf + # systemd-localed does not like if Option values are "" + etc."X11/xorg.conf.d/00-keyboard.conf".text = + let + optionLine = + name: value: lib.optionalString (value != null && value != "") ''Option "${name}" "${value}"''; + in + '' + Section "InputClass" + Identifier "Keyboard catchall" + MatchIsKeyboard "on" + ${optionLine "XkbModel" xcfg.xkb.model} + ${optionLine "XkbLayout" xcfg.xkb.layout} + ${optionLine "XkbOptions" xcfg.xkb.options} + ${optionLine "XkbVariant" xcfg.xkb.variant} + EndSection + ''; systemPackages = with pkgs; [ nixos-icons # needed for gnome and pantheon about dialog, nixos-manual and maybe more xdg-utils diff --git a/nixos/modules/services/monitoring/vnstat.nix b/nixos/modules/services/monitoring/vnstat.nix index 062d181b059a..4aaa89668c19 100644 --- a/nixos/modules/services/monitoring/vnstat.nix +++ b/nixos/modules/services/monitoring/vnstat.nix @@ -6,17 +6,32 @@ }: let cfg = config.services.vnstat; + settingsFormat = pkgs.formats.keyValue { }; in { options.services.vnstat = { enable = lib.mkEnableOption "update of network usage statistics via vnstatd"; package = lib.mkPackageOption pkgs "vnstat" { }; + settings = lib.mkOption { + type = lib.types.submodule { freeformType = settingsFormat.type; }; + default = { }; + description = '' + Configuration for vnstat. Refer to + [https://humdi.net/vnstat/man/vnstat.conf.html] + or {manpage}`vnstat.conf(5)` for more information. + ''; + example = { + AlwaysAddNewInterfaces = 1; + }; + }; }; config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; + environment.etc."vnstat.conf".source = settingsFormat.generate "vnstat.conf" cfg.settings; + users = { groups.vnstatd = { }; @@ -59,4 +74,8 @@ in }; }; }; + + meta = { + maintainers = with lib.maintainers; [ hmenke ]; + }; } diff --git a/nixos/modules/services/networking/headplane.nix b/nixos/modules/services/networking/headplane.nix index 19e131fcab8d..7285accb5962 100644 --- a/nixos/modules/services/networking/headplane.nix +++ b/nixos/modules/services/networking/headplane.nix @@ -44,7 +44,7 @@ in settings = mkOption { description = '' Headplane configuration options. Generates a YAML config file. - See: https://github.com/tale/headplane/blob/main/config.example.yaml + See . ''; type = types.submodule { options = { @@ -129,6 +129,16 @@ in headscale = mkOption { type = types.submodule { options = { + api_key_path = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Path to a file containing a Headscale API key. + This is required for OIDC authentication aswell for the Headplane agent. + ''; + example = lib.literalExpression "config.sops.secrets.headplane_pre_authkey.path"; + }; + url = mkOption { type = types.str; default = "http://127.0.0.1:${toString config.services.headscale.port}"; @@ -211,15 +221,6 @@ in ''; }; - pre_authkey_path = mkOption { - type = types.nullOr types.path; - default = null; - description = '' - Path to a file containing a Headscale pre-auth key for the agent. - ''; - example = lib.literalExpression "config.sops.secrets.headplane_pre_authkey.path"; - }; - executable_path = mkOption { type = types.path; readOnly = true; @@ -237,20 +238,14 @@ in }; cache_ttl = mkOption { - type = types.nullOr types.int; - default = null; + type = types.ints.positive; + default = 180000; description = '' - Deprecated cache TTL for the agent. This option is accepted - by Headplane 0.6.2 but has no effect. + How long to cache agent information (in milliseconds). + If you want data to update faster, reduce the TTL, but this will increase the frequency of requests to Headscale. ''; }; - cache_path = mkOption { - type = types.path; - default = "/var/lib/headplane/agent_cache.json"; - description = "The path to store the agent's cache."; - }; - work_dir = mkOption { type = types.path; default = "/var/lib/headplane/agent"; @@ -325,16 +320,6 @@ in example = lib.literalExpression "config.sops.secrets.oidc_client_secret.path"; }; - headscale_api_key_path = mkOption { - type = types.nullOr types.path; - default = null; - description = '' - Path to a file containing the Headscale API key. - Required for OIDC authentication. - ''; - example = lib.literalExpression "config.sops.secrets.headscale_api_key.path"; - }; - disable_api_key_login = mkOption { type = types.bool; default = false; @@ -366,25 +351,6 @@ in ''; }; - redirect_uri = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Deprecated OIDC redirect URI. Use services.headplane.settings.server.base_url - instead; Headplane derives the callback URL from it. - ''; - example = "https://headplane.example.com/admin/oidc/callback"; - }; - - strict_validation = mkOption { - type = types.nullOr types.bool; - default = null; - description = '' - Deprecated OIDC validation setting. This option is accepted - by Headplane 0.6.2 but has no effect. - ''; - }; - profile_picture_source = mkOption { type = types.enum [ "oidc" @@ -429,16 +395,6 @@ in description = "Custom userinfo endpoint URL."; example = "https://provider.example.com/userinfo"; }; - - user_storage_file = mkOption { - type = types.nullOr types.path; - default = null; - description = '' - Deprecated path to the pre-0.6.2 JSON user database. - Headplane uses this once to migrate users into its internal database. - ''; - example = "/var/lib/headplane/users.json"; - }; }; } ); @@ -452,33 +408,6 @@ in }; config = mkIf cfg.enable { - warnings = - lib.optionals (cfg.settings.oidc != null && cfg.settings.oidc.redirect_uri != null) [ - '' - services.headplane.settings.oidc.redirect_uri is deprecated by Headplane 0.6.2. - Use services.headplane.settings.server.base_url instead; Headplane derives - the OIDC callback URL from it. - '' - ] - ++ lib.optionals (cfg.settings.oidc != null && cfg.settings.oidc.strict_validation != null) [ - '' - services.headplane.settings.oidc.strict_validation is deprecated and has no effect - in Headplane 0.6.2. - '' - ] - ++ lib.optionals (cfg.settings.oidc != null && cfg.settings.oidc.user_storage_file != null) [ - '' - services.headplane.settings.oidc.user_storage_file is deprecated. Headplane 0.6.2 - uses it only to migrate the pre-0.6.2 JSON user database into the internal database. - '' - ] - ++ lib.optionals (agentSettings != null && agentSettings.cache_ttl != null) [ - '' - services.headplane.settings.integration.agent.cache_ttl is deprecated and has no - effect in Headplane 0.6.2. - '' - ]; - assertions = [ { assertion = config.services.headscale.enable; @@ -502,26 +431,25 @@ in ''; } { - assertion = cfg.settings.oidc == null || cfg.settings.oidc.headscale_api_key_path != null; + assertion = cfg.settings.oidc == null || cfg.settings.headscale.api_key_path != null; message = '' - services.headplane.settings.oidc.headscale_api_key_path must be set - when services.headplane.settings.oidc is non-null. Headplane's OIDC - flow requires a Headscale API key to mint sessions. + services.headplane.settings.headscale.api_key_path must be set + when services.headplane.settings.oidc is non-null. + Headplane's OIDC flow requires a Headscale API key to mint sessions. ''; } { assertion = - agentSettings == null || !agentSettings.enabled || agentSettings.pre_authkey_path != null; + agentSettings == null || !agentSettings.enabled || cfg.settings.headscale.api_key_path != null; message = '' - services.headplane.settings.integration.agent.pre_authkey_path must be set - when the agent is enabled. + services.headplane.settings.headscale.api_key_path must be set when the agent is enabled. ''; } ]; environment = { systemPackages = [ cfg.package ]; - etc."headplane/config.yaml".source = "${settingsFile}"; + etc."headplane/config.yaml".source = settingsFile; }; systemd.services.headplane = { @@ -534,6 +462,7 @@ in config.systemd.services.headscale.name ]; requires = [ config.systemd.services.headscale.name ]; + restartTriggers = [ settingsFile ]; environment = { HEADPLANE_DEBUG_LOG = toString cfg.debug; diff --git a/nixos/modules/services/networking/networkd-dispatcher.nix b/nixos/modules/services/networking/networkd-dispatcher.nix index adc948104da3..e2f766463e38 100644 --- a/nixos/modules/services/networking/networkd-dispatcher.nix +++ b/nixos/modules/services/networking/networkd-dispatcher.nix @@ -93,8 +93,8 @@ in config = mkIf cfg.enable { - warnings = mkIf (!config.networking.useNetworkd) [ - "services.networkd-dispatcher will not execute any scripts unless networking.useNetworkd is enabled." + warnings = mkIf (!config.systemd.network.enable) [ + "services.networkd-dispatcher will not execute any scripts unless networkd is enabled, either via `systemd.network.enable` or via `networking.useNetworkd`." ]; systemd = { diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index a948cd02bc4f..72702b605f3d 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -232,6 +232,10 @@ in "openssh" "banner" ] "Use services.openssh.settings.Banner instead.") + (lib.mkRenamedOptionModule + [ "services" "openssh" "moduliFile" ] + [ "services" "openssh" "settings" "ModuliFile" ] + ) ]; ###### interface @@ -729,6 +733,14 @@ in ''; example = "/etc/ssh/banner"; }; + ModuliFile = lib.mkOption { + type = lib.types.path; + default = "${config.services.openssh.package}/etc/ssh/moduli"; + defaultText = lib.literalExpression ''"''${config.services.openssh.package}/etc/ssh/moduli"''; + description = '' + Specifies the {manpage}`moduli(5)` file to use for Diffie-Hellman key exchange. + ''; + }; }; } ); @@ -740,16 +752,6 @@ in description = "Verbatim contents of {file}`sshd_config`."; }; - moduliFile = lib.mkOption { - example = "/etc/my-local-ssh-moduli;"; - type = lib.types.path; - description = '' - Path to `moduli` file to install in - `/etc/ssh/moduli`. If this option is unset, then - the `moduli` file shipped with OpenSSH will be used. - ''; - }; - }; users.users = lib.mkOption { @@ -770,14 +772,12 @@ in }; users.groups.sshd = { }; - services.openssh.moduliFile = lib.mkDefault "${cfg.package}/etc/ssh/moduli"; services.openssh.sftpServerExecutable = lib.mkDefault "${cfg.package}/libexec/sftp-server"; environment.etc = authKeysFiles // authPrincipalsFiles // { - "ssh/moduli".source = cfg.moduliFile; "ssh/sshd_config".source = sshconf; }; diff --git a/nixos/modules/services/security/authelia.nix b/nixos/modules/services/security/authelia.nix index f8bcc4bb15b9..5fe0d6bc23e3 100644 --- a/nixos/modules/services/security/authelia.nix +++ b/nixos/modules/services/security/authelia.nix @@ -268,15 +268,6 @@ let }; }; - writeOidcJwksConfigFile = - oidcIssuerPrivateKeyFile: - pkgs.writeText "oidc-jwks.yaml" '' - identity_providers: - oidc: - jwks: - - key: {{ secret "${oidcIssuerPrivateKeyFile}" | mindent 10 "|" | msquote }} - ''; - # Remove an attribute in a nested set # https://discourse.nixos.org/t/modify-an-attrset-in-nix/29919/5 removeAttrByPath = @@ -362,7 +353,12 @@ in execCommand = "${instance.package}/bin/authelia"; configFile = format.generate "config.yml" cleanedSettings; oidcJwksConfigFile = lib.optional (instance.secrets.oidcIssuerPrivateKeyFile != null) ( - writeOidcJwksConfigFile instance.secrets.oidcIssuerPrivateKeyFile + pkgs.writeText "oidc-jwks.yaml" '' + identity_providers: + oidc: + jwks: + - key: {{ mustEnv "CREDENTIALS_DIRECTORY" | printf "%s/oidcIssuerPrivateKeyFile" | secret | mindent 10 "|" | msquote }} + '' ); configArg = "--config ${ builtins.concatStringsSep "," ( @@ -373,21 +369,25 @@ in ] ) }"; + # Mapping between the Authelia env variables and the secret keys defined in the module + envSecretsMap = { + AUTHELIA_IDENTITY_VALIDATION_RESET_PASSWORD_JWT_SECRET_FILE = "jwtSecretFile"; + AUTHELIA_STORAGE_ENCRYPTION_KEY_FILE = "storageEncryptionKeyFile"; + AUTHELIA_SESSION_SECRET_FILE = "sessionSecretFile"; + AUTHELIA_IDENTITY_PROVIDERS_OIDC_HMAC_SECRET_FILE = "oidcHmacSecretFile"; + }; + nonNullEnvSecretsMap = lib.filterAttrs (_: v: instance.secrets.${v} != null) envSecretsMap; in { description = "Authelia authentication and authorization server"; wantedBy = [ "multi-user.target" ]; after = [ "network-online.target" ]; # Checks SMTP notifier creds during startup wants = [ "network-online.target" ]; - environment = - (lib.filterAttrs (_: v: v != null) { - X_AUTHELIA_CONFIG_FILTERS = lib.mkIf (oidcJwksConfigFile != [ ]) "template"; - AUTHELIA_IDENTITY_VALIDATION_RESET_PASSWORD_JWT_SECRET_FILE = instance.secrets.jwtSecretFile; - AUTHELIA_STORAGE_ENCRYPTION_KEY_FILE = instance.secrets.storageEncryptionKeyFile; - AUTHELIA_SESSION_SECRET_FILE = instance.secrets.sessionSecretFile; - AUTHELIA_IDENTITY_PROVIDERS_OIDC_HMAC_SECRET_FILE = instance.secrets.oidcHmacSecretFile; - }) - // instance.environmentVariables; + environment = { + X_AUTHELIA_CONFIG_FILTERS = lib.mkIf (oidcJwksConfigFile != [ ]) "template"; + } + // lib.mapAttrs (_: v: "%d/${v}") nonNullEnvSecretsMap + // instance.environmentVariables; preStart = "${execCommand} ${configArg} validate-config"; serviceConfig = { @@ -399,6 +399,12 @@ in StateDirectory = autheliaName instance.name; StateDirectoryMode = "0700"; + LoadCredential = + lib.optional ( + instance.secrets.oidcIssuerPrivateKeyFile != null + ) "oidcIssuerPrivateKeyFile:${instance.secrets.oidcIssuerPrivateKeyFile}" + ++ lib.mapAttrsToList (_: v: "${v}:${instance.secrets.${v}}") nonNullEnvSecretsMap; + # Security options: AmbientCapabilities = ""; CapabilityBoundingSet = ""; diff --git a/nixos/modules/services/system/userborn.nix b/nixos/modules/services/system/userborn.nix index 5649b438965b..eeb0f6a40f35 100644 --- a/nixos/modules/services/system/userborn.nix +++ b/nixos/modules/services/system/userborn.nix @@ -86,7 +86,7 @@ in The primary motivation for this is an immutable `/etc`, where we cannot write the files directly to `/etc`. - However this an also serve other use cases, e.g. when `/etc` is on a `tmpfs`. + However this can also serve other use cases, e.g. when `/etc` is on a `tmpfs`. ''; }; diff --git a/nixos/modules/services/torrent/rtorrent.nix b/nixos/modules/services/torrent/rtorrent.nix index 07825ecbc897..2b672d6a6584 100644 --- a/nixos/modules/services/torrent/rtorrent.nix +++ b/nixos/modules/services/torrent/rtorrent.nix @@ -149,13 +149,6 @@ in protocol.encryption.set = allow_incoming,try_outgoing,enable_retry - # Limits for file handle resources, this is optimized for - # an `ulimit` of 1024 (a common default). You MUST leave - # a ceiling of handles reserved for rTorrent's internal needs! - network.http.max_open.set = 50 - network.max_open_files.set = 600 - network.max_open_sockets.set = 3000 - # Memory resource usage (increase if you have a large number of items loaded, # and/or the available resources to spend) pieces.memory.max.set = 1800M @@ -169,15 +162,14 @@ in execute.nothrow = sh, -c, (cat, "echo >", (session.path), "rtorrent.pid", " ", (system.pid)) # Other operational settings (check & adapt) - encoding.add = utf8 system.umask.set = 0027 system.cwd.set = (cfg.basedir) network.http.dns_cache_timeout.set = 25 - schedule2 = monitor_diskspace, 15, 60, ((close_low_diskspace, 1000M)) + schedule = monitor_diskspace, 15, 60, ((close_low_diskspace, 1000M)) # Watch directories (add more as you like, but use unique schedule names) - #schedule2 = watch_start, 10, 10, ((load.start, (cat, (cfg.watch), "start/*.torrent"))) - #schedule2 = watch_load, 11, 10, ((load.normal, (cat, (cfg.watch), "load/*.torrent"))) + #schedule = watch_start, 10, 10, ((load.start, (cat, (cfg.watch), "start/*.torrent"))) + #schedule = watch_load, 11, 10, ((load.normal, (cat, (cfg.watch), "load/*.torrent"))) # Logging: # Levels = critical error warn notice info debug @@ -218,6 +210,10 @@ in RuntimeDirectory = "rtorrent"; RuntimeDirectoryMode = 750; + # rtorrent derives socket limits from this value since 0.16.15; see table in + # https://github.com/rakshasa/rtorrent/wiki/Socket-Manager-and-Resource-Allocation + LimitNOFILE = lib.mkDefault 16384; + CapabilityBoundingSet = [ "" ]; LockPersonality = true; NoNewPrivileges = true; diff --git a/nixos/modules/services/web-apps/homer.nix b/nixos/modules/services/web-apps/homer.nix index e34e43435d12..a89f51dd832d 100644 --- a/nixos/modules/services/web-apps/homer.nix +++ b/nixos/modules/services/web-apps/homer.nix @@ -169,11 +169,25 @@ in enable = true; virtualHosts."${cfg.virtualHost.domain}".extraConfig = '' root * ${cfg.package} - file_server + encode zstd gzip + + @immutable path /resources/* + header @immutable Cache-Control "public, max-age=31536000, immutable" + + @html not path /resources/* + header @html Cache-Control "no-store" + + header { + -ETag + -Last-Modified + } + handle_path /assets/config.yml { root * ${configFile} file_server } + + file_server ''; }; }; diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 8d6343816e44..9553090e8c85 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -1617,8 +1617,7 @@ in MemoryDenyWriteExecute = !( (builtins.any (mod: (mod.allowMemoryWriteExecute or false)) cfg.package.modules) - || cfg.lua.enable - || (cfg.package == pkgs.openresty) + || (lib.getName cfg.package == "openresty") ); RestrictRealtime = true; RestrictSUIDSGID = true; diff --git a/nixos/modules/services/web-servers/rustfs.nix b/nixos/modules/services/web-servers/rustfs.nix new file mode 100644 index 000000000000..675a6314426b --- /dev/null +++ b/nixos/modules/services/web-servers/rustfs.nix @@ -0,0 +1,151 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.rustfs; +in +{ + meta.maintainers = with lib.maintainers; [ + marcel + ]; + + options.services.rustfs = { + enable = lib.mkEnableOption "RustFS Object Storage Server"; + + package = lib.mkPackageOption pkgs "rustfs" { }; + + user = lib.mkOption { + type = lib.types.str; + default = "rustfs"; + description = "The user RustFS should run as."; + }; + + group = lib.mkOption { + type = lib.types.str; + default = "rustfs"; + description = "The group RustFS should run as."; + }; + + settings = lib.mkOption { + default = { }; + description = '' + Options for RustFS configuration. Refer to + + for details on supported values. + ''; + example = lib.literalExpression '' + { + RUSTFS_CONSOLE_ENABLE = "true"; + RUSTFS_VOLUMES = "/mnt/rustfs"; + } + ''; + type = lib.types.submodule { + freeformType = lib.types.attrsOf ( + lib.types.oneOf [ + lib.types.str + lib.types.int + ] + ); + options = { + RUSTFS_VOLUMES = lib.mkOption { + type = lib.types.path; + default = "/var/lib/rustfs"; + description = "The directory where RustFS stores it's data."; + }; + }; + }; + }; + + environmentFile = lib.mkOption { + type = lib.types.str; + description = "Path to environment file containing secrets like RUSTFS_ACCESS_KEY or RUSTFS_SECRET_KEY."; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = !(cfg.settings ? RUSTFS_ACCESS_KEY); + message = "RUSTFS_ACCESS_KEY must not be set in services.rustfs.settings. Use environmentFile instead."; + } + { + assertion = !(cfg.settings ? RUSTFS_SECRET_KEY); + message = "RUSTFS_SECRET_KEY must not be set in services.rustfs.settings. Use environmentFile instead."; + } + ]; + + systemd = { + tmpfiles.settings."10-rustfs".${cfg.settings.RUSTFS_VOLUMES}.d = { + inherit (cfg) user group; + }; + + # https://docs.rustfs.com/installation/linux/single-node-single-disk.html#_6-configure-system-service + services.rustfs = { + description = "RustFS Object Storage Server"; + documentation = [ "https://rustfs.com/docs/" ]; + + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + + wantedBy = [ "multi-user.target" ]; + + environment = cfg.settings; + + preStart = '' + if [ -z "$RUSTFS_ACCESS_KEY" ] || [ -z "$RUSTFS_SECRET_KEY" ]; then + echo "RustFS uses well-known default values for RUSTFS_ACCESS_KEY and RUSTFS_SECRET_KEY," + echo "please configure them using services.rustfs.environmentFile." + exit 1 + fi + ''; + + serviceConfig = { + Type = "notify"; + NotifyAccess = "main"; + User = cfg.user; + Group = cfg.group; + + EnvironmentFile = cfg.environmentFile; + ExecStart = lib.getExe cfg.package; + + LimitNOFILE = 1048576; + LimitNPROC = 32768; + TasksMax = "infinity"; + + Restart = "always"; + RestartSec = "10s"; + + OOMScoreAdjust = "-1000"; + SendSIGKILL = false; + + TimeoutStartSec = "30s"; + TimeoutStopSec = "30s"; + + NoNewPrivileges = true; + + ProtectHome = true; + PrivateTmp = true; + PrivateDevices = true; + ProtectClock = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectControlGroups = true; + RestrictSUIDSGID = true; + RestrictRealtime = true; + }; + }; + }; + + users = { + users.${cfg.user} = { + isSystemUser = true; + inherit (cfg) group; + }; + groups.${cfg.group} = { }; + }; + }; +} diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix index 3636503992c5..f4923c55e149 100644 --- a/nixos/modules/system/boot/plymouth.nix +++ b/nixos/modules/system/boot/plymouth.nix @@ -68,7 +68,7 @@ let configFile = pkgs.writeText "plymouthd.conf" '' [Daemon] - ShowDelay=0 + ShowDelay=${toString cfg.showDelay} DeviceTimeout=8 Theme=${cfg.theme} ${cfg.extraConfig} @@ -166,6 +166,15 @@ in ''; }; + showDelay = mkOption { + type = types.numbers.nonnegative; + default = 0; + example = 0.5; + description = '' + Time (in seconds) to delay the splash screen. + ''; + }; + extraConfig = mkOption { type = types.lines; default = ""; diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix index 52f34ccd8378..ce414b8896f7 100644 --- a/nixos/modules/virtualisation/incus.nix +++ b/nixos/modules/virtualisation/incus.nix @@ -396,7 +396,7 @@ in abi , include - include "/var/lib/incus/security/apparmor/profiles" + include if exists "/var/lib/incus/security/apparmor/profiles" ''; }; includes."abstractions/base" = '' diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 029a2543ec93..f321b6872c5a 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1512,6 +1512,7 @@ in rtkit = runTest ./rtkit.nix; rtorrent = runTest ./rtorrent.nix; rush = runTest ./rush.nix; + rustfs = runTest ./rustfs.nix; rustical = runTest ./web-apps/rustical.nix; rustls-libssl = runTest ./rustls-libssl.nix; rxe = runTest ./rxe.nix; @@ -1539,7 +1540,7 @@ in sftpgo = runTest ./sftpgo.nix; sfxr-qt = runTest ./sfxr-qt.nix; sgt-puzzles = runTest ./sgt-puzzles.nix; - shadow = runTest ./shadow.nix; + shadow = import ./shadow { inherit runTest; }; shadowsocks = handleTest ./shadowsocks { }; shadps4 = runTest ./shadps4.nix; sharkey = runTest ./web-apps/sharkey.nix; @@ -1684,6 +1685,7 @@ in systemd-journal = runTest ./systemd-journal.nix; systemd-journal-gateway = runTest ./systemd-journal-gateway.nix; systemd-journal-upload = runTest ./systemd-journal-upload.nix; + systemd-localed = runTest ./systemd-localed.nix; systemd-lock-handler = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./systemd-lock-handler.nix; systemd-machinectl = runTest ./systemd-machinectl.nix; systemd-misc = runTest ./systemd-misc.nix; @@ -1842,6 +1844,7 @@ in }; virtualbox = handleTestOn [ "x86_64-linux" ] ./virtualbox.nix { }; vm-variant = handleTest ./vm-variant.nix { }; + vnstat = runTest ./vnstat.nix; vscode-remote-ssh = handleTestOn [ "x86_64-linux" ] ./vscode-remote-ssh.nix { }; vscodium = import ./vscodium.nix { inherit runTest; }; vsftpd = runTest ./vsftpd.nix; diff --git a/nixos/tests/authelia.nix b/nixos/tests/authelia.nix index 98abca0fbc57..256c92cd706e 100644 --- a/nixos/tests/authelia.nix +++ b/nixos/tests/authelia.nix @@ -28,12 +28,10 @@ # This is purely for testing purposes! environment.etc."authelia/storageEncryptionKeyFile" = { mode = "0400"; - user = "authelia-testing"; text = "you_must_generate_a_random_string_of_more_than_twenty_chars_and_configure_this"; }; environment.etc."authelia/jwtSecretFile" = { mode = "0400"; - user = "authelia-testing"; text = "a_very_important_secret"; }; environment.etc."authelia/users_database.yml" = { diff --git a/nixos/tests/keycloak.nix b/nixos/tests/keycloak.nix index 28b47661f3d8..8c5227dd443e 100644 --- a/nixos/tests/keycloak.nix +++ b/nixos/tests/keycloak.nix @@ -38,6 +38,7 @@ let enable = true; settings = { hostname = certs.domain; + metrics-enabled = true; }; inherit initialAdminPassword; sslCertificate = "${certs.${certs.domain}.cert}"; @@ -50,7 +51,6 @@ let }; plugins = with config.services.keycloak.package.plugins; [ keycloak-discord - keycloak-metrics-spi ]; }; environment.systemPackages = with pkgs; [ @@ -131,13 +131,7 @@ let | jq -r '"Authorization: bearer " + .access_token' >admin_auth_header """) - # Register the metrics SPI - keycloak.succeed( - """${pkgs.jre}/bin/keytool -import -alias snakeoil -file ${certs.ca.cert} -storepass aaaaaa -keystore cacert.jks -noprompt""", - """KC_OPTS='-Djavax.net.ssl.trustStore=cacert.jks -Djavax.net.ssl.trustStorePassword=aaaaaa' kcadm.sh config credentials --server '${frontendUrl}' --realm master --user admin --password "$(<${adminPasswordFile})" """, - """KC_OPTS='-Djavax.net.ssl.trustStore=cacert.jks -Djavax.net.ssl.trustStorePassword=aaaaaa' kcadm.sh update events/config -s 'eventsEnabled=true' -s 'adminEventsEnabled=true' -s 'eventsListeners+=metrics-listener'""", - """curl -sSf '${frontendUrl}/realms/master/metrics' | grep '^keycloak_admin_event_UPDATE'""" - ) + keycloak.succeed("curl -sSf https://${certs.domain}:9000/metrics | grep '^jvm_'") # Publish the realm, including a test OIDC client and user keycloak.succeed( diff --git a/nixos/tests/matrix/matrix-authentication-service.nix b/nixos/tests/matrix/matrix-authentication-service.nix index 9194b1fc56cd..19900b5a9c18 100644 --- a/nixos/tests/matrix/matrix-authentication-service.nix +++ b/nixos/tests/matrix/matrix-authentication-service.nix @@ -189,11 +189,26 @@ in { nodes, ... }: let bundle = mkBundle masDomain; + + extraConfig = pkgs.writeText "masExtraConfig.yml" ( + builtins.toJSON { + secrets = { + encryption_file = "/var/lib/matrix-authentication-service/encryption"; + keys = [ + { + kid = "rsa-4096"; + key_file = "/var/lib/matrix-authentication-service/key_rsa_4096"; + } + ]; + }; + } + ); in { services.matrix-authentication-service = { enable = true; createDatabase = true; + extraConfigFiles = [ (toString extraConfig) ]; settings = { http = { public_base = "https://${masDomain}:8080/"; @@ -223,15 +238,7 @@ in secret_file = "/var/lib/matrix-authentication-service/matrix_secret"; }; database.uri = "postgresql:///matrix-authentication-service?host=/run/postgresql&user=matrix-authentication-service"; - secrets = { - encryption_file = "/var/lib/matrix-authentication-service/encryption"; - keys = [ - { - kid = "rsa-4096"; - key_file = "/var/lib/matrix-authentication-service/key_rsa_4096"; - } - ]; - }; + # secrets is defined in extraConfigFiles policy.data.client_registration.allow_insecure_uris = true; upstream_oauth2.providers = [ { diff --git a/nixos/tests/rustfs.nix b/nixos/tests/rustfs.nix new file mode 100644 index 000000000000..7cace30e3bfc --- /dev/null +++ b/nixos/tests/rustfs.nix @@ -0,0 +1,69 @@ +{ pkgs, ... }: + +let + accessKey = "BKIKJAA5BMMU2RHO6IBB"; + secretKey = "V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12"; + + rustfsPythonScript = + pkgs.writers.writePython3 "rustfs-test" { libraries = with pkgs.python3Packages; [ minio ]; } + /* python */ '' + import io + import os + from minio import Minio + + minioClient = Minio( + 'localhost:9000', + access_key='${accessKey}', + secret_key='${secretKey}', + secure=False + ) + sio = io.BytesIO() + sio.write(b'Test from Python') + sio.seek(0, os.SEEK_END) + sio_len = sio.tell() + sio.seek(0) + minioClient.put_object( + 'test-bucket', + 'test.txt', + sio, + sio_len, + content_type='text/plain' + ) + ''; + +in +{ + name = "rustfs"; + meta = with pkgs.lib.maintainers; { + maintainers = [ + marcel + ]; + }; + + containers.machine = + { pkgs, ... }: + { + services.rustfs = { + enable = true; + environmentFile = builtins.toString ( + pkgs.writeText "rustfs-secrets.env" '' + RUSTFS_ACCESS_KEY=${accessKey} + RUSTFS_SECRET_KEY=${secretKey} + '' + ); + }; + + environment.systemPackages = with pkgs; [ minio-client ]; + }; + + testScript = /* python */ '' + machine.wait_for_unit("rustfs.service") + + machine.succeed("mc alias set rustfs http://localhost:9000 ${accessKey} ${secretKey} --api s3v4") + machine.succeed("mc mb rustfs/test-bucket") + machine.succeed("${rustfsPythonScript}") + assert "test-bucket" in machine.succeed("mc ls rustfs") + assert "Test from Python" in machine.succeed("mc cat rustfs/test-bucket/test.txt") + machine.succeed("mc rb --force rustfs/test-bucket") + ''; +} diff --git a/nixos/tests/shadow/default.nix b/nixos/tests/shadow/default.nix new file mode 100644 index 000000000000..ba773f93f073 --- /dev/null +++ b/nixos/tests/shadow/default.nix @@ -0,0 +1,5 @@ +{ runTest }: +{ + login = runTest ./login.nix; + system = runTest ./system.nix; +} diff --git a/nixos/tests/shadow.nix b/nixos/tests/shadow/login.nix similarity index 100% rename from nixos/tests/shadow.nix rename to nixos/tests/shadow/login.nix diff --git a/nixos/tests/shadow/system.nix b/nixos/tests/shadow/system.nix new file mode 100644 index 000000000000..fbed9be8beba --- /dev/null +++ b/nixos/tests/shadow/system.nix @@ -0,0 +1,147 @@ +{ pkgs, ... }: +let + # Create a Python environment for the controller with all necessary test framework dependencies + controllerPython = pkgs.python3.withPackages (ps: [ + ps.flaky + ps.jc + ps.pytest + ps.pytest-mh + ps.pytest-ticket + ]); + + shadowHostName = "shadowhost"; +in +{ + name = "shadow-system-tests"; + + meta.maintainers = with pkgs.lib.maintainers; [ joaosreis ]; + + nodes = { + # The target host: runs sshd, has shadow and other test dependencies installed, mutable users, and some specific settings to match the expectations of the test suite + shadowhost = + { pkgs, ... }: + { + networking.hostName = shadowHostName; + services.openssh = { + enable = true; + settings = { + PermitRootLogin = "yes"; + PasswordAuthentication = false; + }; + }; + + users.mutableUsers = true; + + environment.systemPackages = with pkgs; [ + shadow + expect + ]; + + users.defaultUserShell = "/bin/sh"; + + security.loginDefs.settings = { + PASS_MAX_DAYS = 99999; + PASS_MIN_DAYS = 0; + PASS_WARN_AGE = 7; + USERGROUPS_ENAB = "yes"; + CREATE_HOME = "yes"; + UID_MIN = 1001; + GID_MIN = 1001; + }; + + security.pam.services = { + newusers.text = '' + auth required pam_permit.so + account required pam_permit.so + password required pam_permit.so + session required pam_permit.so + ''; + }; + + services.envfs.enable = true; + }; + + # The controller: runs pytest-mh against the shadow host + controller = + { pkgs, ... }: + { + environment.systemPackages = [ + controllerPython + pkgs.openssh + ]; + }; + + }; + + testScript = '' + import textwrap + + start_all() + + # ------------------------------------------------------------------ + # 1. Generate an SSH keypair on the controller and authorise it + # on the shadow host + # ------------------------------------------------------------------ + controller.succeed("mkdir -p /root/.ssh && chmod 700 /root/.ssh") + controller.succeed( + "ssh-keygen -t ed25519 -N \'\' -f /root/.ssh/id_ed25519 2>&1" + ) + pub_key = controller.succeed("cat /root/.ssh/id_ed25519.pub").strip() + + # Inject the generated public key into the shadow host at runtime + shadowhost.succeed("mkdir -p /root/.ssh && chmod 700 /root/.ssh") + shadowhost.succeed( + f"echo '{pub_key}' >> /root/.ssh/authorized_keys && " + "chmod 600 /root/.ssh/authorized_keys" + ) + + # ------------------------------------------------------------------ + # 2. Make sure the shadow host has a writable /etc/login.defs, + # since the test framework expects to be able to write to it. + # ------------------------------------------------------------------ + shadowhost.succeed( + "cp --remove-destination $(readlink -f /etc/login.defs) /etc/login.defs && " + "chmod 644 /etc/login.defs" + ) + + # ------------------------------------------------------------------ + # 3. Copy the upstream test suite onto the controller + # ------------------------------------------------------------------ + controller.succeed( + "cp -r ${pkgs.shadow.passthru.testFramework} /root/shadow-tests && " + "chmod -R u+w /root/shadow-tests" + ) + + # ------------------------------------------------------------------ + # 4. Write the mhc.yaml topology config + # This tells pytest-mh where the shadow host is and which role + # it plays. The hostname must match the NixOS node name. + # ------------------------------------------------------------------ + controller.succeed(textwrap.dedent(""" + cat > /root/shadow-tests/mhc.yaml << 'EOF' + domains: + - id: shadow + hosts: + - hostname: ${shadowHostName} + role: shadow + ssh: + user: root + private_key: /root/.ssh/id_ed25519 + EOF + """)) + + + # ------------------------------------------------------------------ + # 5. Run the upstream pytest-mh test suite from the controller + # ------------------------------------------------------------------ + shadowhost.wait_for_unit("sshd.service") + # gpasswd tests are disabled, since they rely on specific behavior of the gpasswd command that is not applicable to NixOS + controller.succeed( + "cd /root/shadow-tests && " + "${controllerPython}/bin/pytest " + "--mh-config=mhc.yaml " + "--deselect=tests/test_gpasswd.py " + "-v tests/" + ) + ''; +} diff --git a/nixos/tests/systemd-localed.nix b/nixos/tests/systemd-localed.nix new file mode 100644 index 000000000000..308d90122868 --- /dev/null +++ b/nixos/tests/systemd-localed.nix @@ -0,0 +1,23 @@ +{ lib, ... }: +{ + name = "systemd-localed"; + meta.maintainers = [ lib.maintainers.haansn08 ]; + + nodes.machine = { ... }: { + # we don't use services.xserver.enable because some window managers like + # niri rely on systemd-localed for the keyboard layout: + # https://niri-wm.github.io/niri/Configuration%3A-Input.html#layout + services.graphical-desktop.enable = true; + + services.xserver.xkb.layout = "jp"; + }; + + testScript = '' + machine.start() + machine.wait_for_unit("default.target") + machine.wait_for_unit("dbus.socket") + + status, stdout = machine.execute("localectl") + t.assertIn("X11 Layout: jp", stdout) + ''; +} diff --git a/nixos/tests/vnstat.nix b/nixos/tests/vnstat.nix new file mode 100644 index 000000000000..eae44e1a92d3 --- /dev/null +++ b/nixos/tests/vnstat.nix @@ -0,0 +1,26 @@ +{ lib, ... }: +{ + name = "vnstat"; + meta.maintainers = with lib.maintainers; [ hmenke ]; + + containers.machine = { + services.vnstat = { + enable = true; + settings = { + AlwaysAddNewInterfaces = 1; + }; + }; + }; + + testScript = '' + start_all() + + machine.wait_for_unit("vnstat.service") + + machine.succeed("vnstat --iflist") + machine.fail("vnstat -i dummy0") + machine.succeed("ip link add dummy0 type dummy") + machine.succeed("ip link set dummy0 up") + machine.wait_until_succeeds("vnstat -i dummy0", timeout=10) + ''; +} diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 530acb7debf5..6623930e8771 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -26,9 +26,9 @@ let url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.2.9/android-studio-quail2-rc2-linux.tar.gz"; }; latestVersion = { - version = "2026.1.3.3"; # "Android Studio Quail 3 | 2026.1.3 Canary 3" - sha256Hash = "sha256-C8rbR+0iGNzsr7HtiNiFw++ZG9/t00/c1Ozr9ngssPs="; - url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.3.3/android-studio-quail3-canary3-linux.tar.gz"; + version = "2026.1.4.1"; # "Android Studio Quail 4 | 2026.1.4 Canary 1" + sha256Hash = "sha256-ynHUoMDsTNgKKRAU948k37ktAIlIm9A+md8KyVBTjl4="; + url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.4.1/android-studio-quail4-canary1-linux.tar.gz"; }; in { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix index b1a6b0e4fd70..1115f32c61d0 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix @@ -47,7 +47,6 @@ melpaBuild (finalAttrs: { platforms = [ "aarch64-darwin" "aarch64-linux" - "x86_64-darwin" "x86_64-linux" "x86_64-windows" ]; diff --git a/pkgs/applications/editors/jetbrains/ides/clion.nix b/pkgs/applications/editors/jetbrains/ides/clion.nix index 063d2c752ad2..547e4878df21 100644 --- a/pkgs/applications/editors/jetbrains/ides/clion.nix +++ b/pkgs/applications/editors/jetbrains/ides/clion.nix @@ -28,10 +28,6 @@ let url = "https://download.jetbrains.com/cpp/CLion-2026.1.4-aarch64.tar.gz"; hash = "sha256-I6IKQng4lNtRlQIq08K5bueqgKI/q1awX4EuRnyAnOk="; }; - x86_64-darwin = { - url = "https://download.jetbrains.com/cpp/CLion-2026.1.4.dmg"; - hash = "sha256-AJt+K1zv4eyjdzubUeFGwB9mqzvOeb3ffA2k0MajPBs="; - }; aarch64-darwin = { url = "https://download.jetbrains.com/cpp/CLion-2026.1.4-aarch64.dmg"; hash = "sha256-i3stX7dyRgSOJkFTMD9/hkw6e2mGNqn13S7X/vJ66RQ="; diff --git a/pkgs/applications/editors/jetbrains/ides/datagrip.nix b/pkgs/applications/editors/jetbrains/ides/datagrip.nix index dfe4ed7f7d3f..81c7b8d92a09 100644 --- a/pkgs/applications/editors/jetbrains/ides/datagrip.nix +++ b/pkgs/applications/editors/jetbrains/ides/datagrip.nix @@ -19,10 +19,6 @@ let url = "https://download.jetbrains.com/datagrip/datagrip-2026.1.3-aarch64.tar.gz"; hash = "sha256-G+tinD/+qM5HVR4u2E0cNXtdVsbwgK8/PdZ3ic6hf4M="; }; - x86_64-darwin = { - url = "https://download.jetbrains.com/datagrip/datagrip-2026.1.3.dmg"; - hash = "sha256-vW2LEonl0D9S0VxbeJX4jRrwhELGBwlOXwiHslvh06E="; - }; aarch64-darwin = { url = "https://download.jetbrains.com/datagrip/datagrip-2026.1.3-aarch64.dmg"; hash = "sha256-Kyt3fYPXzwTVxPFVKd+atiHWb/i7gjGahz1MJ4iXxy8="; diff --git a/pkgs/applications/editors/jetbrains/ides/dataspell.nix b/pkgs/applications/editors/jetbrains/ides/dataspell.nix index 18dd09b48cf9..a9435844c443 100644 --- a/pkgs/applications/editors/jetbrains/ides/dataspell.nix +++ b/pkgs/applications/editors/jetbrains/ides/dataspell.nix @@ -21,10 +21,6 @@ let url = "https://download.jetbrains.com/python/dataspell-2026.1.2-aarch64.tar.gz"; hash = "sha256-SSmIPF0pDMolxeXL21UaHMbZdtYbChWVxTKZOsPhH+I="; }; - x86_64-darwin = { - url = "https://download.jetbrains.com/python/dataspell-2026.1.2.dmg"; - hash = "sha256-2qzwzGMYuy1qEuTprxwNa5gOPgCZq2MadSKN8FT8w8c="; - }; aarch64-darwin = { url = "https://download.jetbrains.com/python/dataspell-2026.1.2-aarch64.dmg"; hash = "sha256-MGWufS0nlswdqhACNQWtlXJwfPiYw8wUx7olIxPS15k="; diff --git a/pkgs/applications/editors/jetbrains/ides/gateway.nix b/pkgs/applications/editors/jetbrains/ides/gateway.nix index 56370da57946..28f722fed168 100644 --- a/pkgs/applications/editors/jetbrains/ides/gateway.nix +++ b/pkgs/applications/editors/jetbrains/ides/gateway.nix @@ -19,10 +19,6 @@ let url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.3-aarch64.tar.gz"; hash = "sha256-CSe04BBo4jS1cIhu4NfZqaSHMaNue2eFUPa+1gOxuoo="; }; - x86_64-darwin = { - url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.3.dmg"; - hash = "sha256-WKwIP19y5EKO98JgEm468ofaRp/JO5z8lqNhtpsH4tY="; - }; aarch64-darwin = { url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.3-aarch64.dmg"; hash = "sha256-AHY/lY0ARkW0VoSgy0t7LLNXA965PLooWBSWxBKBV5M="; diff --git a/pkgs/applications/editors/jetbrains/ides/goland.nix b/pkgs/applications/editors/jetbrains/ides/goland.nix index 692e2ba49fc8..b19fd343d896 100644 --- a/pkgs/applications/editors/jetbrains/ides/goland.nix +++ b/pkgs/applications/editors/jetbrains/ides/goland.nix @@ -19,10 +19,6 @@ let url = "https://download.jetbrains.com/go/goland-2026.1.4-aarch64.tar.gz"; hash = "sha256-7s98kY08aKjdRGQLDkffeVhgj1FWurLmTTYmtb5Qx6c="; }; - x86_64-darwin = { - url = "https://download.jetbrains.com/go/goland-2026.1.4.dmg"; - hash = "sha256-RbvcLpLVyeL4B1DJ2/9Ub/6Cz6fJGXMPCHsJ705GsAo="; - }; aarch64-darwin = { url = "https://download.jetbrains.com/go/goland-2026.1.4-aarch64.dmg"; hash = "sha256-y7mEke0z0MvQs+kMtrmrq7EeAtJUbgo6sGZrOB0MraM="; diff --git a/pkgs/applications/editors/jetbrains/ides/idea.nix b/pkgs/applications/editors/jetbrains/ides/idea.nix index e77c6a800f61..3367506afa51 100644 --- a/pkgs/applications/editors/jetbrains/ides/idea.nix +++ b/pkgs/applications/editors/jetbrains/ides/idea.nix @@ -22,10 +22,6 @@ let url = "https://download.jetbrains.com/idea/ideaIU-2026.1.4-aarch64.tar.gz"; hash = "sha256-MDZFuLrUxcCIc0Zhi4QhgKPeU7Pgs9oJ/FxQH1n3gBM="; }; - x86_64-darwin = { - url = "https://download.jetbrains.com/idea/ideaIU-2026.1.4.dmg"; - hash = "sha256-8K+LiewiINP4S9eqV0kGWtfy2Ff/zvBwX89iX7mYZ78="; - }; aarch64-darwin = { url = "https://download.jetbrains.com/idea/ideaIU-2026.1.4-aarch64.dmg"; hash = "sha256-XIBK/+Lxaz9dX+Lxl7HXsl+Z3Z7GBzSuDxNssb/4A2s="; diff --git a/pkgs/applications/editors/jetbrains/ides/mps.nix b/pkgs/applications/editors/jetbrains/ides/mps.nix index 52e18be29bcd..691bd0f94179 100644 --- a/pkgs/applications/editors/jetbrains/ides/mps.nix +++ b/pkgs/applications/editors/jetbrains/ides/mps.nix @@ -19,10 +19,6 @@ let url = "https://download.jetbrains.com/mps/2025.3/MPS-2025.3.tar.gz"; hash = "sha256-xAI+UrTheCTWHSdoI4YZvhTlrlc121M+OVFkfzd7a3k="; }; - x86_64-darwin = { - url = "https://download.jetbrains.com/mps/2025.3/MPS-2025.3-macos.dmg"; - hash = "sha256-whYAjKkF79mrknHflZnvOOy2bLosYUguelZDSuPt3uY="; - }; aarch64-darwin = { url = "https://download.jetbrains.com/mps/2025.3/MPS-2025.3-macos-aarch64.dmg"; hash = "sha256-3HnEHOhRRI9IYjBhc5FO7h5j4jBBDtZTVkmO/S1fBEQ="; diff --git a/pkgs/applications/editors/jetbrains/ides/phpstorm.nix b/pkgs/applications/editors/jetbrains/ides/phpstorm.nix index be56d33d23bc..b76837caa81b 100644 --- a/pkgs/applications/editors/jetbrains/ides/phpstorm.nix +++ b/pkgs/applications/editors/jetbrains/ides/phpstorm.nix @@ -19,10 +19,6 @@ let url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.4-aarch64.tar.gz"; hash = "sha256-T9q3/nxv/AA6y7CHWtOhUibR7bnKN8OZmfN3NWYTsIQ="; }; - x86_64-darwin = { - url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.4.dmg"; - hash = "sha256-W7EwYu7S3hs1564tXq8H1Uok/Gwx/8QJO4brUGOfFY4="; - }; aarch64-darwin = { url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.4-aarch64.dmg"; hash = "sha256-XGcfEWHHeLugvkT/WlQDsVRN33F46b1PCNhINQitqSY="; diff --git a/pkgs/applications/editors/jetbrains/ides/pycharm.nix b/pkgs/applications/editors/jetbrains/ides/pycharm.nix index 4f418ef23a3b..452f73600373 100644 --- a/pkgs/applications/editors/jetbrains/ides/pycharm.nix +++ b/pkgs/applications/editors/jetbrains/ides/pycharm.nix @@ -20,10 +20,6 @@ let url = "https://download.jetbrains.com/python/pycharm-2026.1.4-aarch64.tar.gz"; hash = "sha256-71FbYpN0seJ5k/yZA7aoXgU4W/N1BhjtKl7W7Hic9UE="; }; - x86_64-darwin = { - url = "https://download.jetbrains.com/python/pycharm-2026.1.4.dmg"; - hash = "sha256-Q5hTcYoNUzmAxwcsXJNS4medQjFKWc/Sgkybt4PQPfg="; - }; aarch64-darwin = { url = "https://download.jetbrains.com/python/pycharm-2026.1.4-aarch64.dmg"; hash = "sha256-qxSgp8r4S0KXjCCTIoAiEZFCn3uBE/0pWLLA6td0Fq0="; diff --git a/pkgs/applications/editors/jetbrains/ides/rider.nix b/pkgs/applications/editors/jetbrains/ides/rider.nix index c962306f3389..d787cbecf590 100644 --- a/pkgs/applications/editors/jetbrains/ides/rider.nix +++ b/pkgs/applications/editors/jetbrains/ides/rider.nix @@ -31,10 +31,6 @@ let url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.4-aarch64.tar.gz"; hash = "sha256-GXmyBrqxUpwK4djjwllvK+pnfktDrDHpLJKoe4D2xFo="; }; - x86_64-darwin = { - url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.4.dmg"; - hash = "sha256-GfQ5WpKunJ+JhE1VcArm3UxZ5udCbfnS1Kw3D4gZorA="; - }; aarch64-darwin = { url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.4-aarch64.dmg"; hash = "sha256-cfwT22BN1jzKZzrZHMQqYFJPGuRwta/sqoOJOp+PfBE="; diff --git a/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix b/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix index b4ab8c0b34c4..b99a31ccb041 100644 --- a/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix +++ b/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix @@ -19,10 +19,6 @@ let url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.4-aarch64.tar.gz"; hash = "sha256-oSu19pkGVWt31vWBdAffSZsu4QzsUznVbUSwDy98nug="; }; - x86_64-darwin = { - url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.4.dmg"; - hash = "sha256-BLo2weIJK8gQAcMtAiETM7FMdhw9aoFIGh5Yqjv3k7s="; - }; aarch64-darwin = { url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.4-aarch64.dmg"; hash = "sha256-4wEnwcPRtwp0wxePUMiLow6sMxirwndRMdmJL8LBh9k="; diff --git a/pkgs/applications/editors/jetbrains/ides/rust-rover.nix b/pkgs/applications/editors/jetbrains/ides/rust-rover.nix index 3f82ae6aea2e..6e4312187c31 100644 --- a/pkgs/applications/editors/jetbrains/ides/rust-rover.nix +++ b/pkgs/applications/editors/jetbrains/ides/rust-rover.nix @@ -25,10 +25,6 @@ let url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.4-aarch64.tar.gz"; hash = "sha256-KpF3jCnLKCEeEXkBdB8ZsPPqP9FOVRTwRV/FQLKyh1Q="; }; - x86_64-darwin = { - url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.4.dmg"; - hash = "sha256-2BwgAD0xF9IxRJh+gW4vLzBW13rFQSzQPbEwdmQGvLU="; - }; aarch64-darwin = { url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.4-aarch64.dmg"; hash = "sha256-Hly4NBv9mg/RMmxCM6m9w5eS/CQ7ycxp7V2VQZwyGQE="; diff --git a/pkgs/applications/editors/jetbrains/ides/webstorm.nix b/pkgs/applications/editors/jetbrains/ides/webstorm.nix index 0e35c48c293b..6e28014f825b 100644 --- a/pkgs/applications/editors/jetbrains/ides/webstorm.nix +++ b/pkgs/applications/editors/jetbrains/ides/webstorm.nix @@ -19,10 +19,6 @@ let url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.4-aarch64.tar.gz"; hash = "sha256-f9KenMq1gtldzpBraSBwOb/186WQwh1ps5Ypj5JoOU0="; }; - x86_64-darwin = { - url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.4.dmg"; - hash = "sha256-SGdo6WYMCcCBuZUjvURcMTbJUqhZ4MzFlSLg6Zjr84I="; - }; aarch64-darwin = { url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.4-aarch64.dmg"; hash = "sha256-ZYen6Ew0GYbBAmuGCDACPBsygxZ6sT787o6gqF9DJzw="; diff --git a/pkgs/applications/editors/jetbrains/readme.md b/pkgs/applications/editors/jetbrains/readme.md index 0ed0a67d4fd5..c890021090e9 100644 --- a/pkgs/applications/editors/jetbrains/readme.md +++ b/pkgs/applications/editors/jetbrains/readme.md @@ -78,7 +78,5 @@ Any comments or other manual changes between these markers will be removed when - on `aarch64-linux`: - from source build - see if build (binary or source) works without expat - - on `x86_64-darwin`: - - from source build - on `aarch64-darwin`: - from source build diff --git a/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/config.py b/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/config.py index 0449427e945f..d2c202c13fcf 100644 --- a/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/config.py +++ b/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/config.py @@ -3,7 +3,7 @@ import os import dataclasses from pathlib import Path -SUPPORTED_SYSTEMS = ["x86_64-linux", "aarch64-linux", "x86_64-darwin", "aarch64-darwin"] +SUPPORTED_SYSTEMS = ["x86_64-linux", "aarch64-linux", "aarch64-darwin"] def find_nixpkgs(current_path: Path) -> Path: diff --git a/pkgs/applications/editors/jetbrains/updater/updateInfo.json b/pkgs/applications/editors/jetbrains/updater/updateInfo.json index a64e1af94fcd..41f9f5b8ddd1 100644 --- a/pkgs/applications/editors/jetbrains/updater/updateInfo.json +++ b/pkgs/applications/editors/jetbrains/updater/updateInfo.json @@ -4,7 +4,6 @@ "urls": { "x86_64-linux": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", "aarch64-linux": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz", - "x86_64-darwin": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", "aarch64-darwin": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg" } }, @@ -13,7 +12,6 @@ "urls": { "x86_64-linux": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", "aarch64-linux": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.tar.gz", - "x86_64-darwin": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg", "aarch64-darwin": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg" } }, @@ -22,7 +20,6 @@ "urls": { "x86_64-linux": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz", "aarch64-linux": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.tar.gz", - "x86_64-darwin": "https://download.jetbrains.com/python/dataspell-{version}.dmg", "aarch64-darwin": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg" } }, @@ -31,7 +28,6 @@ "urls": { "x86_64-linux": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz", "aarch64-linux": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.tar.gz", - "x86_64-darwin": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg", "aarch64-darwin": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg" } }, @@ -40,7 +36,6 @@ "urls": { "x86_64-linux": "https://download.jetbrains.com/go/goland-{version}.tar.gz", "aarch64-linux": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz", - "x86_64-darwin": "https://download.jetbrains.com/go/goland-{version}.dmg", "aarch64-darwin": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg" } }, @@ -49,7 +44,6 @@ "urls": { "x86_64-linux": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz", "aarch64-linux": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz", - "x86_64-darwin": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", "aarch64-darwin": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg" } }, @@ -62,7 +56,6 @@ "urls": { "x86_64-linux": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz", "aarch64-linux": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz", - "x86_64-darwin": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos.dmg", "aarch64-darwin": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos-aarch64.dmg" } }, @@ -71,7 +64,6 @@ "urls": { "x86_64-linux": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", "aarch64-linux": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz", - "x86_64-darwin": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", "aarch64-darwin": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg" } }, @@ -80,7 +72,6 @@ "urls": { "x86_64-linux": "https://download.jetbrains.com/python/pycharm-{version}.tar.gz", "aarch64-linux": "https://download.jetbrains.com/python/pycharm-{version}-aarch64.tar.gz", - "x86_64-darwin": "https://download.jetbrains.com/python/pycharm-{version}.dmg", "aarch64-darwin": "https://download.jetbrains.com/python/pycharm-{version}-aarch64.dmg" } }, @@ -93,7 +84,6 @@ "urls": { "x86_64-linux": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", "aarch64-linux": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.tar.gz", - "x86_64-darwin": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", "aarch64-darwin": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg" } }, @@ -102,7 +92,6 @@ "urls": { "x86_64-linux": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", "aarch64-linux": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz", - "x86_64-darwin": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", "aarch64-darwin": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg" } }, @@ -111,7 +100,6 @@ "urls": { "x86_64-linux": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz", "aarch64-linux": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz", - "x86_64-darwin": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg", "aarch64-darwin": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg" } }, @@ -120,7 +108,6 @@ "urls": { "x86_64-linux": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", "aarch64-linux": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz", - "x86_64-darwin": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", "aarch64-darwin": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg" } } diff --git a/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix b/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix index ee081737e355..af56ba9147eb 100644 --- a/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix +++ b/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix @@ -13,7 +13,7 @@ # nix run --impure --expr 'with import {}; jupyter-console.withSingleKernel clojupyter.definition' # Jupyter notebook: -# nix run --impure --expr 'with import {}; jupyter.override { definitions.clojure = clojupyter.definition; }' +# nix shell --impure --expr 'with import {}; [ (jupyter.override { definitions.clojure = clojupyter.definition; }) ]' -c jupyter-notebook let cljdeps = import ./deps.nix { inherit pkgs; }; diff --git a/pkgs/applications/editors/jupyter-kernels/octave/default.nix b/pkgs/applications/editors/jupyter-kernels/octave/default.nix index 74ea3d9b60f5..f4b9202b8109 100644 --- a/pkgs/applications/editors/jupyter-kernels/octave/default.nix +++ b/pkgs/applications/editors/jupyter-kernels/octave/default.nix @@ -12,7 +12,7 @@ # nix run --impure --expr 'with import {}; jupyter-console.withSingleKernel octave-kernel.definition' # Jupyter notebook: -# nix run --impure --expr 'with import {}; jupyter.override { definitions.octave = octave-kernel.definition; }' +# nix shell --impure --expr 'with import {}; [ (jupyter.override { definitions.octave = octave-kernel.definition; }) ]' -c jupyter-notebook let kernel = callPackage ./kernel.nix { diff --git a/pkgs/applications/editors/jupyter-kernels/wolfram/default.nix b/pkgs/applications/editors/jupyter-kernels/wolfram/default.nix index 92ffdcb38e8a..89efbb9d041e 100644 --- a/pkgs/applications/editors/jupyter-kernels/wolfram/default.nix +++ b/pkgs/applications/editors/jupyter-kernels/wolfram/default.nix @@ -7,7 +7,7 @@ # nix run --impure --expr 'with import {}; jupyter-console.withSingleKernel wolfram-for-jupyter-kernel.definition' # Jupyter notebook: -# nix run --impure --expr 'with import {}; jupyter.override { definitions.wolfram = wolfram-for-jupyter-kernel.definition; }' +# nix shell --impure --expr 'with import {}; [ (jupyter.override { definitions.wolfram = wolfram-for-jupyter-kernel.definition; }) ]' -c jupyter-notebook let kernel = callPackage ./kernel.nix { }; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index ec930367a355..6289b4c42ff7 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1610,12 +1610,12 @@ final: prev: { base16-nvim = buildVimPlugin { pname = "base16-nvim"; - version = "0-unstable-2026-06-21"; + version = "0-unstable-2026-07-15"; src = fetchFromGitHub { owner = "RRethy"; repo = "base16-nvim"; - rev = "21233d5fd574439ae1e2f5e4bfbc574214f4ab3d"; - hash = "sha256-Dizi44p6XYaQlXEL5qnfJFX44nXKIAkZAZvQ5QH11eA="; + rev = "fd128e380624c34f12a201690944bf657f861361"; + hash = "sha256-W5tHY4U87eCAiOerNMAeqcbz1JlMZ6YGqSC0TBhI6t4="; }; meta.homepage = "https://github.com/RRethy/base16-nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -1638,12 +1638,12 @@ final: prev: { base46 = buildVimPlugin { pname = "base46"; - version = "0-unstable-2026-07-09"; + version = "0-unstable-2026-07-11"; src = fetchFromGitHub { owner = "nvchad"; repo = "base46"; - rev = "a972909f1d7ba798b93b56631bc2cd5e96ea40da"; - hash = "sha256-7WqUWfziecAeGtbKBU6/FESY/pf56bEGKhvnxcm/gNI="; + rev = "cbb71c6cb56f53b30ab1a95a6d277f7e0524025b"; + hash = "sha256-QG9FcdlCKYXzncvDt47RQQGyJ2ARt1N+ec75qtc7gSk="; }; meta.homepage = "https://github.com/nvchad/base46/"; meta.license = unfree; @@ -1736,12 +1736,12 @@ final: prev: { bitbake = buildVimPlugin { pname = "bitbake"; - version = "6.0.1"; + version = "6.0.2"; src = fetchFromGitHub { owner = "openembedded"; repo = "bitbake"; - tag = "yocto-6.0.1"; - hash = "sha256-ReX6cGzy6IOfMR1z90U5QWdWLkRqO524zXcp/7xBfBk="; + tag = "yocto-6.0.2"; + hash = "sha256-Jho1X7udSvh413u8ueRqR8z1Q7E2qcotdkzl9azBu7g="; }; meta.homepage = "https://github.com/openembedded/bitbake/"; meta.license = unfree; @@ -2310,12 +2310,12 @@ final: prev: { catppuccin-vim = buildVimPlugin { pname = "catppuccin-vim"; - version = "0-unstable-2026-06-30"; + version = "0-unstable-2026-07-15"; src = fetchFromGitHub { owner = "catppuccin"; repo = "vim"; - rev = "029e9a878a58eba039e47847a2f17e10acefb3f5"; - hash = "sha256-gDq7vXIBc2mY8DMl+A6Ps0qPvAIR3NDhCRxBgqMOYCM="; + rev = "78c40a773e56d05e1c4e29216c45a483bdd67351"; + hash = "sha256-xOf5PwhgVWwMGtJt+om9z0MULrMLoO6AmaJ/G/vWGrk="; }; meta.homepage = "https://github.com/catppuccin/vim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -3484,12 +3484,12 @@ final: prev: { coc-nvim = buildVimPlugin { pname = "coc.nvim"; - version = "0.0.82-unstable-2026-07-07"; + version = "0.0.82-unstable-2026-07-15"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "0ff79c0056910e574af2b2aa31aa359065705c4b"; - hash = "sha256-Pp+qMv4Inc4JsrK59XDS+5CX/F9bEd4Pp4Cb611K+lk="; + rev = "d1689a4876305e5fc6691910c8ee6f1eb5da2219"; + hash = "sha256-6AjcLD8gh3rG3uXj8LjdXr5pbzIKwtu+14ZcCVwXCuI="; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; meta.license = unfree; @@ -3568,12 +3568,12 @@ final: prev: { codecompanion-nvim = buildVimPlugin { pname = "codecompanion.nvim"; - version = "19.18.0"; + version = "19.19.0"; src = fetchFromGitHub { owner = "olimorris"; repo = "codecompanion.nvim"; - tag = "v19.18.0"; - hash = "sha256-4O0UuJuuv4gmyxiZlLMG/sKlt84SW2ZooeOlFlK6/7I="; + tag = "v19.19.0"; + hash = "sha256-1ypjttA0T6wnVrqBaiqGtcJnqiyhxeg2EXh7O9nPBpE="; }; meta.homepage = "https://github.com/olimorris/codecompanion.nvim/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -3652,12 +3652,12 @@ final: prev: { cole-nvim = buildVimPlugin { pname = "cole.nvim"; - version = "0-unstable-2026-05-29"; + version = "0-unstable-2026-07-14"; src = fetchFromGitHub { owner = "thekylehuang"; repo = "cole.nvim"; - rev = "1920cfa31c717e1f73a5a6e5a2c02a44b5faeb5c"; - hash = "sha256-k153XzTkkBm1qF6iKK8fzmAHIPnoIbXEAxAOQIoAPo0="; + rev = "74f6a8e1bbce0d9a845a339d849bca3c0bec7aaa"; + hash = "sha256-TJxpLhabIl73I9O6Soi9TEd/9Xa7FVfpV7sNrza64oM="; }; meta.homepage = "https://github.com/thekylehuang/cole.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -3778,12 +3778,12 @@ final: prev: { command-t = buildVimPlugin { pname = "command-t"; - version = "8.1"; + version = "8.2"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - tag = "8.1"; - hash = "sha256-yp3kqhHQMtUFFPfbqgnrmmclx6r39k3ohen4Ys3s3BU="; + tag = "8.2"; + hash = "sha256-Q2fYHr9GFQvkoyoAOkvxJDArtqMxq7352eSGQNHBFZ8="; }; meta.homepage = "https://github.com/wincent/command-t/"; meta.license = getLicenseFromSpdxId "BSD-2-Clause"; @@ -4185,12 +4185,12 @@ final: prev: { coq_nvim = buildVimPlugin { pname = "coq_nvim"; - version = "0-unstable-2026-07-09"; + version = "0-unstable-2026-07-12"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "47a2b8157b05433268564672bd2e9667bb287c9d"; - hash = "sha256-affL0j96Hp+Ffry2KF69dR2hQfLSY2kRYoexvd38r5A="; + rev = "0b2b0db07b0426441ece46988d9ab28088f07cd5"; + hash = "sha256-SjAiNoeAxuu2UFHupUnDtjrPtGqAiFdHoq21Qn35OVA="; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; meta.license = getLicenseFromSpdxId "GPL-3.0-only"; @@ -5433,12 +5433,12 @@ final: prev: { easy-dotnet-nvim = buildVimPlugin { pname = "easy-dotnet.nvim"; - version = "0-unstable-2026-07-03"; + version = "0-unstable-2026-07-09"; src = fetchFromGitHub { owner = "GustavEikaas"; repo = "easy-dotnet.nvim"; - rev = "24a927e168789103137156e980e2635956e90b3c"; - hash = "sha256-uo3/DBMPv67UOQJscAW6aoc7c5IDJdQta7f8/1kI9dQ="; + rev = "26b939e2e013ddfc137a8e6149cda1f0b62303ca"; + hash = "sha256-M6uNfKiHviaJyItvvAdEplB+pdqF4N5DOwxG2oPYwpg="; }; meta.homepage = "https://github.com/GustavEikaas/easy-dotnet.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -5995,12 +5995,12 @@ final: prev: { flash-nvim = buildVimPlugin { pname = "flash.nvim"; - version = "2.1.0-unstable-2025-10-28"; + version = "2.1.0-unstable-2026-07-10"; src = fetchFromGitHub { owner = "folke"; repo = "flash.nvim"; - rev = "fcea7ff883235d9024dc41e638f164a450c14ca2"; - hash = "sha256-pHh0tJd/ynfjriu8xjnKunKVDHkoXii6ZbikdkIwovY="; + rev = "b6346946d10d07998efee029fb0f7a593806d0cd"; + hash = "sha256-1v2+iq4/TnJq37iiGedIKFf6PxlTHQac8RXECZ2HYdM="; }; meta.homepage = "https://github.com/folke/flash.nvim/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -6737,11 +6737,11 @@ final: prev: { gitportal-nvim = buildVimPlugin { pname = "gitportal.nvim"; - version = "0-unstable-2026-06-26"; + version = "0-unstable-2026-07-10"; src = fetchgit { url = "https://codeberg.org/trevorhauter/gitportal.nvim/"; - rev = "ee5446aa17738a419e855e2e4c01cb65e378e4cb"; - hash = "sha256-nt+4FjY+9IEBbUMNk0FpTwNfFu0/3k7DKeops+cGlxk="; + rev = "d2efb8d1bf141c77cfa1b5311995912bc36671d0"; + hash = "sha256-ofRP84DSgrXyNXXZjM82n1AhsfleDU6k7r4+R9sof40="; }; meta.homepage = "https://codeberg.org/trevorhauter/gitportal.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -8752,12 +8752,12 @@ final: prev: { lexima-vim = buildVimPlugin { pname = "lexima.vim"; - version = "2.1.0-unstable-2025-05-15"; + version = "2.1.0-unstable-2026-07-11"; src = fetchFromGitHub { owner = "cohama"; repo = "lexima.vim"; - rev = "ab621e4756465c9d354fce88cff2bd1aa7887065"; - hash = "sha256-NtHCfuL2Tq1a4Xevx+xAbnzsKqnPAbU/l7JvK7p0evU="; + rev = "9f6942c5e1f0f6fe63bdcdac515f34c484b970f5"; + hash = "sha256-hU/MmP5Ykb52vCJvlMtQipKe4LGC7d+lH//r8ysDELE="; }; meta.homepage = "https://github.com/cohama/lexima.vim/"; meta.license = unfree; @@ -9325,12 +9325,12 @@ final: prev: { lspsaga-nvim = buildVimPlugin { pname = "lspsaga.nvim"; - version = "0-unstable-2026-05-14"; + version = "0-unstable-2026-07-16"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "3e33a6a6c5d379f3d4fae77fae6b53b762a0a30f"; - hash = "sha256-hkXvv5NgW+wnbR7wGtAs+aUDv/4o/T5Mv7rGhk1qR3U="; + rev = "cf6fc9473bba1d332eda9887855ea29ed9b37701"; + hash = "sha256-ggw3U/LXNCDaSmXmHWEV9coOjoDW6v0JvD5BGSvDCaM="; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -11034,12 +11034,12 @@ final: prev: { neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "1.4.0-unstable-2026-07-09"; + version = "1.4.0-unstable-2026-07-16"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "f6c1c4832932d336feb77befa30074cd1a998f3d"; - hash = "sha256-1IPVcaU+I2MRz+ATZ9nQafzccEHn9UfmaLkfR1YB2e0="; + rev = "50bdc4130d9e30d28d0b209544d49ee472f6bf12"; + hash = "sha256-hsYouOS+ImmA6HnwqFRq3RMBTsn87oHrnijMqvargU4="; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -11118,12 +11118,12 @@ final: prev: { neogit = buildVimPlugin { pname = "neogit"; - version = "3.0.0-unstable-2026-07-09"; + version = "3.0.0-unstable-2026-07-15"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "a0847c4bea5a5f92a36e3f3bf7da99d7d685d3ac"; - hash = "sha256-37iNw57kC+fFk+hEgHKd07+NNDKP2g0YAmLwPYw6NyQ="; + rev = "95295edaa26e8e8db5a9bc4119256e602311c6bc"; + hash = "sha256-hAswp9Ba5xfFfBS+NKjLOoSky+SRrLfd8fdFC46Dq2s="; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -11611,12 +11611,12 @@ final: prev: { neotest-python = buildVimPlugin { pname = "neotest-python"; - version = "0-unstable-2026-07-03"; + version = "0-unstable-2026-07-15"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest-python"; - rev = "51c453d57f8d5156671b42ea57fafa2e1c9fb641"; - hash = "sha256-M0FROtTXMiAmmo83m1WwSQ5px5I6awV4I3/UY+sTYAc="; + rev = "1b56ca4ba51c6014f986d6548ee629bdc95589d1"; + hash = "sha256-9FL0qWTdkeX57ujRvSa9QqO/ZIthlzLSJyKHtNitbSg="; }; meta.homepage = "https://github.com/nvim-neotest/neotest-python/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -11681,12 +11681,12 @@ final: prev: { neotest-vitest = buildVimPlugin { pname = "neotest-vitest"; - version = "0.2.0-unstable-2026-06-29"; + version = "0.2.0-unstable-2026-07-12"; src = fetchFromGitHub { owner = "marilari88"; repo = "neotest-vitest"; - rev = "ab5a73d6ec9d33e807d6c67ce5169c4ca4a5d7f3"; - hash = "sha256-daeDCN58hMAesXEBhc4gbN2ISGQ0orIUNhL2ApB3E+s="; + rev = "c3c69715da4b158069fd4262083e7219a5c14cfb"; + hash = "sha256-BPERc4+iWEu1UWDXv+MaSUXJR4KNFFAqrPXxyJCSe9I="; }; meta.homepage = "https://github.com/marilari88/neotest-vitest/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -12140,6 +12140,20 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + none-ls-extras-nvim = buildVimPlugin { + pname = "none-ls-extras.nvim"; + version = "0-unstable-2026-06-06"; + src = fetchFromGitHub { + owner = "nvimtools"; + repo = "none-ls-extras.nvim"; + rev = "27681d797a26f1b4d6119296df42f5204c88a2dc"; + hash = "sha256-GZLT8X1eLeSkiV5EN1nOkCQg5nwNATURi/KMj90i40I="; + }; + meta.homepage = "https://github.com/nvimtools/none-ls-extras.nvim/"; + meta.license = getLicenseFromSpdxId "Unlicense"; + meta.hydraPlatforms = [ ]; + }; + none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; version = "0-unstable-2026-06-02"; @@ -12254,12 +12268,12 @@ final: prev: { nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "0-unstable-2026-07-09"; + version = "0-unstable-2026-07-11"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "5cfd3c8f2c3e6603d52d8f6c0b715743bbb5270d"; - hash = "sha256-TgBx2alqrazm2JSu4afsZ0tnKWHqpclpBly/0SxYpxs="; + rev = "28019401865beffcedc744bb1506d0201b88f2f9"; + hash = "sha256-QKBDxZzEQKGzHOVJmS9D9i9h2/0HubbgUlAvaA7Erh0="; }; meta.homepage = "https://github.com/nvchad/ui/"; meta.license = getLicenseFromSpdxId "GPL-3.0-only"; @@ -12436,12 +12450,12 @@ final: prev: { nvim-colorizer-lua = buildVimPlugin { pname = "nvim-colorizer.lua"; - version = "0-unstable-2026-05-30"; + version = "0-unstable-2026-07-14"; src = fetchFromGitHub { owner = "catgoose"; repo = "nvim-colorizer.lua"; - rev = "664c0b7cea1de71f8b65dfe951b7996fc3e6ccde"; - hash = "sha256-qVFQGJMGr0htwZqarhMdh7yG6SSH/rv8yqmp1CsoT3I="; + rev = "72a05f62c52241bc7441c820eb53946f92b2e6a4"; + hash = "sha256-hdnk816SBKWD/Ula4hjQ3o14I3+fBmEengfo72S4+8U="; }; meta.homepage = "https://github.com/catgoose/nvim-colorizer.lua/"; meta.license = unfree; @@ -12657,12 +12671,12 @@ final: prev: { nvim-dap-ui = buildVimPlugin { pname = "nvim-dap-ui"; - version = "4.0.0-unstable-2026-04-05"; + version = "4.0.0-unstable-2026-07-14"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "1a66cabaa4a4da0be107d5eda6d57242f0fe7e49"; - hash = "sha256-J/gUD4X//JtC2HB3HBeONivCQdMnXDnZJWd6jFF9+nk="; + rev = "cc9dd33aade7f20bae414d0cba163bc60d4d4b43"; + hash = "sha256-za3/6W1J6aMvNZQq8ANCq+TGHKHJtSxR/C5t3/oL3DI="; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -14152,12 +14166,12 @@ final: prev: { ocaml-nvim = buildVimPlugin { pname = "ocaml.nvim"; - version = "1.0.0-unstable-2026-07-03"; + version = "1.0.0-unstable-2026-07-16"; src = fetchFromGitHub { owner = "tarides"; repo = "ocaml.nvim"; - rev = "333647c7d16aa0e28a6d7cf15f2716111bec53af"; - hash = "sha256-+RUoWuV9YEOsx+jOTa8No5OyoeO6iVUuSsrtHmYKpb4="; + rev = "e12ded73f461d392cc2cad579a39733ebe34de61"; + hash = "sha256-3NiRM02g7BU+MzCybSfsyZdODcPA+RbuNU9QOmmoCxo="; }; meta.homepage = "https://github.com/tarides/ocaml.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -14194,12 +14208,12 @@ final: prev: { octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "0-unstable-2026-06-29"; + version = "0-unstable-2026-07-09"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "b9a73e167f851a98d8f29d62658d3640bb8a7314"; - hash = "sha256-v6vM3ajWF3yI2QA1pSqzo2zsbQohX1kmaI81b1Aqusc="; + rev = "8476766529b7c0ee9b7da12b6dbce1b716bb62cd"; + hash = "sha256-Ahxcp7UCoISeLOhZAkX966lyHk8jiSwWy9SAlUnzJo4="; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -15737,12 +15751,12 @@ final: prev: { roslyn-nvim = buildVimPlugin { pname = "roslyn.nvim"; - version = "0-unstable-2026-07-08"; + version = "0-unstable-2026-07-10"; src = fetchFromGitHub { owner = "seblyng"; repo = "roslyn.nvim"; - rev = "05ffc134f0b70ce2715c761745f1f78321fcfa9b"; - hash = "sha256-LLD9Vm3E1Vmp8P5dF1TAzHvRyGxmjpYSOvGksmhtEHc="; + rev = "b4954e97e145bd8129b3bbe99809759f6ced2235"; + hash = "sha256-AuJNxfvNYnqPvihxBn1vADdvwoDNInVbOLS0Pq5q9v8="; }; meta.homepage = "https://github.com/seblyng/roslyn.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -16086,12 +16100,12 @@ final: prev: { seoul256-vim = buildVimPlugin { pname = "seoul256.vim"; - version = "0-unstable-2026-05-20"; + version = "0-unstable-2026-07-15"; src = fetchFromGitHub { owner = "junegunn"; repo = "seoul256.vim"; - rev = "88997adf362f57c3eadedde6b8c1393fe218c02c"; - hash = "sha256-Em9vpXJmUyLfBHOLHVQQUGsOuluwyx+J4Q5vU8akyS0="; + rev = "0357ff3e44faab66c98bc98dfc89c834e37012da"; + hash = "sha256-TEu6ybYthrtTd7k2HkQEEH1z2iImU0I6SEclt87oAGQ="; }; meta.homepage = "https://github.com/junegunn/seoul256.vim/"; meta.license = unfree; @@ -16227,12 +16241,12 @@ final: prev: { smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2.1.0-unstable-2026-07-04"; + version = "2.1.0-unstable-2026-07-10"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "ebf4d8bbc16570817c0f5275468466b9d00b8d7d"; - hash = "sha256-mqmD7cZ2B+VuIyW/yv+N8nJquRX31tXw1tz1qvSMmus="; + rev = "9493405fb8ee683aa6efd50c529f6296ad8f40ad"; + hash = "sha256-cMPRVxFMBVRpIcy7kCQyoXzgsIFJJ1cDgAcvOm9FNnI="; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -16506,12 +16520,12 @@ final: prev: { spellwarn-nvim = buildVimPlugin { pname = "spellwarn.nvim"; - version = "0-unstable-2026-03-05"; + version = "0-unstable-2026-07-13"; src = fetchFromGitHub { owner = "ravibrock"; repo = "spellwarn.nvim"; - rev = "c98cfca978791cae3edaced7056bd340debee8fe"; - hash = "sha256-rLsiBIifNC8zwUNsAJ8AeTlDS9IS/y3XEKfF5FZ2hZI="; + rev = "3e818a7da69bfb342e2d84fdef9cb9f639d047d3"; + hash = "sha256-WHXJaSTB91B0S3YizCJLBriGQDvYQKVK3I8WT97YQEc="; }; meta.homepage = "https://github.com/ravibrock/spellwarn.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -17926,12 +17940,12 @@ final: prev: { tinted-nvim = buildVimPlugin { pname = "tinted-nvim"; - version = "1.0.0-unstable-2026-06-27"; + version = "1.0.0-unstable-2026-07-15"; src = fetchFromGitHub { owner = "tinted-theming"; repo = "tinted-nvim"; - rev = "f72f46057151de65ece4c280f67db84c63d64c76"; - hash = "sha256-U9SSaB68n/rDaeyQfRk0SnEwKW7MKG9gUaFG0ivt70A="; + rev = "a229fe0efadb4d9bfa92cad16175bb4e93fa70d4"; + hash = "sha256-a79rQSpPyCH/zbunrW9NxtsnwKVcQiwLzhW/1YNl3a4="; }; meta.homepage = "https://github.com/tinted-theming/tinted-nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -17940,12 +17954,12 @@ final: prev: { tinted-vim = buildVimPlugin { pname = "tinted-vim"; - version = "01-unstable-2026-06-21"; + version = "01-unstable-2026-07-15"; src = fetchFromGitHub { owner = "tinted-theming"; repo = "tinted-vim"; - rev = "65a386074124f211536dc04f7427cbcbd80ee183"; - hash = "sha256-hRgKzVnFtpAsI4dxmOTdSdi02+VEvTydbdTU+HqyhzI="; + rev = "1ee9f7bbb3e5928b84ab0bedaf04f6ad9dafdfb2"; + hash = "sha256-fwFxfq0Kr/EPdx4r9qTjzvjxkQsNoAD9KvB6kP3NwlE="; }; meta.homepage = "https://github.com/tinted-theming/tinted-vim/"; meta.license = unfree; @@ -18504,12 +18518,12 @@ final: prev: { typst-preview-nvim = buildVimPlugin { pname = "typst-preview.nvim"; - version = "1.4.2-unstable-2026-03-30"; + version = "1.5.0"; src = fetchFromGitHub { owner = "chomosuke"; repo = "typst-preview.nvim"; - rev = "87db18b8d19c8b0eed399f52e4c527ce5afe4817"; - hash = "sha256-EUYiHzDWJQM9Guk6ZM5GWE/etB+GHM48myRg/BPtOV0="; + tag = "v1.5.0"; + hash = "sha256-UTugVfydwGTmf5RomQ0R72Yf6fSz8gGeY/fg51qW454="; }; meta.homepage = "https://github.com/chomosuke/typst-preview.nvim/"; meta.license = getLicenseFromSpdxId "GPL-3.0-only"; @@ -18770,12 +18784,12 @@ final: prev: { vague-nvim = buildVimPlugin { pname = "vague.nvim"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "vague-theme"; repo = "vague.nvim"; - tag = "v2.1.3"; - hash = "sha256-ULBLMmJQe93N3uOPx6h8wif+38g0OSC7haklfVJyZdA="; + tag = "v2.1.4"; + hash = "sha256-57dHWOUPFIyFdLEs9RDv0cateLRc8XAqT4TmDUSQyV4="; }; meta.homepage = "https://github.com/vague-theme/vague.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -18826,12 +18840,12 @@ final: prev: { vifm-vim = buildVimPlugin { pname = "vifm.vim"; - version = "0.14-unstable-2026-06-07"; + version = "0.14-unstable-2026-07-12"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "6bffbab9c448f2814217ea2f7f982ad73b8fa718"; - hash = "sha256-/8lN8y20+g9pWzBrXgVArgZQq0CfXyLGRVDpweDmguE="; + rev = "9102ad4198c4f3adeef4b039c042866eb9345cdd"; + hash = "sha256-BLI7TEtSfXG1Md8lBnejJ3vUuXh3LJyZH6PJGHMoCuI="; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; meta.license = unfree; @@ -20814,12 +20828,12 @@ final: prev: { vim-flog = buildVimPlugin { pname = "vim-flog"; - version = "3.0.0-unstable-2025-03-19"; + version = "3.0.0-unstable-2026-07-12"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; - rev = "665b16ac8915f746bc43c9572b4581a5e9047216"; - hash = "sha256-x8fUmcuBLEQwZD+m7gEanpPppukRa6NoalNehY/2JuM="; + rev = "c8a573b5a829d0a3ed1b72c87dd62d832b665e87"; + hash = "sha256-BKnp7LKONUT/BRu7kS8Yvmj7xcFgrTWxHtz2wyAhtYg="; }; meta.homepage = "https://github.com/rbong/vim-flog/"; meta.license = unfree; @@ -21543,12 +21557,12 @@ final: prev: { vim-illuminate = buildVimPlugin { pname = "vim-illuminate"; - version = "0-unstable-2026-07-03"; + version = "0-unstable-2026-07-11"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "8629e6b2dfa8c66677b9d489eb02480cbcfa9599"; - hash = "sha256-lvcm3OA1jYmwhyD9yLYT829s70jGBgEPEgfenlGSJnY="; + rev = "91313e598ca62e110bc71535c49069b66b9883c9"; + hash = "sha256-3HM1aqFasEWXHaLQbJnax6Spw71TVd23BjsmH8jdTtQ="; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -21894,12 +21908,12 @@ final: prev: { vim-just = buildVimPlugin { pname = "vim-just"; - version = "0-unstable-2026-06-12"; + version = "0-unstable-2026-07-11"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "49f318424ed17fb8d49122daa39820fd6a2880f5"; - hash = "sha256-r/YS0LFio0BNTCUh0nRrAndUfcJgYio+ADCoqq8NH8U="; + rev = "b3301b091c730061a6da1f9fab670eece6af187c"; + hash = "sha256-ZcrnrD8ZHb76U1SrjEGlDLSr54WbtAyqjeooj8y0tug="; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -22202,12 +22216,12 @@ final: prev: { vim-lsp-settings = buildVimPlugin { pname = "vim-lsp-settings"; - version = "0.0.1-unstable-2026-06-11"; + version = "0.0.1-unstable-2026-07-11"; src = fetchFromGitHub { owner = "mattn"; repo = "vim-lsp-settings"; - rev = "bffb50ffa688e651a3d4ad827c90b887d5c67200"; - hash = "sha256-4AzLUvDTv8stTk2oKvjXetinK5YGx636TwP9yKdluZs="; + rev = "1b1803c4ae35ef8fecaaea1e6580ee700278804f"; + hash = "sha256-kGQZWrg6tf5j/iHfTIKiQC/JZJRoKbKxMYzfhERvN+8="; }; meta.homepage = "https://github.com/mattn/vim-lsp-settings/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -25098,12 +25112,12 @@ final: prev: { vimade = buildVimPlugin { pname = "vimade"; - version = "2.5.1-unstable-2026-05-17"; + version = "2.5.1-unstable-2026-07-16"; src = fetchFromGitHub { owner = "TaDaa"; repo = "vimade"; - rev = "a5323f4930e3f1f48c0329e50bd218ba61577aaf"; - hash = "sha256-sBCZ/EEuGoqCBSg3Jh1o05sSuAJNOdortEB7b4sR2Z4="; + rev = "3d3d2db7ecd43c0181b20fede11d26f090dbc0d9"; + hash = "sha256-dR+h9pPglZmpOsrmOUJpwVDcx5m+RqeNMjsoWcGhMsQ="; }; meta.homepage = "https://github.com/TaDaa/vimade/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -25799,12 +25813,12 @@ final: prev: { y9nika-nvim = buildVimPlugin { pname = "y9nika.nvim"; - version = "0-unstable-2026-05-26"; + version = "0-unstable-2026-07-11"; src = fetchFromGitHub { owner = "y9san9"; repo = "y9nika.nvim"; - rev = "0fc35319498d8e4509601546f4efb423026e53a1"; - hash = "sha256-0S2+9L1gW6Rbh1lUP+EGJ0AGIUnNAiTlrGAEJrbm7rc="; + rev = "18827266802e8e105c724c72a84c2c59beb5d90f"; + hash = "sha256-CzEqiuag+4RKOCjM4P2qp3ux9LMcRpQNA8t9r8RzXRc="; }; meta.homepage = "https://github.com/y9san9/y9nika.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -26053,11 +26067,11 @@ final: prev: { zig-vim = buildVimPlugin { pname = "zig.vim"; - version = "0-unstable-2026-07-08"; + version = "0-unstable-2026-07-12"; src = fetchgit { url = "https://codeberg.org/ziglang/zig.vim/"; - rev = "71f3454efc5cf781aba507f709b921993d096731"; - hash = "sha256-oiZv49qsZIHfB+OtxCYwC+CzpI1cJnEdyhDMZS3DGO8="; + rev = "1ba233de1f93ae7cf5c0903541e6ad422207b089"; + hash = "sha256-rbzX8wJKczk/dKpjPnNouf/LhpFmN9/zRNzEc0QhHm0="; }; meta.homepage = "https://codeberg.org/ziglang/zig.vim/"; meta.license = unfree; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/windsurf-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/windsurf-nvim/default.nix index ca8b0fec8b1c..077bff37e046 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/windsurf-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/windsurf-nvim/default.nix @@ -14,7 +14,6 @@ let codeiumHashes = { x86_64-linux = "sha256-IeNK7UQtOhqC/eQv7MAya4jB1WIGykSR7IgutZatmHM="; aarch64-linux = "sha256-ujTFki/3V79El2WCkG0PJhbaMT0knC9mrS9E7Uv9HD4="; - x86_64-darwin = "sha256-r2KloEQsUku9sk8h76kwyQuMTHcq/vwfTSK2dkiXDzE="; aarch64-darwin = "sha256-1jNH0Up8mAahDgvPF6g42LV+RVDVsPqDM54lE2KYY48="; }; @@ -30,7 +29,6 @@ let { x86_64-linux = "linux_x64"; aarch64-linux = "linux_arm"; - x86_64-darwin = "macos_x64"; aarch64-darwin = "macos_arm"; } .${system} or throwSystem; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 1f59ee2cdc3d..5ccb9ddd6506 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -3098,6 +3098,10 @@ assertNoAdditions { dependencies = [ self.nui-nvim ]; }; + none-ls-extras-nvim = super.none-ls-extras-nvim.overrideAttrs { + dependencies = [ self.none-ls-nvim ]; + }; + none-ls-nvim = super.none-ls-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 45eca79a28a3..c50708c82eeb 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -865,6 +865,7 @@ https://github.com/aktersnurra/no-clown-fiesta.nvim/,, https://github.com/shortcuts/no-neck-pain.nvim/,, https://github.com/kartikp10/noctis.nvim/,, https://github.com/folke/noice.nvim/,, +https://github.com/nvimtools/none-ls-extras.nvim/,, https://github.com/nvimtools/none-ls.nvim/,, https://github.com/nordtheme/vim/,,nord-vim https://github.com/shaunsingh/nord.nvim/,, 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 f547aec1465c..a38756a2b825 100644 --- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix +++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix @@ -21,26 +21,22 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-QxZa6ugaMC7otLQmDZU54Fv3OGMNYO5iyjqjCLDNdbI="; + hash = "sha256-pPgl7MTzkBqZ/KatgAme7F6w873GLxZ1ZTYfkXzD4kw="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-lgE5dld8lvt/dyGVNjR1ZiV2qtBu9pMZayNe5dBfHo0="; - }; - "x86_64-darwin" = { - arch = "darwin-x64"; - hash = "sha256-AnqO7aZ3uybYnAHYCi5ppZ/5xOuiTqs+75TflN7bVow="; + hash = "sha256-gnaECK1yMNatDn/ZJ6od8wBQYMlJJ/Q49Z+Ur4SxWU8="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-KKuUXjfIsngnKrSLTMYNzb6XVZkJszUwIihCGHQJ0gU="; + hash = "sha256-g0DEP2f+ooEgYz8TFUYTMoVV83HGR2eK2dL5MWa92F8="; }; }; in { name = "claude-code"; publisher = "anthropic"; - version = "2.1.207"; + version = "2.1.212"; } // sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); @@ -60,7 +56,6 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix b/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix index d083d33635b7..2128bad3a243 100644 --- a/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix +++ b/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix @@ -14,10 +14,6 @@ vscode-utils.buildVscodeMarketplaceExtension { arch = "linux-x64"; hash = "sha256-lhDt8XEF90y4pj8RLUZgfZNmHkV1XlmHsYuT6sGJMRc="; }; - "x86_64-darwin" = { - arch = "darwin-x64"; - hash = "sha256-SqFRn5FVQ+LcpmYT7/AIdIKTOxbapaKvPi+I360dVW8="; - }; "aarch64-linux" = { arch = "linux-arm64"; hash = "sha256-iuYVCG4YWPFI8o4GmuNjkbXvzJsAre0gSSEWq6CUk2E="; @@ -57,7 +53,6 @@ vscode-utils.buildVscodeMarketplaceExtension { "aarch64-linux" "aarch64-darwin" "x86_64-linux" - "x86_64-darwin" ]; maintainers = [ lib.maintainers.azd325 ]; }; diff --git a/pkgs/applications/editors/vscode/extensions/continue.continue/default.nix b/pkgs/applications/editors/vscode/extensions/continue.continue/default.nix index 96c4d7441c5f..330c30ad87dd 100644 --- a/pkgs/applications/editors/vscode/extensions/continue.continue/default.nix +++ b/pkgs/applications/editors/vscode/extensions/continue.continue/default.nix @@ -13,10 +13,6 @@ vscode-utils.buildVscodeMarketplaceExtension { arch = "linux-x64"; hash = "sha256-4GiTNT+UPdTth9VDhHTXfqhQ5gM6vfLAaU5Cy3VMTCI="; }; - "x86_64-darwin" = { - arch = "darwin-x64"; - hash = "sha256-XJfDXWYpxYV5YHIBINqNJdyVho7Xd9OGMu11WE0LENM="; - }; "aarch64-linux" = { arch = "linux-arm64"; hash = "sha256-QngCharrjiDKrY7RgWtKzIJxjXazuRvpuHVUAxknWfA="; @@ -44,7 +40,6 @@ vscode-utils.buildVscodeMarketplaceExtension { maintainers = with lib.maintainers; [ flacks ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ]; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index de3ec7a5475f..93e524df8ec2 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1174,8 +1174,8 @@ let mktplcRef = { publisher = "DanielSanMedium"; name = "dscodegpt"; - version = "3.23.1"; - hash = "sha256-B97cImVKnholhZV0ZBru/gpeVSaTHOFfQywwmjk+kq8="; + version = "3.24.12"; + hash = "sha256-2vpFCxF65Y/VfyTHDO0wLAe0+m/lc0+iloEI//FdaQg="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/DanielSanMedium.dscodegpt/changelog"; @@ -1226,8 +1226,8 @@ let mktplcRef = { name = "databricks"; publisher = "databricks"; - version = "2.12.1"; - hash = "sha256-GKm3rZMvU/5Ii01GjUg7rE15TnOtDTh0LwkDVsuSLfY="; + version = "2.12.3"; + hash = "sha256-/hFBw6STQG4zycS44em1DlaQSpKGP4w7YlH+fu/cHlA="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/databricks.databricks/changelog"; @@ -1760,8 +1760,8 @@ let mktplcRef = { name = "foam-vscode"; publisher = "foam"; - version = "0.44.1"; - hash = "sha256-OH4i4cGh/ivHQNAI55FHjM9ZjnhMaJSnsuQUnxub9/g="; + version = "0.44.2"; + hash = "sha256-jz1j8KzD5PDZ+P5V7yLo1BEmcW+q+D2nYKzYEf7Sg2w="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/foam.foam-vscode/changelog"; @@ -2015,8 +2015,8 @@ let mktplcRef = { name = "gitlab-workflow"; publisher = "gitlab"; - version = "6.84.2"; - hash = "sha256-UBoZ6DxT5d7zeTycgmuLomzoVcB7iAnflfxAup6QslI="; + version = "6.85.3"; + hash = "sha256-EsQ+95Wo/5F9mEMQ7X36vBgUWlsz5BCOm+7QrGHuepc="; }; meta = { description = "GitLab extension for Visual Studio Code"; @@ -2592,8 +2592,8 @@ let mktplcRef = { publisher = "jnoortheen"; name = "nix-ide"; - version = "0.5.9"; - hash = "sha256-hPOcp6Yksgfu1+In21/gJ3MthV8JUV5WaRpYHvo5GGk="; + version = "0.5.10"; + hash = "sha256-5rNqQRFLryzeIezUiqgvSY8Vz5n48367RHQrFDxpoD8="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/jnoortheen.nix-ide/changelog"; @@ -3190,10 +3190,6 @@ let arch = "linux-x64"; hash = "sha256-pmA7BNwyHiaU93j61/MyrBV5kH0DlW+7BA6HNlKGnso="; }; - "x86_64-darwin" = { - arch = "darwin-x64"; - hash = "sha256-E2KRzjIxLFmwArzEKittjejacrCOFFNNzphWw8v5CpE="; - }; "aarch64-linux" = { arch = "linux-arm64"; hash = "sha256-pnQP1OKr3NJgUuXzO1InYqGA49OuMFn2iEf8wpl4PqM="; @@ -3224,7 +3220,6 @@ let maintainers = [ lib.maintainers.magnouvean ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ]; @@ -4556,8 +4551,8 @@ let mktplcRef = { name = "svelte-vscode"; publisher = "svelte"; - version = "110.2.1"; - hash = "sha256-NcidslqM4AVrobOaxW1EBpMoBCTn2Bej86phIVU2psc="; + version = "110.3.0"; + hash = "sha256-vVLnjFOpOmfmkwP0Yz7zONrBgpNDFfFZ0TAAicxdZ64="; }; meta = { changelog = "https://github.com/sveltejs/language-tools/releases"; @@ -4831,8 +4826,8 @@ let mktplcRef = { name = "opa"; publisher = "tsandall"; - version = "0.23.0"; - hash = "sha256-xya4Kxjc/uR4LFTZ5fAVOa0/cyHy8XHZkkapmODyMK4="; + version = "0.24.1"; + hash = "sha256-wNlZM9/2K32W4vYPKzLiBCTqhV+SqgZzXGRxKoHoIaM="; }; meta = { changelog = "https://github.com/open-policy-agent/vscode-opa/blob/master/CHANGELOG.md"; @@ -5118,8 +5113,8 @@ let mktplcRef = { name = "vscode-gradle"; publisher = "vscjava"; - version = "3.17.3"; - hash = "sha256-heFcGOe10r7y23xyFc/nFKk/nsrX4wc5fT9e4GKGhW0="; + version = "3.18.0"; + hash = "sha256-ybMejIJER9HHVh1z+tazgvQ0UIa8eKoJBb7JOLU1Kpw="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/docker.docker/default.nix b/pkgs/applications/editors/vscode/extensions/docker.docker/default.nix index 70523c30c6d4..2abc84aba7d9 100644 --- a/pkgs/applications/editors/vscode/extensions/docker.docker/default.nix +++ b/pkgs/applications/editors/vscode/extensions/docker.docker/default.nix @@ -10,10 +10,6 @@ let hash = "sha256-jfjd2V7IJ4GQlz/pXmrY/LlBjQ2qtlsQV4ZRD8RiWTg="; arch = "linux-x64"; }; - x86_64-darwin = { - hash = "sha256-aOFoTLVaaMFsdGoWV0OC31/nmOHXUhr2Y8K4SWcNil8="; - arch = "darwin-x64"; - }; aarch64-linux = { hash = "sha256-ugluaghNNZ/VrQORVIhc0Fuv3rHo++LO3Uwg2ujmsQc="; arch = "linux-arm64"; diff --git a/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix b/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix index b470cd4ca50f..64bb5e1086ce 100644 --- a/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix +++ b/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix @@ -45,7 +45,6 @@ vscode-utils.buildVscodeMarketplaceExtension { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/applications/editors/vscode/extensions/kilocode.kilo-code/default.nix b/pkgs/applications/editors/vscode/extensions/kilocode.kilo-code/default.nix index e8d4b1b9ce98..2fa4097929c3 100644 --- a/pkgs/applications/editors/vscode/extensions/kilocode.kilo-code/default.nix +++ b/pkgs/applications/editors/vscode/extensions/kilocode.kilo-code/default.nix @@ -14,10 +14,6 @@ vscode-utils.buildVscodeMarketplaceExtension { arch = "linux-x64"; hash = "sha256-uPmJyEq7X6uJzE1M5Xywax1mrnTcg6jOb9MlpKZ0WRk="; }; - "x86_64-darwin" = { - arch = "darwin-x64"; - hash = "sha256-oEVt3VbRUPD4tfQs0EU7RX6671fCJiMi38wF+76RzZI="; - }; "aarch64-linux" = { arch = "linux-arm64"; hash = "sha256-b46f0f99rjBivewC9jUbAFiKK+DS1XKv+AynUlKHliw="; @@ -52,7 +48,6 @@ vscode-utils.buildVscodeMarketplaceExtension { "aarch64-linux" "aarch64-darwin" "x86_64-linux" - "x86_64-darwin" ]; maintainers = with lib.maintainers; [ xiaoxiangmoe ]; }; diff --git a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix index dc8ca7283294..67df81e6ddf4 100644 --- a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix @@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "mongodb-vscode"; publisher = "mongodb"; - version = "1.16.0"; - hash = "sha256-cnKYDrExL3yDJkEofWPglzMa50KDMgKQxsM5zK1RaBs="; + version = "1.16.1"; + hash = "sha256-UIxXrJpH/Ix4Ev6veumcT/9h1SgZgEXHjnwkOH9ch44="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix index af7fd5daef40..96eeea294b2d 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix @@ -22,10 +22,6 @@ let arch = "linux-arm64"; hash = "sha256-1zz9xrMALIOXzMpArWSwO12WmRE+0ldbIwUFH1G2GQI="; }; - x86_64-darwin = { - arch = "darwin-x64"; - hash = "sha256-3PoSbp8M2X4bhSQyxvNC7jtNDVNEuEKeYRZQMFOmbtQ="; - }; aarch64-darwin = { arch = "darwin-arm64"; hash = "sha256-F4CsyiX46SpjilJNV+qYps1JAw09pVruLmW+muN9/B4="; @@ -138,7 +134,6 @@ vscode-utils.buildVscodeMarketplaceExtension { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix index b0bb0e750ec8..abd222def11d 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix @@ -24,10 +24,6 @@ let arch = "linux-arm64"; hash = "sha256-EV3745OXbwrRmc8P5e13DZbomyJGcYQUF07WflRWU1Q="; }; - x86_64-darwin = { - arch = "darwin-x64"; - hash = "sha256-i2cALeaSXfwIdfXNeWfND99nFYIiOFwsxbqU7/Effx8="; - }; aarch64-darwin = { arch = "darwin-arm64"; hash = "sha256-KCIkjBmYZPiuFmQ3/aDycARYIHPyDTmMkoGcuG5DQX8="; @@ -159,7 +155,6 @@ vscode-utils.buildVscodeMarketplaceExtension { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix index a934f7a21db6..4c95c0174df3 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix @@ -18,10 +18,6 @@ let hash = "sha256-HQfmDV6rJX6l1pGybe8//2QrTSwE+rlEJOi4/iW69lY="; arch = "linux-x64"; }; - x86_64-darwin = { - hash = "sha256-tAZyt2fwB/GOhffY5lhHJTmbXG8UloynPtjoMtWRHok="; - arch = "darwin-x64"; - }; aarch64-linux = { hash = "sha256-v7fatW/LMJ8CeSRrE/5b7dLqOrhNhwzUySUxtAMuBUE="; arch = "linux-arm64"; diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode.vscode-speech/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode.vscode-speech/default.nix index a92f471d2f06..4399094441b1 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vscode.vscode-speech/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.vscode-speech/default.nix @@ -16,10 +16,6 @@ vscode-utils.buildVscodeMarketplaceExtension { arch = "linux-x64"; hash = "sha256-dZwOBehoYEqaYskvcPB55IKnG1CMToioyUJXlndqorA="; }; - "x86_64-darwin" = { - arch = "darwin-x64"; - hash = "sha256-b6LobvVngC0TFuWTC9JBQrECkoX7ewLNCpCROkXHk20="; - }; "aarch64-linux" = { arch = "linux-arm64"; hash = "sha256-/EaOfoubfq1ufwB7TTQ2hqmh1ZJiZ1+B6QeYu3MoFPI="; @@ -68,7 +64,6 @@ vscode-utils.buildVscodeMarketplaceExtension { license = lib.licenses.unfree; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; diff --git a/pkgs/applications/editors/vscode/extensions/redhat.vscode-xml/default.nix b/pkgs/applications/editors/vscode/extensions/redhat.vscode-xml/default.nix index 4e311914bc7a..1df127e0fd59 100644 --- a/pkgs/applications/editors/vscode/extensions/redhat.vscode-xml/default.nix +++ b/pkgs/applications/editors/vscode/extensions/redhat.vscode-xml/default.nix @@ -13,10 +13,6 @@ vscode-utils.buildVscodeMarketplaceExtension { arch = "linux-x64"; hash = "sha256-cP/oFn19CZ/G3kjdHNZGqXvoDE1qUtg6xrg/2MO14Lo="; }; - "x86_64-darwin" = { - arch = "darwin-x64"; - hash = "sha256-wtk8SasxXEQ3pCJpVTWR8wcY/bNaIZmImbAtrFWYWOo="; - }; "aarch64-darwin" = { arch = "darwin-arm64"; hash = "sha256-XYdwVoDqK+88ZYUm6APyamFNx6XlYjy0R4CIhSMuRmU="; @@ -42,7 +38,6 @@ vscode-utils.buildVscodeMarketplaceExtension { platforms = [ "x86_64-linux" "aarch64-darwin" - "x86_64-darwin" ]; }; } diff --git a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix index c4b9eee45455..2baf64ec3aa9 100644 --- a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix +++ b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "claude-dev"; publisher = "saoudrizwan"; - version = "3.89.2"; - hash = "sha256-lDt/xn1PFs0UDg0rOOun8Bl/FTXSjvQ//ETkoHFypAM="; + version = "4.0.8"; + hash = "sha256-qSlz2wXQwpO1Wi9P40hVm+ACZ+VfCiV9LF3lnOkMoXA="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix index dba6740771e6..305f1123a1b8 100644 --- a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix +++ b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix @@ -15,10 +15,6 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { arch = "linux-x64"; hash = "sha256-Oz4Buraof4yXIxGeKXIsDkvEQQ0Gzf/b5mdses1nHlo="; }; - "x86_64-darwin" = { - arch = "darwin-x64"; - hash = "sha256-Iqe4KZXQHenKAypXK/qzG2BCXbk2cZ0i/0xhWhlfQxo="; - }; "aarch64-darwin" = { arch = "darwin-arm64"; hash = "sha256-vMDB5zmdBNt3R5AkeuCYhxzW/rSGwM+wtU5K4v3ZU/U="; diff --git a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix index 6d5b83c7e2d6..f7aafb38d63a 100644 --- a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix @@ -20,10 +20,6 @@ let arch = "linux-arm64"; hash = "sha256-Z3cRojI4mCCS2t3aLojgImULQOobq5liDwoeHuzKEhY="; }; - x86_64-darwin = { - arch = "darwin-x64"; - hash = "sha256-Th0cseTJk+CD3BO/99t0VMD7zcF6nxAfmHFhfN8j5sw="; - }; aarch64-darwin = { arch = "darwin-arm64"; hash = "sha256-rHgMl71YCs9ea0nFnx+E2U8isL4zQzIvvE9tgxM7IiA="; @@ -66,7 +62,6 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { "aarch64-linux" "aarch64-darwin" "x86_64-linux" - "x86_64-darwin" ]; maintainers = [ ]; }; diff --git a/pkgs/applications/editors/vscode/extensions/tombi-toml.tombi/default.nix b/pkgs/applications/editors/vscode/extensions/tombi-toml.tombi/default.nix index 66e9fbc2eb18..c29133655ef5 100644 --- a/pkgs/applications/editors/vscode/extensions/tombi-toml.tombi/default.nix +++ b/pkgs/applications/editors/vscode/extensions/tombi-toml.tombi/default.nix @@ -10,10 +10,6 @@ let hash = "sha256-DWrKvjWpUYvyqgZCShqwBKw33MHW31cxb4ERV65O+uc="; arch = "linux-x64"; }; - x86_64-darwin = { - hash = "sha256-CYDutYtU0+AAn6PYO/EQ/Suv8BNuMtvePpFdKRtiqAs="; - arch = "darwin-x64"; - }; aarch64-linux = { hash = "sha256-iFHeZiTubXA/t2Gib9hP42d7yjq/WRyywp+l8VhGfmo="; arch = "linux-arm64"; diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix index 51f89e1e87c3..7523d64c9ea6 100644 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix +++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix @@ -180,7 +180,7 @@ stdenv.mkDerivation { meta = { description = "Native debugger extension for VSCode based on LLDB"; homepage = "https://github.com/vadimcn/vscode-lldb"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ ]; platforms = lib.platforms.all; }; diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix index eb1b67a6132b..f07054e2fd07 100644 --- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix +++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix @@ -15,10 +15,6 @@ vscode-utils.buildVscodeMarketplaceExtension { arch = "linux-x64"; hash = "sha256-htZGjy7ZnQLGZUncokGaGHyLpvPM5jzWUvCdnfN1vbM="; }; - "x86_64-darwin" = { - arch = "darwin-x64"; - hash = "sha256-OFdrXunh63xBZW/HwDDjj17TTiOLGY1Enb6ARxNc4bI="; - }; "aarch64-linux" = { arch = "linux-arm64"; hash = "sha256-rgeNJbl6G2yKAWYW7NarQwVLmd3oZ4YTOVeCUat6ZqQ="; @@ -56,7 +52,6 @@ vscode-utils.buildVscodeMarketplaceExtension { "aarch64-linux" "aarch64-darwin" "x86_64-linux" - "x86_64-darwin" ]; maintainers = with lib.maintainers; [ sandarukasa ]; }; diff --git a/pkgs/applications/editors/vscode/extensions/yoshi47.selection-path-copier/default.nix b/pkgs/applications/editors/vscode/extensions/yoshi47.selection-path-copier/default.nix index a309d6d7ddc9..8933fcac2d30 100644 --- a/pkgs/applications/editors/vscode/extensions/yoshi47.selection-path-copier/default.nix +++ b/pkgs/applications/editors/vscode/extensions/yoshi47.selection-path-copier/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { mktplcRef = { publisher = "yoshi47"; name = "selection-path-copier"; - version = "1.5.0"; - hash = "sha256-ip8dsU8B2vghINPSftvfC5OtM0bjIP0V3JAMt5skmdg="; + version = "1.6.0"; + hash = "sha256-KnV9WariqK3GMjoQARtamxriBkL0Pi9y7+fhfwObCWE="; }; meta = { description = "Copy file paths with line numbers, code snippets, and GitHub permalinks in multiple formats"; diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 652b2fab1896..4bfc6969b048 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -429,7 +429,6 @@ stdenv.mkDerivation ( # see https://www.npmjs.com/package/@vscode/ripgrep-universal?activeTab=code ripgrepSystem = { - x86_64-darwin = "darwin-x64"; aarch64-darwin = "darwin-arm64"; armv7l-linux = "linux-arm"; aarch64-linux = "linux-arm64"; diff --git a/pkgs/applications/editors/vscode/update-vscodium.sh b/pkgs/applications/editors/vscode/update-vscodium.sh index 6420ff0ee1f2..08c776dd9a46 100755 --- a/pkgs/applications/editors/vscode/update-vscodium.sh +++ b/pkgs/applications/editors/vscode/update-vscodium.sh @@ -21,8 +21,7 @@ for i in \ "aarch64-linux linux-arm64 tar.gz" \ "armv7l-linux linux-armhf tar.gz" \ "loongarch64-linux linux-loong64 tar.gz" \ - "aarch64-darwin darwin-arm64 zip" \ - "x86_64-darwin darwin-x64 zip"; do + "aarch64-darwin darwin-arm64 zip"; do set -- $i hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri $(nix-prefetch-url "https://github.com/VSCodium/vscodium/releases/download/$latestVersion/VSCodium-$2-$latestVersion.$3")) update-source-version vscodium $latestVersion $hash --system=$1 --ignore-same-version diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 89ed737e0c43..480d02b1b232 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -24,7 +24,6 @@ let plat = { x86_64-linux = "linux-x64"; - x86_64-darwin = "darwin"; aarch64-linux = "linux-arm64"; aarch64-darwin = "darwin-arm64"; armv7l-linux = "linux-armhf"; @@ -36,7 +35,6 @@ let hash = { x86_64-linux = "sha256-4G+zZ5HJuvdJXUt9wPWqqCVOfRpgpe5D5sfevAXJYrU="; - x86_64-darwin = "sha256-+o+UZwmJMeGyf2n1VZcm0zl4dzuC/0UBV5jyUANKsEQ="; aarch64-linux = "sha256-UEkpGlTV/KZ8Qcw/OBOCNDQHblD7gHHloSzM62FvDnw="; aarch64-darwin = "sha256-IHu9EwW9/oS2FTr/mB7ugMss5Pku3IyslqFYr4riZyk="; armv7l-linux = "sha256-Rfp2H6L7bXXhdxf2yphW9YXDGW1+Ea0nKdyTFS8Y/tU="; @@ -128,7 +126,6 @@ buildVscode { ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" "aarch64-linux" "armv7l-linux" diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index af9fa5cc4eba..f78790955fcd 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -15,7 +15,6 @@ let plat = { x86_64-linux = "linux-x64"; - x86_64-darwin = "darwin-x64"; aarch64-linux = "linux-arm64"; aarch64-darwin = "darwin-arm64"; armv7l-linux = "linux-armhf"; @@ -28,7 +27,6 @@ let hash = { x86_64-linux = "sha256-LJsGc11MH6zlcJNfSWjTWPn2Jp9dkjeBPQuCXH1woUM="; - x86_64-darwin = "sha256-bC7AfH2eKmmsWIOHifNGKD/kVQCYyuMfU3SUil0DXkM="; aarch64-linux = "sha256-mT5dvw8GOZ0GnZaKRS/TAzQDEEYDOgcj6w6lNLy5kQ0="; aarch64-darwin = "sha256-c8K17XKpRG1ji2mUfoyg2+cRF+qc1KVMYVkaQoUIz7Y="; armv7l-linux = "sha256-91ZHhEUDVoDiRBLwMHVLhzKmb9gWcPBUsVRZVLhCA4M="; @@ -88,7 +86,6 @@ buildVscode rec { mainProgram = "codium"; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-linux" "aarch64-darwin" "armv7l-linux" diff --git a/pkgs/applications/editors/your-editor/default.nix b/pkgs/applications/editors/your-editor/default.nix index 60ef8d53553b..bee347a92d7c 100644 --- a/pkgs/applications/editors/your-editor/default.nix +++ b/pkgs/applications/editors/your-editor/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Small and simple terminal editor core that is meant to be extended through a powerful plugin architecture"; homepage = "https://your-editor.org/"; changelog = "https://github.com/your-editor/yed/blob/${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; platforms = lib.platforms.unix; mainProgram = "yed"; }; diff --git a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix index 5b806bb2dcc4..8a89ec55c87b 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-2026-07-03"; + version = "0-unstable-2026-07-10"; src = fetchFromGitHub { owner = "libretro"; repo = "beetle-pce-fast-libretro"; - rev = "744a9ffb6120e7531c153aa468f34adb3fab9057"; - hash = "sha256-n5Mz0a2bIbQEDsX8PZzji58D8L/yFoQVghrMTg7Srd0="; + rev = "0bc6c86928343ca4202c5b6ef33fa4387c47fc12"; + hash = "sha256-TgUueogxf5KZ1S5pt0WiYtoHXWQI81C6QUts1xJClh8="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/dolphin.nix b/pkgs/applications/emulators/libretro/cores/dolphin.nix index 3975f8f5e6fc..3b96117dcb04 100644 --- a/pkgs/applications/emulators/libretro/cores/dolphin.nix +++ b/pkgs/applications/emulators/libretro/cores/dolphin.nix @@ -20,13 +20,13 @@ }: mkLibretroCore { core = "dolphin"; - version = "0-unstable-2026-06-28"; + version = "0-unstable-2026-07-12"; src = fetchFromGitHub { owner = "libretro"; repo = "dolphin"; - rev = "894fdda35688f3ac33c680ef6fe17ce965a16bf1"; - hash = "sha256-Dkvv8EgQjLjyt0muSVF0Cnex/3xUcZXvWTzgUw61Sv0="; + rev = "0b766a68cc835775b3216500bb9af2f5d4602b12"; + hash = "sha256-JaUiDc4/vEWjEXe6H9+i6pft2DTsl5my5wyFmtbjdR0="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/libretro/cores/opera.nix b/pkgs/applications/emulators/libretro/cores/opera.nix index b1c2a0b39b02..3f84f95bdedf 100644 --- a/pkgs/applications/emulators/libretro/cores/opera.nix +++ b/pkgs/applications/emulators/libretro/cores/opera.nix @@ -6,13 +6,13 @@ }: mkLibretroCore { core = "opera"; - version = "0-unstable-2026-06-28"; + version = "0-unstable-2026-07-13"; src = fetchFromGitHub { owner = "libretro"; repo = "opera-libretro"; - rev = "340f9e9014c292fc47a8844a871a71dafe072b6d"; - hash = "sha256-geBK8RIlaRcWn4CDzVl3pjK0WOFQcMZl7zFMXE2oZNo="; + rev = "1edda8a2a6c6b9ae259d5c7cd7d54dcba9ee7e32"; + hash = "sha256-dc7xRjFxfSL2q9u1N0QH2j+oPbRGng2Z3U3J484lXiU="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/prboom.nix b/pkgs/applications/emulators/libretro/cores/prboom.nix index 907e3f47386f..38a3b5c3ecca 100644 --- a/pkgs/applications/emulators/libretro/cores/prboom.nix +++ b/pkgs/applications/emulators/libretro/cores/prboom.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "prboom"; - version = "0-unstable-2026-07-01"; + version = "0-unstable-2026-07-07"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-prboom"; - rev = "141978db577b52cb943641629401776e49ccbbe6"; - hash = "sha256-USRBq+h2HAoDIdYVd47wGLEnUzJAEOvikuvSNTHpboI="; + rev = "31563d6e65faa6b9b7e975754d2062370bba4342"; + hash = "sha256-eFRzbVTL5ARf650D0ZAEFGNTxjAy1CjBiAhwSQR8vJ4="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/snes9x.nix b/pkgs/applications/emulators/libretro/cores/snes9x.nix index aee94c8e128b..ac4657b975c3 100644 --- a/pkgs/applications/emulators/libretro/cores/snes9x.nix +++ b/pkgs/applications/emulators/libretro/cores/snes9x.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "snes9x"; - version = "0-unstable-2026-07-05"; + version = "0-unstable-2026-07-13"; src = fetchFromGitHub { owner = "snes9xgit"; repo = "snes9x"; - rev = "51ef0275df25fc6347d241e3b5325b52b6e96582"; - hash = "sha256-+f6u8VUHNLI9pb2AFLyEoGQtGzNIkeWS2wvF9PYDIm8="; + rev = "b5cc7651f9fc02189cb51b5a43848877db5aec42"; + hash = "sha256-htwL5m49J+ku7h79Eu4y74LKiHkbL3UE3+LAXE52ZY8="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/stella.nix b/pkgs/applications/emulators/libretro/cores/stella.nix index e33d2c161206..bfb7842100db 100644 --- a/pkgs/applications/emulators/libretro/cores/stella.nix +++ b/pkgs/applications/emulators/libretro/cores/stella.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "stella"; - version = "0-unstable-2026-06-28"; + version = "0-unstable-2026-07-16"; src = fetchFromGitHub { owner = "stella-emu"; repo = "stella"; - rev = "62522a804dec6b5aa683fa5e37f5f6c48aefded1"; - hash = "sha256-YALzsYJwZDtVkVx9yvkkEZ1AHxT4fAc+epoFDwStmSI="; + rev = "61f4282f57934df94e08a2db79ec492aaab5b805"; + hash = "sha256-2pEQzl3aUq5ya9297Aj4MYN2ePkg/dyCvJavRWkyE1U="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/stella2014.nix b/pkgs/applications/emulators/libretro/cores/stella2014.nix index 863d375c6617..9432548683f3 100644 --- a/pkgs/applications/emulators/libretro/cores/stella2014.nix +++ b/pkgs/applications/emulators/libretro/cores/stella2014.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "stella2014"; - version = "0-unstable-2026-07-04"; + version = "0-unstable-2026-07-06"; src = fetchFromGitHub { owner = "libretro"; repo = "stella2014-libretro"; - rev = "8ddf2146ed2d2053cff9df64192f920e57709629"; - hash = "sha256-VDywbP7PhcQPHhu/KMvV1LlI/iOGjMzRooqvoT+Tnxc="; + rev = "4a7da82595d27b8df7af1ecb467a64b642a41bc9"; + hash = "sha256-uwtYNo6hUR6u2OicFYcbfgCGNlpDfIOF7Q5bNuJ/uMM="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index 465fc428cfd6..776dceef6050 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -365,7 +365,7 @@ stdenv.mkDerivation ( meta = { inherit version; homepage = "https://www.winehq.org/"; - license = with lib.licenses; [ lgpl21Plus ]; + license = lib.licenses.lgpl21Plus; sourceProvenance = with lib.sourceTypes; [ fromSource binaryNativeCode # mono, gecko diff --git a/pkgs/applications/emulators/wine/fonts.nix b/pkgs/applications/emulators/wine/fonts.nix index 94b2d74440a4..3ed188a42705 100644 --- a/pkgs/applications/emulators/wine/fonts.nix +++ b/pkgs/applications/emulators/wine/fonts.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "Microsoft replacement fonts by the Wine project"; homepage = "https://wiki.winehq.org/Create_Fonts"; - license = with lib.licenses; [ lgpl21Plus ]; + license = lib.licenses.lgpl21Plus; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ avnik diff --git a/pkgs/applications/emulators/wine/packages.nix b/pkgs/applications/emulators/wine/packages.nix index c548d3c1a72e..918046b464da 100644 --- a/pkgs/applications/emulators/wine/packages.nix +++ b/pkgs/applications/emulators/wine/packages.nix @@ -84,7 +84,6 @@ in if pkgs.stdenv.hostPlatform.isAarch64 then [ "--enable-archs=aarch64" ] else [ "--enable-win64" ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-linux" ]; mainProgram = "wine"; @@ -145,7 +144,6 @@ in [ "--enable-archs=x86_64,i386" ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-linux" ]; mainProgram = "wine"; diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index cdbac84aaf3d..a2decfce52cd 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -209,7 +209,7 @@ lib.makeScope pkgs.newScope ( broken = gimp.apiVersion != "2.0"; description = "GIMP plug-in to do the fourier transform"; homepage = "https://people.via.ecp.fr/~remi/soft/gimp/gimp_plugin_en.php3#fourier"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; }; }; @@ -243,7 +243,7 @@ lib.makeScope pkgs.newScope ( broken = lib.versionOlder gimp.version "3"; description = "Suite of gimp plugins for texture synthesis"; homepage = "https://github.com/bootchk/resynthesizer"; - license = [ lib.licenses.gpl3Plus ]; + license = lib.licenses.gpl3Plus; }; }; diff --git a/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix b/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix index 0024092cfcd5..65151cb3192b 100644 --- a/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix +++ b/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix @@ -101,7 +101,7 @@ python3.pkgs.buildPythonApplication { meta = { description = "Inkscape extension for machine embroidery design"; homepage = "https://inkstitch.org/"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ tropf pluiedev diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 17291bdc2cce..f0a220d8733d 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -29,7 +29,6 @@ let ]; platforms = [ "i686-linux" - "x86_64-darwin" "x86_64-linux" "aarch64-darwin" ]; diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index a3bc7a312ec7..9f18dc8e1bec 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -1,10 +1,9 @@ { "chromium": { - "version": "150.0.7871.114", + "version": "150.0.7871.128", "chromedriver": { - "version": "150.0.7871.115", - "hash_darwin": "sha256-3QytnwfqPqpYL2TMTMykvT+yAfZqWiRHMbMEK+whe0Q=", - "hash_darwin_aarch64": "sha256-jJ1URVS4led/1rTODm3t8wewJ8oIOzKIrq1utn5JJ3s=" + "version": "150.0.7871.129", + "hash_darwin_aarch64": "sha256-CtfrqG/AeXCg7Sl6LoidM+OhYvBWkRJoAxv3g68wqUw=" }, "deps": { "depot_tools": { @@ -21,8 +20,8 @@ "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "f405107495a07cb1bfcf687d4af8d91117098db6", - "hash": "sha256-VdDnFbE+/leFzR/PqR3ColKKqwkvuY/LsFje0nrwiXU=", + "rev": "81891e5ca708047763816c778216799ef14c66cb", + "hash": "sha256-lGHZZ2xIih+TaH145CZwEwyXsM1ZQWwqXsIQjWQ/jvk=", "recompress": true }, "src/third_party/clang-format/script": { @@ -92,8 +91,8 @@ }, "src/third_party/angle": { "url": "https://chromium.googlesource.com/angle/angle.git", - "rev": "8d3c5a8caebd836b99fa32062951a401910eba33", - "hash": "sha256-7X8FSWCA+BpAXbUPvjPyiGagmVXsadRGAY5haAEzRL8=" + "rev": "13e691adf3d4d3ebee2f7239731a07d3b9704956", + "hash": "sha256-fbjREn3D+quRRADGwR7V65BZt5b+1DgnsG4ZMhwGq6o=" }, "src/third_party/angle/third_party/glmark2/src": { "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2", @@ -552,8 +551,8 @@ }, "src/third_party/libyuv": { "url": "https://chromium.googlesource.com/libyuv/libyuv.git", - "rev": "3c5fa6ef272f6077d76816ee3d6a697ef1d6d272", - "hash": "sha256-FXFSC9dRb/KhSQdhJUqKEUpZbzU8ZpVnoSXtF/HPiJI=" + "rev": "8aeb3a9ca36341a640528e59b34b5d641080dca8", + "hash": "sha256-FGl0xK7ooaRFzFBxuV6oOu3h1x2b/myLLO2En3xgVCk=" }, "src/third_party/lss": { "url": "https://chromium.googlesource.com/linux-syscall-support.git", @@ -657,8 +656,8 @@ }, "src/third_party/skia": { "url": "https://skia.googlesource.com/skia.git", - "rev": "14d05ec761901b6e9e9193af8b347ab3a7f6fed0", - "hash": "sha256-KZGrztOKaT368KSCxiJAqnsgINpNODUlaXnH/maQNIA=" + "rev": "bee4c917220040e147f14964635ff92ce6c5a3f6", + "hash": "sha256-SWmoX+sNaw4KnlTBPt63uBSYfQavJejB3+Vlw/gtWX8=" }, "src/third_party/smhasher/src": { "url": "https://chromium.googlesource.com/external/smhasher.git", @@ -827,8 +826,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "ce0af5c0d181678bcda077c68d4beaec2854ad16", - "hash": "sha256-gjuH2HQAC0poQileS8JLusocBDoShuaQ9pbaAXmFj4g=" + "rev": "2b2f69158528fdd9d86b778cfcc2d0a1c4f8c59f", + "hash": "sha256-bqzCZSpKdXgKv3O1I7ck1PEXCa/2jBT7hpBEKW0LgTA=" }, "src/agents/shared": { "url": "https://chromium.googlesource.com/chromium/agents.git", @@ -838,7 +837,7 @@ } }, "ungoogled-chromium": { - "version": "150.0.7871.114", + "version": "150.0.7871.128", "deps": { "depot_tools": { "rev": "f4fadaf6a5ba1bced9d3d9021060667b563bf583", @@ -850,16 +849,16 @@ "hash": "sha256-/1A+DkzAQj2zGPe/A/G0Z3VrYJXUxq4Hd/+d/o5p3G8=" }, "ungoogled-patches": { - "rev": "150.0.7871.114-1", - "hash": "sha256-qvAtrj013U44vU+U3JLuItAPbgtHwm9Kq7hU2NLYDaE=" + "rev": "150.0.7871.128-1", + "hash": "sha256-GxSsGTC68IEMPt85RLBCVDT0dTl7ZVVPc8o4vxc50H8=" }, "npmHash": "sha256-pF0JtwFpPC4/fodbhSJnQKkczA9WlDg4VqEAy9aDVLg=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "f405107495a07cb1bfcf687d4af8d91117098db6", - "hash": "sha256-VdDnFbE+/leFzR/PqR3ColKKqwkvuY/LsFje0nrwiXU=", + "rev": "81891e5ca708047763816c778216799ef14c66cb", + "hash": "sha256-lGHZZ2xIih+TaH145CZwEwyXsM1ZQWwqXsIQjWQ/jvk=", "recompress": true }, "src/third_party/clang-format/script": { @@ -929,8 +928,8 @@ }, "src/third_party/angle": { "url": "https://chromium.googlesource.com/angle/angle.git", - "rev": "8d3c5a8caebd836b99fa32062951a401910eba33", - "hash": "sha256-7X8FSWCA+BpAXbUPvjPyiGagmVXsadRGAY5haAEzRL8=" + "rev": "13e691adf3d4d3ebee2f7239731a07d3b9704956", + "hash": "sha256-fbjREn3D+quRRADGwR7V65BZt5b+1DgnsG4ZMhwGq6o=" }, "src/third_party/angle/third_party/glmark2/src": { "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2", @@ -1389,8 +1388,8 @@ }, "src/third_party/libyuv": { "url": "https://chromium.googlesource.com/libyuv/libyuv.git", - "rev": "3c5fa6ef272f6077d76816ee3d6a697ef1d6d272", - "hash": "sha256-FXFSC9dRb/KhSQdhJUqKEUpZbzU8ZpVnoSXtF/HPiJI=" + "rev": "8aeb3a9ca36341a640528e59b34b5d641080dca8", + "hash": "sha256-FGl0xK7ooaRFzFBxuV6oOu3h1x2b/myLLO2En3xgVCk=" }, "src/third_party/lss": { "url": "https://chromium.googlesource.com/linux-syscall-support.git", @@ -1494,8 +1493,8 @@ }, "src/third_party/skia": { "url": "https://skia.googlesource.com/skia.git", - "rev": "14d05ec761901b6e9e9193af8b347ab3a7f6fed0", - "hash": "sha256-KZGrztOKaT368KSCxiJAqnsgINpNODUlaXnH/maQNIA=" + "rev": "bee4c917220040e147f14964635ff92ce6c5a3f6", + "hash": "sha256-SWmoX+sNaw4KnlTBPt63uBSYfQavJejB3+Vlw/gtWX8=" }, "src/third_party/smhasher/src": { "url": "https://chromium.googlesource.com/external/smhasher.git", @@ -1664,8 +1663,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "ce0af5c0d181678bcda077c68d4beaec2854ad16", - "hash": "sha256-gjuH2HQAC0poQileS8JLusocBDoShuaQ9pbaAXmFj4g=" + "rev": "2b2f69158528fdd9d86b778cfcc2d0a1c4f8c59f", + "hash": "sha256-bqzCZSpKdXgKv3O1I7ck1PEXCa/2jBT7hpBEKW0LgTA=" }, "src/agents/shared": { "url": "https://chromium.googlesource.com/chromium/agents.git", diff --git a/pkgs/applications/networking/browsers/chromium/update.mjs b/pkgs/applications/networking/browsers/chromium/update.mjs index 9aab0753db78..c3652f161d5e 100755 --- a/pkgs/applications/networking/browsers/chromium/update.mjs +++ b/pkgs/applications/networking/browsers/chromium/update.mjs @@ -170,7 +170,6 @@ async function fetch_chromedriver_binaries(version) { const url = (platform) => `https://storage.googleapis.com/chrome-for-testing-public/${version}/${platform}/chromedriver-${platform}.zip` return { version, - hash_darwin: await prefetch(url('mac-x64')), hash_darwin_aarch64: await prefetch(url('mac-arm64')), } } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 947166188ad2..88d59af1aa81 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -39,9 +39,7 @@ let i686-linux = "linux-i686"; x86_64-linux = "linux-x86_64"; aarch64-linux = "linux-aarch64"; - # bundles are universal and can be re-used for both darwin architectures aarch64-darwin = "mac"; - x86_64-darwin = "mac"; }; arch = mozillaPlatforms.${stdenv.hostPlatform.system}; diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 441bd02ec555..9bb86c82dc54 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,1859 +1,1859 @@ { - version = "152.0.5"; + version = "152.0.6"; sources = [ { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/ach/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/ach/firefox-152.0.6.tar.xz"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "159545eaae8f56fd1cbb103d0e01cb58eec82957250c8e308f3e0526a911e825"; + sha256 = "53da6c76e669896c25752d5a306433641885be91873131b767ba450ac8a96ab8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/af/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/af/firefox-152.0.6.tar.xz"; locale = "af"; arch = "linux-x86_64"; - sha256 = "da652c456b722b76ef5d193c2193164436886a6e6de9d073037a6df1c262cec1"; + sha256 = "81cf2cf2ceb3914907591054d38799e1b0b835ea37c13d50cd4363e54ce25e59"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/an/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/an/firefox-152.0.6.tar.xz"; locale = "an"; arch = "linux-x86_64"; - sha256 = "11c90e7bcf3d5409c3c4f9e3495b9f0df9564dd93df5ed0ebbee613aefc3ce22"; + sha256 = "866dde5e094c2441b9cab44707237ab350f0753cbb321a9911332664a7d1497e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/ar/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/ar/firefox-152.0.6.tar.xz"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "d2a0ee4d04d5b9398f9239315c6d8c333b74265eeadd436a299aea6076ebab0d"; + sha256 = "36fc703ace26d95dbe1718648324e30fa1184799559619ef3e1708f9fb67d7a4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/ast/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/ast/firefox-152.0.6.tar.xz"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "02e01f3ed5614ca860905ca76bc1f2f5a44ce02907e5470ffc64f55c564c019c"; + sha256 = "85fd36179af5fbf16636ef58e10d3a132d0b4d96286f83c45fbc7a66634a4ca6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/az/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/az/firefox-152.0.6.tar.xz"; locale = "az"; arch = "linux-x86_64"; - sha256 = "56b9c8db95d05b8f21b4a2b990a0728fbb1bb9203921fa030d17ed391357acc8"; + sha256 = "251e5c4e1eaec93d4939b950a85b8d8802533485c349f037f89fb1466360e704"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/be/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/be/firefox-152.0.6.tar.xz"; locale = "be"; arch = "linux-x86_64"; - sha256 = "a00a2aac468fc0cdbe7e8415ad03576b72730ee244a90c4e83bf0257a0b7a624"; + sha256 = "8057cdf0b8e86648c033549d2e63d6aedd2ed0a95f771c721c28e5bd5c2794c2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/bg/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/bg/firefox-152.0.6.tar.xz"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "3e2ee087bd915860213d4fb1c3c03c759c183c14983cf7bc74ce5cfa4f11690c"; + sha256 = "428696f168888b01a530da727bd07d810ea42bcba23c34820bccfe26acb70ae1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/bn/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/bn/firefox-152.0.6.tar.xz"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "e3ddd1f61a421ea726f45b3fa18312d3c8dd415e1cd08fa54ce96b62698d5ba0"; + sha256 = "b22e1940a9e60a40da6d5127d0c29f43e01f1271a15939f7ab93ae5902b484dd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/br/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/br/firefox-152.0.6.tar.xz"; locale = "br"; arch = "linux-x86_64"; - sha256 = "2618d8bb5d17eb1f7b9faa1c34eb0a74e8b23971339275d702cb8b6926d70403"; + sha256 = "f9a4fc964002c8ce9f82167017768c24320a9c076070635870dfda737e893bfc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/bs/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/bs/firefox-152.0.6.tar.xz"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "fe500ef5afe20ccfc93494f88d121ded4214d3a872cced1f415a63f281fb691f"; + sha256 = "54a1b10fd2ac56b1d6b6d80b8c64815677403f49f74032ed8b7cce07a43ed468"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/ca-valencia/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/ca-valencia/firefox-152.0.6.tar.xz"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "79a4cebf167dbaaa442bdec7795e1ccd7c96e5cdc8d9aafeeeb28bb20022e204"; + sha256 = "b39d78823ee3fad16094abe5ece3f60d96d13a475e6d6ad00b65f8b5dbe467e4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/ca/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/ca/firefox-152.0.6.tar.xz"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "583e8617382f42ba261c4bf1a8e14a9d18d8dcd79683551113ca995e756c05f4"; + sha256 = "de5ed038ac006e03769cdb36e3525901535ab9d1fba9113b5845535a19f18d1e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/cak/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/cak/firefox-152.0.6.tar.xz"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "41dd315aea022db5ef8c6f7560943010baeb51e27f9637263113f37a900f4fe8"; + sha256 = "b5a2478d59b49486e8b41cf1dd685437395121797ff0f69e0faecb9f1c245d44"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/cs/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/cs/firefox-152.0.6.tar.xz"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "21adabd938f94d26a33da917f25537e0a8523f1952de5f68d7fa6abebe5d9911"; + sha256 = "749adb2d28369ae4e5a9b93e20af4da004ed947b03f2056253264fb8978adf70"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/cy/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/cy/firefox-152.0.6.tar.xz"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "b8494d6eb13ab896c3cf42f3e451e135eddf772bec484ef4375531a632506460"; + sha256 = "d2817f96925193e3b44a7231c7b0a472b00e08d75d64b2d346138b64d1f7f45a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/da/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/da/firefox-152.0.6.tar.xz"; locale = "da"; arch = "linux-x86_64"; - sha256 = "70ed9794b6f01eeba4c99166b2cbec3c3de7aaa635d916325fc09b59cf6b4b12"; + sha256 = "c2161e6e98dc7bc6bd774edc38daf266a863ac35779bda128ca619b598c15236"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/de/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/de/firefox-152.0.6.tar.xz"; locale = "de"; arch = "linux-x86_64"; - sha256 = "5db7b0b8d4ef9992de180c5eab4d3d36c23657def92729d265c31bab36d3be51"; + sha256 = "99554068e8f4714cd48585d12ea6580206079dad8a95a582a0da48f7801c1037"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/dsb/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/dsb/firefox-152.0.6.tar.xz"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "d347b5fbb2bbe3633a346254a4a41b9b024ba91dbde79308e19949c257e34be3"; + sha256 = "4f574a79933c91ea4ab987fee2e7085d4086658fb0152e887e7c4232b8f317ce"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/el/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/el/firefox-152.0.6.tar.xz"; locale = "el"; arch = "linux-x86_64"; - sha256 = "6783167303ff8387e35c6729860583065a95e8e65f7a4904d56d1138e7367c67"; + sha256 = "55164fc88776cc710475cdf91cfe6ff9d0188b011c891b1a00b53fb5eb6687dd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/en-CA/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/en-CA/firefox-152.0.6.tar.xz"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "ba6c34845af3f0fb7ff9922530f24798f2431bbcccadbe4b82f91704449ce919"; + sha256 = "27d760ec9000f5e45fa251189e6269569a363ab4ed8783a30b776b7c6b2e609f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/en-GB/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/en-GB/firefox-152.0.6.tar.xz"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "1568e6666b2a8c3cdf97e435ab002967cf93bd7ef37c22531040b7f0fa1c9b85"; + sha256 = "f6bdbfa3dfed4d6bea87398620139d842395c64178847d338e63a09e7d690d9d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/en-US/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/en-US/firefox-152.0.6.tar.xz"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "0e19ef84ab8a40f92f84db29d63032a746f43286423c91dfbf141633ac1ed935"; + sha256 = "c8080dad034d8c9119651463807639c6a648cb0186909988da6acc3ef2467322"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/eo/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/eo/firefox-152.0.6.tar.xz"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "5a601ed43ef3bd54f659c489fcc63bed83498fc2599703333d7d85b9ef276b70"; + sha256 = "a65bc9c90fdb162f2edc84f3b292797b6a99035029045b2c2608bea395fb4f17"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/es-AR/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/es-AR/firefox-152.0.6.tar.xz"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "853e771c41b44a6a4dc1e32d6ac426878629498c0fef0d34bda58a1e6bfadb15"; + sha256 = "e0b95e8cca697a5cd91c906e34f1c5b00e5003ee544173926bedde15a77511ef"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/es-CL/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/es-CL/firefox-152.0.6.tar.xz"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "ac2e52d7e3e5698ead9e7f0869d282b08f75e4866a5a552e6460c60ad828d10a"; + sha256 = "ece947f5b1c16e859c32b80444beebbd56e82e2476976ebe90a79aff473c4abd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/es-ES/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/es-ES/firefox-152.0.6.tar.xz"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "aae72112a0f59824c032f527ee1fd6d234785367b448cf9427e23b92a33f1aec"; + sha256 = "a71d9b3ecc26deca901baa97c73423311a2e837938073705397f001029724ab0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/es-MX/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/es-MX/firefox-152.0.6.tar.xz"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "ffb14ac97035c1e18b4fe387f3eb51fc6e360f732ea2cc6412cb7db3fd2c609a"; + sha256 = "6947588fd3bd7c0329611554befff3e1ff5ee86a1ea9446a7ef35a491b588172"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/et/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/et/firefox-152.0.6.tar.xz"; locale = "et"; arch = "linux-x86_64"; - sha256 = "04c096df3a6d54dc9dcac7629c11bc5ea9ec4701e3d9446266aa6a9f8c44797f"; + sha256 = "430f87de21c9e70e70f5d49d642c00092dabfb5f44c7e3e0ef5a75c57b82eef3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/eu/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/eu/firefox-152.0.6.tar.xz"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "c42744a0791ae22749728c66b3f73d155f684f9fc3fd9a1b7a9de9a9b6df2c7f"; + sha256 = "c79923e7b7a3851a395ee0ce2a4fac7be51f8dfa9bb5614390d27ed4475f47d6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/fa/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/fa/firefox-152.0.6.tar.xz"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "180bb07209f8acb2ed5d7234bb6803501ec893e3d9cc8dcc93c04460cd2a887c"; + sha256 = "61613573e5f5cc5b2eb539d8400e5c46e09e29f736e17b5373dbfa7b7ed2cd07"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/ff/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/ff/firefox-152.0.6.tar.xz"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "3cd3a3b926d4f9eca2e6e389e7e97a6ea8855f1f93107be5480fc0970a3530e0"; + sha256 = "a2c23937ad3942858b418365de1eacd3d13284970880850db8e3c2112094c06a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/fi/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/fi/firefox-152.0.6.tar.xz"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "be130c3cc2b9505dd803543de8a50f3e90f7e66be67081bd16ea07b2fae94c6d"; + sha256 = "6e8160b8c1b26d610acf042de3ff4e790c3b432576f68167f2e8952b20906812"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/fr/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/fr/firefox-152.0.6.tar.xz"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "d0b7c4477a50768507a2ccf538c7c1962433348a43812e253027918cd7ccd695"; + sha256 = "bb7c4ca390eb48fca70cf3d4cc34685d262249bed76d277d663cf23fb0e4aae8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/fur/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/fur/firefox-152.0.6.tar.xz"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "2bcc33430701c5db07d4a3b2000a7124345fe2f73c9c3d2aac787c518fb68f16"; + sha256 = "71d7aefd95caa229dbb4bba68159321b089ba7d415954a06cc0b58abe06b7661"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/fy-NL/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/fy-NL/firefox-152.0.6.tar.xz"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "edc76bff0745e918024f2821ead6d9eb52ecc944248086d54cc41e08c859ef31"; + sha256 = "3961c26a5fdf799378018b5a3cb462b39c4402b07c18e349b8d56a2fb16f9852"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/ga-IE/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/ga-IE/firefox-152.0.6.tar.xz"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "7155779cc7a9069f2a6c5d30c3eb720796627ccb6f942ddc0f82082ee2a3ec58"; + sha256 = "8796f9353a65ca6ab3d8e096e3290c42402a9b14436c66ef5fca7903ece83030"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/gd/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/gd/firefox-152.0.6.tar.xz"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "6e815731ee8ab36f04c0d79ea1530451a58ff60dafe5a13607ae93c72fb8d12d"; + sha256 = "58c11c1f1c5f7e84204d607d765a593abd1a250bcaf816ceee0a4857457eccdf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/gl/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/gl/firefox-152.0.6.tar.xz"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "b9742a5e2d7e778e9e7c73343b3a1754619cf72f11e330930f5b5700347c6335"; + sha256 = "6b9901802d48babdd5dade4fadfea8631e204e9c1e786d3654803c5388690052"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/gn/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/gn/firefox-152.0.6.tar.xz"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "7f354afe4344fc4702c65accf1b58423fa80e8d4b0160d8e9a7804520b52e762"; + sha256 = "54654efdc6d6c10163641c87a36d83df7bd781023574ee69b15919971cfa5bca"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/gu-IN/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/gu-IN/firefox-152.0.6.tar.xz"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "34430bf374dabcd3393447b5dc95ad386a74d6c1ad71a8f44018f715004b4e76"; + sha256 = "d130b2318c53ba672d7efd65ad4689ff3dd30e75cce03e1bb4dc044518f57b73"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/he/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/he/firefox-152.0.6.tar.xz"; locale = "he"; arch = "linux-x86_64"; - sha256 = "825759b9b9b24163bd31a7060df690267cc50e80da3319e35e5e2d536860bed6"; + sha256 = "4ab6b712a94c6ac7480ea0b30cdc7dec7a5ab295de25362603074c8fb28f4c8e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/hi-IN/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/hi-IN/firefox-152.0.6.tar.xz"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "5638231e4e5b6163dc50a0df0372fa864a844cf2b97a7945bc34757061efbd0f"; + sha256 = "8af84d1922251e689e7318d33e4da0df49633c571675ecf43352f718f15a2ece"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/hr/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/hr/firefox-152.0.6.tar.xz"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "4f1fa1394ad46afe6826ea2e6d781f8105c74e4aaa988d37786f2243a826b4f8"; + sha256 = "3ee63e71c27b2a54c44b87a345b4eb98d065712723381d52cd6eb9ebcb3469c5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/hsb/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/hsb/firefox-152.0.6.tar.xz"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "be479390fde0dae1fb49885e0f912e4ac8df508df9a4b60b544380cfe4766c54"; + sha256 = "a258a09304462c7c1b265a48a45dd4b72326d56fe981edffe51845cc40cc4e49"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/hu/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/hu/firefox-152.0.6.tar.xz"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "05ed70ed5d9371e4b707d5fe401e2c68c4d6f99fbba27aa1354ad45ca4f4dcf9"; + sha256 = "37aa1752daf059445c40ef76742f435677f609242a62c940a5225d434adfda30"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/hy-AM/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/hy-AM/firefox-152.0.6.tar.xz"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "82b1b8eee1485abcd544ad2242d9f2fe39c1fa258a850fa54cfa2826ee8ef74b"; + sha256 = "356274551767fb2c250a918bb3cdbcb71fb471f90908d73e0f936cdf1376a555"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/ia/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/ia/firefox-152.0.6.tar.xz"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "c9f4daba881eadd1b1c24e4c28e46db87e8e7682085f0ce4d079067d8e040230"; + sha256 = "75edb40814e3b45e48a92a437c489fb4b5e85add6a332e658a2cd50758eaccfb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/id/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/id/firefox-152.0.6.tar.xz"; locale = "id"; arch = "linux-x86_64"; - sha256 = "2e1c5bad315225edd7f7f0f25a0ce6700fd85027a525a0cd1b4e5df5d2fc8e4e"; + sha256 = "33890a2e1d2ee5662c267441eb4332b7b19c730469936eb1064398afe4e8cca9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/is/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/is/firefox-152.0.6.tar.xz"; locale = "is"; arch = "linux-x86_64"; - sha256 = "552afe39cca9eaa99caf76c42f53cd7cb7328332bc3f16ebac3dc10240b6ad50"; + sha256 = "313191e2d176875ef3cd9831be75620c4dc6079f56ef5959dca686495e255e67"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/it/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/it/firefox-152.0.6.tar.xz"; locale = "it"; arch = "linux-x86_64"; - sha256 = "6483b544e81e2cb7753b2668f98134ce043ed53ffd6272a7d3616b5dfc12b82e"; + sha256 = "eec5937b854c34030574b14d51706ac2f0afe83bcc0bd3d7dee11f8978d91479"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/ja/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/ja/firefox-152.0.6.tar.xz"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "615ec2a10b741475458e3fc0779e34a8a67cd1f8939f6d32529ee56d3570a331"; + sha256 = "dd7f675b6b84ec05d1673c74af563caf1fbe393f51913a8ce9218cb1f8f5b525"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/ka/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/ka/firefox-152.0.6.tar.xz"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "522602223fdedf84d93a26a94453e94a0ad972aa2a32f592d67d652ba7de85e4"; + sha256 = "74398db859fdb80b8cb5396a5f2737260f0a74933a4b631478ef7bb64470a60e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/kab/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/kab/firefox-152.0.6.tar.xz"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "44bd2f057937fdbbb8f64e6065facee405d112dbad67fd21018a1f2ba71b5abd"; + sha256 = "d2988e524e272bec87d857aa2e47281b6e6ca14e7915d821bc71fe0b39bd4b89"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/kk/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/kk/firefox-152.0.6.tar.xz"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "0c67eb728bdb479b0ee76466b1a92c2d05cd7f8568a002b0a3ca8f451b9bee06"; + sha256 = "3d7f23e184d3053315a8d2f253122db483cb73ca9d0ccb18f22674d1659e0772"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/km/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/km/firefox-152.0.6.tar.xz"; locale = "km"; arch = "linux-x86_64"; - sha256 = "cc57ebc42f5caba691fa9d27c98319fcab5405ecdbe704a2a03491533bd74369"; + sha256 = "b8b4422e29b9b97e6ba7d6431f6cea68e27b8939603e08c6a0a99e9a8ca072dc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/kn/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/kn/firefox-152.0.6.tar.xz"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "30015a7039773ac7388c0f3a040a8ab2d9ece4cb8a6f5e19a8af45f5b22d3952"; + sha256 = "b4c6cb0f179bca038a11d4f346be5b531d45e9551dca19c1fed0f2169a6c5725"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/ko/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/ko/firefox-152.0.6.tar.xz"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "205aab8711871331a4036ecb92c95d5e947b424bb4be724c8222982e205a7bdb"; + sha256 = "68f93a85d9b72ffdeb0ff8656854b815ec8fa700fd3765cb189a0301f12459b8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/lij/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/lij/firefox-152.0.6.tar.xz"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "6de1e2cf2f6e0f85064a665f71a4c7946ed0f9174d8f80ae0d271a6cbe8a1077"; + sha256 = "249d4996dbbaf4bc75df24fc0b95bd290c4596dcd9585daa7cf728d24cb32370"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/lt/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/lt/firefox-152.0.6.tar.xz"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "05b76d77dea3d5ca21431b2174c597a5a73c1ff8a9c29330a75b8fbd75542730"; + sha256 = "8cef49b9464b6ee3e7f321b3aa56b37361748cc28f639460bffe83cc4d57ac91"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/lv/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/lv/firefox-152.0.6.tar.xz"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "0b1fb21c52564c24ba6c7fd412ab3d1aa5336ae1c91056b210e0aa35786838b2"; + sha256 = "ddf7c0d835a5140481c26379db9f8191b249ff2eab20a20c50f58b9aae129d29"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/mk/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/mk/firefox-152.0.6.tar.xz"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "bba5081504d5afc88766952e15a1b7bd9d98e599d6b2b15c79ba4d53f18cc1b3"; + sha256 = "aa3755cdb2004e34b11b4a5b47c317fe8bd7f57ba87ce90c1458c04fdc5806d7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/mr/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/mr/firefox-152.0.6.tar.xz"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "059f455a1489e7add710a16d2b809b7688d435b78d0ea04a5d2ec92185a8d0f3"; + sha256 = "ae5d0ac7ee6994ac828b87a4ae19a8702f07a8c67e1b8e992f8e61e54a87375c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/ms/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/ms/firefox-152.0.6.tar.xz"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "105444ebe08e0ff46e3b710f715226038ed3b7199a16322e4bd3958c0f9f655d"; + sha256 = "8c8e8c46ab834ae69f8c01303b7c2adff5d4c45fc545b656d9a9f4309529db38"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/my/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/my/firefox-152.0.6.tar.xz"; locale = "my"; arch = "linux-x86_64"; - sha256 = "d401b5aa812464929366ab03ac0f7b48a1a385999c0d5cdf721dd3499f801460"; + sha256 = "e4926ce17645dcf71d433cfd36df1798cb9b897c20cedf0d894e542f1ffeb1c5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/nb-NO/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/nb-NO/firefox-152.0.6.tar.xz"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "fc1c0c2a096ac2fa73326c3ad3144613f7aa318fc16f40312060ca25a85a46bf"; + sha256 = "b60d7ede2aa2f5b27174dd4dfa9b65a1b7b56fe94aa266ae94ec98ccd5ac39d8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/ne-NP/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/ne-NP/firefox-152.0.6.tar.xz"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "e626a9df7478e7ae6f186da0addf351a84e4051a83fff22759e835b71e98cd3b"; + sha256 = "18381c921e0f93170d918359dc810bf627faa142975f6d064a6ae5ce08c0548f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/nl/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/nl/firefox-152.0.6.tar.xz"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "58aa58bdd1429efde7e28a3bf908e4f7995b55f75a7c929bf77be489b4c9dedc"; + sha256 = "4c90c0b9189fad5dc81a8f533d8017c68e845ff97d6bac1de0a3d048f8697ba2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/nn-NO/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/nn-NO/firefox-152.0.6.tar.xz"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "95f1b863cdc5bbfc60911b81b2ad7470106dd21ff8ba816e1307e2f3ba0c7c54"; + sha256 = "a7176dd2a2f2d50e87d16819d903c75867655f005c05c64636b8d1cb513b820b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/oc/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/oc/firefox-152.0.6.tar.xz"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "39def0c09ef8b8ec1a1b5de177343671e4869789dcfd6c03600a25e0400bfadd"; + sha256 = "d7eebad6e90eec1af95ae54cad0e3484d5422bfa3a6b0cf557212559f36ab78a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/pa-IN/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/pa-IN/firefox-152.0.6.tar.xz"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "c214169cfd3c24a178090772d69025dbad41bf5984e3e4055c6470f9a5e4ece7"; + sha256 = "e3ec832291b60d06e2f337c9bde8e9f9c532667b33feff3483f75ec74633fe56"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/pl/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/pl/firefox-152.0.6.tar.xz"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "9f8824d0413f94ac3b173e65f014cd8dcdc5defd302d8b79ede5958f9f4b3345"; + sha256 = "bb7cc5735e841ebe18f947d84af36828cf6ba9ecf9f6dfc8087ebb0ae1a29ae9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/pt-BR/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/pt-BR/firefox-152.0.6.tar.xz"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "9fe02014b4116fa50c3da0054ce050033ed74e0986505fde78b3245eee8e18f1"; + sha256 = "13b362ef838dc3593713beb90ea2ca66c73e219ba4ac6f3660e820ee63300959"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/pt-PT/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/pt-PT/firefox-152.0.6.tar.xz"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "9f7efeea3a4d3399513f7af79b2b90e4cc11d8aedab715d48406907440f2925b"; + sha256 = "c0e16aa34ff6f030252027c171281675fa6cafcc746c76f1b637c077730caf39"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/rm/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/rm/firefox-152.0.6.tar.xz"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "524be9df7f85b81c5dcf8c362f683f947d82c8933292314b176091954a47cc94"; + sha256 = "3e5ed0848557fdb53101f0458736e8ff4280d6bf038a510dcbd0746c5dcf82ba"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/ro/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/ro/firefox-152.0.6.tar.xz"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "6fcdc3dd7d066d71b061168e382acdc8b53eed1361cead66cd0119b1530dffc2"; + sha256 = "4a5c733a0fbcd61d83c729cb2226eec991b9c1bc53e564244e83bdb064d4e0ad"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/ru/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/ru/firefox-152.0.6.tar.xz"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "5c05da9234d8993104f5443b8dcc0973ef2a36df7537a23958d9ed91ab715cde"; + sha256 = "db8d188de7c68c98e756e3281f3b967165fd82a7c024ecf7135ceb3986b8c947"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/sat/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/sat/firefox-152.0.6.tar.xz"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "6713a7c93312fc43d885e0df1d24b8fa6a5320bad01f806e776cde503586046b"; + sha256 = "4451e794f9c09d2437a5243f38bb601fe0b994ae28f8e0d34b5bb4acd460139a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/sc/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/sc/firefox-152.0.6.tar.xz"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "c9b33ed62e94fd21ed321ceca2a9c0203d8cc0116e0890022d81f05deb1c9a0b"; + sha256 = "12ddc9ff45f9fd9dbf718e41f8d95e7df8c9b18f58dfdb1e15c305c17bc552e2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/sco/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/sco/firefox-152.0.6.tar.xz"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "345d9495dc84fd47b5bdbf4843dbba44d4f289998c5693936d87c6c3958305ad"; + sha256 = "4f2174c2b829af5ca223ccb51e66cafc29a9fa8b455a8a1aa5b5441e2e012cef"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/si/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/si/firefox-152.0.6.tar.xz"; locale = "si"; arch = "linux-x86_64"; - sha256 = "25a9cc09b4fa15f23ab11e377bc02de63bf83009d6df3dc17ccc24c569aa8acf"; + sha256 = "61503385700d9bacd620c494b390620c776b40cf44aba87ad500e44098f1e4d2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/sk/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/sk/firefox-152.0.6.tar.xz"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "46d824f7977d0e5b06985064a658926f8db65c5af249dcf7cf0b62dbb66b6991"; + sha256 = "9c6a8de041c617f3541b00474be3125c0b0b9afcc4a3a783b8d1a87f44888eed"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/skr/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/skr/firefox-152.0.6.tar.xz"; locale = "skr"; arch = "linux-x86_64"; - sha256 = "287239dbf01839824f3bf57cf9ea67efe74ced6e421e3875dd10e698b532a8de"; + sha256 = "957c2dc79ef5bf23255265d3689332cfdbe94e6d682f77365210014f84cea0d3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/sl/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/sl/firefox-152.0.6.tar.xz"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "f7b5483b3514ea62851aa192ebf964e863889146a6e5b015c4cc2205e00d4cb3"; + sha256 = "3662f3df195666971ee316f4fcfd078c53372d1b87bea99b2cfed7688d814066"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/son/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/son/firefox-152.0.6.tar.xz"; locale = "son"; arch = "linux-x86_64"; - sha256 = "df4db03580beadf07c92efe423ce0b6604fb4cf5fb0d1e9c8b3e00667e761714"; + sha256 = "4e0aa93c4ee80d71b0ccb4e7e031764ef033ed5d9bb01decd5644dba882f86d4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/sq/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/sq/firefox-152.0.6.tar.xz"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "ae31bc0f06cd9318f5b8a18e4217f3965a66fe52a103ed2faf5788ed1dd76115"; + sha256 = "6a9a821eda43b8184958c00b94cc1b5c9f55bfb1ed0f64881ef1c6c5f1bb59e9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/sr/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/sr/firefox-152.0.6.tar.xz"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "d97ee53463a081b5c508eb74e5a950166d3f64b9d1b55fff23f3f5ea9a567bec"; + sha256 = "89bea824d6b3af9ea7a4585b526c2314bb55a769d0e0bb57812fe1609c14cb3a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/sv-SE/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/sv-SE/firefox-152.0.6.tar.xz"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "6d30cb63fcffc13fc2debf7508f23eed40cfb4c2a9c91f5ddbf73e94f4771416"; + sha256 = "b460bb49aa32129cf808e84af83b7c1d1463e6758a49d6b12b7f79d221d7d542"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/szl/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/szl/firefox-152.0.6.tar.xz"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "f39197b1d4e630437073f4e79e1fa9446e6a68fe45f7a15a762ee34528926992"; + sha256 = "51840862bbac6e8e9f11f65ec1278655721668e5cf9c13831a309610431bdd6c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/ta/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/ta/firefox-152.0.6.tar.xz"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "3e4c6cf0a455b7e2558c00565a2d65c143968b6be3983a4952ea99959953423d"; + sha256 = "7b4e4687f4de0de3e09327c345f21cfb2d1bf538f93fc34ec11ddbb4cb358c59"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/te/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/te/firefox-152.0.6.tar.xz"; locale = "te"; arch = "linux-x86_64"; - sha256 = "10101d931d044fb6122789c10f6af41e5ee488ccc0b89ee10386bd7b081771d7"; + sha256 = "001a00cb5af359b5779adbadd73ec1225a962e8c07b2661fc3cc530d91ba60d7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/tg/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/tg/firefox-152.0.6.tar.xz"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "b461f00db572ec9032514bd5b365a3ce310e89004f4403898719dd98391813e0"; + sha256 = "2dd4be301936348f49e5b16a73c4bbef5fe72c3f38c6f61aadd06a0438e548fc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/th/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/th/firefox-152.0.6.tar.xz"; locale = "th"; arch = "linux-x86_64"; - sha256 = "127d2493e64d6fc03740a44467f62210bcf70d8c7e6eb14b0c9470eebf19e7cc"; + sha256 = "3f326bc7a8779f10de934954cd1324344e1dbd1077324283b9a8cb53d816005e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/tl/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/tl/firefox-152.0.6.tar.xz"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "1ab0bda8c002a2508b37395d4fb5c215aa7d0fde7a1731f0b454f9f8e65de503"; + sha256 = "b3a3c7d001e16affd4fc8c4a17616ab72c9270779b8af4434e142bbafc35b1ab"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/tr/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/tr/firefox-152.0.6.tar.xz"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "49be9eba0fa3154531d786c757bd182b7de5466a6f0485069e17bac660e26e2b"; + sha256 = "1973b7f4de327515b80a37f84c0dfecd6386d0ae886d8a02633cf67bef51f347"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/trs/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/trs/firefox-152.0.6.tar.xz"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "36212c55718ae5b817fe2d28442840a07243957e2613dc3b488ecd4f5970d216"; + sha256 = "7655bb8dc2bee88f8fc5fb96f2d2c42f59f751407031fad4fef2cf87e4073b59"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/uk/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/uk/firefox-152.0.6.tar.xz"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "3bdb92b52d69817b27950595d9024b98b9f97afa5ed9f7eb93ccecd7807b9c48"; + sha256 = "595acb9a96bdafe3e102c0e01f13b754715c58ef856a6e6607a9d90c153b82f8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/ur/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/ur/firefox-152.0.6.tar.xz"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "8a79f37fd05c8157367cb953dfdb52d16ad36af3c010ee8d55e8380dafc9b92e"; + sha256 = "433b58b71194dad432bd282694a3fd0e456e3f240409c0b31673e88365c28071"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/uz/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/uz/firefox-152.0.6.tar.xz"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "578e4221e9514b070b864e52b5a0618aa18b0a14204d6c2ff3410b4929631131"; + sha256 = "39b60eed98c54332d68c2649cb422e48605bd9a51d50f4e9e455207e7cb95466"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/vi/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/vi/firefox-152.0.6.tar.xz"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "f3fe9a5ce4188e61ddad6bdf39b715d2b7a75b18b7b0f62081f658098a2dcdfb"; + sha256 = "25b86bcfa86df3e457ccb348f8d9d2e4bb4a0f46f3015d99aeb839baca9b431b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/xh/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/xh/firefox-152.0.6.tar.xz"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "62bbddff08e0b5cadca2726971bf7bf5c0f4fc1dc2ca245ee39c280615803b14"; + sha256 = "c2e34f6777c7e2afb893d26c33e03d5c01a1f285837c6247a692cc59cdca6f36"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/zh-CN/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/zh-CN/firefox-152.0.6.tar.xz"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "da152b95089ea18d1fdb4b52c919c8eeca3f39f27276469c51d9a5460b324699"; + sha256 = "a096637efb88b76d1e3d7c1eca3652c27a0f65295a044c1cb4c74f7c1ea8bdba"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-x86_64/zh-TW/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-x86_64/zh-TW/firefox-152.0.6.tar.xz"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "8d4b62626a8592cef6c576cd613083e17b500e48df827d83f82569513c2f5506"; + sha256 = "85b418b03df923727561f667bbef20c24d2c7c826f50e6ca324e1e5ab0a82797"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/ach/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/ach/firefox-152.0.6.tar.xz"; locale = "ach"; arch = "linux-aarch64"; - sha256 = "0224879bbb3314d8565dc91dc7c8cb5db530590201d0e3d002be9ee220d46fc3"; + sha256 = "ad6a241592a9a7874a06bc45b741583c93c0d6c4c0e9e993a08e69c6c0e95497"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/af/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/af/firefox-152.0.6.tar.xz"; locale = "af"; arch = "linux-aarch64"; - sha256 = "53faf820d8060149fa68ad10d7908dd5d52e8819c076df66c6fc512cfe79d5cb"; + sha256 = "c703f95d30f8dfd84bc018329665b6fa2f89b4d6a28a55774246f89274d3605a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/an/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/an/firefox-152.0.6.tar.xz"; locale = "an"; arch = "linux-aarch64"; - sha256 = "b41fe9009d73b43d8b480b0e702f1674b34cac756b6a8bae5e515a584ea1d72d"; + sha256 = "bfa940096dbed0f5a6e7359496aade86c0451eb91e20a5fd53cfe542bc5e0425"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/ar/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/ar/firefox-152.0.6.tar.xz"; locale = "ar"; arch = "linux-aarch64"; - sha256 = "2b6d36db0f3aa69c3249045365038935317fb52b9fdd8f249474bf0f1acb12a5"; + sha256 = "3b65e1165756d1c861f1c462d795dc305537f0a0605a45025f9de07f3ef3ddcb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/ast/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/ast/firefox-152.0.6.tar.xz"; locale = "ast"; arch = "linux-aarch64"; - sha256 = "ccd4772bc15c770deb805f92e20ff27748087e43c267ba49a6e822b9998ca190"; + sha256 = "61cd83337415c038f9104b29e92e36fcdbeecb3a5d97815f48f93e6622e233f2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/az/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/az/firefox-152.0.6.tar.xz"; locale = "az"; arch = "linux-aarch64"; - sha256 = "61529dd7a721ef5e14e7c10c32ec39407efcbe5bf96806b1f2f1034729874f4b"; + sha256 = "e3de19ca5f2eda2742522219a90702ba9fd56665a42f6a0e8534fbb7a79a9c9c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/be/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/be/firefox-152.0.6.tar.xz"; locale = "be"; arch = "linux-aarch64"; - sha256 = "0fa932a138fe42a98dfdb81ac828f5f06988778ebf3643602b00abae2f6ae929"; + sha256 = "e3e0f06eb4d8628290a369780b2db59d4e36693956474e9caca660cdfad3b22b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/bg/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/bg/firefox-152.0.6.tar.xz"; locale = "bg"; arch = "linux-aarch64"; - sha256 = "3c21cf3c9b353c717670e59e33125f918e202136b39836e7372a0108b7a93bc4"; + sha256 = "60e153954527a2c0e835cdf250d28d1246b6d38f3a41d7c779a49fd859308889"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/bn/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/bn/firefox-152.0.6.tar.xz"; locale = "bn"; arch = "linux-aarch64"; - sha256 = "a8f01f935de912a2f88f4f710a1f2996def0f95e63383d851a4ac568847abf0b"; + sha256 = "295eecd93269750f041f33d33d0295fcbb117fa2ec06c69792867ecffaad88fb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/br/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/br/firefox-152.0.6.tar.xz"; locale = "br"; arch = "linux-aarch64"; - sha256 = "86305f075c5291e208ad46d34d58b6e804527abb97aa0282a9a5879b8265dfb2"; + sha256 = "a20e77c06aa3d4565ff7f1a77c3b2479f0977f7ee2a21b30ef79bba6da9bd133"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/bs/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/bs/firefox-152.0.6.tar.xz"; locale = "bs"; arch = "linux-aarch64"; - sha256 = "c179176b64b52b856f750d635076e02518aeab0605f3b6b24f0384f311cb60c1"; + sha256 = "ec40fed088658b474de00df7ca5db52670b8394cff18d381e0c4122d5b28deb5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/ca-valencia/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/ca-valencia/firefox-152.0.6.tar.xz"; locale = "ca-valencia"; arch = "linux-aarch64"; - sha256 = "e0aa6116a2fd021a73fc10a43f5ed890b34768e89e00251aff8a50451aff4f6e"; + sha256 = "08c368b9fce36ecf6e924a327a9086c407324e56ef628d6dc26e73eaf511407a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/ca/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/ca/firefox-152.0.6.tar.xz"; locale = "ca"; arch = "linux-aarch64"; - sha256 = "3aa984864a93605621e137995cbab3867549cb574c7b0ca76c0daac0f35328dd"; + sha256 = "0d04a36848a57e25c3a2eedceb7542a3de17c5dda9437f3bbb9558b425699bf6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/cak/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/cak/firefox-152.0.6.tar.xz"; locale = "cak"; arch = "linux-aarch64"; - sha256 = "46b68b94179c1ebf538023303cf32d01f60993c8517eb9057e4302de2ebb2f56"; + sha256 = "f987348d67b18f860945b86a02badaf01d91c03bae4bb655415a211be2d8f267"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/cs/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/cs/firefox-152.0.6.tar.xz"; locale = "cs"; arch = "linux-aarch64"; - sha256 = "69bfc54784d3f9f94306e6448eac05843dbae228d48a9f313fcb6ddbd09a7ba9"; + sha256 = "9919bdf63d63dbb9663b9daed196b44fc4b335ff85789d3768fc4ef3279420db"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/cy/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/cy/firefox-152.0.6.tar.xz"; locale = "cy"; arch = "linux-aarch64"; - sha256 = "e265a374d73327161a0bd655b7f84269dfb1d5fe9d0aeecc71ff73d592efceba"; + sha256 = "44becbbd4622067267c131b45fe18a3e2d01206a4f73667bc870e3a71a806b0a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/da/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/da/firefox-152.0.6.tar.xz"; locale = "da"; arch = "linux-aarch64"; - sha256 = "e078f923b0404763fed60d8b1a67f18ed966099b52e787e0d0648bc9d2e06d42"; + sha256 = "1215ed44589b3daab8e0a9753a899a2fd417bb5d4b84947fe56ad9c287b9567b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/de/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/de/firefox-152.0.6.tar.xz"; locale = "de"; arch = "linux-aarch64"; - sha256 = "5163954e882a4889932b567624dd4af89669df33851b7eb58826d36a6777e8f9"; + sha256 = "e5f7dfe9ca335058a83a402e6963fa0e40b8819d5ebb417fb33d456649c9d4b3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/dsb/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/dsb/firefox-152.0.6.tar.xz"; locale = "dsb"; arch = "linux-aarch64"; - sha256 = "5fe4e7e0a1e82ed7dcbf9d29e2c5329a11a2625c3cffbaf92b7016ee3be2164f"; + sha256 = "86248815018556abed1824520d593d1ad4321d3b54a8bd325026bace61e0165d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/el/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/el/firefox-152.0.6.tar.xz"; locale = "el"; arch = "linux-aarch64"; - sha256 = "f702f72563e1f71ce4b267dda784240117bb39524adfebf1ecb45c1263a24b9c"; + sha256 = "f459ef4cae1117ae3a68b664d85e9cddab9ae669c10dc524f61748622a02bdd6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/en-CA/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/en-CA/firefox-152.0.6.tar.xz"; locale = "en-CA"; arch = "linux-aarch64"; - sha256 = "e7899ae1aa25b109f2a63c628f5f0f22f9dc37ec8bb71e4358d8268ef14ecc22"; + sha256 = "13099c841caad527692493503f4a0500304c7419177376c70159d0b8f170b875"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/en-GB/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/en-GB/firefox-152.0.6.tar.xz"; locale = "en-GB"; arch = "linux-aarch64"; - sha256 = "d1f6d5a7add468fc39265af94ee572e4942c6bc4709aa726483003dd49cb98c4"; + sha256 = "68222cbbcf1cf81698ede8a058c11e696cbaaae1903992e6b76e2620e13136a5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/en-US/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/en-US/firefox-152.0.6.tar.xz"; locale = "en-US"; arch = "linux-aarch64"; - sha256 = "6ea600b7c20a38042157817bd18c921e15de3508d0f073377c179d5f1b3e8c2d"; + sha256 = "2a715a4c13a0d19e6e12dabf133d53cb39ff06dfcaab3bad9ab1aa8ff24a65c3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/eo/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/eo/firefox-152.0.6.tar.xz"; locale = "eo"; arch = "linux-aarch64"; - sha256 = "6859aac9fec4a911bd1ff8e682a17ad417bc4446fc87eee6560a1052c9355e94"; + sha256 = "d394bc1478a5b23eed8bcaba6a8500fdbf9b841fe101e18418d8365ceb828684"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/es-AR/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/es-AR/firefox-152.0.6.tar.xz"; locale = "es-AR"; arch = "linux-aarch64"; - sha256 = "fbb10387e14791b8615b5ac0e7fe0449db41a57a8b76adccbd70a9a954bd9105"; + sha256 = "c9475393d768a6b30cb3410cbfe437bf5f8e6bd50801b89316d2af298a40b1dc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/es-CL/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/es-CL/firefox-152.0.6.tar.xz"; locale = "es-CL"; arch = "linux-aarch64"; - sha256 = "ca52fd9af14d6223f9ad46d808c6cc606802a65375ca02bd4b290e0fb4b9475c"; + sha256 = "1622501737e265f80e90fa3dedd3b7ebe2e5e5ccd8c3f636b34e3ffc91f71da9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/es-ES/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/es-ES/firefox-152.0.6.tar.xz"; locale = "es-ES"; arch = "linux-aarch64"; - sha256 = "4a15bac88be36cc84786a9df066d274087755032c1762a8cfee350de0ebfe0dd"; + sha256 = "e99b4d1327d675c0cc7bb53479a5340098d6d7b84c667ad228666abea1a3ac22"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/es-MX/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/es-MX/firefox-152.0.6.tar.xz"; locale = "es-MX"; arch = "linux-aarch64"; - sha256 = "ab8d36e66bbb61046875003ce57322f6cdb32f16a29beda32c14535fedebb4a7"; + sha256 = "f1638977316239bfe3cbcb82cc7dc819b0bbadd054c0b4de448de58c40f62924"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/et/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/et/firefox-152.0.6.tar.xz"; locale = "et"; arch = "linux-aarch64"; - sha256 = "d4727a60700603d04775a5109614dce7aa6a7e0da3ca6940a98215b0413de9e3"; + sha256 = "93f24651029c6eba7144cbe58c1e866ab3992f931e165acc841424263f18ddcd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/eu/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/eu/firefox-152.0.6.tar.xz"; locale = "eu"; arch = "linux-aarch64"; - sha256 = "3fa6cc8abe42a23e469b9bb6e520304291583dd080abc656e868e93eb7e18baa"; + sha256 = "7f5ca7ebc4fa374c4c3a92785b92537f627497021b32df54e442e7b40b81bd65"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/fa/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/fa/firefox-152.0.6.tar.xz"; locale = "fa"; arch = "linux-aarch64"; - sha256 = "0d1ae98e7038c59596aa126a22476e73459b6ff3ebf785a9e836ad31c660e377"; + sha256 = "73e8dd05940ad42ba208e02ef8308dc456cd0b2fe7940577eea6d850dbba6846"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/ff/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/ff/firefox-152.0.6.tar.xz"; locale = "ff"; arch = "linux-aarch64"; - sha256 = "00d36157affa3392f8330779ae64a8f682f74500f7d5d1999f253230061c1761"; + sha256 = "d30c6019b5c8139e96b1db8fd99d1ce3d4159c2399bf320520970879c4bbdff7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/fi/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/fi/firefox-152.0.6.tar.xz"; locale = "fi"; arch = "linux-aarch64"; - sha256 = "7f788d3e350d53af1db649f3ea36281ddd2b0adda7c76ecf571606ac32e35184"; + sha256 = "de1273cbc6210de19aafcf5a23b7c8c669466727219be819a955f887fc1ce4b6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/fr/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/fr/firefox-152.0.6.tar.xz"; locale = "fr"; arch = "linux-aarch64"; - sha256 = "fd5bf7f0e5b37c52e7ad8b103f05dcc9a71dd586bd0c34e05a02aa942acb7611"; + sha256 = "7552fd2335b129043702815a2948c4d8c50927a23579241ce38810fedaeb7216"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/fur/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/fur/firefox-152.0.6.tar.xz"; locale = "fur"; arch = "linux-aarch64"; - sha256 = "00ef471419b1b215971ddf0327e3ad898d4ea9bf1542a2ec4a478663f1897019"; + sha256 = "639cd75ab14775f833b986e610bf5aa4258b4fbbd7b77fc72100050c5820ed2c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/fy-NL/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/fy-NL/firefox-152.0.6.tar.xz"; locale = "fy-NL"; arch = "linux-aarch64"; - sha256 = "d3fea2001182fa418f9686c16eebee5f3000647e2895b59a6ac067ad78233095"; + sha256 = "12a828f423f9f1c99f5b32bd2fd4e5a94d35ade5b3f2a8f2b9572b88ba0351ba"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/ga-IE/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/ga-IE/firefox-152.0.6.tar.xz"; locale = "ga-IE"; arch = "linux-aarch64"; - sha256 = "0a803e4208bfc8b28707ee3ca83d06a1aee3114ecf50604b57effab1daa5ba28"; + sha256 = "b74e3b3d196d80f047605963a724f1433741cc3932c7cc8f302756413c25a58a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/gd/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/gd/firefox-152.0.6.tar.xz"; locale = "gd"; arch = "linux-aarch64"; - sha256 = "230da448fe43ebcd243a39c14b14fb16c30b12358c51cba4d1f1c0adab753e48"; + sha256 = "2dcbf505caa903b72d2df4f774bd5fcdeb98f97bb51488d430eb75e8487b0a38"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/gl/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/gl/firefox-152.0.6.tar.xz"; locale = "gl"; arch = "linux-aarch64"; - sha256 = "afc9cd4e79de0d72dae6cc60526b0d3271aae3c457a4c2a7b5203d928ee2912e"; + sha256 = "35cb06c379c7b6988d72749dd8e2d358705fc9b6ca47dbf55985f095c250b4c3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/gn/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/gn/firefox-152.0.6.tar.xz"; locale = "gn"; arch = "linux-aarch64"; - sha256 = "724f551ead657a85b0bd1f84f28e90920d1565c990e1635d662b7a4605680dd2"; + sha256 = "267b63e160a47345442d0e09371f300cb607fe1b423e44f7fccfa8312ed43831"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/gu-IN/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/gu-IN/firefox-152.0.6.tar.xz"; locale = "gu-IN"; arch = "linux-aarch64"; - sha256 = "c018f9e675b9fc522a868255e16dd2e54a758a2463446f915dbac5b97e1b08ca"; + sha256 = "02fcce1dfc328cdf0077b317b44cec3dc7ce61c66e04145bc3d0caf11e971eac"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/he/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/he/firefox-152.0.6.tar.xz"; locale = "he"; arch = "linux-aarch64"; - sha256 = "fb2e66148e9a43ffdf51cddd8ebf0bbe4d40cade36aca313cae1b50e339a3088"; + sha256 = "5af91bfd37da388c9f09b3ea918e889c4fcbe1d426ee16f874a6c505ad26799d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/hi-IN/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/hi-IN/firefox-152.0.6.tar.xz"; locale = "hi-IN"; arch = "linux-aarch64"; - sha256 = "fb45fea713173ece732ba944b13cd5630251db1fc57679211ece5cf1f53316cc"; + sha256 = "c62e6f00b8cdd08cc0e83d6c48399751a8a8195f522c00ba0d536d945fe820a0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/hr/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/hr/firefox-152.0.6.tar.xz"; locale = "hr"; arch = "linux-aarch64"; - sha256 = "7691bd6c66a92a1415f08296014a0f8da3202bfcd3f1e447da602cd254af2956"; + sha256 = "f325e2703e28fe824798b99170509f87babc8a83818c82bf4ae31028fc4d86d9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/hsb/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/hsb/firefox-152.0.6.tar.xz"; locale = "hsb"; arch = "linux-aarch64"; - sha256 = "fe13b096a020b70032c57e95e7fa8a82c0be0e1f3fcefc8e23aaf56fbe76d3ae"; + sha256 = "d5f74b0085541d703e11487c54774a779a0e9c179c0ecef1d99c142918c957be"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/hu/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/hu/firefox-152.0.6.tar.xz"; locale = "hu"; arch = "linux-aarch64"; - sha256 = "4ac1f5a69b8b6f07adfcff78ca8dd2334e8389bb6e29177270d19a4738337045"; + sha256 = "944e49b8df69e113db385e3355c834fbc3eada5c28c926b49ac8c3d55039ea75"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/hy-AM/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/hy-AM/firefox-152.0.6.tar.xz"; locale = "hy-AM"; arch = "linux-aarch64"; - sha256 = "70d2acc0eb84cc7927787360f8d4627db91b2615767250373c6fed13e439dd2d"; + sha256 = "ead5cc80da72a570bbcb2b3c5caf6a1e4a2813576b5e7fbc38474fed25a8845c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/ia/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/ia/firefox-152.0.6.tar.xz"; locale = "ia"; arch = "linux-aarch64"; - sha256 = "d68b839a410aef3a7d35ad161f7ae6f5d4903dfc77c5d3f62bdbc2407ce4b9d2"; + sha256 = "0b713f4978c2f853d2ea370c9fb693e9e663a736a8b7975228fff0ab7052f18c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/id/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/id/firefox-152.0.6.tar.xz"; locale = "id"; arch = "linux-aarch64"; - sha256 = "d93ed1a908ede8d4eda7102a94fad46bc5bad08841f7c034f0ee6801f192eda1"; + sha256 = "26dce62510661e58e457d59f15446211101ac26429889a1b4713f51d67a540dd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/is/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/is/firefox-152.0.6.tar.xz"; locale = "is"; arch = "linux-aarch64"; - sha256 = "41709c14dae4868577f0891da2e231a41a7e39d121acede500770b636cfcb991"; + sha256 = "2349fb719de0276df080801281acdd6dfc439bb4419cb9db7553b3629ed82324"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/it/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/it/firefox-152.0.6.tar.xz"; locale = "it"; arch = "linux-aarch64"; - sha256 = "982dc854b4852e5ca501fef9403291a8e6f36bcde063243f6a4b886b281c2c10"; + sha256 = "e0e006991cc6a72b7ba2f38b4796a221ccdf6ebbf20c5ba3dde0a233cd92fc2c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/ja/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/ja/firefox-152.0.6.tar.xz"; locale = "ja"; arch = "linux-aarch64"; - sha256 = "c71518e189294b2a0cda6434d8871693fb0b62814638439e901dd97b35fc1d1b"; + sha256 = "af5a86fb73e8bd0c5b2538ad8732cbd00df2a383baf0b617294fd5ec86f21c91"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/ka/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/ka/firefox-152.0.6.tar.xz"; locale = "ka"; arch = "linux-aarch64"; - sha256 = "b81ce817978672cc35f13f7160f1f31a6c72dcd5c1eebfb67122ada8383eea3b"; + sha256 = "abfd9da4c8b522005d015e0f7e9d4ac8227aeff2be23db66784e7d93e632fb7e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/kab/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/kab/firefox-152.0.6.tar.xz"; locale = "kab"; arch = "linux-aarch64"; - sha256 = "18f971d979fee918b4696d11abb3cac10bfada008fbca8166d2849ab6fa285a5"; + sha256 = "1a6a15e2a1dfa187064fd996e48469fb5b2633f137947796f826a5dfea6375a7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/kk/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/kk/firefox-152.0.6.tar.xz"; locale = "kk"; arch = "linux-aarch64"; - sha256 = "fcc3ccd6b8b34122787d248f0c64b2318bdf75ab0b37ca239c5dc1564ee54546"; + sha256 = "e39b5b6016ac1d000654e6fa8e53030b2d6a538399465e9ccd84a0b3038183e4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/km/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/km/firefox-152.0.6.tar.xz"; locale = "km"; arch = "linux-aarch64"; - sha256 = "030f42cafb1d9321743d129b72abfa55369e9c953fb398066f5052bc5c83d6d5"; + sha256 = "cc2220a040547dfba8e9257c357b98f4a3de5875b7994502baad6db8f4693ad2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/kn/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/kn/firefox-152.0.6.tar.xz"; locale = "kn"; arch = "linux-aarch64"; - sha256 = "f29e80c2523ef575f0e506d556a4bd01829918ea81804858f44f28860e348792"; + sha256 = "ee3b529fce8d86d7f5294e2058b3ca1e55bd999a7cdb04785dc832f2a921b03c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/ko/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/ko/firefox-152.0.6.tar.xz"; locale = "ko"; arch = "linux-aarch64"; - sha256 = "2e11f9ce27b1961e3d396e7b8566a525e5d5bd516143853c18ead3c3e9de88a3"; + sha256 = "9233e3b7d811c84ceeab5073726354789f6d09d8abdc034f200ce3bba45eb02f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/lij/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/lij/firefox-152.0.6.tar.xz"; locale = "lij"; arch = "linux-aarch64"; - sha256 = "b826e4f9c2d6aed5b5e9a0503f8ad9376dd614b6b9aad0a4b00e625e0ecb9cbb"; + sha256 = "ada61d1b1f3434a367be104e11566536425ff7d07be550717adefcff16e63bf9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/lt/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/lt/firefox-152.0.6.tar.xz"; locale = "lt"; arch = "linux-aarch64"; - sha256 = "73d5d344fe10353e27043c93a34fc35c6f752eee358c6cae8929a0b6fc532c43"; + sha256 = "6de81bd18ec6d5affe6da940a2de77afdc5989c062866708cac0e6bb2db9bb64"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/lv/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/lv/firefox-152.0.6.tar.xz"; locale = "lv"; arch = "linux-aarch64"; - sha256 = "d60198752bcb14bacafe633722ef17aedafe93a2184f6aa40e5ee7fdc3d60c03"; + sha256 = "22653f76e11dd9d057f14c645ccbd3fda202a48d8c612a4df4c407c9c45c4f7f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/mk/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/mk/firefox-152.0.6.tar.xz"; locale = "mk"; arch = "linux-aarch64"; - sha256 = "9f5787ba891e3a5e027107be70ed5c830b20f1c7cb4c0bf018922d9ce945fe2c"; + sha256 = "4c4614b451a888da0e9e4c1c779fa1b68a58c86623091b35d129a46a024c7359"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/mr/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/mr/firefox-152.0.6.tar.xz"; locale = "mr"; arch = "linux-aarch64"; - sha256 = "31b6101936ec6813afaa44e0dc68eb8b5fdfc9626d4a06a59bee661307208e26"; + sha256 = "23efc57c74c656138b50d465fac0cac95ebb56e863535bf76e126b2b59d1c5a1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/ms/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/ms/firefox-152.0.6.tar.xz"; locale = "ms"; arch = "linux-aarch64"; - sha256 = "70dcbb9086fcac3e5dc2697468e17ffd73f2656f48328ba6c712e448f699bfb6"; + sha256 = "6ddf31ac846ca8f3d08f89280bb2742abc91c67c2e5aa64b37da7c09602260a8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/my/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/my/firefox-152.0.6.tar.xz"; locale = "my"; arch = "linux-aarch64"; - sha256 = "2083e5930446ad496f3b49274e6f55f566531c587fe15c14644aa182ea03eb48"; + sha256 = "a688ecd50257411edd28e460125d2a5be9b5c7f001dd81c275097e31e2cdcd93"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/nb-NO/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/nb-NO/firefox-152.0.6.tar.xz"; locale = "nb-NO"; arch = "linux-aarch64"; - sha256 = "279ef7228447ea3fd47abcdaa91ddba2f4bd044320f6eade0e6c057ae5ae820b"; + sha256 = "ae664f30a1f0ab560a4acb3fbb086128fef826d7cc40a9a2e84494a3bb3ddab2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/ne-NP/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/ne-NP/firefox-152.0.6.tar.xz"; locale = "ne-NP"; arch = "linux-aarch64"; - sha256 = "1d25e3ab937e3599aefcf4b2b7a48d4c5074b7a4bb1d535d650c5d5fde5dc4be"; + sha256 = "9169417b385206fc17e3463a035a48ff26927a75226f839942b96727c02ee8eb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/nl/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/nl/firefox-152.0.6.tar.xz"; locale = "nl"; arch = "linux-aarch64"; - sha256 = "e62103a45295fed353658f76dbdbc4cbb0cb4ecf429792ccfbf59402af30b6b8"; + sha256 = "e7ff94e0d4bf471e579668fee12511951b3eb7f40ec7ce5570c62a700a5f9d11"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/nn-NO/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/nn-NO/firefox-152.0.6.tar.xz"; locale = "nn-NO"; arch = "linux-aarch64"; - sha256 = "4147d574547fceed38472b47b0edd47328909bcf18d916623a134cfcce9ba18e"; + sha256 = "05d464216716a07bcdb931ddcbbbc26008d47b93ce7a71d8fcd9860f11ce657a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/oc/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/oc/firefox-152.0.6.tar.xz"; locale = "oc"; arch = "linux-aarch64"; - sha256 = "056ed35c465195b18aa55f162de501362e9ec261e1e64def3cfd26cf98255eba"; + sha256 = "e58747fba4281c5aaddbde426ebb22e70dbc065abcd6b124a78eedee1c8f80f2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/pa-IN/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/pa-IN/firefox-152.0.6.tar.xz"; locale = "pa-IN"; arch = "linux-aarch64"; - sha256 = "6aa82951a0301a1bfa15a02e0ea4719867257a140fd5d056e01cd9d48dd1792a"; + sha256 = "e42db2e26ffb1cec00326ee664661e7550ca0ab3b2bf38f8e8c99cac7b97134f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/pl/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/pl/firefox-152.0.6.tar.xz"; locale = "pl"; arch = "linux-aarch64"; - sha256 = "15874772160eb9693e24548591d3a583bdc8f967cd8590b8354ddcb20ce28b56"; + sha256 = "b129d354e0795685e63a9fa3625cee1bac12f9683558a2db270c24e922458acb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/pt-BR/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/pt-BR/firefox-152.0.6.tar.xz"; locale = "pt-BR"; arch = "linux-aarch64"; - sha256 = "aa82d56620f28936c49a46faada0b6bb1922d1c7ea124326e73d1c4813691f18"; + sha256 = "e3677917eb800ccb72bde49d5c959e039220b20617393c3a8b58c1f4cbf87bea"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/pt-PT/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/pt-PT/firefox-152.0.6.tar.xz"; locale = "pt-PT"; arch = "linux-aarch64"; - sha256 = "87a9871edeb4bb60c4ae55c27954e0ba6ca29941c17d2432fc6beba75780c8ef"; + sha256 = "3b93aa680c21a353a33d22544bd3173a2b56e5dd6848d775b56c56050b8a7892"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/rm/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/rm/firefox-152.0.6.tar.xz"; locale = "rm"; arch = "linux-aarch64"; - sha256 = "bd043b0fa5f7d52c6b9f4feb9c30dbbc3bbee8d0666ae2f730e0ee3a44508c8d"; + sha256 = "8c785cd66fd08a31079b0c265294d2194653123f0874d8e23c2de90c6cac54a8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/ro/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/ro/firefox-152.0.6.tar.xz"; locale = "ro"; arch = "linux-aarch64"; - sha256 = "0073610ee8b2962fb44ed47f0ffb32b95cd6d036e3749d079e45db93d95ddb63"; + sha256 = "5724f5d8306cbe9cc6e72988dbc0c7dc15335f83c6c8e6ad8937f48793e7aa97"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/ru/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/ru/firefox-152.0.6.tar.xz"; locale = "ru"; arch = "linux-aarch64"; - sha256 = "f7f5ceed47a77c622aae15ea789b453b0a4923d7522f503ec0b0e07cda1886e6"; + sha256 = "32a0ae38f48fdf8a98fca3a33c2ed40d8fe3eeb9b920ed3794111be218fa8957"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/sat/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/sat/firefox-152.0.6.tar.xz"; locale = "sat"; arch = "linux-aarch64"; - sha256 = "9b06a3ea6ed971ccec16510d96be8bf47817a5253e3c8261e20d5209c12d02f0"; + sha256 = "b1376f88a788ea93035900e2f7b2852078a6047222a635f1a77a9b8d0941951b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/sc/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/sc/firefox-152.0.6.tar.xz"; locale = "sc"; arch = "linux-aarch64"; - sha256 = "7187f4c9daf496e537ef032a30228272167a134bfd6f32d4384b347c183907c4"; + sha256 = "38746af0b8690c38113b08be1420c50ec665b78ca2a6a8b1549cc6246b2274ee"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/sco/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/sco/firefox-152.0.6.tar.xz"; locale = "sco"; arch = "linux-aarch64"; - sha256 = "bd7d4275e6185784fd3018365d0d1536cb631013983d7cfc8bd5d089ef8d87d1"; + sha256 = "6711c93a5ae80f6697dd471e048b4b1a12adb96ee6f03bd0228712c29bbbc288"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/si/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/si/firefox-152.0.6.tar.xz"; locale = "si"; arch = "linux-aarch64"; - sha256 = "afbeffd406351c3f3e12a4f9de8a6c93f4e58151e87ecb6e475f8eb3ab760b51"; + sha256 = "8f657f0a6b30913ec1749f7af61e737a7bed9dec49d2daaab2e55078f9af2468"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/sk/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/sk/firefox-152.0.6.tar.xz"; locale = "sk"; arch = "linux-aarch64"; - sha256 = "3d9e39964d9b05d0f3a74d809a8a254236cc37051ab4e0186f52f8113f8236a9"; + sha256 = "4fd91a70b04c2ccb200a8149456811e63f8435124227eb794f7729ba857e7fd1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/skr/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/skr/firefox-152.0.6.tar.xz"; locale = "skr"; arch = "linux-aarch64"; - sha256 = "bb9b4b3aa6edb39bfff7f7dace57a74d8f0a25bac79f6f9fb88aed9c10ac38a3"; + sha256 = "6bd5c41748acb81e8840bccac5eb2c2a60379bf932fab91d4f85c6d38674a12d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/sl/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/sl/firefox-152.0.6.tar.xz"; locale = "sl"; arch = "linux-aarch64"; - sha256 = "af258951d11c47155a4e6708eae63164e5c0a0b074b3917ab8c69e62e3bd250d"; + sha256 = "7edd3131c0231760adb624e3a533283cb53b5967cd6acc7b5a6172701044abe9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/son/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/son/firefox-152.0.6.tar.xz"; locale = "son"; arch = "linux-aarch64"; - sha256 = "0dcb4fc85e5cda4dde8b544c4520ee7fa86604f44bbc4dd3f2bc9a4da3f43637"; + sha256 = "3f9078a5fad247532eb1ef22af2dad1bf87fef9f464c998cca71981f29078060"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/sq/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/sq/firefox-152.0.6.tar.xz"; locale = "sq"; arch = "linux-aarch64"; - sha256 = "be76a686ff19458436338a0149f01e6ae15e7c6a914270f499de53cde9bc9220"; + sha256 = "7e39ad43b88056b81b1cbaca424e567aeb572ebe7feb2f2af50796b622d2b2cd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/sr/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/sr/firefox-152.0.6.tar.xz"; locale = "sr"; arch = "linux-aarch64"; - sha256 = "3edd944e610e41fa6d078c4fee006c973ad308aebab79da51e39786678b42c86"; + sha256 = "8f5db4dcbec611b22dfc9d2d3a8afca2626713513735ad89c16e03ce14ac75a8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/sv-SE/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/sv-SE/firefox-152.0.6.tar.xz"; locale = "sv-SE"; arch = "linux-aarch64"; - sha256 = "dac56a61934480c57eb5cd80d1e1cf284334ff482685ce95ae05bf3ff91026cf"; + sha256 = "e750cdf718dd9e410206e1caa87fbe528e87c2e1e68a5295a86b4dc75770c7f0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/szl/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/szl/firefox-152.0.6.tar.xz"; locale = "szl"; arch = "linux-aarch64"; - sha256 = "b31069b20bc118599eba6bbb25791d3228cbfdc0740f4051a88bd681012867d8"; + sha256 = "b68f3cf6cf9dbd72a14d9c82f90ccc25c64969a80521cb51503a551d38ba61ae"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/ta/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/ta/firefox-152.0.6.tar.xz"; locale = "ta"; arch = "linux-aarch64"; - sha256 = "d8dc7374505b287aab6ad5ac17e74f1a69812ca2ffc7e6faffc4abe84dcebb57"; + sha256 = "7ec026e6db911abf4f5cd35b296cc86ebadf76160a95f96f50bcb95d7a0bf4ff"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/te/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/te/firefox-152.0.6.tar.xz"; locale = "te"; arch = "linux-aarch64"; - sha256 = "52270e848e907b181e36d2d0bf30f1b2d6e55b87ec7f89c20cf09f394713098c"; + sha256 = "42a19ce881dce4afbcf016a3178eaa500e630a87147677177aa65bf2bc8c91ff"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/tg/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/tg/firefox-152.0.6.tar.xz"; locale = "tg"; arch = "linux-aarch64"; - sha256 = "14f23dd875db658f6a4d35d18dc1b431de5208300a25c45f43b9454a3aac6880"; + sha256 = "24101cced228902589500bc88ad6e404ff4ecfdf626405b00193a5bef6a1ac87"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/th/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/th/firefox-152.0.6.tar.xz"; locale = "th"; arch = "linux-aarch64"; - sha256 = "0f74e394a54970aee132f61b35527b02cc73a22b708b351da2c82ac691f8f1b4"; + sha256 = "0b0678122f231e3d86a7aa6691a57cb70cc1ce2d61cb5374e0196b7fe091e886"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/tl/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/tl/firefox-152.0.6.tar.xz"; locale = "tl"; arch = "linux-aarch64"; - sha256 = "160063bb897b8dc65f66b79bc80fde51f2cfb5e926a52c7a82ebd24eac46fd70"; + sha256 = "02b78938427804be1b1f72da89f21203467787c5f46f2a9572206c8996f76d9a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/tr/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/tr/firefox-152.0.6.tar.xz"; locale = "tr"; arch = "linux-aarch64"; - sha256 = "d3b4d2a7eab5c0a1d4cce248656d23efa864dc152be980803c9c22a757e3a1d3"; + sha256 = "d1536eae6dfc828aa965185f0c5e8797eac3bc92eb5ad9d73de6f8d7299b1559"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/trs/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/trs/firefox-152.0.6.tar.xz"; locale = "trs"; arch = "linux-aarch64"; - sha256 = "d66fcc3070df87735f149ebd1c47bc404420eca6bf7f193ef29f94b1d6a9ea96"; + sha256 = "98c140d4c7f855d5d172cfa72ef0db294c6ec2b24af57484aaa055d7428d15d4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/uk/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/uk/firefox-152.0.6.tar.xz"; locale = "uk"; arch = "linux-aarch64"; - sha256 = "0824270266808c34a8be3da4713828642cfe6810a711f22dd0fb7f82d23666ba"; + sha256 = "1617250a8b6a87633716fe66e246c01278acc1f07dbd17c7a5cbecabed15d875"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/ur/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/ur/firefox-152.0.6.tar.xz"; locale = "ur"; arch = "linux-aarch64"; - sha256 = "6d21259cd467f22b6084dea81d7a84f42f537e84e69980e507852c0725b97c87"; + sha256 = "8e158bfcc2cac983eeca3f9aeafe773d6bfa34b6826c8bd551a527a836cb8435"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/uz/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/uz/firefox-152.0.6.tar.xz"; locale = "uz"; arch = "linux-aarch64"; - sha256 = "ea4f5ed877f771fd707ea2c47d36a79a6b4a93a91ccc98a71b892296629cf0aa"; + sha256 = "b0de859de993eca5acb1c920fc4a48828ffcd8a1168403b26b4a345af4cab50a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/vi/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/vi/firefox-152.0.6.tar.xz"; locale = "vi"; arch = "linux-aarch64"; - sha256 = "61d17a982cb88cad8fa3088ce785617249592f4cefd3b77bede7a824a55fddbe"; + sha256 = "e3a92cbf7c033e5a3f9a53a46c993979c868828fc79e46411082ca0c1f89a962"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/xh/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/xh/firefox-152.0.6.tar.xz"; locale = "xh"; arch = "linux-aarch64"; - sha256 = "9ea959b6687611b9c2f414fe8bfcd739e1f710255a59bade2607586f100894ec"; + sha256 = "5fb463d72d8fe2524537abf504536d524d2fb3409387f5988fa06e491a4b9cfd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/zh-CN/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/zh-CN/firefox-152.0.6.tar.xz"; locale = "zh-CN"; arch = "linux-aarch64"; - sha256 = "97a769af0e6303d420b5656db0abf15d6abb4588a3f12e0798ba1f9196ee88a5"; + sha256 = "8797b2f2f42061fc27f266b79a61a0bbcea643ffa61940fa9c42c6e10793f0ca"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/linux-aarch64/zh-TW/firefox-152.0.5.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/linux-aarch64/zh-TW/firefox-152.0.6.tar.xz"; locale = "zh-TW"; arch = "linux-aarch64"; - sha256 = "179af0cf28f95851f06f1a3fcdabae368dcc9fef2a12372a9f06bb6a3c2d0a90"; + sha256 = "7c362aa4d91cb5616e442cf50badd42209305c7c99e87bf39431a4820e49f7b4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/ach/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/ach/Firefox%20152.0.6.dmg"; locale = "ach"; arch = "mac"; - sha256 = "21b534b3ffac7a4979a109e20ae648e0ddd0cb26e9d136b9e445c67dde049363"; + sha256 = "6a0c4a57f5372fe81613cb7be8ff05dcc009351d7167575f02b527babd04b0e8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/af/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/af/Firefox%20152.0.6.dmg"; locale = "af"; arch = "mac"; - sha256 = "a1d19103162acdd555cd508a9aa069240b9c8ef61fe0f3c67819ebc814b66979"; + sha256 = "8f87b1ed2de2430400fc6d774789dd42708564abb2acbc93fcf17532b4de7ca6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/an/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/an/Firefox%20152.0.6.dmg"; locale = "an"; arch = "mac"; - sha256 = "b90f0cc93135879200a59c93f3bcfadffaaefe44f5abc8df368bfc8fc1b38e70"; + sha256 = "578054b050c0ac3efd1d922fdc1dfaf38c31d162071e7a8dd67ab65a09aa8000"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/ar/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/ar/Firefox%20152.0.6.dmg"; locale = "ar"; arch = "mac"; - sha256 = "c924be38a8cbe22e558acb5cc07a1a75706e148f05d5e0a0bff6108489aa28bc"; + sha256 = "90f75e532cc72c70c0b36519dd2dcb68fa355cb5e498acd78ec2ffb8376fd106"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/ast/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/ast/Firefox%20152.0.6.dmg"; locale = "ast"; arch = "mac"; - sha256 = "0460aff72204b0cbbac04368c6b484c241bb9010fe966bf9870caa382a8b06c4"; + sha256 = "de557d310f0850a8e5fc56939110f09773033e6677625b02d3a76b9735394fdd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/az/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/az/Firefox%20152.0.6.dmg"; locale = "az"; arch = "mac"; - sha256 = "2491125901cd56c4bae56fe71466d52a0ecd27db569d19ff90e2da9c45dbeea0"; + sha256 = "3dca06e7d9d39cb7edbf69f7d530632b2033411aeb4ed4415cb9f4022e17cf97"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/be/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/be/Firefox%20152.0.6.dmg"; locale = "be"; arch = "mac"; - sha256 = "713d3aa9f331122f7cf3c3f881755220565fc8a511736165802c29958a5ce89b"; + sha256 = "24d3e36b7dcb4e73ea28c0d915b4fea55ea883e4fbe4c45ff01e7a3e8c634bb6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/bg/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/bg/Firefox%20152.0.6.dmg"; locale = "bg"; arch = "mac"; - sha256 = "ceee812e2d8d5f04a09ce3da49879f5ffefcf78e8a20bfe8d9b2ef7e61399567"; + sha256 = "77a80dc800cba5f3fc923ed7f195bd9919382ddaeb22734007c61b0e28f75250"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/bn/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/bn/Firefox%20152.0.6.dmg"; locale = "bn"; arch = "mac"; - sha256 = "3087719e9936d87d64fd259b4df1c0cdcba9f8a568b2bbe25ccba3f4ecb85a3e"; + sha256 = "729d1be845f289c8125ef477c1aa20e4091e94282da1d267d2517a684c082cd6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/br/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/br/Firefox%20152.0.6.dmg"; locale = "br"; arch = "mac"; - sha256 = "dc8df5a0f265886f54413fb0b283280b7d0f54c6f49c2b094a0f897223f3de7c"; + sha256 = "0c09c70b1cd31cb5fc66cd7915ec73d38ccd0221a9268e8635e340e5c4979254"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/bs/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/bs/Firefox%20152.0.6.dmg"; locale = "bs"; arch = "mac"; - sha256 = "eb14e4b22f4d806ce047a437189d60f22eed1a74b0fec952655aed150a64163f"; + sha256 = "5e2d6c95a2c6f37b57535028f60cbe90855c4cf7c45d429ceba7af53b143a4f7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/ca-valencia/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/ca-valencia/Firefox%20152.0.6.dmg"; locale = "ca-valencia"; arch = "mac"; - sha256 = "a6a2326ce1eba819792b250c55fb19f861a923556e67528c9d9cdaef6d8fcd96"; + sha256 = "159b64b2cca6d3f0c53c46b643c9b4dbd19bba8876f3b0f73f82e6d0422ebe91"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/ca/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/ca/Firefox%20152.0.6.dmg"; locale = "ca"; arch = "mac"; - sha256 = "0ab7fd5ed33c0c4aa71c1d26e0447f507aae27105981078cdf470b9373725943"; + sha256 = "8001006a0505c8b8f9ea61cb8077f7af0228fc642ce8b2be8e9868257f1a6b75"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/cak/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/cak/Firefox%20152.0.6.dmg"; locale = "cak"; arch = "mac"; - sha256 = "1e019ad3df351d782e69053cbc8f72401a4636e605c8dfcae7c8826042409bba"; + sha256 = "e20f8a9802f279d4681c3309cdf77df1b4705b1d2718bd4bfa5edf8b1a83e4d4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/cs/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/cs/Firefox%20152.0.6.dmg"; locale = "cs"; arch = "mac"; - sha256 = "8dfaf95b0969e42c5e9bcce364a1d58254484f9f718d795df99f97b812639345"; + sha256 = "b02f700b1022509d955e1aa3dd52a7b5349dbd67ba9c1c2cbb32ba59acb83e95"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/cy/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/cy/Firefox%20152.0.6.dmg"; locale = "cy"; arch = "mac"; - sha256 = "4dab9578fa2dfa6a3ad066aecb1cb54e3d1ca6ddcef9e4ed0fc9b889520606c1"; + sha256 = "48fc3800d924cf8b39dafa560b82c3b7fe2f2e30aa83decf8ec00031f036604a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/da/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/da/Firefox%20152.0.6.dmg"; locale = "da"; arch = "mac"; - sha256 = "3808a7be55ef6bb50b7f38ff76d05e8122c30eb6746499ca22f4d6b5f47f834c"; + sha256 = "36d24a2b9881c79324a82cab9697bec989cae4e8d1b8f72d38e32cd497e8f2d2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/de/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/de/Firefox%20152.0.6.dmg"; locale = "de"; arch = "mac"; - sha256 = "5a6f5900215d893dd78a2621715ccf9a62eebddfef6e89e987a01d6737770a4d"; + sha256 = "100889eb8444c05c488e83f3d8ca6c4e5cb67dbdf40b5ce578044466daf0bdfc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/dsb/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/dsb/Firefox%20152.0.6.dmg"; locale = "dsb"; arch = "mac"; - sha256 = "99a91bf8ba89fa121bd78d3f30ee0906b246b43ccf3354f3fc1fa209f38a4763"; + sha256 = "6f076e41d40149071e508349dcc259c5536ce9a687565d1070e7c6b87b05d14a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/el/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/el/Firefox%20152.0.6.dmg"; locale = "el"; arch = "mac"; - sha256 = "98b619d0658ff5a4ca4f2ead669df89c0ef1c73cb2399ed4e96ec1de20c1e744"; + sha256 = "335d3d43b19f85b6100d38fd5bff454429b442d76e80dadcd1024036622824f3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/en-CA/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/en-CA/Firefox%20152.0.6.dmg"; locale = "en-CA"; arch = "mac"; - sha256 = "00e9993474a68f43bb056c351243103ad83eb88e70fb40855ae856a4dcea9afd"; + sha256 = "d8598c687183eca9b3e4fb4bf226071f779a8b3850b14996917cec79be89a016"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/en-GB/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/en-GB/Firefox%20152.0.6.dmg"; locale = "en-GB"; arch = "mac"; - sha256 = "5bf257049dfea7083399665b4b8b86c936811cc57e626b1bf2a9f26fbb23fc8f"; + sha256 = "f0562088dfc7660d69cec4730682a9c80d883b1e6431d361ddd629dce7f26de4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/en-US/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/en-US/Firefox%20152.0.6.dmg"; locale = "en-US"; arch = "mac"; - sha256 = "69295aed9b9de3a1d5b625b423bff724ab44079a4ed37d21072e0558fe969796"; + sha256 = "747002d592063e0b106de0c500b34fe6d84438b3b866621521c8e7be9ea7816c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/eo/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/eo/Firefox%20152.0.6.dmg"; locale = "eo"; arch = "mac"; - sha256 = "c4bd2bddf0e87e251c9db789bd5b8cc04a964c8938bac8a74c6e58c499b91d9c"; + sha256 = "ed29ca89e0df849885dd816d43199cfb73721e45c083d3eac53860685a6970b9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/es-AR/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/es-AR/Firefox%20152.0.6.dmg"; locale = "es-AR"; arch = "mac"; - sha256 = "0009d5d55b69a44cee3982d3c2c055614b5a1beb8127576bc0e5ee2576a69efd"; + sha256 = "55aa27872fda22d77a32b35d4ddfb8410deabde8ae75385741dec1071c573984"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/es-CL/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/es-CL/Firefox%20152.0.6.dmg"; locale = "es-CL"; arch = "mac"; - sha256 = "a05df58105fe20ce0ece208b0f276ffc3d9f5d0685edb9ee8bac58a3c30ca249"; + sha256 = "8fe69c1e196267e936390ac455993993f58556ff7e0aa018c5e4b4a9a28cb3fa"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/es-ES/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/es-ES/Firefox%20152.0.6.dmg"; locale = "es-ES"; arch = "mac"; - sha256 = "5b65bd03d6f854432e541ce90266d3ad9c427684a7d13ba83a615cc9a56a38a8"; + sha256 = "e547743f842482c6c6d285b63629747a388acec54efea4b5b1e6a30e8b430929"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/es-MX/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/es-MX/Firefox%20152.0.6.dmg"; locale = "es-MX"; arch = "mac"; - sha256 = "a1f182db4541e99d31224b7be68e89317e11c269f5701548937022f183d075c3"; + sha256 = "1e3d9fb6bd8e26099cb68b29f0a79c8d14c1ed3f2cd60a5ca5f7c5c43bc778dd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/et/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/et/Firefox%20152.0.6.dmg"; locale = "et"; arch = "mac"; - sha256 = "b4e7b50a198375e95a3e43981f62b85a5844e256aa8e74cadce44437e3a87484"; + sha256 = "a64b3070e1fc361cfcaa7070d6b41d1937add2e094ac899d3530f60306b8643c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/eu/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/eu/Firefox%20152.0.6.dmg"; locale = "eu"; arch = "mac"; - sha256 = "1fd4570ad45d27d414e8044067973a19af38d1d57a0de0dddd4cf4b004034aee"; + sha256 = "22ff141db9d52617936cbae5f993ac3204ab08bfdfea84f16a1c1b9b3a5926fb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/fa/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/fa/Firefox%20152.0.6.dmg"; locale = "fa"; arch = "mac"; - sha256 = "14c4db4a3bbcbbcb422c464ee79ebc6c9737e3fdd95a55a542594975b96ab2d8"; + sha256 = "3b35f5e8827f345a51b838761f1c3222e417313a355271bed07fd4f776bda91a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/ff/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/ff/Firefox%20152.0.6.dmg"; locale = "ff"; arch = "mac"; - sha256 = "6462c6f607d4cdc49cdc701db8890d30d81411a41977220fbced4c4664389215"; + sha256 = "3025be112a000792de23595aa9b62ce8f73899d9a93a95fbefed1dd5aa452a3d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/fi/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/fi/Firefox%20152.0.6.dmg"; locale = "fi"; arch = "mac"; - sha256 = "a83ad6a3ad23b0a0f9d9c38d4f6042fc331fc52ca47162390527161ba11c938f"; + sha256 = "3a66c6daec7cd7fafaf1037a350c0e3d54812466938f6d5fb0bf7af304ed13e5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/fr/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/fr/Firefox%20152.0.6.dmg"; locale = "fr"; arch = "mac"; - sha256 = "c00eeb475d44e76a5494a53f4c5a5aebd5a565badebe7675fda073f7f0637038"; + sha256 = "628a385c012bc9e9621d5a6f7f2e42b2271c0b3d50261f3b3c6c1acf639cf568"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/fur/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/fur/Firefox%20152.0.6.dmg"; locale = "fur"; arch = "mac"; - sha256 = "df8b257d006387dad2ff0936fe323c36f1fc7b9d4825b4f9c6d8b39533a0c0ba"; + sha256 = "dc08e1fd9b31388875d9db1748308a55a1014e9c514f418c8500ccfdf2bb1e5f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/fy-NL/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/fy-NL/Firefox%20152.0.6.dmg"; locale = "fy-NL"; arch = "mac"; - sha256 = "d5179a6dd283f24a520b21087edd56395f94c5585861c4e6d9b88e176eeb2121"; + sha256 = "023ef715ac2b88904ab77ed7dcc1f3b65533d875137af7a0aaa3083737b2b3fd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/ga-IE/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/ga-IE/Firefox%20152.0.6.dmg"; locale = "ga-IE"; arch = "mac"; - sha256 = "0f634f6a192d076d83143d2a9cba2923e3b27a8078a06a62d2c7ad3816c13c51"; + sha256 = "64eddaf14f6e04330d1db1479c6172c4c92c23dfe60e8031f5ce9bef076fbda4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/gd/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/gd/Firefox%20152.0.6.dmg"; locale = "gd"; arch = "mac"; - sha256 = "934ef59921cfb746c73d589e39f55ec1198b03da8e3ec776275f759eb75c9c5e"; + sha256 = "9d7ccb6cd53650cb31b13d1d55f59688bf07f8e15261700355335e96d46f4c0c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/gl/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/gl/Firefox%20152.0.6.dmg"; locale = "gl"; arch = "mac"; - sha256 = "02ee2ed4290aeb401c93419b5aef79ae6da8c529b74824f92ef1d8af7c0a6046"; + sha256 = "5d897c1e6033997c915e16bf9fd6cdc999077ba336cc414d535eaac96d2dffc0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/gn/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/gn/Firefox%20152.0.6.dmg"; locale = "gn"; arch = "mac"; - sha256 = "77a1b6b6176ac78af2a527620b9b05b66bc4c8a10479b88a6259872cbbc74ced"; + sha256 = "4ef673445c8637a53a700bf41a37aeb876d6861d8ab6c605de20da349a0b7b1f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/gu-IN/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/gu-IN/Firefox%20152.0.6.dmg"; locale = "gu-IN"; arch = "mac"; - sha256 = "7b30bf7a0e4bc884c0cbe070d6207364b6b380b1b144c62f4978b83eb1608b02"; + sha256 = "caf52727a469b6fca1899bcd595f33241bc7d28ca4ddfd14c5692908de35c36a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/he/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/he/Firefox%20152.0.6.dmg"; locale = "he"; arch = "mac"; - sha256 = "1e6e63dfe0680d3dfd31d4551716b629915d41e44a436d977df106d8258904ed"; + sha256 = "b47703d32020037154ff936425114e9baa44885364fce623ef86e38f7d645183"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/hi-IN/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/hi-IN/Firefox%20152.0.6.dmg"; locale = "hi-IN"; arch = "mac"; - sha256 = "e20dc094af7fae96b5175e6d37ae0d7fa2ba4c4a170ea231c7cacdd5de4f9161"; + sha256 = "616383532ddb7897bb66bcd0d2cffc40b7cd586dbb878c32e1545f688cc3c989"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/hr/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/hr/Firefox%20152.0.6.dmg"; locale = "hr"; arch = "mac"; - sha256 = "0602ec19e8ca98da8a59ba43e9dd6af5152c646ac42d69c7a53422b7263e7f61"; + sha256 = "2827bb593da69cdb2f42bc2fd2b2eb4759c6f591d5c6078736fe03976f6d12ac"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/hsb/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/hsb/Firefox%20152.0.6.dmg"; locale = "hsb"; arch = "mac"; - sha256 = "4ac863122b0f8f1d3810da95d22b76c76f030f0f311bc22b92a2e5519c88d068"; + sha256 = "7967ff85ab2cb8c72b19ddb5e0bbbf801f03a10da0095cef10be0288ecb6d2f1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/hu/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/hu/Firefox%20152.0.6.dmg"; locale = "hu"; arch = "mac"; - sha256 = "f5a2af2aaa10b94a4047c89ca64c30a5995834836a6361261731d74d45526f3e"; + sha256 = "c3cff12c5c947e480563cfd7a6b244dc8c663dfdffb72d2a21138ba410eeef17"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/hy-AM/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/hy-AM/Firefox%20152.0.6.dmg"; locale = "hy-AM"; arch = "mac"; - sha256 = "37eaada6943e6f3fb6e31d646b481d5646df17d3419fa48c4974e9b19a8a8457"; + sha256 = "e29dd68f6c42007bddbcc98f19f4de3a5ddb39a8e04b24309ff0790272cbdd52"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/ia/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/ia/Firefox%20152.0.6.dmg"; locale = "ia"; arch = "mac"; - sha256 = "ccbcacc121fb64caa4be00ed29da9efec9b1e8238ccbb397031fca25100f6822"; + sha256 = "e38d2543c8f978cf22977569533092a4f093633a43bff54a356211be31c968bc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/id/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/id/Firefox%20152.0.6.dmg"; locale = "id"; arch = "mac"; - sha256 = "5276ec8bef1848f67af48d254603fc262b9350c08181ec8994fb8ccb7a1ec527"; + sha256 = "f416b9aa3506d6948c837f27513a8c52b20970abf9a3566143e4d2062379ef2f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/is/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/is/Firefox%20152.0.6.dmg"; locale = "is"; arch = "mac"; - sha256 = "247991f77f4cafc1a8a9ffa445ef572ddebe52b54efbcd271d1554d22eb7587a"; + sha256 = "63d227f0884dbdcdb202d0e58dec31c3d440aa3c2f6a63162ae16688e1e3e56a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/it/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/it/Firefox%20152.0.6.dmg"; locale = "it"; arch = "mac"; - sha256 = "c70cadf056e3dc1e3154218824535dfbe68a0859af776308fe9d5e33354ff7a0"; + sha256 = "94cc0a5778549e00fbd23ed4a29cfab33e8732cb6b4af5c29b3341fbcab11b75"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/ja-JP-mac/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/ja-JP-mac/Firefox%20152.0.6.dmg"; locale = "ja-JP-mac"; arch = "mac"; - sha256 = "ea2a1278a04b28eea1683105ae83c9ba905ceed486d17d5dcd441d6d7eca46a4"; + sha256 = "74ca80f964982e8b9afb78b32a6d58a85295a8e4f205027835c115c4edca830b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/ka/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/ka/Firefox%20152.0.6.dmg"; locale = "ka"; arch = "mac"; - sha256 = "a894b345489df373f15014a62c6e6be5c715634df00115095b0b1bb90969f190"; + sha256 = "0a6b7deb1470f02a4f1ccb85b3afa4ecb4fd31bbf8e311c992fd417acf468afb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/kab/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/kab/Firefox%20152.0.6.dmg"; locale = "kab"; arch = "mac"; - sha256 = "cffd8abb0404c8d5f9dfca027a151305de518a749480e7145e88eb8298f7e731"; + sha256 = "465bb2c06dfc886e13eb3f22ef8ba4e41921a4a13b8990c9b7a71ef7d82503c9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/kk/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/kk/Firefox%20152.0.6.dmg"; locale = "kk"; arch = "mac"; - sha256 = "b9bb544d94cf28d51500df939664372455fe9d92843fc407bed4a12eae1c425a"; + sha256 = "ce6be2a5cb1da6004e8eed6d030c5ccf13d5bf617d706071653bed80ea27933b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/km/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/km/Firefox%20152.0.6.dmg"; locale = "km"; arch = "mac"; - sha256 = "c22f7fe126e65bc97372cc0a1094bb6e0dba88bab43e98195b9009226f660bd4"; + sha256 = "b1bea283124f337471ab0a63142a3fe21c613c111568177b8dc8bb870bf0e3a9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/kn/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/kn/Firefox%20152.0.6.dmg"; locale = "kn"; arch = "mac"; - sha256 = "c86413a67bf8a6d4ab9e27416cf93cfba49a2985fba357f065fb2daa98aab770"; + sha256 = "1ea6aef8cfa8b63ebe401a167aef52ceca86608570d4281f89771dad4ad850b4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/ko/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/ko/Firefox%20152.0.6.dmg"; locale = "ko"; arch = "mac"; - sha256 = "327b887eafec061ace9641f9f9f6e6f317ac63a21c4949161c45cfce45b39fcc"; + sha256 = "9ff389139e18e07169498e8d63741e7df93ddb59a45c40eca7475dde08c48139"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/lij/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/lij/Firefox%20152.0.6.dmg"; locale = "lij"; arch = "mac"; - sha256 = "6807fafa6a0a48bab2ee036f8841102dcbfc5414f309d36f86e48f5ac1de7775"; + sha256 = "1b5bf426383ea8983953da975f130ab9a960513386232f7f7b78fa7538ba6b97"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/lt/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/lt/Firefox%20152.0.6.dmg"; locale = "lt"; arch = "mac"; - sha256 = "f6b47dc482404bf982e4620eb3b43878a9b78ba3a412d1f5fd65121407986787"; + sha256 = "122666ca4d32467872b8ed96975c3491d335183338bc5b8caeae66093e9a9c38"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/lv/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/lv/Firefox%20152.0.6.dmg"; locale = "lv"; arch = "mac"; - sha256 = "909fdaab26f051a7f4266b73acc877b1116a73be9c38ed83791532f57af6009e"; + sha256 = "23752290e10db884c025af66a6dcb7bc940dbee0071837aa101f1d35370c0fba"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/mk/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/mk/Firefox%20152.0.6.dmg"; locale = "mk"; arch = "mac"; - sha256 = "c0384f378f5203106b64b7dc041f2205a5caad0c7a4c558923c92f86e7f0952e"; + sha256 = "48352370384b97ddfaac1bb7f3069604bc36e4ef6f4e978f53c8be7ec5b00a50"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/mr/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/mr/Firefox%20152.0.6.dmg"; locale = "mr"; arch = "mac"; - sha256 = "149a62f981f438ca365a10e1e4c31be9045f4cc85c9e4e8eceec777053ceacfd"; + sha256 = "86d03a5f5464eaa3ef8444c5ec1dd787080bb7cc4ab2595243536c6126ec7dc0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/ms/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/ms/Firefox%20152.0.6.dmg"; locale = "ms"; arch = "mac"; - sha256 = "b63c2458cec31631febc7b14925b90384e4e18bba57319fd7f71b5d85fb030b5"; + sha256 = "2081da2ec820722d8c17455d3f4aedb439bb57d4224b8ff474ca1da9577d42e8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/my/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/my/Firefox%20152.0.6.dmg"; locale = "my"; arch = "mac"; - sha256 = "d6c1702c52d108fbf00e9ee2efea581ae5ae9912f939cfaadc9389c9b53c93b4"; + sha256 = "f085e1dc3b716bbe4d0c089664cd3a516ee8dc9d14454c04e0501e3a1a05e80e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/nb-NO/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/nb-NO/Firefox%20152.0.6.dmg"; locale = "nb-NO"; arch = "mac"; - sha256 = "5b98c9141514ea47626cf0f3961a59cbc9283ec538ac351d944b3ed5056d96cc"; + sha256 = "82b9e1be9e090363c559d1f2b7999a6954f369dc4553ae7ace5e49288fbd0c9b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/ne-NP/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/ne-NP/Firefox%20152.0.6.dmg"; locale = "ne-NP"; arch = "mac"; - sha256 = "bd4b4ec8b8a7fe255cd4c128a6197a540501700d6d765e6ab6530b77f9bf974e"; + sha256 = "a62958201afd74b9fb03ab99ce1db5a7476228805f6116d453b779a04ce8dff8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/nl/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/nl/Firefox%20152.0.6.dmg"; locale = "nl"; arch = "mac"; - sha256 = "89e903851de3640ef6070d0cad3ff360f80063cc8e100af446d324baa8995655"; + sha256 = "f67bcf13867030263c5aa5acd7db9c0462d26b6c663540db8592312226d56124"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/nn-NO/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/nn-NO/Firefox%20152.0.6.dmg"; locale = "nn-NO"; arch = "mac"; - sha256 = "7c5f7e214712d99ee9365f59868593885ace6b841ea9f25112245ee44a6f750e"; + sha256 = "cf159557c5bb41f205cf56de769298d14562fc8d4065a3439c28f8eac59b4d36"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/oc/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/oc/Firefox%20152.0.6.dmg"; locale = "oc"; arch = "mac"; - sha256 = "8456dd6a5c14a24ad680fcdb4b0c7588ea03cfa8ab6b83e7fd6e1dc090e01325"; + sha256 = "d949a354ba41a93c4903dd49180d1b946e9b10e51da97bdf04bbc5119ebcd2e3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/pa-IN/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/pa-IN/Firefox%20152.0.6.dmg"; locale = "pa-IN"; arch = "mac"; - sha256 = "4ef36dd3b8b6fe63e590137f15113f3a938c8ce9826882dce21c8fe12ad0488c"; + sha256 = "00c40704639b103eb2193b7bb309708925ba4487d8e64ce7f422a95000e022fb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/pl/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/pl/Firefox%20152.0.6.dmg"; locale = "pl"; arch = "mac"; - sha256 = "66cee424a764f604f947030e3c6a1ed26035f98f0c6acef724386c66cc46383b"; + sha256 = "29c697ce9dcbcfedda3761e8b1093e7111deaa7b917b11f674ce5d8a89ed43b4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/pt-BR/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/pt-BR/Firefox%20152.0.6.dmg"; locale = "pt-BR"; arch = "mac"; - sha256 = "8f4abc16a06184c87e6dd33c052489864516cbeb163d0c966c024ba25089ba2f"; + sha256 = "42565bba90aff96250d6924e60bd039928acbc929cda68bab4e7e2034965ae10"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/pt-PT/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/pt-PT/Firefox%20152.0.6.dmg"; locale = "pt-PT"; arch = "mac"; - sha256 = "3e6e4f4ef79440e84d60cf8579c185c5926270055c00f5e114556edcbf6c7c24"; + sha256 = "e432d785806800557641911ca1657c7107c976617fa472450f93f4417b647dbf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/rm/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/rm/Firefox%20152.0.6.dmg"; locale = "rm"; arch = "mac"; - sha256 = "bf7083f12b2d849d84ff5c01fa9746b104e862ac8715ea0bc4580f0fe577166f"; + sha256 = "5600f25f99a9630e51296bb3972ceddf7eb36254c6dfc4f0da363f62433e3370"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/ro/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/ro/Firefox%20152.0.6.dmg"; locale = "ro"; arch = "mac"; - sha256 = "88c400fcd2d751dc8fd2d27c926ee94e0f4f8ecca0cfafe84ee18802e0255718"; + sha256 = "42caca7179b5fe870a4bd6c1abf4944e5f2c69f720c94cb9594f2cd59f98f14c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/ru/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/ru/Firefox%20152.0.6.dmg"; locale = "ru"; arch = "mac"; - sha256 = "f54ba43b4bf267634d21a2d1dd4449c7cfb16990c9451a0cf3074348742e6095"; + sha256 = "54209bba0052b808c9c6c02c25e8bf9ad72774047aa596ade3e8a7550031ba8a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/sat/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/sat/Firefox%20152.0.6.dmg"; locale = "sat"; arch = "mac"; - sha256 = "715684a3c3336c438cd0ba121351cfdc20e4d4294e2ced1241afea657dd62324"; + sha256 = "1ab4eb843736aeadfd4702f487e090ccf2457e8c40a2a8d136f65c1746b40d28"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/sc/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/sc/Firefox%20152.0.6.dmg"; locale = "sc"; arch = "mac"; - sha256 = "1f55a8b02774c7d8ab1ea51f2fbdde2561aa4d4ef0741204426ecf8ba00cf158"; + sha256 = "9509a852b0303fc12204fcfa231e2300634e628964b5d805aad9d8f8c9e4a8f3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/sco/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/sco/Firefox%20152.0.6.dmg"; locale = "sco"; arch = "mac"; - sha256 = "7931c9a844ffab20aaf9be1ccad89324570326f24506117b4a9382e50c15db07"; + sha256 = "29039af009a5197689c516f3d08c869f80a7f78413fe478a76a7cf7201111166"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/si/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/si/Firefox%20152.0.6.dmg"; locale = "si"; arch = "mac"; - sha256 = "b579ca47fd9adae2b1ffd2c3dc754369eae47c50ed740c10f001ed3654cc0aa8"; + sha256 = "76d591eed0dcaa5f7d3c707a46819919760c3b32b97597c281b28556aa6060d0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/sk/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/sk/Firefox%20152.0.6.dmg"; locale = "sk"; arch = "mac"; - sha256 = "e233dadd5f9dcffea1c2db9459cc6a4fbb73f91d93284a3796b8922577ce4068"; + sha256 = "a82a55040edcd02eadfdb5be9afc96eee8895faec3c135bb29810870d0dd2c0f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/skr/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/skr/Firefox%20152.0.6.dmg"; locale = "skr"; arch = "mac"; - sha256 = "9ffcd4c26ef8a8a5fbdd8ca6133cfbbbf22043094c73444005a3f7df61d26cb2"; + sha256 = "470926f0aae969714eb9844fa66aa789691672b65a76efbd9fbcfed00f8fc52e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/sl/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/sl/Firefox%20152.0.6.dmg"; locale = "sl"; arch = "mac"; - sha256 = "345a71f80c0fd98b422ed3be7ffe1ef2fe46dba167b955986566024d910b55b0"; + sha256 = "460907d6e7bdd1006c14fd08ef178bb1efba353aa7e307c62298fc14fa674a01"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/son/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/son/Firefox%20152.0.6.dmg"; locale = "son"; arch = "mac"; - sha256 = "d296ebc52b3a795c2e8da8194ae207d76e47cace9f68b29a0ea79ce0a196e454"; + sha256 = "1800661b190fdc51d5e731eff00ca071b72ed4068bf30c6b005ed932d0765772"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/sq/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/sq/Firefox%20152.0.6.dmg"; locale = "sq"; arch = "mac"; - sha256 = "1d74a1fc016eaa619cfaec922a8816a990e7a6351f458ca3067ae48e7d8e28aa"; + sha256 = "94454b310a116c0ea6e4a9b742c816058eb5f984fa9cab9a99b63a5f26908afe"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/sr/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/sr/Firefox%20152.0.6.dmg"; locale = "sr"; arch = "mac"; - sha256 = "a9f8d2de27469c31cf01c470b417016f4301e8fad16e7f9298ad845fbde8a6b9"; + sha256 = "2676dd843140239442d044bfc42e51fa466362a0e12e65027fbd213773e6cb99"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/sv-SE/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/sv-SE/Firefox%20152.0.6.dmg"; locale = "sv-SE"; arch = "mac"; - sha256 = "1bdb500fafe8ec10322fd78d47496160fb7ad6b5b3abb5297233ac9abd2ff42f"; + sha256 = "d2925c3dfef57e94e70ba1604d18eb9d3b76a5b611e52a955f8aad7410cf2528"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/szl/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/szl/Firefox%20152.0.6.dmg"; locale = "szl"; arch = "mac"; - sha256 = "dcdd05fc822a0d58ca67f3cda7d9ad4b39c2c42b7c8fd22707c9bf6bf89e8fd9"; + sha256 = "d52063bd4eea4deba671d83265d9bca95b11147e4ebebc0d25eae8e1cd671c43"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/ta/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/ta/Firefox%20152.0.6.dmg"; locale = "ta"; arch = "mac"; - sha256 = "82c739cb7cbd734f8d7385e385a42a5f1c138395c503063e9f8de95eb2293566"; + sha256 = "0a134af2838b431a9fc9a7ee41b81d769f9062414fa6aeae189ddbbfb50efc3c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/te/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/te/Firefox%20152.0.6.dmg"; locale = "te"; arch = "mac"; - sha256 = "6ef36dfdbded72513aa3d351c792a025311b83fecb704095aa6d79f00fed1f64"; + sha256 = "2757f5630368121e2767ec85058c65c3729dfa084f585ead678536aefd8aa406"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/tg/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/tg/Firefox%20152.0.6.dmg"; locale = "tg"; arch = "mac"; - sha256 = "40ab48ece74d955d0ab0e3f9e2d281cef347ce5f97d259e876a45cc27221a576"; + sha256 = "cd2ac95907ad6f91f73a7ccc30c3bf505c10edd797c1a3ea7ad27c025ec07668"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/th/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/th/Firefox%20152.0.6.dmg"; locale = "th"; arch = "mac"; - sha256 = "cecee2e9dc8efa06503e3ef99ff1df9347414b428b78da4c18155b92783f67a0"; + sha256 = "d40fc728551be930f33f29cb641eb1475da3feb14be48382bbcea381cf55c8e7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/tl/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/tl/Firefox%20152.0.6.dmg"; locale = "tl"; arch = "mac"; - sha256 = "b946a7e6de82d467b24cee7365ca2011d067d4e06bb3871c74ea67cff9b065cf"; + sha256 = "50c15d68fc1fbf8a923b36fb4dbfb48547cdca093776e6dde5f4da472afd96c3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/tr/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/tr/Firefox%20152.0.6.dmg"; locale = "tr"; arch = "mac"; - sha256 = "28fb15081a46a6c5c467ffe0e21a814585c4f6bf0a6d46c3512f6cf33749f8fb"; + sha256 = "2947dee7fd29f947a04ef6c638ee7a854dc060bfdb8eb62d46221b92d7e216dd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/trs/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/trs/Firefox%20152.0.6.dmg"; locale = "trs"; arch = "mac"; - sha256 = "7a7522b90d8de1b8902feb41757b8307d41258faeb464d7e65273ed72e34a17d"; + sha256 = "4874731cab707e50231e23b9ab9d46eb8ec1d51c6a07b31d8c52a5fb13238c9a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/uk/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/uk/Firefox%20152.0.6.dmg"; locale = "uk"; arch = "mac"; - sha256 = "527ad38dc945c62610d41531d1a71817ad7327ea145cf11e1e22f0acc0026fb7"; + sha256 = "9ce4d54265b808b86fd1d83009c0fa88c8f405a1f5ea1710f40ec5be3753e66d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/ur/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/ur/Firefox%20152.0.6.dmg"; locale = "ur"; arch = "mac"; - sha256 = "586aed3f8f1f18b283bfd91421e6e73c8a027877fea337a3da31ebc65399ba5f"; + sha256 = "fa6acebf921fb52513e58df630907784955a3dff707af1c56b8bc0ff8aced260"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/uz/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/uz/Firefox%20152.0.6.dmg"; locale = "uz"; arch = "mac"; - sha256 = "0a407929707d1669c65d8e5b99703a8a909c4fe07f32cb740bf962f04322d889"; + sha256 = "aaa9414510113b8985ba13d67ba42e03d0e41d53ab12f2878d8e62de63d4e966"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/vi/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/vi/Firefox%20152.0.6.dmg"; locale = "vi"; arch = "mac"; - sha256 = "030bb044c393a72315b53d8c4efb983507558e103a9f0975c1c62b976b89608e"; + sha256 = "0d59114aba52524058aaf5b819db8ecbb34c85904e532558160c24a85af77e73"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/xh/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/xh/Firefox%20152.0.6.dmg"; locale = "xh"; arch = "mac"; - sha256 = "f0eb143ea34e4c315af614744e2a62280ea865118fdeffbb30aea967501c68b2"; + sha256 = "5b1db86e888a1fb34a761a46656d0db47e12acba3ffa7fc0b5a2f222cb8fcdb1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/zh-CN/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/zh-CN/Firefox%20152.0.6.dmg"; locale = "zh-CN"; arch = "mac"; - sha256 = "1a72c7471bebf56aea589930198311a047ea248acb423a4f374b36e323cec9d1"; + sha256 = "29efe4d3373a06cb57977c20261b81bab21fbd470f674492f2059e931f9f977c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/152.0.5/mac/zh-TW/Firefox%20152.0.5.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/152.0.6/mac/zh-TW/Firefox%20152.0.6.dmg"; locale = "zh-TW"; arch = "mac"; - sha256 = "86eff428f777aca1ec642312475a9fbf0b86ca20b41fd6055ce149cf1b8821ef"; + sha256 = "304bc1d395517f9961e8e26e10e27ab1525b7b78ccd9fccb188bb68f8a8aa83b"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix index 2212b456dfb0..83fb6538eb5b 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix @@ -10,11 +10,11 @@ buildMozillaMach rec { pname = "firefox-beta"; binaryName = "firefox-beta"; - version = "152.0b10"; + version = "153.0b13"; applicationName = "Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "531117225f690736e529d654766136878e3c719ec500860fcd578d9bf93f2e46f2887f0c4ba21dd17884cc41bda37fbd735c998091a0e1b0eb72d5d43f4f2339"; + sha512 = "fecfb1837d1907d54ed52bc40113804b6637352c2cbe6eb906f950d7749cbece32446b42c392102fa9e16591949619237dc2dbeb13bec18697ddd42e9ce8d4dd"; }; meta = { diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix index c7133df13e16..23e821f4494e 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix @@ -10,13 +10,13 @@ buildMozillaMach rec { pname = "firefox-devedition"; binaryName = "firefox-devedition"; - version = "153.0b11"; + version = "153.0b13"; applicationName = "Firefox Developer Edition"; requireSigning = false; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "b9cba9de51157db94ae421fcb82e2172e3a3b5026b01b1049c858e45302603dde9e8d859a163d1ec00e225788516fb769c1b7b1a4bd4f4ed3785c9552aab4e78"; + sha512 = "ee1a699ab3f390031e7eb85b6cc394d3431cc2e2960e97cabc393cc4edad1bd1a2ba62e7d834e2ae52fa7fcf3a08c6194c1801ba7e62fa3ceb98ee08ac27981d"; }; # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix index 16ec61822d5d..c996851021db 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix @@ -9,10 +9,10 @@ buildMozillaMach rec { pname = "firefox"; - version = "152.0.5"; + version = "152.0.6"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "6cf2dc7f28a6a3430f2866df4ca35063cbadf234c82a34fa651e02d909e5741e50cd986fef1bd97d486b51244cb639b2b103514688347bf7f94fd16d264cc4f2"; + sha512 = "c4d877837d7007fb611c38d49d9b6dd3bc4c5c9ca900b54e722e140ce7ecd0924f69b5cedc7f8c1fe602e7efe1d7159b019de27999e29235cd631821bb13e6b0"; }; meta = { diff --git a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix deleted file mode 100644 index 2e430baa0706..000000000000 --- a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - lib, - buildGoModule, - minikube, -}: - -buildGoModule rec { - inherit (minikube) - version - src - nativeBuildInputs - buildInputs - vendorHash - doCheck - postPatch - ; - - pname = "docker-machine-hyperkit"; - - buildPhase = '' - make docker-machine-driver-hyperkit COMMIT=${src.rev} - ''; - - installPhase = '' - install out/docker-machine-driver-hyperkit -Dt $out/bin - ''; - - meta = { - homepage = "https://minikube.sigs.k8s.io/docs/drivers/hyperkit"; - description = "HyperKit driver for docker-machine"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ atkinschang ]; - platforms = [ "x86_64-darwin" ]; - }; -} diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index e592740d8129..11e899ebe285 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -26,7 +26,6 @@ assert lib.elem stdenv.system [ "x86_64-linux" - "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; @@ -178,7 +177,6 @@ in srcHash = "sha256-AkZjpHk57S3pYiZambxgRHR7PD51HSI4H1HHW9ICah4="; variant = "lean"; }; - x86_64-darwin = x86_64-linux; aarch64-linux = { version = "3.4.0"; hash = "sha256-QWxzKtNyw/AzcHMv0v7kj91pw1HO7VAN9MHO84caFk8="; @@ -199,7 +197,6 @@ in hash = "sha256-9RlQWcDUECrap//xf3sqhd+Qa8tuGZSHFjGfmXhkGgQ="; srcHash = "sha256-4OEsVhBNV9CJ+PN4FgCduUCVA9/el5yezSCZ6ko3+bU="; }; - x86_64-darwin = x86_64-linux; aarch64-linux = x86_64-linux // { hash = "sha256-5Lv2uA72BJEva5v2yncyPe5gKNCNOPNsoHffVt6KXQ0="; }; diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix index 7a57f58bef6c..8ba869bfb2ec 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix @@ -32,7 +32,7 @@ buildGoModule rec { meta = { description = "Helm plugin which maps deprecated or removed Kubernetes APIs in a release to supported APIs"; homepage = "https://github.com/helm/helm-mapkubeapis"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ aos ]; }; } diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix index 6395244fe708..7b23822646e0 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix @@ -40,8 +40,8 @@ stdenv.mkDerivation rec { runHook preInstall install -dm755 $out/helm-secrets $out/helm-secrets/scripts - install -m644 -Dt $out/helm-secrets plugin.yaml - cp -r scripts/* $out/helm-secrets/scripts + install -m644 -Dt $out/helm-secrets plugins/helm-secrets-cli/plugin.yaml + cp -r plugins/helm-secrets-cli/scripts/* $out/helm-secrets/scripts wrapProgram $out/helm-secrets/scripts/run.sh \ --prefix PATH : ${ lib.makeBinPath [ diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 019b0716544b..0c2d87864f76 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -45,13 +45,13 @@ "vendorHash": "sha256-031RZo1EqWrt79NvdrrZ9FW/E+mfwkGmr7wyMYX4SHg=" }, "aliyun_alicloud": { - "hash": "sha256-PF/mGGoO8voHyUiUN3qTOsBEJ0r6TBWa+p1P4vgliDs=", + "hash": "sha256-G52l+5WlcxSNflx0ioD0jEKI1GBWe5D4qW8VH8k6uTA=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.284.0", + "rev": "v1.285.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-sESuNlWNyjjGYb7z+tQF7RGBgicnPISuwXRzB+QJ7E4=" + "vendorHash": "sha256-sZeXHTrMUUPllPzvpbFjwA5FjFJXnO1k5h9B5i8U+vs=" }, "aminueza_minio": { "hash": "sha256-4b5K2Hyy26euJct1/0dxC39DMM41W6+jdJS68/d4yCw=", @@ -155,13 +155,13 @@ "vendorHash": "sha256-SO3CX7pZ+q7ytz/55cxTPlW7ByY1zKhxkQxMiqAvm8o=" }, "checkly_checkly": { - "hash": "sha256-9kcZXbrfl8ovrg1w3bWdta/ABnLtVIfseRptZn5NrgI=", + "hash": "sha256-or9qjJdA8sDmPnETyedWtsAWEsF9hJdDmPpX+qncN7E=", "homepage": "https://registry.terraform.io/providers/checkly/checkly", "owner": "checkly", "repo": "terraform-provider-checkly", - "rev": "v1.25.0", + "rev": "v1.26.0", "spdx": null, - "vendorHash": "sha256-7XgTkzYBfkpF8Dd4YsgpB+YIfkANsg/60b3AyO8Y8FA=" + "vendorHash": "sha256-nB77EpptqXhF+7/85h37CRQUk/iyq1ffSc2v2kQwFAQ=" }, "ciscodevnet_aci": { "hash": "sha256-8QnmISiZGRbW60mN9I6UYWDo6f2HUIFersVs/pDUD3o=", @@ -209,13 +209,13 @@ "vendorHash": "sha256-rCWeetM6nhNb1I1PmB66E5K1ku9ODRqN87MU9y6W/dc=" }, "cloudflare_cloudflare": { - "hash": "sha256-SHEK/NJrs1ZkyDc8jSnb39dT/wX7ixSsHc//cwhTfz8=", + "hash": "sha256-qy/bW3CnsSXoiCLPW+LVuBb7OQLhxIpCDNTyAdjU5rM=", "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v5.21.1", + "rev": "v5.22.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-YLgIcohvOYBVt/GOkiqxdJVThhcphG2l8Lha1MwU9L4=" + "vendorHash": "sha256-IwklxMtQ6pOO/066SKx298ANoh0i/DiGtgqamenMi+s=" }, "cloudfoundry-community_cloudfoundry": { "hash": "sha256-1nYncJLVU/f9WD6Quh9IieIXgixPzbPk4zbtI1zmf9g=", @@ -427,13 +427,13 @@ "vendorHash": "sha256-ZbU2z7qUHPR7vDSflesSjgK7x3LYXVe/gnVsy19q6Bs=" }, "fortinetdev_fortios": { - "hash": "sha256-w7LxnOEAoeJKyicI8Bfd2yH+3oTz3ZVBnskbSEgZBO4=", + "hash": "sha256-etGi9KDbmET8Eh4DPJkNA/HbjR+1VUBADlf3MKWbqkc=", "homepage": "https://registry.terraform.io/providers/fortinetdev/fortios", "owner": "fortinetdev", "repo": "terraform-provider-fortios", - "rev": "1.24.1", + "rev": "1.25.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-V+D/D+i1xbPp9IAfrAds2rNv5t/aXQxPwH9vY09DsMo=" + "vendorHash": "sha256-ZU05thGO6uUsAxEi/aMQFxlQZ57okGfDEHx/+wNe+x8=" }, "gavinbunney_kubectl": { "hash": "sha256-UQ/xvhs7II+EGH5bKdrVC47hp5dhLqQZeqSBz06ho1s=", @@ -724,11 +724,11 @@ "vendorHash": "sha256-6knIcS3hkzt3R1IC1hA6EKOceJl51/pJXpftEaZjgtY=" }, "huaweicloud_huaweicloud": { - "hash": "sha256-yuBbgu3DtnwMLwgFZtHpI6yo8p0Pzl6AtlqbW2cWi+c=", + "hash": "sha256-1WVZ5NOvVFuRIWJQpFy9lRvlt5GbOHINFISABexcb/M=", "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "owner": "huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.94.0", + "rev": "v1.95.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -851,13 +851,13 @@ "vendorHash": "sha256-OgKOjLwDQxJiv+VWdOzjMcUDPu9LOuhyTRyLyM39vLM=" }, "linode_linode": { - "hash": "sha256-aOLto01ntce/l+1ZcQf5Rsdu6ptgpYWpf5JpJ0zRUNs=", + "hash": "sha256-N/SVZ1ajNRT53zxdYBT6Hd/wwAuKhEre0QSZUYbkwGA=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v3.14.1", + "rev": "v4.1.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-dnvv6sSzEUZ4Hbrq/pAgi/O1RyxCx89omCVzvCe70S0=" + "vendorHash": "sha256-r5T8kmvCb2iBUJqw5m7hrr+ET7U9kIBUbsvEVqZlgrE=" }, "loafoe_htpasswd": { "hash": "sha256-1HCvAGWsYlcYCA8iOmBb/AawxHPLuoxxQWLzNy0x79M=", @@ -1067,11 +1067,11 @@ "vendorHash": null }, "ovh_ovh": { - "hash": "sha256-JaZdCten+5mV8aKCRhkoifqP4EwNrytK25TLJl1eQjQ=", + "hash": "sha256-01xbvlVgdpRXPw7S1J067cj92ogfcBOzC6y+/PTWtRM=", "homepage": "https://registry.terraform.io/providers/ovh/ovh", "owner": "ovh", "repo": "terraform-provider-ovh", - "rev": "v2.15.0", + "rev": "v2.16.1", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1085,11 +1085,11 @@ "vendorHash": "sha256-F1AuO/dkldEDRvkwrbq2EjByxjg3K2rohZAM4DzKPUw=" }, "pagerduty_pagerduty": { - "hash": "sha256-SBPy6elle5eSGY67JZEkfaov1jkfaqmvDGPEO9Zd8AY=", + "hash": "sha256-+0edUEoaJCg8iDZxRQVQMiP3pLROTi19djEhS5LiRHw=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v3.33.1", + "rev": "v3.34.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1139,13 +1139,13 @@ "vendorHash": "sha256-WpI4OZ7BUVgHwQY+7ct+K6CnwXFFuiRbI+iTFSJ8a5A=" }, "rootlyhq_rootly": { - "hash": "sha256-eJKJedLDp6CdFNimI8artmKYMsgURFXxS/RpMEJnVWk=", + "hash": "sha256-uxEqnGPJPUHhD2qtT9BR34/x6xSN5cZcW0JvH8fKfT0=", "homepage": "https://registry.terraform.io/providers/rootlyhq/rootly", "owner": "rootlyhq", "repo": "terraform-provider-rootly", - "rev": "v5.16.1", + "rev": "v5.17.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-QVZBQ7Ir8iEUaJo0yXFNp8rInIcbp9qw70UDJ3NAgRM=" + "vendorHash": "sha256-CndTtUfv1NWZd1sgfGq+e4lPm68aQuqwo55KzmdgXeI=" }, "rundeck_rundeck": { "hash": "sha256-g8unbz8+UGLiAOJju6E2bLkygvZgHkv173PdMDefmrc=", @@ -1184,13 +1184,13 @@ "vendorHash": "sha256-uCw5Xdqp3VjLj6IytoVfO0atxkT69FNqJmAlA6eCmfs=" }, "scaleway_scaleway": { - "hash": "sha256-rO5xmAJB2ndhVh7Lkun1Gxi04+I2lGVtkbbCbmngp3E=", + "hash": "sha256-NXW3b4E92uqZbzIpRTFKVKbPRghwfRK4akn4KY7C9p0=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.78.0", + "rev": "v2.79.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-x2cppxUU58nN7eu+wMxIoS16HezxzkHWI50ck2r34ls=" + "vendorHash": "sha256-MKYAdMLETD12850TIBqBfHLRNLy15B6ycDUckIapwt8=" }, "scottwinkler_shell": { "hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=", @@ -1202,13 +1202,13 @@ "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "selectel_selectel": { - "hash": "sha256-DKz+Cs8Jh480SnZsG7x+CE70pCP43GhQa9S1gl5oWl0=", + "hash": "sha256-ff8XqDp31pwbPmKe7RFMupwVWuhQoOTizFdTAfW5eek=", "homepage": "https://registry.terraform.io/providers/selectel/selectel", "owner": "selectel", "repo": "terraform-provider-selectel", - "rev": "v8.2.1", + "rev": "v8.2.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-PERDJ74FtXhK+HUd9EjYINpmUXVX+kHtkRbFf6gv8Ng=" + "vendorHash": "sha256-zdAJOPL+4gEsESzG4XHSMhM9JkFPuoMudwNmVr6HJFE=" }, "siderolabs_talos": { "hash": "sha256-/NACmEpodBNx+Q2M9y3JnKpw9a3Y1eFDdTQ+48MXAc8=", @@ -1238,22 +1238,22 @@ "vendorHash": "sha256-skswuFKhN4FFpIunbom9rM/FVRJVOFb1WwHeAIaEjn8=" }, "spacelift-io_spacelift": { - "hash": "sha256-1f066NavFneIeH8X5CYGd0GmssPfzJACXt6GHvR/FLU=", + "hash": "sha256-mPrRDA/waxBNIpO8u/QCSi8uNZT6sCs2M5UFyMYZ4dw=", "homepage": "https://registry.terraform.io/providers/spacelift-io/spacelift", "owner": "spacelift-io", "repo": "terraform-provider-spacelift", - "rev": "v1.52.3", + "rev": "v1.52.4", "spdx": "MIT", - "vendorHash": "sha256-C8TE7uxMf6LOTS6v22mXwUdk2eqQRinwrCH4ZVUCx4k=" + "vendorHash": "sha256-VmrvdRsNk2s6GQw7t8Aj0ASAEgQ/9v1TxnNIO9TderI=" }, "splunk-terraform_signalfx": { - "hash": "sha256-bWZ5TvTVoYA6J67mi24rSzf5Qf6jk0RUgiC9CAa1s1o=", + "hash": "sha256-xdB2VAacBGFAeVd60Zy6MWSmx6BFJ7ciZKSTXYdRZY0=", "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx", "owner": "splunk-terraform", "repo": "terraform-provider-signalfx", - "rev": "v9.30.3", + "rev": "v9.33.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-27mA2OAApUtPawZZk7Wxme9TfQY19TraIJSqHh8MFZg=" + "vendorHash": "sha256-m7Op/K3Xo9nKgVg9bTHmpmPiFpCB6Ek/kgj76P+ViGQ=" }, "spotinst_spotinst": { "hash": "sha256-OX2uclduqzLPlRNHmji8X+PrEV78gdsE/W/SND4cVRA=", @@ -1283,11 +1283,11 @@ "vendorHash": "sha256-nbiLH+J051XxTx+z8xGrp/DPYB7g9S4clFSWcZUKnAg=" }, "sysdiglabs_sysdig": { - "hash": "sha256-r14FsYrLqcZLcQlm25qOCKICTAb3dMBkphRAHiUeXrs=", + "hash": "sha256-VeIgHhCHyNgAcv2NIBAWCJIwGHE3nqYeCxGd4VSUymU=", "homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig", "owner": "sysdiglabs", "repo": "terraform-provider-sysdig", - "rev": "v3.8.2", + "rev": "v3.9.0", "spdx": "MPL-2.0", "vendorHash": "sha256-HjrB7C0KaLJz9NVLfZdq5EZbNbF9lJPxSkQwnWUF978=" }, @@ -1310,13 +1310,13 @@ "vendorHash": "sha256-ZuH+uIv+iRQgUooyXsryICItSRglk1AGGWMVb+o1ILs=" }, "temporalio_temporalcloud": { - "hash": "sha256-gWboOWDlfoMIlfmeGOom83T/ymMW8leqO0tzrG5xhmk=", + "hash": "sha256-7xj+/RzXtMXN9IWjua0+cAH5zyMMCIqlOzvFqNsAFHk=", "homepage": "https://registry.terraform.io/providers/temporalio/temporalcloud", "owner": "temporalio", "repo": "terraform-provider-temporalcloud", - "rev": "v1.5.0", + "rev": "v1.6.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-7ZoJg1HEVj5Nygr46lmBZeJDfZuU4F90yntrgkBVgGg=" + "vendorHash": "sha256-QvtirfTfnvy7CBNUng07OZnbXLHJAyRlf1I9Mur44N4=" }, "tencentcloudstack_tencentcloud": { "hash": "sha256-1UBML3E5ZnOcsdGZlZ5qkaqQsE1+Q9Uw9R8FeWJXFSw=", @@ -1490,13 +1490,13 @@ "vendorHash": "sha256-rUYHapEVqRupLOPVbcAH8YP0cuXclMmYTQUkqeOwCN0=" }, "vultr_vultr": { - "hash": "sha256-TMja+5jeYxIjY/MvJwCR/2rsbHuF7RcPReQSzkksk7Q=", + "hash": "sha256-hK4/Pzj0UtWDLQS3cRMC73ZRr20HCWqI+jUlTUHcHaw=", "homepage": "https://registry.terraform.io/providers/vultr/vultr", "owner": "vultr", "repo": "terraform-provider-vultr", - "rev": "v2.31.2", + "rev": "v2.32.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-OASLdReS245N4y0SQ4WY7kPNPpGTHptQgXlNqPlb3nM=" + "vendorHash": "sha256-av/hIjHWw64WIJv3LVyVDu6IMUKCsM4VOLFZKB0IXjU=" }, "wgebis_mailgun": { "hash": "sha256-cz+KSvlm1mFe+NXn4IhiWYWT0/U+UAAA8SCNJgXvIKc=", diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index ebbbddb8dbed..4bedf5ef87fe 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -35,7 +35,7 @@ let self = discord-development; }; }; - x86_64-darwin = { + aarch64-darwin = { discord = rec { branch = "stable"; binaryName = desktopName; @@ -62,7 +62,6 @@ let }; }; - aarch64-darwin = x86_64-darwin; default = x86_64-linux; # Used for unsupported platforms, so we can return *something* there. }; @@ -81,7 +80,6 @@ let ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index afbeaa4e4885..e9b623befca0 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -38,14 +38,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "gajim"; - version = "2.4.7.1"; + version = "2.5.0"; src = fetchFromGitLab { domain = "dev.gajim.org"; owner = "gajim"; repo = "gajim"; - tag = "${finalAttrs.version}+win"; - hash = "sha256-/X2Xp1ZnPLTZc1Hf4Kp6R/+mezU6qoUhaT9OskYlnOY="; + tag = finalAttrs.version; + hash = "sha256-3/HQNizXLjeQpCdEK14LMflyNUKF1BI8eli3BGxiH40="; }; pyproject = true; @@ -55,11 +55,11 @@ python3.pkgs.buildPythonApplication (finalAttrs: { adwaita-icon-theme gtksourceview5 glib-networking + gstreamer + gst-plugins-base ] ++ lib.optionals enableJingle [ farstream - gstreamer - gst-plugins-base gst-libav gst-plugins-good libnice diff --git a/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix b/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix deleted file mode 100644 index a346ebd7b0de..000000000000 --- a/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - stdenvNoCC, - lib, - fetchzip, -}: - -stdenvNoCC.mkDerivation rec { - pname = "ripcord"; - version = "0.4.29"; - - src = fetchzip { - url = "https://cancel.fm/dl/Ripcord_Mac_${version}.zip"; - sha256 = "sha256-v8iydjLBjFN5LuctpcBpEkhSICxPhLKzLjSASWtsQok="; - stripRoot = false; - }; - - dontBuild = true; - dontFixup = true; # modification is not allowed by the license https://cancel.fm/ripcord/shareware-redistribution/ - - installPhase = '' - runHook preInstall - - mkdir -p $out/Applications - cp -r $src/Ripcord.app $out/Applications/ - - runHook postInstall - ''; - - meta = { - description = "Desktop chat client for Slack and Discord"; - homepage = "https://cancel.fm/ripcord/"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - # See: https://cancel.fm/ripcord/shareware-redistribution/ - license = lib.licenses.unfreeRedistributable; - maintainers = with lib.maintainers; [ mikroskeem ]; - platforms = [ "x86_64-darwin" ]; - }; -} diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index c6ce7747558d..004c91f93cfc 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -39,9 +39,7 @@ let mozillaPlatforms = { x86_64-linux = "linux-x86_64"; - # bundles are universal and can be re-used for both darwin architectures aarch64-darwin = "mac"; - x86_64-darwin = "mac"; }; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix index e3e80e2cbef5..91ed7e4894ef 100644 --- a/pkgs/applications/office/beancount/bean-add.nix +++ b/pkgs/applications/office/beancount/bean-add.nix @@ -3,11 +3,12 @@ stdenv, fetchFromGitHub, python3Packages, + installShellFiles, }: stdenv.mkDerivation { pname = "bean-add"; - version = "unstable-2018-01-08"; + version = "0-unstable-2018-01-08"; src = fetchFromGitHub { owner = "simon-v"; @@ -18,10 +19,10 @@ stdenv.mkDerivation { propagatedBuildInputs = with python3Packages; [ python ]; - installPhase = '' - mkdir -p $out/bin/ - cp bean-add $out/bin/bean-add - chmod +x $out/bin/bean-add + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installBin bean-add ''; meta = { diff --git a/pkgs/applications/office/libreoffice/darwin/default.nix b/pkgs/applications/office/libreoffice/darwin/default.nix index 5a36fda68a8b..eb613364c8f3 100644 --- a/pkgs/applications/office/libreoffice/darwin/default.nix +++ b/pkgs/applications/office/libreoffice/darwin/default.nix @@ -12,29 +12,15 @@ let version = "26.2.4"; dist = { - aarch64-darwin = rec { - arch = "aarch64"; - archSuffix = arch; - url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${arch}/LibreOffice_${version}_MacOS_${archSuffix}.dmg"; - sha256 = "64e0ad05564554eeee639d49b08b20908a38d4722ec95f1620d05c99bcbe9fb1"; - }; - - x86_64-darwin = rec { - arch = "x86_64"; - archSuffix = "x86-64"; - url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${arch}/LibreOffice_${version}_MacOS_${archSuffix}.dmg"; - sha256 = "f92ba40fdada173232fe929bf77973a1ffcccec55ae7971957a6de84d33f0f1e"; - }; + url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/aarch64/LibreOffice_${version}_MacOS_aarch64.dmg"; + sha256 = "64e0ad05564554eeee639d49b08b20908a38d4722ec95f1620d05c99bcbe9fb1"; }; in stdenvNoCC.mkDerivation { inherit version; pname = "libreoffice"; src = fetchurl { - inherit - (dist.${stdenvNoCC.hostPlatform.system} - or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}") - ) + inherit (dist) url sha256 ; @@ -59,16 +45,13 @@ stdenvNoCC.mkDerivation { let defaultNixFile = toString ./default.nix; updateNix = toString ./update.nix; - aarch64Url = dist."aarch64-darwin".url; - x86_64Url = dist."x86_64-darwin".url; in writeScript "update-libreoffice.sh" '' #!/usr/bin/env nix-shell - #!nix-shell -i bash --argstr aarch64Url ${aarch64Url} --argstr x86_64Url ${x86_64Url} --argstr version ${version} ${updateNix} + #!nix-shell -i bash --argstr url ${dist.url} --argstr version ${version} ${updateNix} set -eou pipefail - update-source-version libreoffice-bin $newVersion $newAarch64Sha256 --file=${defaultNixFile} --system=aarch64-darwin --ignore-same-version - update-source-version libreoffice-bin $newVersion $newX86_64Sha256 --file=${defaultNixFile} --system=x86_64-darwin --ignore-same-version + update-source-version libreoffice-bin $newVersion $newSha256 --file=${defaultNixFile} --ignore-same-version ''; meta = { @@ -78,7 +61,6 @@ stdenvNoCC.mkDerivation { maintainers = with lib.maintainers; [ tricktron ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = [ - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/applications/office/libreoffice/darwin/update.nix b/pkgs/applications/office/libreoffice/darwin/update.nix index f3c5c758b428..17f4c69cf85e 100644 --- a/pkgs/applications/office/libreoffice/darwin/update.nix +++ b/pkgs/applications/office/libreoffice/darwin/update.nix @@ -1,7 +1,6 @@ # Impure functions, for passthru.updateScript runtime only { - aarch64Url, - x86_64Url, + url, version, pkgs ? import ../../../../../default.nix { }, }: @@ -14,6 +13,5 @@ in pkgs.mkShell rec { buildInputs = [ pkgs.common-updater-scripts ]; newVersion = getLatestStableVersion; - newAarch64Sha256 = getSha256 aarch64Url version newVersion; - newX86_64Sha256 = getSha256 x86_64Url version newVersion; + newSha256 = getSha256 url version newVersion; } diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix deleted file mode 100644 index d7215163a78b..000000000000 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchpatch2, - pkg-config, - libglut, - gtk2, - gtkglext, - libjpeg_turbo, - libtheora, - libxmu, - lua, - libGLU, - libGL, - perl, - autoreconfHook, -}: - -stdenv.mkDerivation rec { - pname = "celestia"; - version = "1.6.4"; - - src = fetchFromGitHub { - owner = "CelestiaProject"; - repo = "Celestia"; - rev = version; - sha256 = "sha256-MkElGo1ZR0ImW/526QlDE1ePd+VOQxwkX7l+0WyZ6Vs="; - }; - - patches = [ - (fetchpatch2 { - url = "https://github.com/CelestiaProject/Celestia/commit/94894bed3bf98d41c5097e7829d491d8ff8d4a62.patch?full_index=1"; - hash = "sha256-hEZ6BhSEx6Qm+fLisc63xSCDT6GX92AHD0BuldOhzFk="; - }) - ]; - - postPatch = '' - substituteInPlace configure.ac \ - --replace-fail "dnl AM_GNU_GETTEXT_VERSION([0.15])" "AM_GNU_GETTEXT_VERSION([0.15])" - ''; - - nativeBuildInputs = [ - pkg-config - autoreconfHook - ]; - buildInputs = [ - libglut - gtk2 - gtkglext - lua - perl - libjpeg_turbo - libtheora - libxmu - libGLU - libGL - ]; - - configureFlags = [ - "--with-gtk" - "--with-lua=${lua}" - ]; - - enableParallelBuilding = true; - - meta = { - homepage = "https://celestiaproject.space/"; - description = "Real-time 3D simulation of space"; - mainProgram = "celestia"; - changelog = "https://github.com/CelestiaProject/Celestia/releases/tag/${version}"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ - returntoreality - ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/pkgs/applications/science/chemistry/quantum-espresso/default.nix index 37c0a8133d1d..2e5bd1ebe4db 100644 --- a/pkgs/applications/science/chemistry/quantum-espresso/default.nix +++ b/pkgs/applications/science/chemistry/quantum-espresso/default.nix @@ -134,7 +134,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; platforms = [ "x86_64-linux" - "x86_64-darwin" ]; maintainers = [ lib.maintainers.costrouc ]; }; diff --git a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix index d53b26671d3e..6c138f1f9f05 100644 --- a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix +++ b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix @@ -35,7 +35,7 @@ let meta = { homepage = "https://github.com/kodi-game/controller-topology-project"; description = "Models how controllers connect to and map to each other for all gaming history"; - license = with lib.licenses; [ odbl ]; + license = lib.licenses.odbl; teams = [ lib.teams.kodi ]; }; }; diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index ad384520cefe..94a25f22f33c 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -300,7 +300,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "i686-linux" "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ]; diff --git a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix index e3ceeb3fbaf6..6c67d1757316 100644 --- a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix @@ -36,13 +36,13 @@ let in stdenv.mkDerivation rec { pname = "advanced-scene-switcher"; - version = "1.34.2"; + version = "1.35.1"; src = fetchFromGitHub { owner = "WarmUpTill"; repo = "SceneSwitcher"; rev = version; - hash = "sha256-BZYJ5ZZbla4nnpKdZAQPrqd+g1aeLMcsnAvyXfmm4yU="; + hash = "sha256-gfJtkX6OGqy+hUXvLXaOETvfIX+TRNEj0IwZnE9t81E="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/obs-studio/plugins/distroav/default.nix b/pkgs/applications/video/obs-studio/plugins/distroav/default.nix index f24a89c61bc3..c223220a29f2 100644 --- a/pkgs/applications/video/obs-studio/plugins/distroav/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/distroav/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = { description = "Network A/V plugin for OBS Studio (formerly obs-ndi)"; homepage = "https://github.com/DistroAV/DistroAV"; - license = with lib.licenses; [ gpl2 ]; + license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ globule655 ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-darkwindow.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-darkwindow.nix index 4097b4b0d045..9a1f00e07b0d 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-darkwindow.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-darkwindow.nix @@ -13,7 +13,7 @@ mkHyprlandPlugin (finalAttrs: { owner = "micha4w"; repo = "Hypr-DarkWindow"; tag = "v${finalAttrs.version}"; - hash = "sha256-By/4CmpJvVvcBoyTtelH7MSLCKRaoXLCpiSfrbZIePc="; + hash = "sha256-91l5TD46OMfvmhd1WqWxm42cEnjR1yAj2Qk/73mr3ks="; }; installPhase = '' diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix index 7d0fbc2f1e16..640e16bfd659 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix @@ -12,13 +12,13 @@ mkHyprlandPlugin { pluginName = "hyprgrass"; - version = "0.8.2-unstable-2025-10-08"; + version = "0.8.2-unstable-2026-06-10"; src = fetchFromGitHub { owner = "horriblename"; repo = "hyprgrass"; - rev = "fdfa60d464a18ae20b7a7bc63c0d2336f37c164b"; - hash = "sha256-2Y2D2wuNqSldprawq8BSca90gSYSR5ZKL5ZW2YAV2F8="; + rev = "d094a3e62f6ecaeb41515982d3e13edefaf8a4e7"; + hash = "sha256-tCt7FNc1RBHou/ym7B0XzoOqqNq8Df+dizEDkAgJ4U0="; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ mkHyprlandPlugin { doCheck = true; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; meta = { description = "Hyprland plugin for touch gestures"; diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix index 4f8d170a5d7a..c8e6d07f48a5 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix @@ -8,13 +8,13 @@ }: mkHyprlandPlugin (finalAttrs: { pluginName = "hyprsplit"; - version = "0.54.2"; + version = "0.54.3-unstable-2026-06-11"; src = fetchFromGitHub { owner = "shezdy"; repo = "hyprsplit"; - tag = "v${finalAttrs.version}"; - hash = "sha256-NFMLZmM6lM7v6WFcewOp7pKPlr6ampX/MB/kGxt/gPE="; + rev = "6b00b677d8905fb38779c91e12d6294e0e586a44"; + hash = "sha256-PaoUtmk+qIP/ESdxkxnY7mUMpMHjix88qu22R5GLQqE="; }; nativeBuildInputs = [ @@ -22,7 +22,7 @@ mkHyprlandPlugin (finalAttrs: { ninja ]; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; meta = { homepage = "https://github.com/shezdy/hyprsplit"; diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/imgborders.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/imgborders.nix index f7e387354ced..ff1811eb2b09 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/imgborders.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/imgborders.nix @@ -5,31 +5,22 @@ cmake, nix-update-script, }: -mkHyprlandPlugin (finalAttrs: { +mkHyprlandPlugin { pluginName = "imgborders"; - version = "1.0.1"; + version = "1.0.2-unstable-2026-05-17"; src = fetchFromCodeberg { owner = "zacoons"; repo = "imgborders"; - tag = finalAttrs.version; - hash = "sha256-fCzz4gh8pd7J6KQJB/avYcS0Z7NYpxjznPMtOwypPSQ="; + rev = "a20b4d36d01f82823ba3749db95c91743d26f656"; + hash = "sha256-e3PiaR7G6l/lMJ41xtSPcfMKhZcx8UHj13lr0u+8JAk="; }; nativeBuildInputs = [ cmake ]; - installPhase = '' - runHook preInstall - - mkdir -p $out/lib - mv imgborders.so $out/lib/libimgborders.so - - runHook postInstall - ''; - - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; meta = { homepage = "https://codeberg.org/zacoons/imgborders"; @@ -39,4 +30,4 @@ mkHyprlandPlugin (finalAttrs: { mrdev023 ]; }; -}) +} diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix index f8298a4c6fe8..58f3f6000a56 100644 --- a/pkgs/build-support/build-mozilla-mach/default.nix +++ b/pkgs/build-support/build-mozilla-mach/default.nix @@ -349,24 +349,6 @@ buildStdenv.mkDerivation { # https://bugzilla.mozilla.org/show_bug.cgi?id=2046162 ./153-cbindgen-0.29.4-compat.patch ] - ++ - # Fixes `ld.lld: error: undefined symbol: FREEBL_GetVector` - # https://bugzilla.mozilla.org/show_bug.cgi?id=2047651 - lib.optionals - ( - lib.versionAtLeast version "153" - && lib.versionOlder version "154" - # We don't set --with-system-nss on Darwin, so it should be - # unaffected. - && !stdenv.hostPlatform.isDarwin - ) - [ - (fetchpatch { - name = "link-freebl-explicitly-for-system-nss-builds.patch"; - url = "https://hg-edge.mozilla.org/mozilla-central/raw-rev/1a56071ddc0fe97a55c3b825e1dd33c8422b9fc1"; - hash = "sha256-+HiU7RMPmV7I7SIzjP0Q6iSDJL/vBjc3UcwUTg57lNQ="; - }) - ] ++ extraPatches; postPatch = '' diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 617bd299a41d..bf079f1b0e53 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -413,14 +413,6 @@ in assert includeFortifyHeaders' -> fortify-headers != null; -# Ensure bintools matches -assert libc_bin == bintools.libc_bin; -assert libc_dev == bintools.libc_dev; -assert libc_lib == bintools.libc_lib; -assert nativeTools == bintools.nativeTools; -assert nativeLibc == bintools.nativeLibc; -assert nativePrefix == bintools.nativePrefix; - stdenvNoCC.mkDerivation { pname = targetPrefix + (if name != "" then name else "${ccName}-wrapper"); version = optionalString (cc != null) ccVersion; @@ -490,9 +482,21 @@ stdenvNoCC.mkDerivation { # This is a quick fix unblock builds broken by https://github.com/NixOS/nixpkgs/pull/370750. dontCheckForBrokenSymlinks = true; - unpackPhase = '' - src=$PWD - ''; + # Ensure bintools matches. This is done here rather than at top level + # so that evaluating the derivation's metadata (such as `name`) + # doesn't force the comparisons, which cause the outPaths of the + # compared derivations to be computed and thus .drv files to be + # written to the store. + unpackPhase = + assert libc_bin == bintools.libc_bin; + assert libc_dev == bintools.libc_dev; + assert libc_lib == bintools.libc_lib; + assert nativeTools == bintools.nativeTools; + assert nativeLibc == bintools.nativeLibc; + assert nativePrefix == bintools.nativePrefix; + '' + src=$PWD + ''; wrapper = ./cc-wrapper.sh; diff --git a/pkgs/build-support/rocq/default.nix b/pkgs/build-support/rocq/default.nix index 68181efcfb44..6a25a171cb25 100644 --- a/pkgs/build-support/rocq/default.nix +++ b/pkgs/build-support/rocq/default.nix @@ -55,7 +55,7 @@ in extraNativeBuildInputs ? [ ], overrideBuildInputs ? [ ], overrideNativeBuildInputs ? [ ], - namePrefix ? [ "rocq-core" ], + namePrefix ? null, enableParallelBuilding ? true, extraInstallFlags ? [ ], setROCQBIN ? true, @@ -66,7 +66,7 @@ in dropDerivationAttrs ? [ ], useDuneifVersion ? (x: false), useDune ? false, - opam-name ? (concatStringsSep "-" (namePrefix ++ [ pname ])), + opam-name ? null, useCoq ? false, useCoqifVersion ? (x: false), ... @@ -160,10 +160,17 @@ let ] "" ) + optionalString (v == null) "-broken"; - append-version = p: n: p + display-pkg n "" rocqPackages.${n}.version + "-"; - prefix-name = foldl append-version "" namePrefix; useDune = args.useDune or (useDuneifVersion fetched.version); useCoq = args.useCoq or (useCoqifVersion fetched.version); + namePrefix = args.namePrefix or [ (if useCoq then "coq" else "rocq") ]; + append-version = + p: n: + let + version = if n == "rocq" then rocqPackages.rocq-core.version else rocqPackages.${n}.version; + in + p + display-pkg n "" version + "-"; + prefix-name = foldl append-version "" namePrefix; + opam-name = args.opam-name or (concatStringsSep "-" (namePrefix ++ [ pname ])); rocq-core = if useCoq then coq // { rocq-version = coq.coq-version; } else args0.rocq-core; rocqlib-flags = [ "COQLIBINSTALL=$(out)/lib/coq/${rocq-core.rocq-version}/user-contrib" diff --git a/pkgs/build-support/writers/scripts.nix b/pkgs/build-support/writers/scripts.nix index 9026c7ea42ca..5b6a2b2640fc 100644 --- a/pkgs/build-support/writers/scripts.nix +++ b/pkgs/build-support/writers/scripts.nix @@ -1196,15 +1196,12 @@ rec { ]) // { interpreter = - if pythonPackages != pkgs.pypy2Packages || pythonPackages != pkgs.pypy3Packages then - if libraries == [ ] then - python.interpreter - else if (lib.isFunction libraries) then - (python.withPackages libraries).interpreter - else - (python.withPackages (ps: libraries)).interpreter + if libraries == [ ] then + python.interpreter + else if (lib.isFunction libraries) then + (python.withPackages libraries).interpreter else - python.interpreter; + (python.withPackages (ps: libraries)).interpreter; check = optionalString (python.isPy3k && doCheck) ( writeDash "pythoncheck.sh" '' exec ${buildPythonPackages.flake8}/bin/flake8 --show-source ${ignoreAttribute} "$1" diff --git a/pkgs/by-name/_0/_010editor/package.nix b/pkgs/by-name/_0/_010editor/package.nix index a74d0473c291..198f52aaea37 100644 --- a/pkgs/by-name/_0/_010editor/package.nix +++ b/pkgs/by-name/_0/_010editor/package.nix @@ -91,11 +91,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-M1D2Bmi45sYiB0Ci+0X0AxyIeR+On60xt4jP1Jsy5tA="; }; - x86_64-darwin = fetchurl { - url = "https://download.sweetscape.com/010EditorMac64Installer${finalAttrs.version}.dmg"; - hash = "sha256-vsI0VgcJGleJTQ5C1JaiCkELfWfwgFhyCx+6j5mldIk="; - }; - aarch64-darwin = fetchurl { url = "https://download.sweetscape.com/010EditorMacARM64Installer${finalAttrs.version}.dmg"; hash = "sha256-+yU5JdPNS2BfiZLsBLyyC+ieVNqbIWba3teBlTIDWtk="; @@ -124,7 +119,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ eljamm ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" "x86_64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/_1/_1password-cli/package.nix b/pkgs/by-name/_1/_1password-cli/package.nix index f9c70c26f423..6595b170e8e3 100644 --- a/pkgs/by-name/_1/_1password-cli/package.nix +++ b/pkgs/by-name/_1/_1password-cli/package.nix @@ -25,14 +25,13 @@ let pname = "1password-cli"; version = "2.34.1"; - sources = rec { + sources = { aarch64-linux = fetch "linux_arm64" "sha256-uEukRq71eeayvNguD9XepvP1Br5AkE2Ag/Chv2idf4A=" "zip"; i686-linux = fetch "linux_386" "sha256-p/F3YZLJnlimrVE2qxTHvIB4m47kuwhoCWTC40VIvMs=" "zip"; x86_64-linux = fetch "linux_amd64" "sha256-oAABMlwwv5X91TT6FK2aPpg+e2CvmHT1rqIVRTjQNCQ=" "zip"; aarch64-darwin = fetch "apple_universal" "sha256-vp1Y1M6DUanx1CAVhLrqgBovwws6Y/5jOgnwTZE8Hhc=" "pkg"; - x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; mainProgram = "op"; diff --git a/pkgs/by-name/_1/_1password-gui/package.nix b/pkgs/by-name/_1/_1password-gui/package.nix index 2b569843f718..260e1ad7ecf2 100644 --- a/pkgs/by-name/_1/_1password-gui/package.nix +++ b/pkgs/by-name/_1/_1password-gui/package.nix @@ -37,7 +37,6 @@ let ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; diff --git a/pkgs/by-name/ab/absolute/package.nix b/pkgs/by-name/ab/absolute/package.nix new file mode 100644 index 000000000000..b1f3a53cb152 --- /dev/null +++ b/pkgs/by-name/ab/absolute/package.nix @@ -0,0 +1,18 @@ +{ lib, ocamlPackages }: + +let + inherit (ocamlPackages) buildDunePackage libabsolute; +in + +buildDunePackage { + pname = "absolute"; + inherit (libabsolute) src version; + + __structuredAttrs = true; + + buildInputs = [ libabsolute ]; + + meta = libabsolute.meta // { + description = "A constraint solver based on abstract domains from the theory of abstract interpretation"; + }; +} diff --git a/pkgs/by-name/ac/accountsservice/fix-paths.patch b/pkgs/by-name/ac/accountsservice/fix-paths.patch index 19c4744e17d0..c512b35bef89 100644 --- a/pkgs/by-name/ac/accountsservice/fix-paths.patch +++ b/pkgs/by-name/ac/accountsservice/fix-paths.patch @@ -78,15 +78,6 @@ index da6428c..682842d 100644 argv[1] = "-s"; argv[2] = shell; argv[3] = "--"; -@@ -3163,7 +3163,7 @@ user_change_icon_file_classic_authorized_cb (Daemon *daemon, - return; - } - -- argv[0] = "/bin/cat"; -+ argv[0] = "@coreutils@/bin/cat"; - argv[1] = filename; - argv[2] = NULL; - @@ -3279,7 +3279,7 @@ user_change_locked_authorized_cb (Daemon *daemon, } else { const gchar *argv[5]; diff --git a/pkgs/by-name/ac/accountsservice/package.nix b/pkgs/by-name/ac/accountsservice/package.nix index c56da88ada7e..3eb9907c5487 100644 --- a/pkgs/by-name/ac/accountsservice/package.nix +++ b/pkgs/by-name/ac/accountsservice/package.nix @@ -9,7 +9,6 @@ gobject-introspection, polkit, systemdLibs, - coreutils, meson, mesonEmulatorHook, dbus, @@ -24,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "accountsservice"; - version = "26.13.3"; + version = "26.27.3"; outputs = [ "out" @@ -36,13 +35,13 @@ stdenv.mkDerivation (finalAttrs: { owner = "accountsservice"; repo = "accountsservice"; tag = finalAttrs.version; - hash = "sha256-ZIfkBlEaITX2rDcV5al4e2IFP238MXOlWeGoh+3+DoQ="; + hash = "sha256-/n0YCPZaf1SsTScidFUZcxfJkpv/+Bnb6Z7oKL+clgE="; }; patches = [ # Hardcode dependency paths. (replaceVars ./fix-paths.patch { - inherit shadow coreutils; + inherit shadow; }) # Do not try to create directories in /var, that will not work in Nix sandbox. diff --git a/pkgs/by-name/ac/acli/sources.json b/pkgs/by-name/ac/acli/sources.json index e35f6351094d..861fa1f4dfe4 100644 --- a/pkgs/by-name/ac/acli/sources.json +++ b/pkgs/by-name/ac/acli/sources.json @@ -9,10 +9,6 @@ "url": "https://acli.atlassian.com/linux/1.3.22-stable/acli_1.3.22-stable_linux_arm64.tar.gz", "sha256": "1a9e86d0b46a62a8f1992c1ef98b3af7e9a9ee3f76d0efa215fe1f2d1b2fd139" }, - "x86_64-darwin": { - "url": "https://acli.atlassian.com/darwin/1.3.22-stable/acli_1.3.22-stable_darwin_amd64.tar.gz", - "sha256": "993fd692700d602fd1e3cff7f1d29f70e44a2ebb8056fbb93bdc8aed1e5cbbd4" - }, "x86_64-linux": { "url": "https://acli.atlassian.com/linux/1.3.22-stable/acli_1.3.22-stable_linux_amd64.tar.gz", "sha256": "de9e0a60a556e4119428b9072f6ca787e75b9f9a538aa71ebcc8084deb8ca1a6" diff --git a/pkgs/by-name/ac/acli/update.py b/pkgs/by-name/ac/acli/update.py index 4afb0b902f6d..0bec673b26b0 100755 --- a/pkgs/by-name/ac/acli/update.py +++ b/pkgs/by-name/ac/acli/update.py @@ -10,7 +10,7 @@ from urllib.request import urlopen, Request def get_arch_os_key(url) -> str: if "darwin_amd64" in url: - return "x86_64-darwin" + return None elif "darwin_arm64" in url: return "aarch64-darwin" elif "linux_amd64" in url: @@ -57,9 +57,8 @@ def parse_and_check(content): ) for url, hex_sha in matches: - key = get_arch_os_key(url) - - data["sources"][key] = {"url": url, "sha256": hex_sha} + if key := get_arch_os_key(url): + data["sources"][key] = {"url": url, "sha256": hex_sha} data["sources"] = dict(sorted(data["sources"].items())) diff --git a/pkgs/by-name/ac/acme-sh/package.nix b/pkgs/by-name/ac/acme-sh/package.nix index 7b4a65a071cc..daddea57ed14 100644 --- a/pkgs/by-name/ac/acme-sh/package.nix +++ b/pkgs/by-name/ac/acme-sh/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "acme.sh"; - version = "3.1.3"; + version = "3.1.4"; src = fetchFromGitHub { owner = "acmesh-official"; repo = "acme.sh"; tag = finalAttrs.version; - hash = "sha256-oWVTk4fKbplMY4NJWf9eTokiHSxPMZ8lgSoG4aF8DVk="; + hash = "sha256-xw10M4C6bqnxLxPeXE9dbFP/ajkpO2SQUJp56CeYysk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ac/acme/package.nix b/pkgs/by-name/ac/acme/package.nix index 8131a6dcdd99..bc3ea21358e7 100644 --- a/pkgs/by-name/ac/acme/package.nix +++ b/pkgs/by-name/ac/acme/package.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "acme"; - version = "unstable-2021-11-05"; + version = "0.97-unstable-2021-11-05"; src = fetchsvn { url = "svn://svn.code.sf.net/p/acme-crossass/code-0/trunk"; diff --git a/pkgs/by-name/ac/actool/package.nix b/pkgs/by-name/ac/actool/package.nix index a33cf769d26a..92e38b436951 100644 --- a/pkgs/by-name/ac/actool/package.nix +++ b/pkgs/by-name/ac/actool/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Apple's actool reimplementation"; homepage = "https://github.com/viraptor/actool"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; mainProgram = "actool"; maintainers = [ lib.maintainers.viraptor ]; }; diff --git a/pkgs/by-name/ad/adbtuifm/package.nix b/pkgs/by-name/ad/adbtuifm/package.nix index 233bb5a818d3..3fa01b1e20b2 100644 --- a/pkgs/by-name/ad/adbtuifm/package.nix +++ b/pkgs/by-name/ad/adbtuifm/package.nix @@ -17,7 +17,7 @@ buildGoModule (finalAttrs: { description = "TUI-based file manager for the Android Debug Bridge"; homepage = "https://github.com/darkhz/adbtuifm"; changelog = "https://github.com/darkhz/adbtuifm/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ daru-san ]; mainProgram = "adbtuifm"; platforms = lib.platforms.linux ++ lib.platforms.darwin; diff --git a/pkgs/by-name/ad/adenum/package.nix b/pkgs/by-name/ad/adenum/package.nix index c44a4e2d37bf..ca4b5d811ce8 100644 --- a/pkgs/by-name/ad/adenum/package.nix +++ b/pkgs/by-name/ad/adenum/package.nix @@ -46,7 +46,7 @@ python3.pkgs.buildPythonApplication { description = "Tool to find misconfiguration through LDAP"; mainProgram = "adenum"; homepage = "https://github.com/SecuProject/ADenum"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/ad/adreaper/package.nix b/pkgs/by-name/ad/adreaper/package.nix index 806fd1a78eda..29f7e2641905 100644 --- a/pkgs/by-name/ad/adreaper/package.nix +++ b/pkgs/by-name/ad/adreaper/package.nix @@ -28,7 +28,7 @@ buildGoModule (finalAttrs: { changelog = "https://github.com/m0n1x90/ADReaper/releases/tag/ADReaperv${finalAttrs.version}"; # Upstream doesn't have a license yet # https://github.com/AidenPearce369/ADReaper/issues/2 - license = with lib.licenses; [ unfree ]; + license = lib.licenses.unfree; maintainers = with lib.maintainers; [ fab ]; mainProgram = "ADReaper"; }; diff --git a/pkgs/by-name/ad/adslib/package.nix b/pkgs/by-name/ad/adslib/package.nix index 72f9602714ac..d5ea2a987392 100644 --- a/pkgs/by-name/ad/adslib/package.nix +++ b/pkgs/by-name/ad/adslib/package.nix @@ -5,18 +5,17 @@ meson, ninja, pkg-config, - unstableGitUpdater, }: stdenv.mkDerivation (finalAttrs: { pname = "adslib"; - version = "0-unstable-2026-04-27"; + version = "113.0.34-1"; src = fetchFromGitHub { owner = "stlehmann"; repo = "ADS"; - rev = "77953d58f2690436e82db9954e2e55878c5edaa4"; - hash = "sha256-UDPuzqD1krEZa7436k1NvE0lJUmNYG4kiP5fstoRDMc="; + tag = finalAttrs.version; + hash = "sha256-Kh8BDioZdwSdATHPgZ7Ar3/E0y3eRRpG/38/2uHZEEQ="; }; nativeBuildInputs = [ @@ -27,12 +26,10 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' # Downstream consumers (e.g. pyads) load the shared library as - # `adslib.so` rather than the meson default `libadslib.so`. - ln -s libadslib.so $out/lib/adslib.so + # `adslib.so` rather than the meson default `libAdsLib.so`. + ln -s libAdsLib.so $out/lib/adslib.so ''; - passthru.updateScript = unstableGitUpdater { }; - meta = { description = "Beckhoff protocol to communicate with TwinCAT devices"; homepage = "https://github.com/stlehmann/ADS"; diff --git a/pkgs/by-name/ae/aemu/package.nix b/pkgs/by-name/ae/aemu/package.nix index 1db8ebbad7b3..f7e3d10209c7 100644 --- a/pkgs/by-name/ae/aemu/package.nix +++ b/pkgs/by-name/ae/aemu/package.nix @@ -44,7 +44,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/af/afew/package.nix b/pkgs/by-name/af/afew/package.nix index d5aa04249411..aa07786b61df 100644 --- a/pkgs/by-name/af/afew/package.nix +++ b/pkgs/by-name/af/afew/package.nix @@ -9,18 +9,21 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "afew"; - version = "3.0.1"; + version = "4.0.1"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - sha256 = "0wpfqbqjlfb9z0hafvdhkm7qw56cr9kfy6n8vb0q42dwlghpz1ff"; + hash = "sha256-LPKSD4aMAREtf5Y4A9oa6Sh5lv/uuLpamcP35SBgA/M="; }; - nativeBuildInputs = with python3Packages; [ - sphinxHook - setuptools_80 - setuptools-scm + build-system = [ + python3Packages.setuptools + python3Packages.setuptools-scm + ]; + + nativeBuildInputs = [ + python3Packages.sphinxHook ]; sphinxBuilders = [ @@ -28,11 +31,10 @@ python3Packages.buildPythonApplication (finalAttrs: { "man" ]; - propagatedBuildInputs = with python3Packages; [ - chardet - dkimpy - notmuch - setuptools + dependencies = [ + python3Packages.chardet + python3Packages.dkimpy + python3Packages.notmuch2 ]; nativeCheckInputs = [ diff --git a/pkgs/by-name/af/affine-bin/package.nix b/pkgs/by-name/af/affine-bin/package.nix index 804f31d6339e..f26a395c878e 100644 --- a/pkgs/by-name/af/affine-bin/package.nix +++ b/pkgs/by-name/af/affine-bin/package.nix @@ -43,12 +43,10 @@ stdenvNoCC.mkDerivation ( license = lib.licenses.mit; maintainers = with lib.maintainers; [ richar - redyf xiaoxiangmoe ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" "x86_64-linux" ]; sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix index 9c5fb55b894e..43b532795f8c 100644 --- a/pkgs/by-name/af/affine/package.nix +++ b/pkgs/by-name/af/affine/package.nix @@ -257,7 +257,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "aarch64-darwin" "aarch64-linux" - "x86_64-darwin" "x86_64-linux" ]; sourceProvenance = [ lib.sourceTypes.fromSource ]; diff --git a/pkgs/by-name/ag/age-plugin-openpgp-card/package.nix b/pkgs/by-name/ag/age-plugin-openpgp-card/package.nix index f1b49b82d9fe..5c8cfad15f1f 100644 --- a/pkgs/by-name/ag/age-plugin-openpgp-card/package.nix +++ b/pkgs/by-name/ag/age-plugin-openpgp-card/package.nix @@ -33,7 +33,6 @@ rustPlatform.buildRustPackage (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "age-plugin-openpgp-card"; diff --git a/pkgs/by-name/ag/agent-safehouse/package.nix b/pkgs/by-name/ag/agent-safehouse/package.nix index ca43776cf6ec..c07c75768503 100644 --- a/pkgs/by-name/ag/agent-safehouse/package.nix +++ b/pkgs/by-name/ag/agent-safehouse/package.nix @@ -2,18 +2,19 @@ lib, stdenvNoCC, fetchFromGitHub, + versionCheckHook, nix-update-script, }: stdenvNoCC.mkDerivation rec { pname = "safehouse"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "eugene1g"; repo = "agent-safehouse"; rev = "v" + version; - hash = "sha256-Nm04UnyQ2mVLkIIEspDd2vbdcJxZ17MH07fW6PvokJI="; + hash = "sha256-2GWxh5J9qqudc2QM/CACXpqJLcNULKSfTAHBzR++UAE="; }; postPatch = "patchShebangs scripts bin"; @@ -37,12 +38,18 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + meta = { description = "Sandbox your local AI agents so they can read/write only what they need"; homepage = "https://github.com/eugene1g/agent-safehouse"; mainProgram = "safehouse"; license = lib.licenses.asl20; platforms = lib.platforms.darwin; - maintainers = with lib.maintainers; [ myzel394 ]; + maintainers = with lib.maintainers; [ + myzel394 + Br1ght0ne + ]; }; } diff --git a/pkgs/by-name/ai/aiodnsbrute/package.nix b/pkgs/by-name/ai/aiodnsbrute/package.nix index 63b463daa275..6477b8e65f23 100644 --- a/pkgs/by-name/ai/aiodnsbrute/package.nix +++ b/pkgs/by-name/ai/aiodnsbrute/package.nix @@ -39,7 +39,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { mainProgram = "aiodnsbrute"; homepage = "https://github.com/blark/aiodnsbrute"; changelog = "https://github.com/blark/aiodnsbrute/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/ai/airbuddy/package.nix b/pkgs/by-name/ai/airbuddy/package.nix index 50c5a10791af..706f9946c238 100644 --- a/pkgs/by-name/ai/airbuddy/package.nix +++ b/pkgs/by-name/ai/airbuddy/package.nix @@ -42,12 +42,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; homepage = "https://v2.airbuddy.app"; changelog = "https://support.airbuddy.app/articles/airbuddy-2-changelog"; - license = with lib.licenses; [ unfree ]; + license = lib.licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; maintainers = with lib.maintainers; [ stepbrobd ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" ]; }; }) diff --git a/pkgs/by-name/al/alacritty-theme/package.nix b/pkgs/by-name/al/alacritty-theme/package.nix index 901d8f32365c..15713eea5f6a 100644 --- a/pkgs/by-name/al/alacritty-theme/package.nix +++ b/pkgs/by-name/al/alacritty-theme/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "alacritty-theme"; - version = "0-unstable-2026-06-12"; + version = "0-unstable-2026-07-10"; src = fetchFromGitHub { owner = "alacritty"; repo = "alacritty-theme"; - rev = "659d2e1d669cd5722f11e58c44fd45dc26a6ffcd"; - hash = "sha256-1GMpnDdfzBIMm9fzQjxYgLNUGA3amvGYgO3VRcd49ro="; + rev = "03cce642656759f440c97bb99ce65fc1c5b064a1"; + hash = "sha256-JfvBUsmw3lRxOj2lb9yVmkRwfUpjJwjBujwztoXtgMY="; sparseCheckout = [ "themes" ]; }; diff --git a/pkgs/by-name/al/aldente/package.nix b/pkgs/by-name/al/aldente/package.nix index 6d41225a7fde..aae7dc51b192 100644 --- a/pkgs/by-name/al/aldente/package.nix +++ b/pkgs/by-name/al/aldente/package.nix @@ -43,7 +43,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ stepbrobd ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" ]; }; }) diff --git a/pkgs/by-name/al/alephone/package.nix b/pkgs/by-name/al/alephone/package.nix index 42fb25a838dc..a0d7cb135ba0 100644 --- a/pkgs/by-name/al/alephone/package.nix +++ b/pkgs/by-name/al/alephone/package.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Aleph One is the open source continuation of Bungie’s Marathon 2 game engine"; mainProgram = "alephone"; homepage = "https://alephone.lhowon.org/"; - license = [ lib.licenses.gpl3 ]; + license = lib.licenses.gpl3; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/al/aliae/package.nix b/pkgs/by-name/al/aliae/package.nix index 42dc084574f5..5a14624dab5b 100644 --- a/pkgs/by-name/al/aliae/package.nix +++ b/pkgs/by-name/al/aliae/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "aliae"; - version = "0.26.6"; + version = "1.1.1"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = "aliae"; tag = "v${finalAttrs.version}"; - hash = "sha256-W/jj2YQc6M0ro4groCynly2stjv2FLAMvIopnQYCngY="; + hash = "sha256-/n20oNQGcfji2whdl/DaUUf2kgiVZMB73veUfOr9EqU="; }; - vendorHash = "sha256-8YTyhjF0p2l76sowq92ts5TjjcARToOfJN9nlFu19L4="; + vendorHash = "sha256-qY12bkwa8lyHtS7AdvkKuAmwDRyn5am2aU6wy8GE4Wk="; sourceRoot = "${finalAttrs.src.name}/src"; diff --git a/pkgs/by-name/al/aliyun-cli/package.nix b/pkgs/by-name/al/aliyun-cli/package.nix index f675965a2659..e18eb1595c6d 100644 --- a/pkgs/by-name/al/aliyun-cli/package.nix +++ b/pkgs/by-name/al/aliyun-cli/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "aliyun-cli"; - version = "3.4.5"; + version = "3.4.7"; src = fetchFromGitHub { owner = "aliyun"; repo = "aliyun-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-Q3jFqWET3mB0kOrLX4JAtza6j/4bXAEBjXzvSGCFgqw="; + hash = "sha256-h/69/noEMV4Yz9vl91Sqc1DMnQ4CBopeowfmPAM94i4="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/al/all-the-package-names/package.nix b/pkgs/by-name/al/all-the-package-names/package.nix index 837cd4e989cf..3908ee82c0cc 100644 --- a/pkgs/by-name/al/all-the-package-names/package.nix +++ b/pkgs/by-name/al/all-the-package-names/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "all-the-package-names"; - version = "2.0.2495"; + version = "2.0.2503"; src = fetchFromGitHub { owner = "nice-registry"; repo = "all-the-package-names"; tag = "v${version}"; - hash = "sha256-65UbcJXOUZVDEtjDy0PkRLPIlhk8/WxItDeyiULLpNY="; + hash = "sha256-UtwbQXhX8dmmA6dVuVFcMQkM98kOt/U//OAVMGBImDU="; }; - npmDepsHash = "sha256-Vv3rJBDRSwWnbYFO01M0rLJM3b2gP0z8wAi9T2nRwxQ="; + npmDepsHash = "sha256-V7MWSEJT2RtYE1iYJHj2ltrfzke+GO1PfT/wo+MqlZk="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/am/amber-lang/fix_word_boundaries.patch b/pkgs/by-name/am/amber-lang/fix_word_boundaries.patch deleted file mode 100644 index ec73631eccae..000000000000 --- a/pkgs/by-name/am/amber-lang/fix_word_boundaries.patch +++ /dev/null @@ -1,38 +0,0 @@ -From efdbecaf721ccb217ece34a5105eaac68e27aa51 Mon Sep 17 00:00:00 2001 -From: Max Karou -Date: Sun, 4 Jan 2026 01:47:51 +0100 -Subject: [PATCH] sed_version: remove word boundary assertions - -Word boundary assertions (\b) are GNU regex extensions that may fail -on systems using non-glibc C libraries (e.g., musl, macOS). - -This was previously fixed in replace_regex() via NixOS/nixpkgs#388412, -which was subsequently upstreamed in amber-lang/amber#686. - -Changes in amber-lang/amber#717 reintroduced the same portability issue. ---- - src/std/text.ab | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/std/text.ab b/src/std/text.ab -index 5f2d935..a5dac3f 100644 ---- a/src/std/text.ab -+++ b/src/std/text.ab -@@ -51,12 +51,12 @@ const SED_VERSION_BUSYBOX = 2 - fun sed_version(): Int { - // We can't match against a word "GNU" because - // alpine's busybox sed returns "This is not GNU sed version" -- trust $ re='\bCopyright\b.+\bFree Software Foundation\b'; [[ \$(sed --version 2>/dev/null) =~ \$re ]] $ -+ trust $ re='Copyright.+Free Software Foundation'; [[ \$(sed --version 2>/dev/null) =~ \$re ]] $ - if status == 0 { - return SED_VERSION_GNU - } - // On BSD single `sed` waits for stdin. We must use `sed --help` to avoid this. -- trust $ re='\bBusyBox\b'; [[ \$(sed --help 2>&1) =~ \$re ]] $ -+ trust $ re='BusyBox'; [[ \$(sed --help 2>&1) =~ \$re ]] $ - if status == 0 { - return SED_VERSION_BUSYBOX - } --- -2.51.2 - diff --git a/pkgs/by-name/am/amber-lang/package.nix b/pkgs/by-name/am/amber-lang/package.nix index a704fbd47fa1..f35e9b533e2f 100644 --- a/pkgs/by-name/am/amber-lang/package.nix +++ b/pkgs/by-name/am/amber-lang/package.nix @@ -4,38 +4,30 @@ rustPlatform, bc, util-linux, - gnused, makeWrapper, installShellFiles, + versionCheckHook, stdenv, runCommand, amber-lang, nix-update-script, + bash, + ksh, + zsh, }: rustPlatform.buildRustPackage rec { pname = "amber-lang"; - version = "0.5.1-alpha"; + version = "0.6.0-alpha"; src = fetchFromGitHub { owner = "amber-lang"; repo = "amber"; tag = version; - hash = "sha256-v1uJe3vVGKXaZcQzdoYzu/bJKMQnS4IYET4QLPW+J8Y="; + hash = "sha256-pyMsxb9XPtseroH2MORhMOg9+iaLyoxmgpUTCej+i+Y="; }; - patches = [ - # Upstreamed in #995, can be removed in >= 0.5.2 - # github.com/amber-lang/amber/pull/995 - ./fix_word_boundaries.patch - ]; - - cargoHash = "sha256-aXcxlmmDYLFbyRJYyGE1gbQMbdysHx4iWXsrUj10Eco="; - - preConfigure = '' - substituteInPlace src/compiler.rs \ - --replace-fail 'Command::new("/usr/bin/env")' 'Command::new("env")' - ''; + cargoHash = "sha256-7TZIRg4NK2uOivUUg09T5mbxrNlRmmVyec2xhmzSNvY="; nativeBuildInputs = [ makeWrapper @@ -43,15 +35,23 @@ rustPlatform.buildRustPackage rec { ]; nativeCheckInputs = [ + bash bc # 'rev' in generated bash script of test # tests::validity::variable_ref_function_invocation util-linux ]; + preCheck = '' + substituteInPlace src/tests/cli.rs \ + --replace-fail 'Command::new(amber_bin())' "Command::new(\"target/${stdenv.targetPlatform.rust.cargoShortTarget}/$cargoBuildType/amber\")" + substituteInPlace src/tests/cli.rs \ + --replace-fail 'cmd.env("AMBER_SHELL", "/bin/bash")' 'cmd.env("AMBER_SHELL", "bash")' + ''; + checkFlags = [ "--skip=tests::extra::download" - "--skip=tests::formatter::all_exist" + "--skip=tests::stdlib::test_stdlib_src_tests_stdlib_http_fetch_ab" ]; postInstall = '' @@ -62,23 +62,46 @@ rustPlatform.buildRustPackage rec { --bash <($out/bin/amber completion) ''; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + passthru = { - updateScript = nix-update-script { }; - tests.run = runCommand "amber-lang-eval-test" { nativeBuildInputs = [ amber-lang ]; } '' - diff -U3 --color=auto <(amber eval 'echo "Hello, World"') <(echo 'Hello, World') - touch $out - ''; + updateScript = nix-update-script { extraArgs = [ "--version=unstable" ]; }; + tests = + let + testHelloWorld = + type: pkg: + runCommand "amber-lang-test-eval-hello-world-${type}" + { + nativeBuildInputs = [ + amber-lang + pkg + ]; + } + '' + diff -U3 --color=auto <(amber eval --target ${type} 'echo("Hello, World")') <(echo 'Hello, World') + touch $out + ''; + in + { + eval-hello-world-bash = testHelloWorld "bash" bash; + eval-hello-world-bash-3_2 = testHelloWorld "bash-3.2" bash; + eval-hello-world-ksh = testHelloWorld "ksh" ksh; + eval-hello-world-zsh = testHelloWorld "zsh" zsh; + }; }; meta = { description = "Programming language compiled to bash"; homepage = "https://amber-lang.com"; - license = lib.licenses.gpl3Plus; + license = lib.licenses.lgpl3Only; mainProgram = "amber"; maintainers = with lib.maintainers; [ cafkafk aleksana + ilai-deutel ]; - platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/am/amber/package.nix b/pkgs/by-name/am/amber/package.nix index ada5d438294a..fbf9a722854a 100644 --- a/pkgs/by-name/am/amber/package.nix +++ b/pkgs/by-name/am/amber/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Code search-and-replace tool"; homepage = "https://github.com/dalance/amber"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.bdesham ]; }; }) diff --git a/pkgs/by-name/am/amd-debug-tools/package.nix b/pkgs/by-name/am/amd-debug-tools/package.nix index 309eb68b0593..226caa0d22ba 100644 --- a/pkgs/by-name/am/amd-debug-tools/package.nix +++ b/pkgs/by-name/am/amd-debug-tools/package.nix @@ -9,13 +9,13 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "amd-debug-tools"; - version = "0.2.18"; + version = "0.2.20"; pyproject = true; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/superm1/amd-debug-tools.git"; tag = finalAttrs.version; - hash = "sha256-qBgQFjiWFRKVTsIx0aLZC9AQWsVzgbJGOPGG6ojKoDE="; + hash = "sha256-JDacCakZC+4N4IDAODWLSuensAtFArl052I4weK/zJQ="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/am/amfora/package.nix b/pkgs/by-name/am/amfora/package.nix index 6733bff81d39..a82f3c7446db 100644 --- a/pkgs/by-name/am/amfora/package.nix +++ b/pkgs/by-name/am/amfora/package.nix @@ -27,7 +27,7 @@ buildGoModule (finalAttrs: { description = "Fancy terminal browser for the Gemini protocol"; mainProgram = "amfora"; homepage = "https://github.com/makew0rld/amfora"; - license = with lib.licenses; [ gpl3 ]; + license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ deifactor ]; changelog = "https://github.com/makew0rld/amfora/blob/v${finalAttrs.version}/CHANGELOG.md"; }; diff --git a/pkgs/by-name/am/amnezia-vpn/package.nix b/pkgs/by-name/am/amnezia-vpn/package.nix index a72a875d43f4..c1bcad8b13f6 100644 --- a/pkgs/by-name/am/amnezia-vpn/package.nix +++ b/pkgs/by-name/am/amnezia-vpn/package.nix @@ -81,7 +81,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "amnezia-vpn"; - version = "4.8.19.0"; + version = "4.8.21.0"; __structuredAttrs = true; @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "amnezia-vpn"; repo = "amnezia-client"; tag = finalAttrs.version; - hash = "sha256-kftLofCyLA6DDfEXRPyy6Zx0JiQUEzpdYpTlvPihPZg="; + hash = "sha256-xNmbXLl+71DhzbGdSobkV1aYbj1XqC9A/3VPjDLsF7A="; fetchSubmodules = true; }; @@ -109,6 +109,13 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "int nVersion = 1;" "int nVersion = 0;" substituteInPlace client/ui/qautostart.cpp \ --replace-fail "/usr/share/pixmaps/AmneziaVPN.png" "AmneziaVPN" + # https://github.com/amnezia-vpn/amnezia-client/pull/2372 + substituteInPlace client/ui/systemtray_notificationhandler.cpp \ + --replace-fail 'm_systemTrayIcon.show();' ''' \ + --replace-fail 'setTrayState(Vpn::ConnectionState::Disconnected);' 'setTrayState(Vpn::ConnectionState::Disconnected); m_systemTrayIcon.show();' + substituteInPlace client/main.cpp \ + --replace-fail '#include "version.h"' $'#include "version.h"\n#include ' \ + --replace-fail 'app.setApplicationDisplayName(APPLICATION_NAME);' $'app.setApplicationDisplayName(APPLICATION_NAME);\n app.setWindowIcon(QIcon::fromTheme("AmneziaVPN"));' substituteInPlace deploy/installer/config/AmneziaVPN.desktop.in \ --replace-fail "/usr/share/pixmaps/AmneziaVPN.png" "$out/share/icons/hicolor/512x512/apps/AmneziaVPN.png" substituteInPlace deploy/data/linux/AmneziaVPN.service \ diff --git a/pkgs/by-name/am/amp-cli/package.nix b/pkgs/by-name/am/amp-cli/package.nix index 93411a575544..ef38328ce8b4 100644 --- a/pkgs/by-name/am/amp-cli/package.nix +++ b/pkgs/by-name/am/amp-cli/package.nix @@ -20,7 +20,6 @@ let # supported x86_64 CPUs instead of depending on the build user's CPU flags. x86_64-linux = "linux-x64-baseline"; aarch64-linux = "linux-arm64"; - x86_64-darwin = "darwin-x64"; aarch64-darwin = "darwin-arm64"; }; @@ -80,7 +79,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { { x86_64-linux = "sha256-KNXCbNhY7njmGQlv3NxBmkIDciVVZlXl9JedBerdrZM="; aarch64-linux = "sha256-HJf1Ikmai/h/Y2HybYcKxRhx5VhiyoPaubocCkoxF3s="; - x86_64-darwin = "sha256-X8yl1GF6PseC1mSrMsQDmpXInKr4GD7cgHqhD/p6l4o="; aarch64-darwin = "sha256-agoKx8pXQf1HGUwsfqpgeZBubwhnPG+xqIfu3Y+AK2Y="; } .${system'}; diff --git a/pkgs/by-name/am/amp-cli/update.sh b/pkgs/by-name/am/amp-cli/update.sh index 86b348d857a2..d795637ef432 100755 --- a/pkgs/by-name/am/amp-cli/update.sh +++ b/pkgs/by-name/am/amp-cli/update.sh @@ -10,7 +10,6 @@ cd "$(dirname "${BASH_SOURCE[0]}")/../../../.." for system in \ x86_64-linux \ aarch64-linux \ - x86_64-darwin \ aarch64-darwin do update-source-version amp-cli "$version" \ diff --git a/pkgs/by-name/an/anchor/package.nix b/pkgs/by-name/an/anchor/package.nix index 76b35e307594..bd8e0316c6da 100644 --- a/pkgs/by-name/an/anchor/package.nix +++ b/pkgs/by-name/an/anchor/package.nix @@ -1,8 +1,8 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, + fetchpatch, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -19,6 +19,17 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-oEgWfklxjP8+TxrhDKJgcTsanpqJpEiHXJyir8neYj8="; + # Upstream patch to fix cargo metadata discovery on macOS Nix sandboxes. + # Replaces fragile subprocess-cwd approach with in-process manifest path + # resolution. Remove on next version bump (included in v1.1.3+). + # See: https://github.com/otter-sec/anchor/pull/4757 + patches = [ + (fetchpatch { + url = "https://github.com/otter-sec/anchor/commit/25bf2112b67d84e5bc406d7eac2919c90d8e54ed.patch"; + hash = "sha256-q5OGNoUGPuCNHgaZNo9fmUxqQnFH2MhRW4ZefX+Of0Y="; + }) + ]; + # Only build the anchor-cli package cargoBuildFlags = [ "-p" @@ -31,16 +42,6 @@ rustPlatform.buildRustPackage (finalAttrs: { "anchor-cli" ]; - # These tests use tempdir + cargo metadata subprocess which fails on Darwin - # sandboxes due to getcwd() differences (XNU vs Linux). Tracked upstream at - # https://github.com/otter-sec/anchor/issues/4751 - checkFlags = map (t: "--skip=${t}") ( - lib.optionals stdenv.hostPlatform.isDarwin [ - "program::tests::discover_solana_programs_finds_sibling_programs_from_nested_member" - "program::tests::discover_solana_programs_lists_all_members_from_nested_member" - ] - ); - meta = { description = "Solana Sealevel Framework"; homepage = "https://github.com/otter-sec/anchor"; diff --git a/pkgs/by-name/an/android-cli/package.nix b/pkgs/by-name/an/android-cli/package.nix index 2e289159937b..95dd81c5cea8 100644 --- a/pkgs/by-name/an/android-cli/package.nix +++ b/pkgs/by-name/an/android-cli/package.nix @@ -14,10 +14,6 @@ let url = "https://dl.google.com/android/cli/${version}/linux_x86_64/android-cli"; hash = "sha256-TmwLwLKqnMCxWwtX8m50KflmisfeG3PjZsBs7z9vccU="; }; - x86_64-darwin = { - url = "https://dl.google.com/android/cli/${version}/darwin_x86_64/android-cli"; - hash = "sha256-ThBobULyevoKlp/22tdUqnBBccX6FbPDNrSwwuK4wnw="; - }; aarch64-darwin = { url = "https://dl.google.com/android/cli/${version}/darwin_arm64/android-cli"; hash = "sha256-E3PC0Ivf6MoYRQu56dSD/49LI8DJZhXL27/o6daH0Sg="; @@ -75,7 +71,6 @@ stdenv.mkDerivation { teams = with teams; [ android ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "android"; diff --git a/pkgs/by-name/an/angrr/package.nix b/pkgs/by-name/an/angrr/package.nix index 0ef7b65f393d..c100ef488f36 100644 --- a/pkgs/by-name/an/angrr/package.nix +++ b/pkgs/by-name/an/angrr/package.nix @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Auto Nix GC Root Retention"; homepage = "https://github.com/linyinfeng/angrr"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ yinfeng ]; platforms = with lib.platforms; linux ++ darwin; mainProgram = "angrr"; diff --git a/pkgs/by-name/an/animatch/package.nix b/pkgs/by-name/an/animatch/package.nix index e727a92f87b0..332be7b42c7a 100644 --- a/pkgs/by-name/an/animatch/package.nix +++ b/pkgs/by-name/an/animatch/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.com/HolyPangolin/animatch/"; description = "Cute match three game for the Librem 5 smartphone"; mainProgram = "animatch"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ colinsane ]; }; }) diff --git a/pkgs/by-name/an/anki-bin/package.nix b/pkgs/by-name/an/anki-bin/package.nix index d3f7622c0820..22846bba8568 100644 --- a/pkgs/by-name/an/anki-bin/package.nix +++ b/pkgs/by-name/an/anki-bin/package.nix @@ -69,7 +69,6 @@ let platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/an/anki-sync-server/package.nix b/pkgs/by-name/an/anki-sync-server/package.nix index 826ff0c21135..994e798115ce 100644 --- a/pkgs/by-name/an/anki-sync-server/package.nix +++ b/pkgs/by-name/an/anki-sync-server/package.nix @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage { meta = { description = "Standalone official anki sync server"; homepage = "https://apps.ankiweb.net"; - license = with lib.licenses; [ agpl3Plus ]; + license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ martinetd ]; mainProgram = "anki-sync-server"; }; diff --git a/pkgs/by-name/an/ansi/package.nix b/pkgs/by-name/an/ansi/package.nix index fd2d0f4b8c5a..41a314206716 100644 --- a/pkgs/by-name/an/ansi/package.nix +++ b/pkgs/by-name/an/ansi/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: { the colors and styles, such as bold or italic. ''; homepage = "https://github.com/phip1611/ansi-escape-sequences-cli"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ phip1611 ]; mainProgram = "ansi"; }; diff --git a/pkgs/by-name/an/ante/package.nix b/pkgs/by-name/an/ante/package.nix index 0368755b9997..f0f678af344a 100644 --- a/pkgs/by-name/an/ante/package.nix +++ b/pkgs/by-name/an/ante/package.nix @@ -70,7 +70,7 @@ rustPlatform.buildRustPackage { homepage = "https://antelang.org/"; description = "Low-level functional language for exploring refinement types, lifetime inference, and algebraic effects"; mainProgram = "ante"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ ehllie ]; }; } diff --git a/pkgs/by-name/an/antigravity-cli/package.nix b/pkgs/by-name/an/antigravity-cli/package.nix index 21da4d2caa59..790ea78b87b7 100644 --- a/pkgs/by-name/an/antigravity-cli/package.nix +++ b/pkgs/by-name/an/antigravity-cli/package.nix @@ -6,27 +6,24 @@ versionCheckHook, }: let - wholeVersion = "1.0.12-6156052174077952"; # unfortunately this has dumb versioning - version = builtins.head (lib.splitString "-" wholeVersion); + version = "1.1.4"; + buildId = "5165726265376768"; + wholeVersion = "${version}-${buildId}"; throwSystem = throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"; sourceData = { x86_64-linux = fetchurl { url = "https://storage.googleapis.com/antigravity-public/antigravity-cli/${wholeVersion}/linux-x64/cli_linux_x64.tar.gz"; - hash = "sha256-fjB132jrrViqHPQiMenYuDvyiVtbBYqxc2sLY4PHUAg="; + hash = "sha256-qHY/CIE65zGFDg2CfMbm06f4xn3mvLIUUhCj7Bh37tE="; }; aarch64-linux = fetchurl { url = "https://storage.googleapis.com/antigravity-public/antigravity-cli/${wholeVersion}/linux-arm/cli_linux_arm64.tar.gz"; - hash = "sha256-oDZ+WHWsG4imwLFjyG69XRPJvvkH9EaaZRb/aQIb8tQ="; + hash = "sha256-9dlI6XbTTLuhRdo+32gE39DWGcMIhikd45kkAj3oGO8="; }; aarch64-darwin = fetchurl { url = "https://storage.googleapis.com/antigravity-public/antigravity-cli/${wholeVersion}/darwin-arm/cli_mac_arm64.tar.gz"; - hash = "sha256-U/cwihF/cP5+7KSmkAToI5yOoYydguR5ZrKQMytpuCk="; - }; - x86_64-darwin = fetchurl { - url = "https://storage.googleapis.com/antigravity-public/antigravity-cli/${wholeVersion}/darwin-x64/cli_mac_x64.tar.gz"; - hash = "sha256-A8YjMmFUiHKxdlR+OpOPQGKC+68z/83vtjw1yiJGt6g="; + hash = "sha256-qhfFyMNvppzI01rjcpq/xUUTYiTsP38Y5ZpqkZMCSJs="; }; }; in diff --git a/pkgs/by-name/an/antigravity-cli/update.sh b/pkgs/by-name/an/antigravity-cli/update.sh index 746a57dd87e7..61ca43ac4483 100755 --- a/pkgs/by-name/an/antigravity-cli/update.sh +++ b/pkgs/by-name/an/antigravity-cli/update.sh @@ -3,6 +3,7 @@ set -euo pipefail +packageFile=pkgs/by-name/an/antigravity-cli/package.nix baseUrl=https://storage.googleapis.com/antigravity-public/antigravity-cli currentVersion=$(nix-instantiate --eval --raw -E "with import ./. {}; antigravity-cli.version or (lib.getVersion antigravity-cli)") @@ -15,15 +16,17 @@ fi # urls unfortunately include a weird buildid that make it hard to get latestWholeVersion=$(curl $baseUrl/$latestVersion/manifest.json | jq -r '.platforms."linux-x64".url' | cut -d/ -f6) +latestBuildId=${latestWholeVersion#*-} +currentBuildId=$(sed -n 's/.*buildId = "\([^"]*\)";.*/\1/p' "$packageFile") -update-source-version --version-key=wholeVersion antigravity-cli $latestWholeVersion || true +sed -i "s/buildId = \"$currentBuildId\";/buildId = \"$latestBuildId\";/" "$packageFile" +update-source-version --version-key=version antigravity-cli $latestVersion || true for system in \ x86_64-linux \ aarch64-linux \ - x86_64-darwin \ aarch64-darwin; do hash=$(nix store prefetch-file --json --hash-type sha256 \ $(nix-instantiate --eval --raw -E "with import ./. {}; antigravity-cli.src.url" --system "$system") | jq -r '.hash') - update-source-version --version-key=wholeVersion antigravity-cli $latestWholeVersion $hash --system=$system --ignore-same-version + update-source-version --version-key=version antigravity-cli $latestVersion $hash --system=$system --ignore-same-version done diff --git a/pkgs/by-name/an/antigravity/information.json b/pkgs/by-name/an/antigravity/information.json index 79cbe4f69f9a..2073ecc8798e 100644 --- a/pkgs/by-name/an/antigravity/information.json +++ b/pkgs/by-name/an/antigravity/information.json @@ -10,10 +10,6 @@ "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.23.2-4781536860569600/linux-arm/Antigravity.tar.gz", "sha256": "64d11085f17edc691adbe8952d59887f257d58448705dc2a19dfa23890d36df1" }, - "x86_64-darwin": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.23.2-4781536860569600/darwin-x64/Antigravity.zip", - "sha256": "86437909f7e1c85d987b02130d3464b3d004d07904d5c893989ac3c924d11357" - }, "aarch64-darwin": { "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.23.2-4781536860569600/darwin-arm/Antigravity.zip", "sha256": "4a8a90feed7078dae30d1dbcb268a0497c103ba76df7012a4467587aa7cffdf8" diff --git a/pkgs/by-name/an/antigravity/package.nix b/pkgs/by-name/an/antigravity/package.nix index a0d5cd05a137..165e5a2c4889 100644 --- a/pkgs/by-name/an/antigravity/package.nix +++ b/pkgs/by-name/an/antigravity/package.nix @@ -66,7 +66,6 @@ buildVscode { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/an/antigravity/update.js b/pkgs/by-name/an/antigravity/update.js index 45bf250a2fd5..38eb4cf7a444 100755 --- a/pkgs/by-name/an/antigravity/update.js +++ b/pkgs/by-name/an/antigravity/update.js @@ -13,12 +13,12 @@ import * as path from "node:path"; * @property {string} sha256hash SHA256 hash of the download file, example: "8eb01462dc4f26aba45be4992bda0b145d1ec210c63a6272578af27e59f23bef" * @property {string} url Download URL, example: "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.11.2-6251250307170304/linux-arm/Antigravity.tar.gz", "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.11.2-6251250307170304/darwin-x64/Antigravity.zip" */ -/** @typedef {"x86_64-linux" | "aarch64-linux" | "x86_64-darwin" | "aarch64-darwin"} Platform */ +/** @typedef {"x86_64-linux" | "aarch64-linux" | "aarch64-darwin"} Platform */ /** @typedef {{ version: string; vscodeVersion: string; sources: Record }} Information */ let version = ""; let vscodeVersion = ""; -async function getLatestInformation(/** @type {"linux-x64" | "linux-arm64" | "darwin-arm64" | "darwin"} */ targetSystem) { +async function getLatestInformation(/** @type {"linux-x64" | "linux-arm64" | "darwin-arm64"} */ targetSystem) { /** @type {UpdateInfo} */ const latestInfo = await (await fetch(`https://antigravity-auto-updater-974169037036.us-central1.run.app/api/update/${targetSystem}/stable/latest`)).json(); const newVersion = /\/antigravity\/stable\/([\d.]+)-[\d]+/.exec(latestInfo.url)?.[1] ?? ""; // Current API lack version field now, we need to parse it from the URL temporarily. @@ -35,7 +35,6 @@ async function getLatestInformation(/** @type {"linux-x64" | "linux-arm64" | "da const sources = { "x86_64-linux": await getLatestInformation("linux-x64"), "aarch64-linux": await getLatestInformation("linux-arm64"), - "x86_64-darwin": await getLatestInformation("darwin"), "aarch64-darwin": await getLatestInformation("darwin-arm64"), }; /** @type {Information} */ diff --git a/pkgs/by-name/an/antiprism/package.nix b/pkgs/by-name/an/antiprism/package.nix index afe7bb297fd5..2ae40853178a 100644 --- a/pkgs/by-name/an/antiprism/package.nix +++ b/pkgs/by-name/an/antiprism/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://www.antiprism.com"; description = "Collection of programs for generating, manipulating, transforming and viewing polyhedra"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ ]; }; }) diff --git a/pkgs/by-name/an/anytype-heart/package.nix b/pkgs/by-name/an/anytype-heart/package.nix index 5b11214a178c..c03e7d4ff88e 100644 --- a/pkgs/by-name/an/anytype-heart/package.nix +++ b/pkgs/by-name/an/anytype-heart/package.nix @@ -15,7 +15,6 @@ let # https://github.com/anyproto/anytype-heart/blob/f33a6b09e9e4e597f8ddf845fc4d6fe2ef335622/pkg/lib/localstore/ftsearch/ftsearchtantivy.go#L3 x86_64-linux = "linux-amd64-musl"; aarch64-linux = "linux-arm64-musl"; - x86_64-darwin = "darwin-amd64"; aarch64-darwin = "darwin-arm64"; } .${stdenv.hostPlatform.system} @@ -89,7 +88,6 @@ buildGoModule (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; broken = stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix index e6f428405645..69b330717963 100644 --- a/pkgs/by-name/an/anytype/package.nix +++ b/pkgs/by-name/an/anytype/package.nix @@ -231,7 +231,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; broken = stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/ap/apache-flex-sdk/package.nix b/pkgs/by-name/ap/apache-flex-sdk/package.nix index 4c5b18d5abe0..5d603721f3bb 100644 --- a/pkgs/by-name/ap/apache-flex-sdk/package.nix +++ b/pkgs/by-name/ap/apache-flex-sdk/package.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Flex SDK for Adobe Flash / ActionScript"; homepage = "https://flex.apache.org/"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ dywedir ]; }; }) diff --git a/pkgs/by-name/ap/apg/package.nix b/pkgs/by-name/ap/apg/package.nix index 6e9f75e175fe..cff5c824551c 100644 --- a/pkgs/by-name/ap/apg/package.nix +++ b/pkgs/by-name/ap/apg/package.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation { pname = "apg"; - version = "unstable-2015-01-29"; + version = "2.3.0b-unstable-2015-01-29"; src = fetchFromGitHub { owner = "wilx"; diff --git a/pkgs/by-name/ap/apidog/package.nix b/pkgs/by-name/ap/apidog/package.nix index a4d99a38cbef..2fe2cfde48be 100644 --- a/pkgs/by-name/ap/apidog/package.nix +++ b/pkgs/by-name/ap/apidog/package.nix @@ -7,11 +7,11 @@ let pname = "apidog"; - version = "2.8.36"; + version = "2.8.38"; src = fetchurl { url = "https://file-assets.apidog.com/download/${version}/Apidog-${version}.AppImage"; - hash = "sha256-IlIt00NQw1InLba/3Zax25yRsn8ZbiBfuA6CRx6veTg="; + hash = "sha256-7wKTMshEYwBCqQ4BQzETclSd3+26PN0SySyLzMgcO1U="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/by-name/ap/apksigcopier/package.nix b/pkgs/by-name/ap/apksigcopier/package.nix index cd8aafdff6d3..ba13328dafff 100644 --- a/pkgs/by-name/ap/apksigcopier/package.nix +++ b/pkgs/by-name/ap/apksigcopier/package.nix @@ -76,7 +76,7 @@ python3.pkgs.buildPythonApplication rec { * compare two APKs with different signatures (requires apksigner) ''; homepage = "https://github.com/obfusk/apksigcopier"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ obfusk ]; }; } diff --git a/pkgs/by-name/ap/apparmor-init/fix-rc-apparmor-functions-FHS.patch b/pkgs/by-name/ap/apparmor-init/fix-rc-apparmor-functions-FHS.patch new file mode 100644 index 000000000000..0e43f12bcecb --- /dev/null +++ b/pkgs/by-name/ap/apparmor-init/fix-rc-apparmor-functions-FHS.patch @@ -0,0 +1,34 @@ +diff --git a/rc.apparmor.functions b/rc.apparmor.functions +index 96cb23d33..4401fc420 100644 +--- a/rc.apparmor.functions ++++ b/rc.apparmor.functions +@@ -31,7 +31,10 @@ + + # Some nice defines that we use + +-PARSER=/sbin/apparmor_parser ++PATH="@PATH@${PATH:+:$PATH}" ++export PATH ++ ++PARSER=$(command -v apparmor_parser) + PARSER_OPTS= + # Suppress warnings when booting in quiet mode + if [ "${QUIET:-no}" = yes ] || [ "${quiet:-n}" = y ]; then +@@ -50,7 +53,7 @@ ADDITIONAL_PROFILE_DIR= + if [ -n "$ADDITIONAL_PROFILE_DIR" ] && [ -d "$ADDITIONAL_PROFILE_DIR" ]; then + PROFILE_DIRS="$PROFILE_DIRS $ADDITIONAL_PROFILE_DIR" + fi +-AA_STATUS=/usr/sbin/aa-status ++AA_STATUS=$(command -v aa-status) + SECURITYFS=/sys/kernel/security + SFS_MOUNTPOINT="${SECURITYFS}/apparmor" + +@@ -91,7 +94,7 @@ is_container_with_internal_policy() { + local ns_name + + # WSL needs to be detected explicitly +- if [ -x /usr/bin/systemd-detect-virt ] && \ ++ if command -v systemd-detect-virt >/dev/null 2>&1 && \ + [ "$(systemd-detect-virt --container)" = "wsl" ]; then + return 0 + fi diff --git a/pkgs/by-name/ap/apparmor-init/package.nix b/pkgs/by-name/ap/apparmor-init/package.nix new file mode 100644 index 000000000000..0e95a3f13b47 --- /dev/null +++ b/pkgs/by-name/ap/apparmor-init/package.nix @@ -0,0 +1,94 @@ +{ + lib, + stdenv, + which, + replaceVars, + perl, + buildPackages, + runtimeShellPackage, + + # apparmor deps + libapparmor, + apparmor-bin-utils, + apparmor-parser, + + # runtime deps + gnused, + gnugrep, + systemd, + coreutils, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "apparmor-init"; + inherit (libapparmor) version src; + + sourceRoot = "${finalAttrs.src.name}/init"; + + patches = [ + (replaceVars ./fix-rc-apparmor-functions-FHS.patch { + PATH = lib.makeBinPath [ + # bash script needs a bunch of binaries, but we can't wrapProgram because it is more a library that will be used with `source` + apparmor-bin-utils + apparmor-parser + coreutils + gnused + gnugrep + systemd + ]; + }) + ]; + + postPatch = '' + patchShebangs . + + substituteInPlace apparmor.service \ + --replace-fail "/bin/true" "${lib.getExe' coreutils "true"}" + + # the various provided scripts hardcode /lib/apparmor + for FILE in aa-teardown apparmor.service apparmor.systemd profile-load + do + substituteInPlace "$FILE" \ + --replace-fail "/lib/apparmor" "$out/lib/apparmor" + done + ''; + + nativeBuildInputs = [ + which + perl + ]; + + buildInputs = [ + runtimeShellPackage + ]; + + makeFlags = [ + "POD2MAN=${lib.getExe' buildPackages.perl "pod2man"}" + "POD2HTML=${lib.getExe' buildPackages.perl "pod2html"}" + "MANDIR=share/man" + ]; + + installFlags = [ + "DESTDIR=${placeholder "out"}" + "DISTRO=unknown" + "USR_SBINDIR=${placeholder "out"}/bin" + "SBINDIR=${placeholder "out"}/bin" + "LOCALEDIR=${placeholder "out"}/share/locale" + "SYSTEMD_UNIT_DIR=${placeholder "out"}/lib/systemd/system" + ]; + + doCheck = true; + + installTargets = [ + "install" + # Likely not very useful for NixOS, as this is missing some NixOS awareness such as loading declarative profiles from the store + # However, the cost is low, it may be useful in the future or on non-NixOS systems, so install the systemd service too. + "install-systemd" + ]; + + strictDeps = true; + __structuredAttrs = true; + + meta = libapparmor.meta // { + description = "Mandatory access control system - init files"; + }; +}) diff --git a/pkgs/by-name/ap/apparmor-parser/fix-rc.apparmor.functions.sh b/pkgs/by-name/ap/apparmor-parser/fix-rc.apparmor.functions.sh deleted file mode 100644 index ebc1baaa92d4..000000000000 --- a/pkgs/by-name/ap/apparmor-parser/fix-rc.apparmor.functions.sh +++ /dev/null @@ -1,32 +0,0 @@ -aa_action() { - STRING=$1 - shift - $* - rc=$? - if [ $rc -eq 0 ] ; then - aa_log_success_msg $"$STRING " - else - aa_log_failure_msg $"$STRING " - fi - return $rc -} - -aa_log_success_msg() { - [ -n "$1" ] && echo -n $1 - echo ": done." -} - -aa_log_warning_msg() { - [ -n "$1" ] && echo -n $1 - echo ": Warning." -} - -aa_log_failure_msg() { - [ -n "$1" ] && echo -n $1 - echo ": Failed." -} - -aa_log_skipped_msg() { - [ -n "$1" ] && echo -n $1 - echo ": Skipped." -} diff --git a/pkgs/by-name/ap/apparmor-parser/package.nix b/pkgs/by-name/ap/apparmor-parser/package.nix index de39713f0c10..8844ca83b316 100644 --- a/pkgs/by-name/ap/apparmor-parser/package.nix +++ b/pkgs/by-name/ap/apparmor-parser/package.nix @@ -11,7 +11,6 @@ # apparmor deps libapparmor, - apparmor-bin-utils, runtimeShellPackage, # testing @@ -25,12 +24,6 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs . - - substituteInPlace init/rc.apparmor.functions \ - --replace-fail "/sbin/apparmor_parser" "$out/bin/apparmor_parser" \ - --replace-fail "/usr/sbin/aa-status" "${lib.getExe' apparmor-bin-utils "aa-status"}" - sed -i init/rc.apparmor.functions -e '2i . ${./fix-rc.apparmor.functions.sh}' - cd parser substituteInPlace Makefile \ diff --git a/pkgs/by-name/ap/apparmor-teardown/package.nix b/pkgs/by-name/ap/apparmor-teardown/package.nix deleted file mode 100644 index f5c299b24d76..000000000000 --- a/pkgs/by-name/ap/apparmor-teardown/package.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - writeShellApplication, - coreutils, - gnused, - gnugrep, - which, - - # apparmor deps - apparmor-parser, - apparmor-bin-utils, - libapparmor, -}: -writeShellApplication { - name = "apparmor-teardown"; - runtimeInputs = [ - apparmor-parser - apparmor-bin-utils - coreutils - gnused - gnugrep - which - ]; - - text = '' - set +e # the imported script tries to `read` an empty line - # shellcheck source=/dev/null - . ${apparmor-parser}/lib/apparmor/rc.apparmor.functions - remove_profiles - exit 0 - ''; - - inherit (libapparmor) meta; -} diff --git a/pkgs/by-name/ap/apparmor-utils/package.nix b/pkgs/by-name/ap/apparmor-utils/package.nix index ea1c275bdeb3..3ec57fde8ebe 100644 --- a/pkgs/by-name/ap/apparmor-utils/package.nix +++ b/pkgs/by-name/ap/apparmor-utils/package.nix @@ -11,8 +11,7 @@ buildPackages, # apparmor deps - apparmor-parser, - apparmor-teardown, + apparmor-init, }: let inherit (python3Packages) libapparmor; @@ -26,7 +25,7 @@ python3Packages.buildPythonApplication { cd utils substituteInPlace aa-remove-unknown \ - --replace-fail "/lib/apparmor/rc.apparmor.functions" "${apparmor-parser}/lib/apparmor/rc.apparmor.functions" + --replace-fail "/lib/apparmor/rc.apparmor.functions" "${apparmor-init}/lib/apparmor/rc.apparmor.functions" substituteInPlace Makefile \ --replace-fail "/usr/include/linux/capability.h" "${linuxHeaders}/include/linux/capability.h" sed -i -E 's/^(DESTDIR|BINDIR|PYPREFIX)=.*//g' Makefile @@ -75,8 +74,6 @@ python3Packages.buildPythonApplication { postInstall = '' wrapProgram $out/bin/aa-remove-unknown \ --prefix PATH : ${lib.makeBinPath [ gawk ]} - - ln -s ${lib.getExe apparmor-teardown} $out/bin/aa-teardown ''; meta = libapparmor.meta // { diff --git a/pkgs/by-name/ap/appfire-cli/package.nix b/pkgs/by-name/ap/appfire-cli/package.nix index a4519d548f3d..3514e508ffa3 100644 --- a/pkgs/by-name/ap/appfire-cli/package.nix +++ b/pkgs/by-name/ap/appfire-cli/package.nix @@ -47,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: { shellNames = { "x86_64-linux" = "bin/shell-linux-amd64"; "aarch64-linux" = "bin/shell-linux-arm64"; - "x86_64-darwin" = "bin/shell-macos-amd64"; "aarch64-darwin" = "bin/shell-macos-arm64"; }; # versionCheckHook cannot be used because appfire-cli requires $HOME to be set diff --git a/pkgs/by-name/ap/appflowy/package.nix b/pkgs/by-name/ap/appflowy/package.nix index fb368880b132..fd19b3534667 100644 --- a/pkgs/by-name/ap/appflowy/package.nix +++ b/pkgs/by-name/ap/appflowy/package.nix @@ -24,16 +24,15 @@ let dist = - rec { + { x86_64-linux = { urlSuffix = "linux-x86_64.tar.gz"; hash = "sha256-A8JUYzEMQH1sEKYrKZ84QZAgYbz0OvpHa3t9RIUVE9c="; }; - x86_64-darwin = { + aarch64-darwin = { urlSuffix = "macos-universal.zip"; hash = "sha256-LSNvFL1ud/FkzNSGk17ZqN2debnqsjlVDHd4NBjTds0="; }; - aarch64-darwin = x86_64-darwin; } ."${stdenvNoCC.hostPlatform.system}" or (throw "appflowy: No source for system: ${stdenvNoCC.hostPlatform.system}"); diff --git a/pkgs/by-name/ap/apt-offline/package.nix b/pkgs/by-name/ap/apt-offline/package.nix index 86a1be8b6343..e5fadb2c6740 100644 --- a/pkgs/by-name/ap/apt-offline/package.nix +++ b/pkgs/by-name/ap/apt-offline/package.nix @@ -55,7 +55,7 @@ python3Packages.buildPythonApplication { meta = { homepage = "https://github.com/rickysarraf/apt-offline"; description = "Offline APT package manager"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; mainProgram = "apt-offline"; maintainers = [ ]; }; diff --git a/pkgs/by-name/ap/apt-swarm/package.nix b/pkgs/by-name/ap/apt-swarm/package.nix index a6e2617b87a4..c15d3ea6a693 100644 --- a/pkgs/by-name/ap/apt-swarm/package.nix +++ b/pkgs/by-name/ap/apt-swarm/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/kpcyrd/apt-swarm"; changelog = "https://github.com/kpcyrd/apt-swarm/releases/tag/v${finalAttrs.version}"; mainProgram = "apt-swarm"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ kpcyrd ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/ap/apt/package.nix b/pkgs/by-name/ap/apt/package.nix index ee0a854d6c20..670b90d7d8ff 100644 --- a/pkgs/by-name/ap/apt/package.nix +++ b/pkgs/by-name/ap/apt/package.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://salsa.debian.org/apt-team/apt"; description = "Command-line package management tools used on Debian-based systems"; changelog = "https://salsa.debian.org/apt-team/apt/-/raw/${finalAttrs.version}/debian/changelog"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "apt"; maintainers = with lib.maintainers; [ VZstless ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/ar/aranym/package.nix b/pkgs/by-name/ar/aranym/package.nix index 3585c8938eb8..58ffd92cc258 100644 --- a/pkgs/by-name/ar/aranym/package.nix +++ b/pkgs/by-name/ar/aranym/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { and direct access to various host resources including sound, disk drives, optical storage devices (CD/DVD-ROMs), parallel port and more. ''; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "aranym"; maintainers = [ ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/ar/arduino-core-unwrapped/downloads.nix b/pkgs/by-name/ar/arduino-core-unwrapped/downloads.nix index b450b1137833..67722d2b081a 100644 --- a/pkgs/by-name/ar/arduino-core-unwrapped/downloads.nix +++ b/pkgs/by-name/ar/arduino-core-unwrapped/downloads.nix @@ -156,29 +156,6 @@ }; } -// optionalAttrs (system == "x86_64-darwin") { - "build/arduino-builder-macosx-1.6.1-signed.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/arduino-builder-macosx-1.6.1-signed.tar.bz2"; - sha256 = "sha256-icMXwovzT2UQAKry9sWyRvcNxPXaFdltAPyW/DDVEFA="; - }; - "build/macosx/avr-gcc-7.3.0-atmel3.6.1-arduino5-x86_64-apple-darwin14-signed.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/avr-gcc-7.3.0-atmel3.6.1-arduino5-x86_64-apple-darwin14-signed.tar.bz2"; - sha256 = "0lcnp525glnc2chcynnz2nllm4q6ar4n9nrjqd1jbj4m706zbv67"; - }; - "build/macosx/avrdude-6.3.0-arduino17-x86_64-apple-darwin12-signed.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino17-x86_64-apple-darwin12-signed.tar.bz2"; - sha256 = "1m24dci8mjf70yrf033mp1834pbp870m8sns2jxs3iy2i4qviiki"; - }; - "build/linux/arduinoOTA-1.3.0-darwin_amd64-signed.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/arduinoOTA-1.3.0-darwin_amd64-signed.tar.bz2"; - sha256 = "12pwfnikq3z3ji5wgjhzx1mfyaha5cym7mr63r8kfl5a85fhk8nz"; - }; - "build/macosx/appbundler/appbundler-1.0ea-arduino5.jar.zip" = fetchurl { - url = "https://downloads.arduino.cc/appbundler-1.0ea-arduino5.jar.zip"; - sha256 = "1ims951z7ajprqms7yd8ll83c79n7krhd9ljw30yn61f6jk46x82"; - }; -} - // optionalAttrs (system == "aarch64-linux") { "build/arduino-builder-linuxaarch64-1.6.1.tar.bz2" = fetchurl { url = "https://downloads.arduino.cc/tools/arduino-builder-linuxaarch64-1.6.1.tar.bz2"; diff --git a/pkgs/by-name/ar/arftracksat/package.nix b/pkgs/by-name/ar/arftracksat/package.nix index 38c1f53cd6c7..a4199fc3f5ad 100644 --- a/pkgs/by-name/ar/arftracksat/package.nix +++ b/pkgs/by-name/ar/arftracksat/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { pname = "arftracksat"; - version = "unstable-2025-09-15"; + version = "1.0-unstable-2025-09-15"; src = fetchFromGitHub { owner = "arf20"; diff --git a/pkgs/by-name/ar/argc/package.nix b/pkgs/by-name/ar/argc/package.nix index 845c341a2a5f..f038fec73678 100644 --- a/pkgs/by-name/ar/argc/package.nix +++ b/pkgs/by-name/ar/argc/package.nix @@ -42,9 +42,9 @@ rustPlatform.buildRustPackage (finalAttrs: { env = { LANG = "C.UTF-8"; - } - // lib.optionalAttrs (glibcLocales != null) { - LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; + LOCALE_ARCHIVE = lib.optionalString ( + finalAttrs.finalPackage.doInstallCheck && glibcLocales != null + ) "${glibcLocales}/lib/locale/locale-archive"; }; doInstallCheck = true; @@ -55,14 +55,7 @@ rustPlatform.buildRustPackage (finalAttrs: { updateScript = nix-update-script { }; tests = { cross = - ( - if stdenv.hostPlatform.isDarwin then - if stdenv.hostPlatform.isAarch64 then pkgsCross.x86_64-darwin else pkgsCross.aarch64-darwin - else if stdenv.hostPlatform.isAarch64 then - pkgsCross.gnu64 - else - pkgsCross.aarch64-multiplatform - ).argc; + (if stdenv.hostPlatform.isAarch64 then pkgsCross.gnu64 else pkgsCross.aarch64-multiplatform).argc; }; }; diff --git a/pkgs/by-name/ar/argocd/package.nix b/pkgs/by-name/ar/argocd/package.nix index 032bec4677c0..b39cc55f242b 100644 --- a/pkgs/by-name/ar/argocd/package.nix +++ b/pkgs/by-name/ar/argocd/package.nix @@ -13,13 +13,13 @@ buildGoModule (finalAttrs: { pname = "argocd"; - version = "3.4.4"; + version = "3.4.5"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; tag = "v${finalAttrs.version}"; - hash = "sha256-I3udVhmPpOA2Lf1mkJqG+d+mGpfM16HIKBkEnTiAw0c="; + hash = "sha256-hM7ss948dr7KntUGwiFDhr1OrbI+LAJlDgUMnegm+es="; }; ui = stdenv.mkDerivation { @@ -45,7 +45,7 @@ buildGoModule (finalAttrs: { }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-w6jFNWKvcwxyeiSy+Pqb43qOfMOXF5UHr2VpyQD2dFw="; + vendorHash = "sha256-yzVSMdupFdrYUWMCPFhiYTnjCDGZo4Se0osXbCvB7gM="; # Set target as ./cmd per cli-local # https://github.com/argoproj/argo-cd/blob/master/Makefile diff --git a/pkgs/by-name/ar/aritim-dark/package.nix b/pkgs/by-name/ar/aritim-dark/package.nix index e57692cddc64..eef426f95c26 100644 --- a/pkgs/by-name/ar/aritim-dark/package.nix +++ b/pkgs/by-name/ar/aritim-dark/package.nix @@ -6,7 +6,7 @@ stdenvNoCC.mkDerivation { pname = "aritim-dark"; - version = "unstable-2021-12-29"; + version = "0.7-unstable-2021-12-29"; src = fetchFromGitHub { owner = "Mrcuve0"; @@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation { meta = { description = "Dark theme deeply inspired by the Ayu Dark color palette"; homepage = "https://github.com/Mrcuve0/Aritim-Dark"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.pasqui23 ]; }; diff --git a/pkgs/by-name/ar/armitage/package.nix b/pkgs/by-name/ar/armitage/package.nix index 1d384ca08e51..286fc11eacb0 100644 --- a/pkgs/by-name/ar/armitage/package.nix +++ b/pkgs/by-name/ar/armitage/package.nix @@ -15,7 +15,7 @@ let pname = "armitage"; - version = "unstable-2022-12-05"; + version = "1.0-unstable-2022-12-05"; src = fetchFromGitHub { owner = "r00t0v3rr1d3"; diff --git a/pkgs/by-name/ar/arouteserver/package.nix b/pkgs/by-name/ar/arouteserver/package.nix index 465367e1db1b..3a5999b6ead6 100644 --- a/pkgs/by-name/ar/arouteserver/package.nix +++ b/pkgs/by-name/ar/arouteserver/package.nix @@ -60,7 +60,7 @@ python3Packages.buildPythonPackage rec { mainProgram = "arouteserver"; homepage = "https://github.com/pierky/arouteserver"; changelog = "https://github.com/pierky/arouteserver/blob/v${version}/CHANGES.rst"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ marcel johannwagner diff --git a/pkgs/by-name/ar/arpoison/package.nix b/pkgs/by-name/ar/arpoison/package.nix index c75964942e7b..7f3228a9888b 100644 --- a/pkgs/by-name/ar/arpoison/package.nix +++ b/pkgs/by-name/ar/arpoison/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "UNIX arp cache update utility"; homepage = "http://www.arpoison.net/"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = [ lib.maintainers.michalrus ]; platforms = lib.platforms.unix; mainProgram = "arpoison"; diff --git a/pkgs/by-name/ar/arsenal/package.nix b/pkgs/by-name/ar/arsenal/package.nix index cbf26e54ed2b..ac65eb8721b2 100644 --- a/pkgs/by-name/ar/arsenal/package.nix +++ b/pkgs/by-name/ar/arsenal/package.nix @@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { meta = { description = "Tool to generate commands for security and network tools"; homepage = "https://github.com/Orange-Cyberdefense/arsenal"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; mainProgram = "arsenal"; }; diff --git a/pkgs/by-name/as/as-tree/package.nix b/pkgs/by-name/as/as-tree/package.nix index 150cd1d3c079..e8f8cde8739e 100644 --- a/pkgs/by-name/as/as-tree/package.nix +++ b/pkgs/by-name/as/as-tree/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage { meta = { description = "Print a list of paths as a tree of paths"; homepage = "https://github.com/jez/as-tree"; - license = with lib.licenses; [ blueOak100 ]; + license = lib.licenses.blueOak100; maintainers = with lib.maintainers; [ jshholland ]; mainProgram = "as-tree"; }; diff --git a/pkgs/by-name/as/asciinema-scenario/package.nix b/pkgs/by-name/as/asciinema-scenario/package.nix index 4b4e869f0119..475a5c480686 100644 --- a/pkgs/by-name/as/asciinema-scenario/package.nix +++ b/pkgs/by-name/as/asciinema-scenario/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Create asciinema videos from a text file"; homepage = "https://github.com/garbas/asciinema-scenario/"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "asciinema-scenario"; }; }) diff --git a/pkgs/by-name/as/asciinema/package.nix b/pkgs/by-name/as/asciinema/package.nix index 9b690bf3b8c6..4f4fab462d49 100644 --- a/pkgs/by-name/as/asciinema/package.nix +++ b/pkgs/by-name/as/asciinema/package.nix @@ -52,7 +52,7 @@ rustPlatform.buildRustPackage (finalAttrs: { computer users working with the command-line, such as developers or system administrators. ''; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; mainProgram = "asciinema"; maintainers = with lib.maintainers; [ jiriks74 diff --git a/pkgs/by-name/as/asciiquarium-transparent/package.nix b/pkgs/by-name/as/asciiquarium-transparent/package.nix index 85ee2cb78c7c..bc18abe19e21 100644 --- a/pkgs/by-name/as/asciiquarium-transparent/package.nix +++ b/pkgs/by-name/as/asciiquarium-transparent/package.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "asciiquarium-transparent"; - version = "1.4"; + version = "1.6"; src = fetchFromGitHub { owner = "nothub"; repo = "asciiquarium"; rev = "v${finalAttrs.version}"; - hash = "sha256-lUNPg+/R/UwnHxjVXROMjvQxBZuCPBrYWB546OHplJM="; + hash = "sha256-p9P9sJZhcNdlIxyz5ulFXFrwJaE7b48D4aWeoTWmIgk="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/as/asdf-vm/package.nix b/pkgs/by-name/as/asdf-vm/package.nix index 59e5688f9162..25c6b0934e4c 100644 --- a/pkgs/by-name/as/asdf-vm/package.nix +++ b/pkgs/by-name/as/asdf-vm/package.nix @@ -8,18 +8,18 @@ }: buildGoModule (finalAttrs: { pname = "asdf-vm"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "asdf-vm"; repo = "asdf"; tag = "v${finalAttrs.version}"; - hash = "sha256-WUHNr9AaCOYh0mZS5zZqWwuq8uw6bgGtj5mPgIvNGUE="; + hash = "sha256-qq1HJidVBqHyfk2OZ439fnkJKRq1xglqOrF3GVvWeXY="; }; - vendorHash = "sha256-RSKenTwSgseEpvT6K36kWRfmIMPymYEGOTPcEHU7o2E="; + vendorHash = "sha256-Rv5p63opBTlyRlRDisgYX5fVJFny1clDn7b/zumV83M="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/as/asn/package.nix b/pkgs/by-name/as/asn/package.nix index e809b7c29697..860a90dab0d5 100644 --- a/pkgs/by-name/as/asn/package.nix +++ b/pkgs/by-name/as/asn/package.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://github.com/nitefood/asn"; changelog = "https://github.com/nitefood/asn/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ devhell ]; mainProgram = "asn"; }; diff --git a/pkgs/by-name/as/assetfinder/package.nix b/pkgs/by-name/as/assetfinder/package.nix index 3dc1ceeca593..66122ca9293f 100644 --- a/pkgs/by-name/as/assetfinder/package.nix +++ b/pkgs/by-name/as/assetfinder/package.nix @@ -31,6 +31,6 @@ buildGoModule (finalAttrs: { fromSource binaryNativeCode ]; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; }; }) diff --git a/pkgs/by-name/at/atari800/package.nix b/pkgs/by-name/at/atari800/package.nix index e19b8730b8a0..43f567993849 100644 --- a/pkgs/by-name/at/atari800/package.nix +++ b/pkgs/by-name/at/atari800/package.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { WinCE, Sega Dreamcast, Android and other systems supported by the SDL library. ''; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; maintainers = [ ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/at/ataripp/package.nix b/pkgs/by-name/at/ataripp/package.nix index fde9cae8f43a..34e3bd45e998 100644 --- a/pkgs/by-name/at/ataripp/package.nix +++ b/pkgs/by-name/at/ataripp/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { will compile on a variety of systems (Linux, Solaris, Irix). ''; maintainers = [ ]; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/at/atlantis/package.nix b/pkgs/by-name/at/atlantis/package.nix index 0a6a212f3298..b42a8e9cd24a 100644 --- a/pkgs/by-name/at/atlantis/package.nix +++ b/pkgs/by-name/at/atlantis/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "atlantis"; - version = "0.44.1"; + version = "0.46.0"; src = fetchFromGitHub { owner = "runatlantis"; repo = "atlantis"; tag = "v${finalAttrs.version}"; - hash = "sha256-CMMsW0VFUi5c2AsuvH5uxggzJ3wD1k24Zrk4tjlBczo="; + hash = "sha256-4twWPp+ZgK6YmNL5RJmLKhtxe33T1GDCu1qejUbqXkA="; }; ldflags = [ @@ -21,7 +21,7 @@ buildGoModule (finalAttrs: { "-X=main.date=1970-01-01T00:00:00Z" ]; - vendorHash = "sha256-hxgujZGbcEelOpoy7eCnbrypXraN7aPe8Ox81kkg3gs="; + vendorHash = "sha256-/PnEQvaqADxwFvrHWOPFopQwdyUXBa6cf/H7a/RaHcg="; subPackages = [ "." ]; diff --git a/pkgs/by-name/at/atomgit-cli/package.nix b/pkgs/by-name/at/atomgit-cli/package.nix new file mode 100644 index 000000000000..39bcf62fbe39 --- /dev/null +++ b/pkgs/by-name/at/atomgit-cli/package.nix @@ -0,0 +1,67 @@ +{ + lib, + stdenv, + buildGoModule, + fetchgit, + gitMinimal, + makeWrapper, + versionCheckHook, + writableTmpDirAsHomeHook, + xdg-utils, +}: + +buildGoModule (finalAttrs: { + __structuredAttrs = true; + + pname = "atomgit-cli"; + version = "0.5.0"; + + src = fetchgit { + url = "https://atomgit.com/hust-open-atom-club/atomgit-cli.git"; + rev = "11f1ff216053bf47c0a3baaed6698c9222f1ce77"; + hash = "sha256-ZvQ8S0f1jUfN48UE/U+JnTTrtoWYZfwhDPDBbKKLlC0="; + }; + + vendorHash = "sha256-7K17JaXFsjf163g5PXCb5ng2gYdotnZ2IDKk8KFjNj0="; + + subPackages = [ "cmd/ag" ]; + + preCheck = '' + # Test all packages, not only cmd/ag. + unset subPackages + ''; + + ldflags = [ + "-s" + "-w" + "-X atomgit.com/hust-open-atom-club/atomgit-cli/internal/version.Version=v${finalAttrs.version}" + "-X atomgit.com/hust-open-atom-club/atomgit-cli/internal/version.Commit=${finalAttrs.src.rev}" + "-X atomgit.com/hust-open-atom-club/atomgit-cli/internal/version.BuildDate=2026-07-13T07:53:45Z" + ]; + + nativeBuildInputs = [ makeWrapper ]; + + postFixup = '' + wrapProgram $out/bin/ag \ + --prefix PATH : ${ + lib.makeBinPath ([ gitMinimal ] ++ lib.optionals stdenv.hostPlatform.isLinux [ xdg-utils ]) + } + ''; + + nativeInstallCheckInputs = [ + versionCheckHook + writableTmpDirAsHomeHook + ]; + versionCheckProgramArg = "version"; + versionCheckKeepEnvironment = [ "HOME" ]; + doInstallCheck = true; + + meta = { + description = "Command-line interface for AtomGit"; + homepage = "https://atomgit.com/hust-open-atom-club/atomgit-cli"; + changelog = "https://atomgit.com/hust-open-atom-club/atomgit-cli/tags/v${finalAttrs.version}"; + license = lib.licenses.mulan-psl2; + mainProgram = "ag"; + maintainers = [ lib.maintainers.silicalet ]; + }; +}) diff --git a/pkgs/by-name/at/atomic-swap/package.nix b/pkgs/by-name/at/atomic-swap/package.nix index 37c1125600bb..81b630af0585 100644 --- a/pkgs/by-name/at/atomic-swap/package.nix +++ b/pkgs/by-name/at/atomic-swap/package.nix @@ -41,7 +41,7 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/AthanorLabs/atomic-swap"; changelog = "https://github.com/AthanorLabs/atomic-swap/releases/tag/v${finalAttrs.version}"; description = "ETH-XMR atomic swap implementation"; - license = with lib.licenses; [ lgpl3Only ]; + license = lib.licenses.lgpl3Only; maintainers = with lib.maintainers; [ happysalada lord-valen diff --git a/pkgs/by-name/at/attic-client/package.nix b/pkgs/by-name/at/attic-client/package.nix index 5a23514ca537..38a5ca86c26e 100644 --- a/pkgs/by-name/at/attic-client/package.nix +++ b/pkgs/by-name/at/attic-client/package.nix @@ -21,13 +21,13 @@ in rustPlatform.buildRustPackage { pname = "attic"; - version = "0-unstable-2026-06-26"; + version = "0-unstable-2026-07-06"; src = fetchFromGitHub { owner = "zhaofengli"; repo = "attic"; - rev = "b7c905657cb81b8ec9c26b0d9f53aa2e4f231810"; - hash = "sha256-//gQFVLVFhwHyI9yrpPqX0MQJGYqS6nE/iLV872K+PU="; + rev = "7a19204df10d606c5070e6bb72615c3461900c05"; + hash = "sha256-AyXLhsc2drC+lunm+TB6Xs6XMMJ/m4B1YjMM1N8JXhU="; }; nativeBuildInputs = [ @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage { buildInputs = lib.optional needNixInclude nix ++ [ boost ]; cargoBuildFlags = lib.concatMapStrings (c: "-p ${c} ") crates; - cargoHash = "sha256-fYWRlgP3uwntULe6o2MC1yB/ea2x+27m1Op7o2wUd+U="; + cargoHash = "sha256-UGgM78QEWJ2QgbQhxEI+yLYXH6T4ey+1oenPTMlJ3GU="; env = { ATTIC_DISTRIBUTOR = "nixpkgs"; diff --git a/pkgs/by-name/at/atuin-desktop/package.nix b/pkgs/by-name/at/atuin-desktop/package.nix index 8c314c465018..a375364af645 100644 --- a/pkgs/by-name/at/atuin-desktop/package.nix +++ b/pkgs/by-name/at/atuin-desktop/package.nix @@ -80,7 +80,6 @@ rustPlatform.buildRustPackage (finalAttrs: { { aarch64-darwin = "sha256-YbjDAa2KG8U0ODqIYc5h7iNr5px+6+iforDrPomOVDo="; aarch64-linux = "sha256-JoUPAfBF4xdQxtx+J/VNpYomBACNsL7Wes0XXuGByGk="; - x86_64-darwin = "sha256-YzxQyZPfcQci8QsGEDRTcc2A9tmvem3cHkv/OBFlWDQ="; x86_64-linux = "sha256-w8fMS6f+F+23EtMjjl0RsHMm6b5jOXSwUDAc21vqLAg="; } .${stdenv.hostPlatform.system} diff --git a/pkgs/by-name/au/aube/package.nix b/pkgs/by-name/au/aube/package.nix index acac055e65eb..2d507db55606 100644 --- a/pkgs/by-name/au/aube/package.nix +++ b/pkgs/by-name/au/aube/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "aube"; - version = "1.26.0"; + version = "1.27.0"; src = fetchFromGitHub { owner = "jdx"; repo = "aube"; tag = "v${finalAttrs.version}"; - hash = "sha256-bQDDLgO5dG9kMF9VDnHGwuMZjWrbNT5Ia90rJrERDaE="; + hash = "sha256-lnW5ZLcdkpt662wDSj5YsnL7wILkJw3xoBs+3n7XWGY="; }; - cargoHash = "sha256-L9UiSO9UL8kBOebFXrZqbIJ/V4tobl1NYAdlktmX2lY="; + cargoHash = "sha256-Ox3l2VqtHfrAICTj7CL99EL5dXF43snPu7/X1ZFYceM="; nativeBuildInputs = [ cmake ]; # libz-ng-sys @@ -33,6 +33,9 @@ rustPlatform.buildRustPackage (finalAttrs: { checkFlags = [ # failed on x86_64-linux "--skip=http::ticket_cache::tests::max_per_host_evicts_oldest" + "--skip=http::ticket_cache::tests::invalidate_removes_all_for_host" + # require network access + "--skip=http::ticket_cache::tests::roundtrip_persists_across_open" ]; __darwinAllowLocalNetworking = true; @@ -44,6 +47,7 @@ rustPlatform.buildRustPackage (finalAttrs: { passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; }; + strictDeps = true; __structuredAttrs = true; meta = { diff --git a/pkgs/by-name/au/audacity/package.nix b/pkgs/by-name/au/audacity/package.nix index 74bd8b0a589c..ff0bd1ae1e67 100644 --- a/pkgs/by-name/au/audacity/package.nix +++ b/pkgs/by-name/au/audacity/package.nix @@ -31,7 +31,7 @@ libid3tag, libopus, libuuid, - ffmpeg_7, + ffmpeg_8, soundtouch, portaudio, # given up fighting their portaudio.patch? portmidi, @@ -59,7 +59,7 @@ # 1. detach sbsms let - ffmpeg = ffmpeg_7; + ffmpeg = ffmpeg_8; in stdenv.mkDerivation (finalAttrs: { pname = "audacity"; diff --git a/pkgs/by-name/au/auge/package.nix b/pkgs/by-name/au/auge/package.nix new file mode 100644 index 000000000000..fdd1d1f07acc --- /dev/null +++ b/pkgs/by-name/au/auge/package.nix @@ -0,0 +1,54 @@ +{ + lib, + stdenv, + fetchurl, + versionCheckHook, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "auge"; + version = "1.9.0"; + + __structuredAttrs = true; + strictDeps = true; + + # Building from source requires swift 6.3.0 while nixpkgs only has 5.10.1 + src = fetchurl { + url = "https://github.com/Arthur-Ficial/auge/releases/download/v${finalAttrs.version}/auge-${finalAttrs.version}-arm64-macos.tar.gz"; + hash = "sha256-hL3kq1/hFo4rlq2nz4iaRLqoErLiF032ovqwl5Rwqso="; + }; + + sourceRoot = "."; + + dontBuild = true; + dontConfigure = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp auge $out/bin/ + chmod +x $out/bin/auge + + runHook postInstall + ''; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "On-device Apple Vision framework CLI"; + homepage = "https://github.com/Arthur-Ficial/auge"; + changelog = "https://github.com/Arthur-Ficial/auge/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Br1ght0ne ]; + platforms = [ "aarch64-darwin" ]; + mainProgram = "auge"; + sourceProvenance = [ + lib.sourceTypes.binaryNativeCode + ]; + }; +}) diff --git a/pkgs/by-name/au/aurea/package.nix b/pkgs/by-name/au/aurea/package.nix index 903190036cf1..0bad074fe21a 100644 --- a/pkgs/by-name/au/aurea/package.nix +++ b/pkgs/by-name/au/aurea/package.nix @@ -63,7 +63,7 @@ python3Packages.buildPythonApplication (finalAttrs: { homepage = "https://github.com/CleoMenezesJr/Aurea"; mainProgram = "aurea"; platforms = lib.platforms.linux; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = [ ]; }; }) diff --git a/pkgs/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix index f1a75fdd3fea..13b363cbded6 100644 --- a/pkgs/by-name/au/authentik/package.nix +++ b/pkgs/by-name/au/authentik/package.nix @@ -307,7 +307,11 @@ let build-system = with final; [ hatchling ]; - propagatedBuildInputs = + pythonRelaxDeps = [ + "structlog" + ]; + + dependencies = with final; [ channels @@ -329,7 +333,11 @@ let build-system = with final; [ hatchling ]; - propagatedBuildInputs = + pythonRelaxDeps = [ + "structlog" + ]; + + dependencies = with final; [ cron-converter diff --git a/pkgs/by-name/au/autobrr/package.nix b/pkgs/by-name/au/autobrr/package.nix index 7078ed821ede..7da263486503 100644 --- a/pkgs/by-name/au/autobrr/package.nix +++ b/pkgs/by-name/au/autobrr/package.nix @@ -16,12 +16,12 @@ let pname = "autobrr"; - version = "1.81.0"; + version = "1.82.1"; src = fetchFromGitHub { owner = "autobrr"; repo = "autobrr"; tag = "v${version}"; - hash = "sha256-Xm5cYtQabHkoiVZ6v71qWKIpx44obzr0Om2hahFUyO8="; + hash = "sha256-dB/lk05v9L8GAF//N1We3byhsK+156rzRT+r9Q+EVD4="; }; autobrr-web = stdenvNoCC.mkDerivation { @@ -46,7 +46,7 @@ let ; pnpm = pnpm_11; fetcherVersion = 4; - hash = "sha256-VDW1B8OVFZ72nBl8IYM5nXqit2za1Q8mXI6UhcmEeSo="; + hash = "sha256-wlikd38tAfgaSSD9L7DiSXRQFYcfVq5YA1eWs5NE4n8="; }; postBuild = '' @@ -65,7 +65,7 @@ buildGoModule (finalAttrs: { src ; - vendorHash = "sha256-mOsiQXuhhNSbViEFecmlNk549LyfUIuc8FxwDma9XNI="; + vendorHash = "sha256-tsGl0uiQV25aemEQvedZUISrlO4IPE+V87nl31m8hZI="; preBuild = '' cp -r ${finalAttrs.passthru.autobrr-web}/* web/dist diff --git a/pkgs/by-name/au/autokey/package.nix b/pkgs/by-name/au/autokey/package.nix index f20e3906ea1e..4722e7557404 100644 --- a/pkgs/by-name/au/autokey/package.nix +++ b/pkgs/by-name/au/autokey/package.nix @@ -96,7 +96,7 @@ python3Packages.buildPythonApplication (finalAttrs: { description = "Desktop automation utility for Linux and X11"; homepage = "https://github.com/autokey/autokey"; changelog = "https://github.com/autokey/autokey/releases/tag/${finalAttrs.src.tag}"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ iamanaws ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/au/automatic-timezoned/package.nix b/pkgs/by-name/au/automatic-timezoned/package.nix index a9a0557fbcdc..b77dc283face 100644 --- a/pkgs/by-name/au/automatic-timezoned/package.nix +++ b/pkgs/by-name/au/automatic-timezoned/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "automatic-timezoned"; - version = "2.0.126"; + version = "2.0.143"; src = fetchFromGitHub { owner = "maxbrunet"; repo = "automatic-timezoned"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-e6r8XfzwIdcGlQwN64bfSQ481b1ViLI+9jTxUYNsA3w="; + sha256 = "sha256-bbdhvQ9THiBRf1rLExXQiwlrkgZBFZlaV2CUszDmwo4="; }; - cargoHash = "sha256-0iUBZXybkK6y19RsZXSibcSRh4jEYwSSYUDyCI3ihOc="; + cargoHash = "sha256-J7h1hVp8wK6UlkstcLCq4uMKJ9ZyLwGR75tcxpWnHT8="; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/au/autoprefixer/package.nix b/pkgs/by-name/au/autoprefixer/package.nix index 35ea1a5adc2c..76efe7f2cd45 100644 --- a/pkgs/by-name/au/autoprefixer/package.nix +++ b/pkgs/by-name/au/autoprefixer/package.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "autoprefixer"; - version = "10.5.0"; + version = "10.5.3"; src = fetchFromGitHub { owner = "postcss"; repo = "autoprefixer"; tag = finalAttrs.version; - hash = "sha256-s152v9sIuQLvhfPsZvQa+O9UhoASgm/e8dnz0t4pP3A="; + hash = "sha256-hjckcgWojItp2gseQI18zzxizjw/HxQPiTb/JegSCcs="; }; nativeBuildInputs = [ @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version src; pnpm = pnpm_10; fetcherVersion = 4; - hash = "sha256-Sxt4vtdlMdXxXqt22hfZJskj8mkB5t85IZ5BsbCoDF4="; + hash = "sha256-diOgX9lXKOwCx9V737mmmtrhqDg5beXJH/PjlJHFpto="; }; installPhase = '' diff --git a/pkgs/by-name/au/autopush-rs/package.nix b/pkgs/by-name/au/autopush-rs/package.nix index 0ab3b4fe426e..2fcc3e9db310 100644 --- a/pkgs/by-name/au/autopush-rs/package.nix +++ b/pkgs/by-name/au/autopush-rs/package.nix @@ -47,7 +47,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "autopush"; - version = "1.82.1"; + version = "1.82.2"; __structuredAttrs = true; strictDeps = true; @@ -61,10 +61,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "mozilla-services"; repo = "autopush-rs"; tag = finalAttrs.version; - hash = "sha256-wOnuYh18q2XDAcCUBGsidAMvOi10s4njVKDLhtNJEoU="; + hash = "sha256-do0EllSpXlJtPM9FnIWgwKemXHhDcj0P+aH6rnt4poE="; }; - cargoHash = "sha256-FiMEDc2wxQPkM50cNKzP8yo90HGMakn6JUl/xheaciQ="; + cargoHash = "sha256-tXkNjgHW4sVWNCQehumbDW1H2azelqyqp5Wxk8M6sPc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/av/avalonia/package.nix b/pkgs/by-name/av/avalonia/package.nix index 91460fe1cc90..e017df48942d 100644 --- a/pkgs/by-name/av/avalonia/package.nix +++ b/pkgs/by-name/av/avalonia/package.nix @@ -203,7 +203,7 @@ stdenvNoCC.mkDerivation ( meta = { homepage = "https://avaloniaui.net/"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ corngood ]; description = "Cross-platform UI framework for dotnet"; sourceProvenance = with lib.sourceTypes; [ diff --git a/pkgs/by-name/av/aver/package.nix b/pkgs/by-name/av/aver/package.nix index 2174d4d5f268..ab28492ef5f7 100644 --- a/pkgs/by-name/av/aver/package.nix +++ b/pkgs/by-name/av/aver/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "aver"; - version = "0.26.0"; + version = "0.27.0"; __structuredAttrs = true; src = fetchFromGitHub { owner = "jasisz"; repo = "aver"; tag = "v${finalAttrs.version}"; - hash = "sha256-LeI6qy+z8azrrgoskRq/hsk5t0PDydQ/yJNxYIB7I68="; + hash = "sha256-jVXkHdTSTvHVKHe1jIYqISvm2oUolBWNLBxHt3KDpWk="; }; - cargoHash = "sha256-Zqu56tBbKjWZmpRpPuK9JMexcajRcDzBW4AfTRAkPbs="; + cargoHash = "sha256-3ekeWs2o2TVe2SZgMKTGANTucSiR3aXaqOzJIaoAuK4="; cargoBuildFlags = [ "--workspace" diff --git a/pkgs/by-name/az/azure-functions-core-tools/package.nix b/pkgs/by-name/az/azure-functions-core-tools/package.nix index 27eaa122b9c4..f37cc27ae3d8 100644 --- a/pkgs/by-name/az/azure-functions-core-tools/package.nix +++ b/pkgs/by-name/az/azure-functions-core-tools/package.nix @@ -66,7 +66,6 @@ buildDotnetModule { platforms = [ "x86_64-linux" "aarch64-darwin" - "x86_64-darwin" ]; }; } diff --git a/pkgs/by-name/az/azure-static-sites-client/package.nix b/pkgs/by-name/az/azure-static-sites-client/package.nix index eec2fbc63e62..51bb767bfabf 100644 --- a/pkgs/by-name/az/azure-static-sites-client/package.nix +++ b/pkgs/by-name/az/azure-static-sites-client/package.nix @@ -16,24 +16,15 @@ let versions = lib.importJSON ./versions.json; flavor = lib.head (lib.filter (x: x.version == versionFlavor) versions); - fetchBinary = - runtimeId: - fetchurl { - url = flavor.files.${runtimeId}.url; - sha256 = flavor.files.${runtimeId}.sha; - }; - sources = { - "x86_64-linux" = fetchBinary "linux-x64"; - "x86_64-darwin" = fetchBinary "osx-x64"; - }; in stdenv.mkDerivation { pname = "StaticSitesClient-${versionFlavor}"; version = flavor.buildId; - src = - sources.${stdenv.hostPlatform.system} - or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + src = fetchurl { + url = flavor.files.linux-x64.url; + sha256 = flavor.files.linux-x64.sha; + }; nativeBuildInputs = [ autoPatchelfHook diff --git a/pkgs/by-name/ba/babashka/package.nix b/pkgs/by-name/ba/babashka/package.nix index cfdfc0910b6b..64e5a1694f03 100644 --- a/pkgs/by-name/ba/babashka/package.nix +++ b/pkgs/by-name/ba/babashka/package.nix @@ -1,22 +1,11 @@ { stdenvNoCC, - lib, babashka-unwrapped, callPackage, makeWrapper, installShellFiles, - rlwrap, clojureToolsBabashka ? callPackage ./clojure-tools.nix { }, jdkBabashka ? clojureToolsBabashka.jdk, - - # rlwrap is a small utility to allow the editing of keyboard input, see - # https://book.babashka.org/#_repl - # - # NOTE In some cases, rlwrap prints some extra empty lines. That behavior can - # break some babashka scripts. For this reason, it is disabled by default. See: - # https://github.com/NixOS/nixpkgs/issues/246839 - # https://github.com/NixOS/nixpkgs/pull/248207 - withRlwrap ? false, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "babashka"; @@ -30,28 +19,20 @@ stdenvNoCC.mkDerivation (finalAttrs: { installShellFiles ]; - installPhase = - let - unwrapped-bin = "${babashka-unwrapped}/bin/bb"; - in - '' - mkdir -p $out/clojure_tools - ln -s -t $out/clojure_tools ${clojureToolsBabashka}/*.edn - ln -s -t $out/clojure_tools ${clojureToolsBabashka}/libexec/* + installPhase = '' + mkdir -p $out/clojure_tools + ln -s -t $out/clojure_tools ${clojureToolsBabashka}/*.edn + ln -s -t $out/clojure_tools ${clojureToolsBabashka}/libexec/* - makeWrapper "${babashka-unwrapped}/bin/bb" "$out/bin/bb" \ - --inherit-argv0 \ - --set-default DEPS_CLJ_TOOLS_DIR $out/clojure_tools \ - --set-default JAVA_HOME ${jdkBabashka} + makeWrapper "${babashka-unwrapped}/bin/bb" "$out/bin/bb" \ + --inherit-argv0 \ + --set-default DEPS_CLJ_TOOLS_DIR $out/clojure_tools \ + --set-default JAVA_HOME ${jdkBabashka} - installShellCompletion --cmd bb --bash ${babashka-unwrapped}/share/bash-completion/completions/bb.bash - installShellCompletion --cmd bb --zsh ${babashka-unwrapped}/share/zsh/site-functions/_bb - installShellCompletion --cmd bb --fish ${babashka-unwrapped}/share/fish/vendor_completions.d/bb.fish - '' - + lib.optionalString withRlwrap '' - substituteInPlace $out/bin/bb \ - --replace '"${unwrapped-bin}"' '"${rlwrap}/bin/rlwrap" "${unwrapped-bin}"' - ''; + installShellCompletion --cmd bb --bash ${babashka-unwrapped}/share/bash-completion/completions/bb.bash + installShellCompletion --cmd bb --zsh ${babashka-unwrapped}/share/zsh/site-functions/_bb + installShellCompletion --cmd bb --fish ${babashka-unwrapped}/share/fish/vendor_completions.d/bb.fish + ''; installCheckPhase = '' ${babashka-unwrapped.installCheckPhase} diff --git a/pkgs/by-name/ba/bacon/package.nix b/pkgs/by-name/ba/bacon/package.nix index 13dfbfbebd45..196e4c34e011 100644 --- a/pkgs/by-name/ba/bacon/package.nix +++ b/pkgs/by-name/ba/bacon/package.nix @@ -27,17 +27,17 @@ in rustPlatform.buildRustPackage (finalAttrs: { pname = "bacon"; - version = "3.23.0"; + version = "3.24.0"; __structuredAttrs = true; src = fetchFromGitHub { owner = "Canop"; repo = "bacon"; tag = "v${finalAttrs.version}"; - hash = "sha256-HMHZQP9GY9iMm+vDeIhavv4akmM0IUbpDtWHyzHG7KE="; + hash = "sha256-rfbK5MrCytBVISXVkazBDnZZxjZQ3ze348mlTyanTWM="; }; - cargoHash = "sha256-zlxhlgcTtSYvvGqSpQIg6f10cQZhF6s4UNrCZr8RIdY="; + cargoHash = "sha256-s49qZMD922l6KKSFRhVIGp6+7E0S+q7McV9PT2F0RQc="; buildFeatures = lib.optionals withSound [ "sound" diff --git a/pkgs/by-name/ba/badgemagic-app/package.nix b/pkgs/by-name/ba/badgemagic-app/package.nix index 09f219b86173..c914b0cdec1e 100644 --- a/pkgs/by-name/ba/badgemagic-app/package.nix +++ b/pkgs/by-name/ba/badgemagic-app/package.nix @@ -23,7 +23,7 @@ flutter338.buildFlutterApplication { meta = { description = "Badge Magic with LEDs - mobile and desktop app"; homepage = "https://github.com/fossasia/badgemagic-app"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = [ lib.maintainers.matthewcroughan ]; platforms = [ "aarch64-linux" diff --git a/pkgs/by-name/ba/badger/package.nix b/pkgs/by-name/ba/badger/package.nix index 0943bdf6f3fd..d574e5839dce 100644 --- a/pkgs/by-name/ba/badger/package.nix +++ b/pkgs/by-name/ba/badger/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "badger"; - version = "4.9.3"; + version = "4.9.4"; src = fetchFromGitHub { owner = "dgraph-io"; repo = "badger"; tag = "v${finalAttrs.version}"; - hash = "sha256-B4DXzcgfkYcHqcK8F7NGbLcZWPmojMW4poRfCLv2DXI="; + hash = "sha256-v/E53imP3wxf7n1nlA0izjdSDkq1mwx7//BcLDPugY4="; }; vendorHash = "sha256-KDIwEH83nPMJPJGTN3UgO00pjYwR17XqGdPXioP1YcY="; diff --git a/pkgs/by-name/ba/badrobot/package.nix b/pkgs/by-name/ba/badrobot/package.nix index 628c41978e11..6cc9b8a2af68 100644 --- a/pkgs/by-name/ba/badrobot/package.nix +++ b/pkgs/by-name/ba/badrobot/package.nix @@ -46,7 +46,7 @@ buildGoModule (finalAttrs: { likelihood that a compromised Operator would be able to obtain full cluster permissions. ''; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ jk ]; diff --git a/pkgs/by-name/ba/bandcampsync/package.nix b/pkgs/by-name/ba/bandcampsync/package.nix new file mode 100644 index 000000000000..3a598bfd55bf --- /dev/null +++ b/pkgs/by-name/ba/bandcampsync/package.nix @@ -0,0 +1,38 @@ +{ + lib, + python3, + fetchFromGitHub, +}: + +python3.pkgs.buildPythonApplication (finalAttrs: { + pname = "bandcampsync"; + version = "0.8.0"; + pyproject = true; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "meeb"; + repo = "bandcampsync"; + tag = "v${finalAttrs.version}"; + hash = "sha256-j370Kn95CQuGjwOoFMXNNQZ5odlR/0uiw02hN/UVAb8="; + }; + + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ + beautifulsoup4 + curl-cffi + ]; + + pythonImportsCheck = [ "bandcampsync" ]; + + meta = { + description = "Download your Bandcamp purchases automatically"; + homepage = "https://github.com/meeb/bandcampsync"; + changelog = "https://github.com/meeb/bandcampsync/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.haylin ]; + mainProgram = "bandcampsync"; + }; +}) diff --git a/pkgs/by-name/ba/bant/package.nix b/pkgs/by-name/ba/bant/package.nix index e5a72fca577d..483a5596f221 100644 --- a/pkgs/by-name/ba/bant/package.nix +++ b/pkgs/by-name/ba/bant/package.nix @@ -20,13 +20,13 @@ let in buildBazelPackage rec { pname = "bant"; - version = "0.2.10"; + version = "0.3.0"; src = fetchFromGitHub { owner = "hzeller"; repo = "bant"; rev = "v${version}"; - hash = "sha256-jFUPCNVoX4I69ibH+w6c41Gqlu8HosQ3DXQWa3lqUsc="; + hash = "sha256-T/BQRYCFAHkaGi5T485I9vbr3g7PzgIEHC27w6mg/3A="; }; bazelFlags = [ diff --git a/pkgs/by-name/ba/barrage/package.nix b/pkgs/by-name/ba/barrage/package.nix index 93ad9db5a828..ebbe395f37cf 100644 --- a/pkgs/by-name/ba/barrage/package.nix +++ b/pkgs/by-name/ba/barrage/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://lgames.sourceforge.io/Barrage/"; description = "Destructive action game"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "barrage"; maintainers = [ ]; inherit (SDL.meta) platforms; diff --git a/pkgs/by-name/ba/bartender/package.nix b/pkgs/by-name/ba/bartender/package.nix index 67a14d429c5c..3b62a9c9020e 100644 --- a/pkgs/by-name/ba/bartender/package.nix +++ b/pkgs/by-name/ba/bartender/package.nix @@ -62,7 +62,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { changelog = "https://downloads.macbartender.com/B2/updates/${ builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version }/rnotes.html"; - license = [ lib.licenses.unfree ]; + license = lib.licenses.unfree; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; maintainers = with lib.maintainers; [ stepbrobd diff --git a/pkgs/by-name/ba/bashate/package.nix b/pkgs/by-name/ba/bashate/package.nix index e405b8f66799..d0ee31928130 100644 --- a/pkgs/by-name/ba/bashate/package.nix +++ b/pkgs/by-name/ba/bashate/package.nix @@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec { description = "Style enforcement for bash programs"; mainProgram = "bashate"; homepage = "https://opendev.org/openstack/bashate"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; teams = [ lib.teams.openstack ]; }; diff --git a/pkgs/by-name/ba/bashmount/package.nix b/pkgs/by-name/ba/bashmount/package.nix index 2b8f6ca3c366..336d31a5b14b 100644 --- a/pkgs/by-name/ba/bashmount/package.nix +++ b/pkgs/by-name/ba/bashmount/package.nix @@ -2,6 +2,15 @@ lib, stdenv, fetchFromGitHub, + makeWrapper, + coreutils, + cryptsetup, + eject, + gnugrep, + gnused, + less, + udisks, + util-linux, }: stdenv.mkDerivation (finalAttrs: { @@ -15,6 +24,8 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "1irw47s6i1qwxd20cymzlfw5sv579cw877l27j3p66qfhgadwxrl"; }; + nativeBuildInputs = [ makeWrapper ]; + installPhase = '' mkdir -p $out/bin cp bashmount $out/bin @@ -31,6 +42,22 @@ stdenv.mkDerivation (finalAttrs: { cp NEWS $out/share/doc/bashmount ''; + postFixup = '' + wrapProgram $out/bin/bashmount \ + --prefix PATH : ${ + lib.makeBinPath [ + coreutils + cryptsetup + eject + gnugrep + gnused + less + udisks + util-linux + ] + } + ''; + meta = { homepage = "https://github.com/jamielinux/bashmount"; description = "Menu-driven bash script for the management of removable media with udisks"; diff --git a/pkgs/by-name/ba/bazaar/package.nix b/pkgs/by-name/ba/bazaar/package.nix index 945fd707bf14..0300802cf929 100644 --- a/pkgs/by-name/ba/bazaar/package.nix +++ b/pkgs/by-name/ba/bazaar/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "bazaar"; - version = "0.9.0"; + version = "0.9.1"; __structuredAttrs = true; strictDeps = true; @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "bazaar-org"; repo = "bazaar"; tag = "v${finalAttrs.version}"; - hash = "sha256-6MDrMXwtNcNJtnoRwfIKVulHu4FtVb4hhCtqIxmlz4A="; + hash = "sha256-9J+XI5JnV8Yfk3xRI/VM5RSG4eMafbw2rBRpPMIu5yA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ba/bazarr/package.nix b/pkgs/by-name/ba/bazarr/package.nix index fcb85a166a8b..3b531409b618 100644 --- a/pkgs/by-name/ba/bazarr/package.nix +++ b/pkgs/by-name/ba/bazarr/package.nix @@ -1,75 +1,112 @@ { - stdenv, lib, - fetchzip, - makeWrapper, - python3, - unar, + stdenv, + fetchFromGitHub, + fetchNpmDeps, + nodejs, + npmHooks, + dart-sass, + makeBinaryWrapper, + python313, ffmpeg, + unar, nixosTests, + nix-update-script, }: - let - runtimeProgDeps = [ - ffmpeg - unar - ]; + python = python313.withPackages (ps: [ + ps.lxml + ps.numpy + ps.pillow + ps.psycopg2 + ps.setuptools + ps.webrtcvad + ]); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bazarr"; version = "1.6.0"; - src = fetchzip { - url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip"; - hash = "sha256-LRcc2wg5u260yl3A7rRwBfldl6WOyvF2T9NKGTKabfw="; - stripRoot = false; + src = fetchFromGitHub { + owner = "morpheus65535"; + repo = "bazarr"; + tag = "v${finalAttrs.version}"; + hash = "sha256-r3H0JEcGYzQOTHVR/zONmtOIF+LnJd+qn2pcAj8vdOA="; }; - nativeBuildInputs = [ makeWrapper ]; + npmRoot = "frontend"; + npmDeps = fetchNpmDeps { + name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; + inherit (finalAttrs) src; + sourceRoot = "${finalAttrs.src.name}/frontend"; + hash = "sha256-cb++eqVtKZer9B1rwJ9WR4mZImnASeFU2MojgXAPWf4="; + }; - buildInputs = [ - (python3.withPackages (ps: [ - ps.lxml - ps.numpy - ps.gevent - ps.gevent-websocket - ps.pillow - ps.setuptools - ps.psycopg2 - ps.webrtcvad - ])) - ] - ++ runtimeProgDeps; + nativeBuildInputs = [ + nodejs + npmHooks.npmConfigHook + dart-sass + makeBinaryWrapper + ]; + + buildPhase = '' + runHook preBuild + pushd frontend + # sass-embedded's bundled Dart compiler won't run in the sandbox; use nixpkgs' dart-sass. + # https://github.com/sass/embedded-host-node/issues/334 + substituteInPlace node_modules/sass-embedded/dist/lib/src/compiler-path.js \ + --replace-fail 'compilerCommand = (() => {' 'compilerCommand = (() => { return ["dart-sass"];' + npm run build + popd + runHook postBuild + ''; installPhase = '' runHook preInstall - mkdir -p "$out"/{bin,share/${pname}} - cp -r * "$out/share/${pname}" + mkdir -p $out/share/bazarr/frontend + cp -r bazarr bazarr.py custom_libs libs migrations $out/share/bazarr/ + cp -r frontend/build $out/share/bazarr/frontend/build - # Add missing shebang and execute perms so that patchShebangs can do its - # thing. - sed -i "1i #!/usr/bin/env python3" "$out/share/${pname}/bazarr.py" - chmod +x "$out/share/${pname}/bazarr.py" + printf '%s' "${finalAttrs.version}" > $out/share/bazarr/VERSION - makeWrapper "$out/share/${pname}/bazarr.py" \ - "$out/bin/bazarr" \ - --suffix PATH : ${lib.makeBinPath runtimeProgDeps} + printf '%s' "${ + lib.generators.toKeyValue { } { + updatemethod = "External"; + updatemethodmessage = "Bazarr is managed by Nix. Update it through your system configuration."; + packageversion = finalAttrs.version; + packageauthor = "nixpkgs"; + } + }" > $out/share/bazarr/package_info + + makeWrapper ${lib.getExe python} $out/bin/bazarr \ + --add-flags $out/share/bazarr/bazarr.py \ + --prefix PATH : ${ + lib.makeBinPath [ + ffmpeg + unar + ] + } runHook postInstall ''; - passthru.tests = { - smoke-test = nixosTests.bazarr; + passthru = { + tests.smoke-test = nixosTests.bazarr; + updateScript = nix-update-script { }; }; meta = { description = "Subtitle manager for Sonarr and Radarr"; homepage = "https://www.bazarr.media/"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + changelog = "https://github.com/morpheus65535/bazarr/releases/tag/v${finalAttrs.version}"; + sourceProvenance = with lib.sourceTypes; [ fromSource ]; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ diogotcorreia ]; + maintainers = with lib.maintainers; [ + connor-grady + diogotcorreia + ]; mainProgram = "bazarr"; - platforms = lib.platforms.all; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ba/bazel-watcher/package.nix b/pkgs/by-name/ba/bazel-watcher/package.nix index 3017531eecb0..3bb61a93afcd 100644 --- a/pkgs/by-name/ba/bazel-watcher/package.nix +++ b/pkgs/by-name/ba/bazel-watcher/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "bazel-watcher"; - version = "0.29.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "bazel-watcher"; rev = "v${finalAttrs.version}"; - hash = "sha256-ssG2BFd2utB9xu9zYdcvZYLq+XF9ZOctxNGtpbrhLG8="; + hash = "sha256-5W39lT66Jid8qzeUADcuDPKR7UkTxtEOwaKUO6oHWtk="; }; vendorHash = "sha256-u1Zg/M9DSkwscy49qtPQygk1gyxKaPbhlFDYNtBQ9NY="; diff --git a/pkgs/by-name/ba/bazel_8/examples.nix b/pkgs/by-name/ba/bazel_8/examples.nix index 596600749b4b..38cc4da6ff97 100644 --- a/pkgs/by-name/ba/bazel_8/examples.nix +++ b/pkgs/by-name/ba/bazel_8/examples.nix @@ -49,7 +49,6 @@ in { aarch64-darwin = "sha256-FwHsg9P65Eu/n8PV7UW90bvBNG+U67zizRy6Krk32Yg="; aarch64-linux = "sha256-W8h2tCIauGnEvPpXje19bZUE/izHaCQ0Wj4nMaP3nkc="; - x86_64-darwin = "sha256-XIrGRmYDDRN3Kkt1dFWex1bPRMeIHAR+XWLqB/PpOAM="; x86_64-linux = "sha256-VBckTQAK5qeyi2ublk+Dcga5O5XZg3bfHR6Yaw6vSp0="; } .${stdenv.hostPlatform.system}; @@ -79,7 +78,6 @@ in { aarch64-darwin = "sha256-l6qJU0zGIKl12TYYsG5b+upswUA0hGE+VtQ9QnKpBh8="; aarch64-linux = "sha256-l6qJU0zGIKl12TYYsG5b+upswUA0hGE+VtQ9QnKpBh8="; - x86_64-darwin = "sha256-l6qJU0zGIKl12TYYsG5b+upswUA0hGE+VtQ9QnKpBh8="; x86_64-linux = "sha256-l6qJU0zGIKl12TYYsG5b+upswUA0hGE+VtQ9QnKpBh8="; } .${stdenv.hostPlatform.system}; @@ -110,7 +108,6 @@ in { aarch64-darwin = "sha256-50cAS1okGT1Mq3+TNLk2dk6OdBOAF2LdcskcYuVNOSY="; aarch64-linux = "sha256-2Oia7+2nzLrWeo/bK/5L7du5Y30DY+S0jit6e1ixJXw="; - x86_64-darwin = "sha256-+vgvj3ABm+vvXT7U7JxjuzIMwVAiUh1gcWZnFNzcmY0="; x86_64-linux = "sha256-kBnSlFRfYsotZTRMrTNhk8/106+BLzwuU6MIRXlD1jE="; } .${stdenv.hostPlatform.system}; diff --git a/pkgs/by-name/ba/bazel_9/examples.nix b/pkgs/by-name/ba/bazel_9/examples.nix index 27f848282eb4..97b262d983b5 100644 --- a/pkgs/by-name/ba/bazel_9/examples.nix +++ b/pkgs/by-name/ba/bazel_9/examples.nix @@ -64,7 +64,6 @@ in { aarch64-darwin = "sha256-Jth981+r20azC/CqoWN3LK5USm8zUIpL9Xt88+TcL1o="; aarch64-linux = "sha256-4E/QCSOXTN/dW65xz/n47tXW0PlHUOP1UP+TwJfMueI="; - x86_64-darwin = "sha256-t4JP4o3O9C9BehidQPVu4EATnUZodhFh1/ctITxD6JA="; x86_64-linux = "sha256-HzgFpbEBZ8efA5pwUsGZjt9bKiAXslB17OZQcm3cspc="; } .${stdenv.hostPlatform.system}; @@ -102,7 +101,6 @@ in { aarch64-darwin = "sha256-CbA4Kcn6656xnK6DkN4TZ7u1/mizA49Im9hRCU86TGs="; aarch64-linux = "sha256-CbA4Kcn6656xnK6DkN4TZ7u1/mizA49Im9hRCU86TGs="; - x86_64-darwin = "sha256-CbA4Kcn6656xnK6DkN4TZ7u1/mizA49Im9hRCU86TGs="; x86_64-linux = "sha256-CbA4Kcn6656xnK6DkN4TZ7u1/mizA49Im9hRCU86TGs="; } .${stdenv.hostPlatform.system}; @@ -141,7 +139,6 @@ in { aarch64-darwin = "sha256-uUl7PpR3jAKvj6VWspPE3IR4Gr/V2VrBv1MlTzOIZJs="; aarch64-linux = "sha256-uhcIwDk8NAZDBynzxWk+0fLP/2XadKQRl5BlFPjf4/8="; - x86_64-darwin = "sha256-vi3+/ps+dhDjqYHxWSnWOXhh1jWJWwb5ifUUhN4vxrg="; x86_64-linux = "sha256-YURF8Zjueq3BN5GfEx5L+C4hGmr5qfJc7OngqZ17384="; } .${stdenv.hostPlatform.system}; diff --git a/pkgs/by-name/bb/bbrew/package.nix b/pkgs/by-name/bb/bbrew/package.nix new file mode 100644 index 000000000000..6c0ed0daf9d2 --- /dev/null +++ b/pkgs/by-name/bb/bbrew/package.nix @@ -0,0 +1,45 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, + versionCheckHook, +}: + +buildGoModule (finalAttrs: { + pname = "bbrew"; + version = "2.3.1"; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "Valkyrie00"; + repo = "bold-brew"; + tag = "v${finalAttrs.version}"; + hash = "sha256-g74rBvBlw/rlLmZdJtIeIp0sba0Q6kFyhlHTwegOA+0="; + }; + + vendorHash = "sha256-5gFyfyerRKfq0uGkyIJ1W4XLhyRR5qPyhc/f2Y2skrI="; + + subPackages = [ "cmd/bbrew" ]; + + ldflags = [ + "-s" + "-w" + "-X bbrew/internal/services.AppVersion=${finalAttrs.version}" + ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "TUI for managing Homebrew, Flatpak, and Mac App Store packages"; + homepage = "https://bold-brew.com"; + changelog = "https://github.com/Valkyrie00/bold-brew/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tyceherrman ]; + platforms = lib.platforms.unix; + mainProgram = "bbrew"; + }; +}) diff --git a/pkgs/by-name/bc/bcompare/package.nix b/pkgs/by-name/bc/bcompare/package.nix index a55448023ecc..906a9d87def9 100644 --- a/pkgs/by-name/bc/bcompare/package.nix +++ b/pkgs/by-name/bc/bcompare/package.nix @@ -25,12 +25,10 @@ let sha256 = "sha256-CCSRNGWIYVKAoQVVJ8McDUtc45nK0S4CdamcT5uVlQM="; }; - x86_64-darwin = fetchurl { + aarch64-darwin = fetchurl { url = "https://www.scootersoftware.com/files/BCompareOSX-${version}.zip"; sha256 = "sha256-R+G2Zlr074i2W4GaEDweK0c0q8tnzjs6M0N106WVAlg="; }; - - aarch64-darwin = srcs.x86_64-darwin; }; src = srcs.${stdenv.hostPlatform.system} or throwSystem; diff --git a/pkgs/by-name/be/beancount-language-server/package.nix b/pkgs/by-name/be/beancount-language-server/package.nix index 882f15ea9ebb..2f34771dceb8 100644 --- a/pkgs/by-name/be/beancount-language-server/package.nix +++ b/pkgs/by-name/be/beancount-language-server/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Language Server Protocol (LSP) for beancount files"; mainProgram = "beancount-language-server"; homepage = "https://github.com/polarmutex/beancount-language-server"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ polarmutex ]; }; }) diff --git a/pkgs/by-name/be/bee/package.nix b/pkgs/by-name/be/bee/package.nix index d1e380341837..4a59f8d2bf50 100644 --- a/pkgs/by-name/be/bee/package.nix +++ b/pkgs/by-name/be/bee/package.nix @@ -51,7 +51,7 @@ buildGoModule (finalAttrs: { Bee is a Swarm node implementation, written in Go. ''; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = [ ]; }; }) diff --git a/pkgs/by-name/be/beekeeper-studio/package.nix b/pkgs/by-name/be/beekeeper-studio/package.nix index c5da0de573aa..d905565eec37 100644 --- a/pkgs/by-name/be/beekeeper-studio/package.nix +++ b/pkgs/by-name/be/beekeeper-studio/package.nix @@ -47,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: { asset = selectSystem { x86_64-linux = "beekeeper-studio_${finalAttrs.version}_amd64.deb"; aarch64-linux = "beekeeper-studio_${finalAttrs.version}_arm64.deb"; - x86_64-darwin = "Beekeeper-Studio-${finalAttrs.version}-mac.zip"; aarch64-darwin = "Beekeeper-Studio-${finalAttrs.version}-arm64-mac.zip"; }; in @@ -56,7 +55,6 @@ stdenv.mkDerivation (finalAttrs: { hash = selectSystem { x86_64-linux = "sha256-e5y7uBzdbDSUQKpxRjho+2kU3wx23spdSv1PwmJ30gA="; aarch64-linux = "sha256-iuZDeSYljiSRUqtLIA1BcrRaYoqg9dnlbRDLsetVkMQ="; - x86_64-darwin = "sha256-7iW40NPAU4C+gDZb7YmGFmTOnmg5V/yb9+6EW6MlyXU="; aarch64-darwin = "sha256-Jnm4Vfm9+6dXmjnI5gYpYW1g7Anl9xhIKXbQA2SGUDE="; }; }; @@ -158,7 +156,6 @@ stdenv.mkDerivation (finalAttrs: { "aarch64-linux" "x86_64-linux" "aarch64-darwin" - "x86_64-darwin" ]; }; }) diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix index 23af3cace5f0..a2e262f622fb 100644 --- a/pkgs/by-name/be/beeper/package.nix +++ b/pkgs/by-name/be/beeper/package.nix @@ -1,5 +1,6 @@ { lib, + runCommand, fetchurl, appimageTools, makeWrapper, @@ -10,13 +11,21 @@ }: let pname = "beeper"; - version = "4.2.957"; + version = "4.2.985"; src = fetchurl { url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}-x86_64.AppImage"; - hash = "sha256-wUGUwWopQ8ox2+UP5hXIIF2XVLQmZyhfb712S8JjTGk="; + hash = "sha256-oWJdpZL+Q8/jaI/WJfgXUisPASuvHkxU6rOeJkedHSM="; }; + # Beeper 4.2.985+ ships AppImages without the type-2 magic bytes + # (ASCII "AI" + 0x02 at ELF offset 8) that appimageTools.extract requires. + linuxSrc = runCommand "Beeper-${version}-appimage" { inherit src; } '' + cp $src $out + chmod +w $out + printf 'AI\x02' | dd of=$out bs=1 seek=8 conv=notrunc status=none + ''; appimageContents = appimageTools.extract { - inherit pname version src; + inherit pname version; + src = linuxSrc; postExtract = '' appRoot="$out/resources/app" @@ -35,7 +44,6 @@ let # hide version status element on about page otherwise an error message is shown sed -i '$ a\.subview-prefs-about > div:nth-child(2) {display: none;}' $appRoot/build-browser/*.css - ''; }; in @@ -89,6 +97,7 @@ appimageTools.wrapAppImage { maintainers = with lib.maintainers; [ jshcmpbll zh4ngx + aspauldingcode ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/by-name/be/bespokesynth/package.nix b/pkgs/by-name/be/bespokesynth/package.nix index 36ed0ff97e27..4c2181fe9523 100644 --- a/pkgs/by-name/be/bespokesynth/package.nix +++ b/pkgs/by-name/be/bespokesynth/package.nix @@ -163,7 +163,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Software modular synth with controllers support, scripting and VST"; homepage = "https://www.bespokesynth.com/"; - license = [ lib.licenses.gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ astro tobiasBora diff --git a/pkgs/by-name/be/bettercap/package.nix b/pkgs/by-name/be/bettercap/package.nix index 2cbeff80b3a8..394cf90956a9 100644 --- a/pkgs/by-name/be/bettercap/package.nix +++ b/pkgs/by-name/be/bettercap/package.nix @@ -43,7 +43,7 @@ buildGoModule (finalAttrs: { in realtime, sniff for credentials and much more. ''; homepage = "https://www.bettercap.org/"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; mainProgram = "bettercap"; # Broken on darwin for Go toolchain > 1.22, with error: # 'link: golang.org/x/net/internal/socket: invalid reference to syscall.recvmsg' diff --git a/pkgs/by-name/be/betterdisplay/package.nix b/pkgs/by-name/be/betterdisplay/package.nix index de3ea22f032d..38f5ca39b283 100644 --- a/pkgs/by-name/be/betterdisplay/package.nix +++ b/pkgs/by-name/be/betterdisplay/package.nix @@ -50,7 +50,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "Unlock your displays on your Mac! Flexible HiDPI scaling, XDR/HDR extra brightness, virtual screens, DDC control, extra dimming, PIP/streaming, EDID override and lots more"; homepage = "https://betterdisplay.pro/"; changelog = "https://github.com/waydabber/BetterDisplay/releases/tag/v${finalAttrs.version}"; - license = [ lib.licenses.unfree ]; + license = lib.licenses.unfree; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; maintainers = with lib.maintainers; [ DimitarNestorov ]; platforms = lib.platforms.darwin; diff --git a/pkgs/by-name/bi/bic/package.nix b/pkgs/by-name/bi/bic/package.nix index 2279faf537e1..130894cd6d09 100644 --- a/pkgs/by-name/bi/bic/package.nix +++ b/pkgs/by-name/bi/bic/package.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation { bic This a project that allows developers to explore and test C-APIs using a read eval print loop, also known as a REPL. ''; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; homepage = "https://github.com/hexagonal-sun/bic"; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ hexagonal-sun ]; diff --git a/pkgs/by-name/bi/bilibili-tui/package.nix b/pkgs/by-name/bi/bilibili-tui/package.nix index c582a809336d..258f6f9a9549 100644 --- a/pkgs/by-name/bi/bilibili-tui/package.nix +++ b/pkgs/by-name/bi/bilibili-tui/package.nix @@ -5,8 +5,9 @@ nix-update-script, stdenv, pkg-config, - makeWrapper, + makeBinaryWrapper, openssl, + cacert, mpv-unwrapped, yt-dlp-light, @@ -14,23 +15,28 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "bilibili-tui"; - version = "1.0.9"; + version = "1.0.12"; src = fetchFromGitHub { owner = "MareDevi"; repo = "bilibili-tui"; tag = "v${finalAttrs.version}"; - hash = "sha256-LACNDpVhlYEgT3fN+Ff2MVipblUqPlqwOUpTLaXSCbk="; + hash = "sha256-G2aoPw8SMu3ytHbxcQrf1iH6i+b9viM+/EYorv6j5bg="; }; - cargoHash = "sha256-q3jRjmzQA64sZjVShoEmu1x2CFOAgBGgZYyTq7Lg4is="; + cargoHash = "sha256-ojAN98of7vZp/F1n0a/88e6k4nBPG9HPKyTO1xc8o4Q="; - nativeBuildInputs = [ makeWrapper ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ]; + nativeBuildInputs = [ + makeBinaryWrapper + ] + ++ lib.optional (!stdenv.hostPlatform.isDarwin) pkg-config; - buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ]; + buildInputs = lib.optional (!stdenv.hostPlatform.isDarwin) openssl; env.OPENSSL_NO_VENDOR = true; + nativeCheckInputs = [ cacert ]; + # Wrap mpv as fallback; users should prefer their system's mpv in PATH postInstall = lib.optionalString withMpv '' wrapProgram $out/bin/bilibili-tui \ diff --git a/pkgs/by-name/bi/biome/package.nix b/pkgs/by-name/bi/biome/package.nix index 21e65a8d6c90..0a577ee4ef5e 100644 --- a/pkgs/by-name/bi/biome/package.nix +++ b/pkgs/by-name/bi/biome/package.nix @@ -11,16 +11,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "biome"; - version = "2.5.0"; + version = "2.5.4"; src = fetchFromGitHub { owner = "biomejs"; repo = "biome"; rev = "@biomejs/biome@${finalAttrs.version}"; - hash = "sha256-d8MhD749rkLWeCKDBxhw2aF3G09h8kug5w2Q40JSkt4="; + hash = "sha256-x8oMtugVmN8Z7obBsiZxLZ5Ikj/oGPXEgg/8M8dsRvc="; }; - cargoHash = "sha256-z1KgScoH9retj0qNd6eOTjejjQypfVkha0ae71Z6TSg="; + cargoHash = "sha256-yV+lvPLPGtWCtbA39NVH1T1Sl1qn1MTsQIVRo3c9+Dg="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/bi/bit/package.nix b/pkgs/by-name/bi/bit/package.nix index ad1a371f33e3..09945a711270 100644 --- a/pkgs/by-name/bi/bit/package.nix +++ b/pkgs/by-name/bi/bit/package.nix @@ -26,7 +26,7 @@ buildGoModule (finalAttrs: { meta = { description = "Command-line tool for git"; homepage = "https://github.com/chriswalz/bit"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; mainProgram = "bit"; }; diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index 305fcc575591..00fe90cf9a4d 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -246,7 +246,6 @@ buildNpmPackage (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "bitwarden"; diff --git a/pkgs/by-name/bl/blackfire/package.nix b/pkgs/by-name/bl/blackfire/package.nix index 0205b58df2db..07e82ae20747 100644 --- a/pkgs/by-name/bl/blackfire/package.nix +++ b/pkgs/by-name/bl/blackfire/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "blackfire"; - version = "2026.6.1"; + version = "2026.7.0"; src = passthru.sources.${stdenv.hostPlatform.system} @@ -60,23 +60,19 @@ stdenv.mkDerivation rec { sources = { "x86_64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; - hash = "sha256-doeqXoS0B7AyzyhkLB9wUC6iuD0c2KIhAIEPeYaDC5E="; + hash = "sha256-GzhcK+7NrQEP48XFmOQ9PVrvvsUzrCy/VRcshTSic9E="; }; "i686-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - hash = "sha256-bQWhiSw9/gGyGoLEyz6BHaRPNLxuqouiobBMfB5ytYk="; + hash = "sha256-F6U7YHSBE5Ogie2yBSGGUKt0XsE8jogKi2GP28H1Eeo="; }; "aarch64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - hash = "sha256-B+rhmnM2sVICVLDcYq2OEp402Wz6kywCRqeS95Vdzlw="; + hash = "sha256-eDJAjd/5omgUJ6sw5kCqxu7Ok2AYei/WGlXV96Ynd/U="; }; "aarch64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - hash = "sha256-Ofs9raAtx/duS8dXWfvjKGzhJr3j9+gkH8lP/VLfnkE="; - }; - "x86_64-darwin" = fetchurl { - url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - hash = "sha256-+rMiD/vFFIA8dR3quUnpr8uDNTdvnXyYjT8brgiOxBI="; + hash = "sha256-xzWw6us+9/r8lMMHZTgE++rX7ZZShAL7L7fOneALA4Q="; }; }; @@ -112,7 +108,6 @@ stdenv.mkDerivation rec { "x86_64-linux" "aarch64-linux" "i686-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/bl/blackfire/php-probe.nix b/pkgs/by-name/bl/blackfire/php-probe.nix index 51181437257b..a85e267b8278 100644 --- a/pkgs/by-name/bl/blackfire/php-probe.nix +++ b/pkgs/by-name/bl/blackfire/php-probe.nix @@ -59,16 +59,6 @@ let "8.5" = "sha256-GpvF7cgcTXLguwQCj0vOwtn7EbUQYqolzt7JPr8RtCM="; }; }; - "x86_64-darwin" = { - system = "amd64"; - hash = { - "8.1" = "sha256-bRoTC959irVHSTbMmBEQPw2O5ecoMj4zJK+a5AT1i7M="; - "8.2" = "sha256-6DGh0Ajlxt6L7acen3171gfyUajmb9k6fAY+h56BZCI="; - "8.3" = "sha256-KhZ5KD+9lCC+4bSVZPfkvWpWgRmOZ9iL87NfQ/YMWzw="; - "8.4" = "sha256-DRU0I60T9ZvIHYU82qbHFmEQwn3Vrp/MGmhiKzOm3og="; - "8.5" = "sha256-LrGek8mg9tBhccLGBKeokKsiYSxitxE+MP9sya3H4aY="; - }; - }; }; makeSource = @@ -166,7 +156,6 @@ stdenv.mkDerivation (finalAttrs: { "x86_64-linux" "aarch64-linux" "i686-linux" - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/bl/blackhole/package.nix b/pkgs/by-name/bl/blackhole/package.nix index b84a1a42b8b1..fa3f1a861c34 100644 --- a/pkgs/by-name/bl/blackhole/package.nix +++ b/pkgs/by-name/bl/blackhole/package.nix @@ -7,15 +7,18 @@ nix-update-script, channel ? "256ch", }: +let + numChannels = lib.toIntBase10 (lib.removeSuffix "ch" channel); +in stdenv.mkDerivation (finalAttrs: { pname = "blackhole"; - version = "0.6.1"; + version = "0.7.1"; src = fetchFromGitHub { owner = "existentialaudio"; repo = "BlackHole"; tag = "v${finalAttrs.version}"; - hash = "sha256-jFKi5LJdTOMFa1mErH6WsjgCtLCKzwpgn2+T3Fp9MtQ="; + hash = "sha256-kuIaoXA0K7SFPXKFHqcilTbf1zn9Ol3JYVpnkFuQEZg="; }; nativeBuildInputs = [ @@ -31,14 +34,14 @@ stdenv.mkDerivation (finalAttrs: { "-configuration" "Release" "PRODUCT_BUNDLE_IDENTIFIER=${finalAttrs.bundleId}" - "GCC_PREPROCESSOR_DEFINITIONS=$GCC_PREPROCESSOR_DEFINITIONS kDriver_Name=\\\"blackhole${channel}\\\" kPlugIn_BundleID=\\\"${finalAttrs.bundleId}\\\" kPlugIn_Icon=\\\"BlackHole.icns\\\"" + "GCC_PREPROCESSOR_DEFINITIONS=$GCC_PREPROCESSOR_DEFINITIONS kNumber_Of_Channels=${toString numChannels} kDriver_Name=\\\"BlackHole\\\" kPlugIn_BundleID=\\\"${finalAttrs.bundleId}\\\" kPlugIn_Icon=\\\"BlackHole.icns\\\"" ]; installPhase = '' runHook preInstall mkdir -p $out/Library/Audio/Plug-Ins/HAL - mv Products/Release/BlackHole.driver $out/Library/Audio/Plug-Ins/HAL/Blackhole${channel}.driver + mv Products/Release/BlackHole.driver $out/Library/Audio/Plug-Ins/HAL/BlackHole${channel}.driver runHook postInstall ''; diff --git a/pkgs/by-name/bl/blast-bin/package.nix b/pkgs/by-name/bl/blast-bin/package.nix index 7436773c178f..a6a5151ac050 100644 --- a/pkgs/by-name/bl/blast-bin/package.nix +++ b/pkgs/by-name/bl/blast-bin/package.nix @@ -26,10 +26,6 @@ let url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-aarch64-linux.tar.gz"; hash = "sha256-1EeiMu08R9Glq8qRky4OTT5lQPLJcM7iaqUrmUOS4MI="; }; - x86_64-darwin = fetchurl { - url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-x64-macosx.tar.gz"; - hash = "sha256-fu4edyD12q8G452ckrEl2Qct5+uB9JnABd7bCLkyMkw="; - }; aarch64-darwin = fetchurl { url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-aarch64-macosx.tar.gz"; hash = "sha256-6NpPNLBCHaBRscLZ5fjh5Dv3bjjPk2Gh2+L7xEtiJNs="; @@ -72,7 +68,6 @@ stdenv.mkDerivation { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/bl/blastem/package.nix b/pkgs/by-name/bl/blastem/package.nix index 2881fe114b73..b58c6bb6101a 100644 --- a/pkgs/by-name/bl/blastem/package.nix +++ b/pkgs/by-name/bl/blastem/package.nix @@ -74,7 +74,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "i686-linux" "x86_64-linux" - "x86_64-darwin" ]; }; }) diff --git a/pkgs/by-name/bl/blaze/package.nix b/pkgs/by-name/bl/blaze/package.nix index 2901db3175cd..345e5d6912b0 100644 --- a/pkgs/by-name/bl/blaze/package.nix +++ b/pkgs/by-name/bl/blaze/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "High performance C++ math library"; homepage = "https://bitbucket.org/blaze-lib/blaze"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/bl/bleep/package.nix b/pkgs/by-name/bl/bleep/package.nix index 2ed661c7138e..3aa0a27072e9 100644 --- a/pkgs/by-name/bl/bleep/package.nix +++ b/pkgs/by-name/bl/bleep/package.nix @@ -12,14 +12,12 @@ let platform = { x86_64-linux = "x86_64-pc-linux"; - x86_64-darwin = "x86_64-apple-darwin"; aarch64-darwin = "arm64-apple-darwin"; } ."${stdenvNoCC.system}" or (throw "unsupported system ${stdenvNoCC.hostPlatform.system}"); hash = { x86_64-linux = "sha256-SGV0fEuwmGwpqmD42a+x0fIK50RWSHEYDesH4obgRhg="; - x86_64-darwin = "sha256-fOeYUchUE1Jj4xSrYjljEUpGrW8cvev7d/qywc81vFo="; aarch64-darwin = "sha256-qL0hjEdfkN62NDvhlzVgW4TYWv0IReo2Fo5eVhUaOrI="; } ."${stdenvNoCC.system}" or (throw "unsupported system ${stdenvNoCC.hostPlatform.system}"); @@ -73,7 +71,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { mainProgram = "bleep"; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" ]; maintainers = with lib.maintainers; [ kristianan ]; diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix index c4d80135ebf5..ff7db4ee1495 100644 --- a/pkgs/by-name/bl/blender/package.nix +++ b/pkgs/by-name/bl/blender/package.nix @@ -453,7 +453,6 @@ stdenv'.mkDerivation (finalAttrs: { platforms = [ "aarch64-darwin" "aarch64-linux" - "x86_64-darwin" "x86_64-linux" ]; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/bl/blendfarm/package.nix b/pkgs/by-name/bl/blendfarm/package.nix index de227c59e8d6..a96e67f8f949 100644 --- a/pkgs/by-name/bl/blendfarm/package.nix +++ b/pkgs/by-name/bl/blendfarm/package.nix @@ -134,7 +134,7 @@ buildDotnetModule rec { meta = { description = "Open-source, cross-platform, stand-alone, Network Renderer for Blender"; homepage = "https://github.com/LogicReinc/LogicReinc.BlendFarm"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ gador ]; mainProgram = "blendfarm-nix"; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/bl/blink1-tool/package.nix b/pkgs/by-name/bl/blink1-tool/package.nix index 2894ddac25e3..36ddfee0a476 100644 --- a/pkgs/by-name/bl/blink1-tool/package.nix +++ b/pkgs/by-name/bl/blink1-tool/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Command line client for the blink(1) notification light"; homepage = "https://blink1.thingm.com/"; - license = with lib.licenses; [ cc-by-sa-40 ]; + license = lib.licenses.cc-by-sa-40; maintainers = with lib.maintainers; [ cransom ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "blink1-tool"; diff --git a/pkgs/by-name/bl/blockattack/package.nix b/pkgs/by-name/bl/blockattack/package.nix index aafab547514c..0d8d99da8cc9 100644 --- a/pkgs/by-name/bl/blockattack/package.nix +++ b/pkgs/by-name/bl/blockattack/package.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Open source clone of Panel de Pon (aka Tetris Attack)"; broken = stdenv.hostPlatform.isDarwin; changelog = "https://github.com/blockattack/blockattack-game/blob/${finalAttrs.src.rev}/CHANGELOG.md"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "blockattack"; maintainers = [ ]; inherit (SDL2.meta) platforms; diff --git a/pkgs/by-name/bl/bloop/package.nix b/pkgs/by-name/bl/bloop/package.nix index 65dbf840fb6e..0fb6d58c68c8 100644 --- a/pkgs/by-name/bl/bloop/package.nix +++ b/pkgs/by-name/bl/bloop/package.nix @@ -86,7 +86,6 @@ stdenv.mkDerivation rec { mainProgram = "bloop"; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" ]; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/bl/blueutil/package.nix b/pkgs/by-name/bl/blueutil/package.nix index 31d6eaf1cadd..6f13a65ab4f1 100644 --- a/pkgs/by-name/bl/blueutil/package.nix +++ b/pkgs/by-name/bl/blueutil/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + llvmPackages, testers, nix-update-script, }: @@ -17,7 +18,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Qw5c9dp7wpuOcQSLsg1pfJ+NbrEtme2o6nKD3Ba3A3M="; }; + # TODO: Remove when NixOS/nixpkgs#536365 reaches master. + nativeBuildInputs = [ llvmPackages.lld ]; + env.NIX_CFLAGS_COMPILE = "-Wall -Wextra -Werror -mmacosx-version-min=10.9 -framework Foundation -framework IOBluetooth"; + # TODO: Remove when NixOS/nixpkgs#536365 reaches master. + env.NIX_CFLAGS_LINK = "--ld-path=${lib.getExe' llvmPackages.lld "ld64.lld"}"; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/bl/bluez-alsa/package.nix b/pkgs/by-name/bl/bluez-alsa/package.nix index 3bdce7e545e1..41fe72114c04 100644 --- a/pkgs/by-name/bl/bluez-alsa/package.nix +++ b/pkgs/by-name/bl/bluez-alsa/package.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { BluezALSA if you disable `bluetooth-discover` and `bluez5-discover` modules in PA and configure it to play/capture sound over `bluealsa` PCM. ''; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "bluealsa"; maintainers = with lib.maintainers; [ oxij ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/bl/bluez-tools/package.nix b/pkgs/by-name/bl/bluez-tools/package.nix index 66ddbe928818..e252d03e6278 100644 --- a/pkgs/by-name/bl/bluez-tools/package.nix +++ b/pkgs/by-name/bl/bluez-tools/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/khvzak/bluez-tools"; description = "Set of tools to manage bluetooth devices for linux"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "bt-agent"; maintainers = [ ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/bo/boltbrowser/package.nix b/pkgs/by-name/bo/boltbrowser/package.nix index 85393e32c2ae..7b152f3fb3b0 100644 --- a/pkgs/by-name/bo/boltbrowser/package.nix +++ b/pkgs/by-name/bo/boltbrowser/package.nix @@ -20,7 +20,7 @@ buildGoModule (finalAttrs: { meta = { description = "CLI Browser for BoltDB files"; homepage = "https://github.com/br0xen/boltbrowser"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; mainProgram = "boltbrowser"; }; diff --git a/pkgs/by-name/bo/bomly/package.nix b/pkgs/by-name/bo/bomly/package.nix index 281ef18c8064..02667684cf59 100644 --- a/pkgs/by-name/bo/bomly/package.nix +++ b/pkgs/by-name/bo/bomly/package.nix @@ -11,7 +11,7 @@ buildGoModule (finalAttrs: { pname = "bomly"; - version = "0.16.1"; + version = "0.18.0"; __structuredAttrs = true; @@ -19,10 +19,10 @@ buildGoModule (finalAttrs: { owner = "bomly-dev"; repo = "bomly-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-RJqYRCnE4lqR68lP9hL9hTOxXS3cPEgspBn2JgvffyM="; + hash = "sha256-U7h9U4wiKohJQUauD8lmTScEWpT0kHZobJnJp8u0VbI="; }; - vendorHash = "sha256-W7FfqWV86D8fXZ4nm/0IVZuqocgo8/Sd9DA1Ef4SJ/4="; + vendorHash = "sha256-rO1hymsyc6Ar7PtNLymP66tKK6X6mwVz4kQt4UzzwDI="; # .gitattributes excludes all testdata from the GitHub tarball postPatch = '' diff --git a/pkgs/by-name/bo/bookstack/package.nix b/pkgs/by-name/bo/bookstack/package.nix index e039d2c5f30d..dc23a741a899 100644 --- a/pkgs/by-name/bo/bookstack/package.nix +++ b/pkgs/by-name/bo/bookstack/package.nix @@ -8,16 +8,16 @@ php83.buildComposerProject2 (finalAttrs: { pname = "bookstack"; - version = "26.05.1"; + version = "26.05.2"; src = fetchFromGitHub { owner = "bookstackapp"; repo = "bookstack"; tag = "v${finalAttrs.version}"; - hash = "sha256-g68wTZ5jRwXEKvAF9nLfKfWGf1FDD15msSkXzzJkVDQ="; + hash = "sha256-AYOl84DY13A5HnyUVY97kelYgoTJyq8nzeaHoksWXtI="; }; - vendorHash = "sha256-YJwJp+OtrCDgGFsZAjdlSx0LoxQFbylqCNW90MF8Kzo="; + vendorHash = "sha256-m98QXFqvdomVEVs2P8gnoKaYEBNYe/CchSvBEc448ko="; passthru = { phpPackage = php83; diff --git a/pkgs/by-name/bo/bookworm/package.nix b/pkgs/by-name/bo/bookworm/package.nix index 3bb6790f0574..3378df6a5ef3 100644 --- a/pkgs/by-name/bo/bookworm/package.nix +++ b/pkgs/by-name/bo/bookworm/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { pname = "bookworm"; - version = "unstable-2026-05-28"; + version = "1.1.2-unstable-2026-05-28"; src = fetchFromGitHub { owner = "babluboy"; diff --git a/pkgs/by-name/bo/boundary/package.nix b/pkgs/by-name/bo/boundary/package.nix index 6645a16a3ccd..c0c2ead360fc 100644 --- a/pkgs/by-name/bo/boundary/package.nix +++ b/pkgs/by-name/bo/boundary/package.nix @@ -15,13 +15,11 @@ stdenv.mkDerivation rec { suffix = selectSystem { x86_64-linux = "linux_amd64"; aarch64-linux = "linux_arm64"; - x86_64-darwin = "darwin_amd64"; aarch64-darwin = "darwin_arm64"; }; hash = selectSystem { x86_64-linux = "sha256-S5wt4Wy2SfO+36YwxQo86vnSIv4I0tMdfXro3i2qS6k="; aarch64-linux = "sha256-bu+tYL5uHs67JG1MxCUDIQ9xwYxArbz/FElN0QCXNU4="; - x86_64-darwin = "sha256-sRPq9+JnKYD5+0JVqhfGpCflHZgFdsrPprJqfxuAlpI="; aarch64-darwin = "sha256-PEaxwEKCidLvDbMSfXZ2ehWOwblLjzU+yy9Qq9tavtw="; }; in diff --git a/pkgs/by-name/bo/boundary/update.sh b/pkgs/by-name/bo/boundary/update.sh index 660f44964a95..a163881d604c 100644 --- a/pkgs/by-name/bo/boundary/update.sh +++ b/pkgs/by-name/bo/boundary/update.sh @@ -26,13 +26,11 @@ replace_sha() { BOUNDARY_VER=$(curl -Ls -w "%{url_effective}" -o /dev/null https://github.com/hashicorp/boundary/releases/latest | awk -F'/' '{print $NF}' | sed 's/v//') BOUNDARY_LINUX_X64_SHA256=$(calc_hash "$BOUNDARY_VER" "linux_amd64") -BOUNDARY_DARWIN_X64_SHA256=$(calc_hash "$BOUNDARY_VER" "darwin_amd64") BOUNDARY_LINUX_AARCH64_SHA256=$(calc_hash "$BOUNDARY_VER" "linux_arm64") BOUNDARY_DARWIN_AARCH64_SHA256=$(calc_hash "$BOUNDARY_VER" "darwin_arm64") sed -i "s/version = \".*\"/version = \"$BOUNDARY_VER\"/" "$NIX_DRV" replace_sha "x86_64-linux" "$BOUNDARY_LINUX_X64_SHA256" -replace_sha "x86_64-darwin" "$BOUNDARY_DARWIN_X64_SHA256" replace_sha "aarch64-linux" "$BOUNDARY_LINUX_AARCH64_SHA256" replace_sha "aarch64-darwin" "$BOUNDARY_DARWIN_AARCH64_SHA256" diff --git a/pkgs/by-name/bo/bounty/package.nix b/pkgs/by-name/bo/bounty/package.nix index 3f2a43d4e5ad..d16d4c6dc29d 100644 --- a/pkgs/by-name/bo/bounty/package.nix +++ b/pkgs/by-name/bo/bounty/package.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage { meta = { description = "CLI tool for bountybot.dev"; homepage = "https://github.com/ghbountybot/cli"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ andrewgazelka ]; mainProgram = "bounty"; }; diff --git a/pkgs/by-name/bo/box-cli/sources.json b/pkgs/by-name/bo/box-cli/sources.json index 10c07df913c5..5b805dbf81e9 100644 --- a/pkgs/by-name/bo/box-cli/sources.json +++ b/pkgs/by-name/bo/box-cli/sources.json @@ -10,10 +10,6 @@ "filename": "box-linux-arm64", "hash": "sha256-V2Sk6C1ZTRWlYQ2bVQTvK6PU8BkBPkmJMjUAo2Ul6+Q=" }, - "x86_64-darwin": { - "filename": "box-darwin-x64", - "hash": "sha256-QI+ecq0O4dkKqdIvkONcYdXsS+EQLFIU35ulKGNSCRE=" - }, "aarch64-darwin": { "filename": "box-darwin-arm64", "hash": "sha256-cyjMUGkWfNOggvtBfVqCijmcAj0P2SuFQORwg9EWbn0=" diff --git a/pkgs/by-name/bo/box-cli/update.sh b/pkgs/by-name/bo/box-cli/update.sh index 3656eb168b46..093689c68b3f 100755 --- a/pkgs/by-name/bo/box-cli/update.sh +++ b/pkgs/by-name/bo/box-cli/update.sh @@ -32,7 +32,6 @@ echo "Updating box-cli from $old_version to $version" declare -A platforms=( [x86_64-linux]="box-linux-x64" [aarch64-linux]="box-linux-arm64" - [x86_64-darwin]="box-darwin-x64" [aarch64-darwin]="box-darwin-arm64" ) diff --git a/pkgs/by-name/br/brave/make-brave.nix b/pkgs/by-name/br/brave/make-brave.nix index 497820c9f4cf..fd018d50a3d5 100644 --- a/pkgs/by-name/br/brave/make-brave.nix +++ b/pkgs/by-name/br/brave/make-brave.nix @@ -307,7 +307,6 @@ stdenv.mkDerivation { "aarch64-linux" "x86_64-linux" "aarch64-darwin" - "x86_64-darwin" ]; mainProgram = "brave"; }; diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix index f42a60bd89b2..a5721a172127 100644 --- a/pkgs/by-name/br/brave/package.nix +++ b/pkgs/by-name/br/brave/package.nix @@ -3,24 +3,20 @@ let pname = "brave"; - version = "1.92.139"; + version = "1.92.140"; allArchives = { aarch64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; - hash = "sha256-CkCpXgP4InjfjuhKqG66OjuZcqq7VLLK3/n+7fXpMj0="; + hash = "sha256-erH7ydVvVykPKYyrIRsn/FCh/ZCU0G+WrubOtfAxFYA="; }; x86_64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-UFQV8iBsa6HdUhGGngpi341o41yRoenkxbG2M90O62A="; + hash = "sha256-IB2jRvtO30OAqyEZRgeuyNU9eLgIXJj7rLOooZcDuKY="; }; aarch64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip"; - hash = "sha256-65qGzjXZfY5eTWbxTA9R3jN2F0CdkXnHXGVfw3spujo="; - }; - x86_64-darwin = { - url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip"; - hash = "sha256-XPKKB/X8w5Neuxeluc5OFZVN1thqZ0Cf/pFTP4GY2/o="; + hash = "sha256-g7R8Sz3apcIMrQX6xqWiz0MMDru4hQQj5Uauq59BE/o="; }; }; diff --git a/pkgs/by-name/br/brave/update.sh b/pkgs/by-name/br/brave/update.sh index f806154aa9dc..ccb7c9b826b0 100755 --- a/pkgs/by-name/br/brave/update.sh +++ b/pkgs/by-name/br/brave/update.sh @@ -8,7 +8,6 @@ latestVersion="$(curl --fail -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://ap hashAarch64="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/brave/brave-browser/releases/download/v${latestVersion}/brave-browser_${latestVersion}_arm64.deb")")" hashAmd64="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/brave/brave-browser/releases/download/v${latestVersion}/brave-browser_${latestVersion}_amd64.deb")")" hashAarch64Darwin="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/brave/brave-browser/releases/download/v${latestVersion}/brave-v${latestVersion}-darwin-arm64.zip")")" -hashAmd64Darwin="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/brave/brave-browser/releases/download/v${latestVersion}/brave-v${latestVersion}-darwin-x64.zip")")" cat > $SCRIPT_DIR/package.nix << EOF # Expression generated by update.sh; do not edit it by hand! @@ -31,10 +30,6 @@ let url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-v\${version}-darwin-arm64.zip"; hash = "${hashAarch64Darwin}"; }; - x86_64-darwin = { - url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-v\${version}-darwin-x64.zip"; - hash = "${hashAmd64Darwin}"; - }; }; archive = diff --git a/pkgs/by-name/br/breitbandmessung/package.nix b/pkgs/by-name/br/breitbandmessung/package.nix index 9b8e37db0735..a696d13904a1 100644 --- a/pkgs/by-name/br/breitbandmessung/package.nix +++ b/pkgs/by-name/br/breitbandmessung/package.nix @@ -18,7 +18,7 @@ let sources = import ./sources.nix; systemArgs = - rec { + { x86_64-linux = { src = fetchurl sources.x86_64-linux; @@ -57,8 +57,8 @@ let ''; }; - x86_64-darwin = { - src = fetchurl sources.x86_64-darwin; + aarch64-darwin = { + src = fetchurl sources.aarch64-darwin; nativeBuildInputs = [ undmg ]; @@ -74,8 +74,6 @@ let runHook postInstall ''; }; - - aarch64-darwin = x86_64-darwin; } .${system} or { src = throw "Unsupported system: ${system}"; @@ -97,7 +95,6 @@ stdenv.mkDerivation ( maintainers = with lib.maintainers; [ b4dm4n ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/br/breitbandmessung/sources.nix b/pkgs/by-name/br/breitbandmessung/sources.nix index cb27fc7b61c6..48d21c728e1a 100644 --- a/pkgs/by-name/br/breitbandmessung/sources.nix +++ b/pkgs/by-name/br/breitbandmessung/sources.nix @@ -4,7 +4,7 @@ url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-3.11.0-linux.deb"; sha256 = "sha256-kNuR+zcKEdZ9p0HEajmFQ3TIUz1z2Ao098QNCK6x5lg="; }; - x86_64-darwin = { + aarch64-darwin = { url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-3.11.0-mac.dmg"; sha256 = "sha256-pKI4Kg4ngXYzyZnzmlijIxmzoCKshdQao1v9JWaAV50="; }; diff --git a/pkgs/by-name/br/breitbandmessung/update.sh b/pkgs/by-name/br/breitbandmessung/update.sh index da982adf933b..88dc7b6e2b36 100755 --- a/pkgs/by-name/br/breitbandmessung/update.sh +++ b/pkgs/by-name/br/breitbandmessung/update.sh @@ -20,7 +20,7 @@ if [[ $current != $latest ]]; then url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-${latest}-linux.deb"; sha256 = "${linux_hash}"; }; - x86_64-darwin = { + aarch64-darwin = { url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-${latest}-mac.dmg"; sha256 = "${darwin_hash}"; }; diff --git a/pkgs/by-name/br/brewtarget/package.nix b/pkgs/by-name/br/brewtarget/package.nix index 334d8e2ba912..cffed27593d7 100644 --- a/pkgs/by-name/br/brewtarget/package.nix +++ b/pkgs/by-name/br/brewtarget/package.nix @@ -26,6 +26,9 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; + __structuredAttrs = true; + strictDeps = true; + postPatch = '' # 3 sed statements from below derived from AUR # Disable boost-stacktrace_backtrace, requires an optional boost lib that's only built in Debianland @@ -41,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: { cmake ninja pkg-config + qt6.qttools qt6.wrapQtAppsHook wrapGAppsHook3 pandoc @@ -51,7 +55,6 @@ stdenv.mkDerivation (finalAttrs: { qt6.qtbase qt6.qtmultimedia qt6.qtsvg - qt6.qttools xercesc xalanc ]; @@ -66,6 +69,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Open source beer recipe creation tool"; mainProgram = "brewtarget"; homepage = "https://www.brewtarget.beer"; + changelog = "https://github.com/Brewtarget/brewtarget/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/br/brioche/librusty_v8.nix b/pkgs/by-name/br/brioche/librusty_v8.nix index 00cbd562c0ae..a15d2d5b2e14 100644 --- a/pkgs/by-name/br/brioche/librusty_v8.nix +++ b/pkgs/by-name/br/brioche/librusty_v8.nix @@ -7,7 +7,6 @@ fetchLibrustyV8 { # NOTE; Follows supported platforms of package (see meta.platforms attribute)! x86_64-linux = "167yh6wabn154axrylam4p76n5a411rqjdgaza4dwsfc5cg2zvv2"; aarch64-linux = "1lmpqndmv9lyzsca1sx4prw76fsnk63cr1i15jdmk764j3zyyki6"; - x86_64-darwin = "1zdlwgq3kgd931ppd9afvqkn45vg8gjsz6k8jb2vnbwzf03grsv0"; aarch64-darwin = "0hm2wdkd5palsxdw0r9y5365gdww7f37g5z9260sa639211lipp4"; }; } diff --git a/pkgs/by-name/br/brioche/package.nix b/pkgs/by-name/br/brioche/package.nix index 8b589de649a8..526d752ba59f 100644 --- a/pkgs/by-name/br/brioche/package.nix +++ b/pkgs/by-name/br/brioche/package.nix @@ -67,7 +67,6 @@ rustPlatform.buildRustPackage (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/br/brioche/update-librusty.sh b/pkgs/by-name/br/brioche/update-librusty.sh index 0ba452c803f5..575755a3c110 100755 --- a/pkgs/by-name/br/brioche/update-librusty.sh +++ b/pkgs/by-name/br/brioche/update-librusty.sh @@ -36,7 +36,6 @@ fetchLibrustyV8 { # NOTE; Follows supported platforms of package (see meta.platforms attribute)! x86_64-linux = "$(nix-prefetch-url --type sha256 https://github.com/denoland/rusty_v8/releases/download/v"$NEW_VERSION"/librusty_v8_release_x86_64-unknown-linux-gnu.a.gz)"; aarch64-linux = "$(nix-prefetch-url --type sha256 https://github.com/denoland/rusty_v8/releases/download/v"$NEW_VERSION"/librusty_v8_release_aarch64-unknown-linux-gnu.a.gz)"; - x86_64-darwin = "$(nix-prefetch-url --type sha256 https://github.com/denoland/rusty_v8/releases/download/v"$NEW_VERSION"/librusty_v8_release_x86_64-apple-darwin.a.gz)"; aarch64-darwin = "$(nix-prefetch-url --type sha256 https://github.com/denoland/rusty_v8/releases/download/v"$NEW_VERSION"/librusty_v8_release_aarch64-apple-darwin.a.gz)"; }; } diff --git a/pkgs/by-name/br/brook/package.nix b/pkgs/by-name/br/brook/package.nix index afbf3e191c48..7e8f9e8b7f6f 100644 --- a/pkgs/by-name/br/brook/package.nix +++ b/pkgs/by-name/br/brook/package.nix @@ -20,7 +20,7 @@ buildGoModule (finalAttrs: { meta = { homepage = "https://github.com/txthinking/brook"; description = "Cross-platform Proxy/VPN software"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ xrelkd ]; mainProgram = "brook"; }; diff --git a/pkgs/by-name/br/broot/package.nix b/pkgs/by-name/br/broot/package.nix index 2dc1d3488e50..bc3dc200e630 100644 --- a/pkgs/by-name/br/broot/package.nix +++ b/pkgs/by-name/br/broot/package.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "broot"; - version = "1.57.0"; + version = "1.58.0"; src = fetchFromGitHub { owner = "Canop"; repo = "broot"; tag = "v${finalAttrs.version}"; - hash = "sha256-uRMa8zaXXM8KWUplYMyOLic/WITLU0eAbZ2VDgM/PBw="; + hash = "sha256-cvrqIgxR96GVD5HpDTjswnuiwuzfJNW0evJIwYTI2lQ="; }; - cargoHash = "sha256-p4R8+PcRmjy/2q7lpfUevuYROPrCQEffmXx5vRrjwKs="; + cargoHash = "sha256-eel+0H5wYk4j/yB3E0M4+iqQXF7tLXm6gxv59rW2e1o="; nativeBuildInputs = [ installShellFiles @@ -87,7 +87,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://dystroy.org/broot/"; changelog = "https://github.com/Canop/broot/releases/tag/v${finalAttrs.version}"; maintainers = with lib.maintainers; [ dywedir ]; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "broot"; }; }) diff --git a/pkgs/by-name/br/bruijn/generated.nix b/pkgs/by-name/br/bruijn/generated.nix index 41327b681a4d..d96ef096eee4 100644 --- a/pkgs/by-name/br/bruijn/generated.nix +++ b/pkgs/by-name/br/bruijn/generated.nix @@ -22,10 +22,10 @@ }: mkDerivation { pname = "bruijn"; - version = "0-unstable-2026-07-05"; + version = "0-unstable-2026-07-16"; src = fetchzip { - url = "https://github.com/marvinborner/bruijn/archive/29a4a3e9620702f47d839a154d64489b8fdce1a7.tar.gz"; - sha256 = "18vxzgd6faq8djgpav4na1nvp0jid44vd52gn9a8smwr2xk44wnz"; + url = "https://github.com/marvinborner/bruijn/archive/9f1ac8856d09666a7444874f80b91b876929eecf.tar.gz"; + sha256 = "18mcwp2xn7wgr81mgqr38irvkf24rf0nvwzi8janasq5favim0vy"; }; isLibrary = true; isExecutable = true; diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 11c53a98a0a0..63153baf9f0f 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -21,13 +21,13 @@ buildNpmPackage rec { pname = "bruno"; - version = "3.5.1"; + version = "3.5.2"; src = fetchFromGitHub { owner = "usebruno"; repo = "bruno"; tag = "v${version}"; - hash = "sha256-ud1zdA38k5RW6qlmPQGnkYUIHOhiHNYWmlXbEzJsIUk="; + hash = "sha256-Lll/ywDkHv0xvLk8iiBEySek7A3dBmfO4V/q2xaNtBQ="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json @@ -197,7 +197,6 @@ buildNpmPackage rec { gepbird kashw2 mattpolzin - redyf water-sucks starsep ]; diff --git a/pkgs/by-name/br/brutus/package.nix b/pkgs/by-name/br/brutus/package.nix index cb47e2affa73..bb38e4e4b14b 100644 --- a/pkgs/by-name/br/brutus/package.nix +++ b/pkgs/by-name/br/brutus/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "brutus"; - version = "1.6.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "praetorian-inc"; repo = "brutus"; tag = "v${finalAttrs.version}"; - hash = "sha256-iZ0oUYlrcPxPGuJvHXqHX+R4dXKS7pLgZgNhBuBVWtc="; + hash = "sha256-tHTgKeQ37DsrrucrI8ZfgvdGy8Xrqs1RtOt/GLrmOk0="; }; - vendorHash = "sha256-XpwwFz8PfyTksLD0SomC5BE0tzUL9D/qtBSed4mrsXQ="; + vendorHash = "sha256-scgSyLQvkTzG5bdW56bPO4raE+rLULHxOaFCu+DjyEE="; ldflags = [ "-s" diff --git a/pkgs/by-name/bs/bs-manager/depotdownloader/default.nix b/pkgs/by-name/bs/bs-manager/depotdownloader/default.nix index 8e8112ce33d7..a093c2041d3a 100644 --- a/pkgs/by-name/bs/bs-manager/depotdownloader/default.nix +++ b/pkgs/by-name/bs/bs-manager/depotdownloader/default.nix @@ -27,7 +27,6 @@ buildDotnetModule { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "DepotDownloader"; diff --git a/pkgs/by-name/bt/btfdump/package.nix b/pkgs/by-name/bt/btfdump/package.nix index f90f3fa12b1c..f7b97a1c6d83 100644 --- a/pkgs/by-name/bt/btfdump/package.nix +++ b/pkgs/by-name/bt/btfdump/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { description = "BTF introspection tool"; mainProgram = "btf"; homepage = "https://github.com/anakryiko/btfdump"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = [ ]; }; } diff --git a/pkgs/by-name/bu/buck2/hashes.json b/pkgs/by-name/bu/buck2/hashes.json index 1f897e49538a..5738dd882710 100644 --- a/pkgs/by-name/bu/buck2/hashes.json +++ b/pkgs/by-name/bu/buck2/hashes.json @@ -7,10 +7,6 @@ "buck2": "sha256-IqDsyQ7Omy7QujT85oKrWwyirG7gwfupdxzvRoMRmQs=", "rust-project": "sha256-iFSko4FTvAVlKUxJE/6FzR6H7V2SryRfEi7nRhfyhxQ=" }, - "x86_64-darwin": { - "buck2": "sha256-G/xarAld9dXanZl7Ivcuoer3YsytmFXWED44u2U4q8g=", - "rust-project": "sha256-jbvvqPI7+qpONhk8UZfSiFpMGCGWRr85BocA58d+C7Y=" - }, "aarch64-linux": { "buck2": "sha256-VKV1vltATu3tAPmMiifba7MV9kNFH754FDda6i8cQrU=", "rust-project": "sha256-oqxHdbNzQn1KHObboAd4/LTbilIJgLqMiWCgHLaPFrc=" diff --git a/pkgs/by-name/bu/buck2/package.nix b/pkgs/by-name/bu/buck2/package.nix index 9cb994ba84f0..175d05aadc14 100644 --- a/pkgs/by-name/bu/buck2/package.nix +++ b/pkgs/by-name/bu/buck2/package.nix @@ -47,7 +47,6 @@ let # NOTE (aseipp): must be synchronized with update.nu! platform-suffix = { - x86_64-darwin = "x86_64-apple-darwin"; aarch64-darwin = "aarch64-apple-darwin"; x86_64-linux = "x86_64-unknown-linux-gnu"; aarch64-linux = "aarch64-unknown-linux-gnu"; @@ -150,7 +149,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/bu/buck2/update.nu b/pkgs/by-name/bu/buck2/update.nu index dd43e7b834b6..57188e797bee 100755 --- a/pkgs/by-name/bu/buck2/update.nu +++ b/pkgs/by-name/bu/buck2/update.nu @@ -5,7 +5,6 @@ const ARCHES = [ { name: "x86_64-linux", target: "x86_64-unknown-linux-gnu" }, - { name: "x86_64-darwin", target: "x86_64-apple-darwin" }, { name: "aarch64-linux", target: "aarch64-unknown-linux-gnu" }, { name: "aarch64-darwin", target: "aarch64-apple-darwin" }, ]; diff --git a/pkgs/by-name/bu/buddy/package.nix b/pkgs/by-name/bu/buddy/package.nix index 6abc5dda3439..ac5845e6303b 100644 --- a/pkgs/by-name/bu/buddy/package.nix +++ b/pkgs/by-name/bu/buddy/package.nix @@ -32,10 +32,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://sourceforge.net/projects/buddy/"; description = "Binary decision diagram package"; - license = { - url = "https://sourceforge.net/p/buddy/gitcode/ci/master/tree/README"; - fullName = "Buddy License"; - }; + license = lib.licenses.buddy; platforms = lib.platforms.unix; # Once had cygwin problems }; diff --git a/pkgs/by-name/bu/budget-tracker-tui/package.nix b/pkgs/by-name/bu/budget-tracker-tui/package.nix index ad6125fbebfe..c4cf146c31af 100644 --- a/pkgs/by-name/bu/budget-tracker-tui/package.nix +++ b/pkgs/by-name/bu/budget-tracker-tui/package.nix @@ -6,7 +6,7 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "budget-tracker-tui"; - version = "1.4.0"; + version = "1.4.1"; __structuredAttrs = true; @@ -14,9 +14,9 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "Feromond"; repo = "budget_tracker_tui"; tag = "v${finalAttrs.version}"; - hash = "sha256-rVNAYMfTGYRepeNSlm+d/bJq11lRNFZjpoQjQpclSzY="; + hash = "sha256-vNpnW9SIjuSnvNtBW8wzDNCCVpw3z/2nv9bremTMqww="; }; - cargoHash = "sha256-u9XlckBJCRzpmY+Hs5x9cBWtxIN1zwMuIYMCuS7i6rQ="; + cargoHash = "sha256-eMzqi2uEaLmHEQtegiT2aWOJCq0tIdywtv1rl99kyys="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/bu/bugdom/package.nix b/pkgs/by-name/bu/bugdom/package.nix index c2f40e2c262e..abb1511068bb 100644 --- a/pkgs/by-name/bu/bugdom/package.nix +++ b/pkgs/by-name/bu/bugdom/package.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Port of Bugdom, a 1999 Macintosh game by Pangea Software, for modern operating systems"; homepage = "https://github.com/jorio/Bugdom"; - license = with lib.licenses; [ cc-by-sa-40 ]; + license = lib.licenses.cc-by-sa-40; maintainers = with lib.maintainers; [ lux ]; mainProgram = "Bugdom"; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/bu/buildkit/package.nix b/pkgs/by-name/bu/buildkit/package.nix index f84d146ccf31..65f9ab3f1884 100644 --- a/pkgs/by-name/bu/buildkit/package.nix +++ b/pkgs/by-name/bu/buildkit/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "buildkit"; - version = "0.31.1"; + version = "0.31.2"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${finalAttrs.version}"; - hash = "sha256-lpcbCPsnvwMULeZgo1eQ0AqlfsyOMO/7b3ZOCoVTDKk="; + hash = "sha256-VAEZr2KerCKTeULZWM50n7P7qPjk9X9oTgpuK7+oWfU="; }; vendorHash = null; diff --git a/pkgs/by-name/bu/buildpack/package.nix b/pkgs/by-name/bu/buildpack/package.nix index 09dcb0b5cc33..9cc9b7fc1cc1 100644 --- a/pkgs/by-name/bu/buildpack/package.nix +++ b/pkgs/by-name/bu/buildpack/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "pack"; - version = "0.40.3"; + version = "0.40.8"; src = fetchFromGitHub { owner = "buildpacks"; repo = "pack"; tag = "v${finalAttrs.version}"; - hash = "sha256-KKgF05oJDgMQExJtsAc6weor4OxUZl4xNIFY0VoQfs4="; + hash = "sha256-mD32ZQ/PxiWnOvCdDFlNx1NIevhfgPcg9+ToUmfM6jo="; }; - vendorHash = "sha256-sRITmNcCwJw4aXLv/wKYOTZai95YY/DY87F4P2+7b5A="; + vendorHash = "sha256-0cyxhyEt4P+sd0FmN177rsTugWM0x2Ebk1LEHtX9wZE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/bu/bulloak/package.nix b/pkgs/by-name/bu/bulloak/package.nix index 39bd57007466..863802b9fa05 100644 --- a/pkgs/by-name/bu/bulloak/package.nix +++ b/pkgs/by-name/bu/bulloak/package.nix @@ -15,10 +15,6 @@ let url = "https://raw.githubusercontent.com/ethereum/solc-bin/bdd7dd3fda6e4a00c0697d891a1a7ae9f2b3a5fd/linux-amd64/list.json"; hash = "sha256-H6D6XbIw5sDZlbc2c51vIMRmOqs2nDIcaNzCaOvnLsw="; }; - x86_64-darwin = fetchurl { - url = "https://raw.githubusercontent.com/ethereum/solc-bin/bdd7dd3fda6e4a00c0697d891a1a7ae9f2b3a5fd/macosx-amd64/list.json"; - hash = "sha256-A3A6gtNb129tD5KC0tCXvlzQ11t5SrNrX8tQeq73+mY="; - }; aarch64-linux = fetchurl { url = "https://raw.githubusercontent.com/nikitastupin/solc/99b5867237b37952d372e0dab400d6788feda315/linux/aarch64/list.json"; hash = "sha256-u6WRAcnR9mN9ERfFdLOxxSc9ASQIQvmS8uG+Z4H6OAU="; diff --git a/pkgs/by-name/bu/bun/package.nix b/pkgs/by-name/bu/bun/package.nix index 928ec621b10e..2ead9ba2e839 100644 --- a/pkgs/by-name/bu/bun/package.nix +++ b/pkgs/by-name/bu/bun/package.nix @@ -27,7 +27,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { sourceRoot = { aarch64-darwin = "bun-darwin-aarch64"; - x86_64-darwin = "bun-darwin-x64-baseline"; } .${stdenvNoCC.hostPlatform.system} or null; @@ -59,23 +58,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { -change /usr/lib/libicucore.A.dylib '${lib.getLib darwin.ICU}/lib/libicucore.A.dylib' '${lib.getExe rcodesign}' sign --code-signature-flags linker-signed $out/bin/bun '' - # We currently cannot generate completions for x86_64-darwin because bun requires avx support to run, which is: - # 1. Not currently supported by the version of Rosetta on our aarch64 builders - # 2. Is not correctly detected even on macOS 15+, where it is available through Rosetta - # - # The baseline builds are no longer an option because they too now require avx support. - + - lib.optionalString - ( - stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform - && !(stdenvNoCC.hostPlatform.isDarwin && stdenvNoCC.hostPlatform.isx86_64) - ) - '' - installShellCompletion --cmd bun \ - --bash <(SHELL="bash" $out/bin/bun completions) \ - --zsh <(SHELL="zsh" $out/bin/bun completions) \ - --fish <(SHELL="fish" $out/bin/bun completions) - ''; + + lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) '' + installShellCompletion --cmd bun \ + --bash <(SHELL="bash" $out/bin/bun completions) \ + --zsh <(SHELL="zsh" $out/bin/bun completions) \ + --fish <(SHELL="fish" $out/bin/bun completions) + ''; passthru = { sources = { @@ -87,10 +75,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { url = "https://github.com/oven-sh/bun/releases/download/bun-v${finalAttrs.version}/bun-linux-aarch64.zip"; hash = "sha256-cLrkGzkIsKEg4eWMXIrzDnSvrjuNEbDT/djnh937SyI="; }; - "x86_64-darwin" = fetchurl { - url = "https://github.com/oven-sh/bun/releases/download/bun-v${finalAttrs.version}/bun-darwin-x64-baseline.zip"; - hash = "sha256-qYumpIDyL9qbNDYmuQak4mqlNhi/hdK8WSjs8rpF8O0="; - }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${finalAttrs.version}/bun-linux-x64.zip"; hash = "sha256-ecB3H6i5LDOq5B4VoODTB+qZ0OLwAxfHHGxTI3p44lo="; @@ -139,8 +123,5 @@ stdenvNoCC.mkDerivation (finalAttrs: { # Broken for Musl at 2024-01-13, tracking issue: # https://github.com/NixOS/nixpkgs/issues/280716 broken = stdenvNoCC.hostPlatform.isMusl; - - # Hangs when run via Rosetta 2 on Apple Silicon - hydraPlatforms = lib.lists.remove "x86_64-darwin" lib.platforms.all; }; }) diff --git a/pkgs/by-name/by/bytecode-viewer/package.nix b/pkgs/by-name/by/bytecode-viewer/package.nix index dfcbb86ecf0b..2fc9eef6c4d4 100644 --- a/pkgs/by-name/by/bytecode-viewer/package.nix +++ b/pkgs/by-name/by/bytecode-viewer/package.nix @@ -79,6 +79,6 @@ maven.buildMavenPackage rec { fromSource binaryBytecode # deps ]; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; }; } diff --git a/pkgs/by-name/c3/c3c/package.nix b/pkgs/by-name/c3/c3c/package.nix index 806cd0c3f6ab..761b7d9bd695 100644 --- a/pkgs/by-name/c3/c3c/package.nix +++ b/pkgs/by-name/c3/c3c/package.nix @@ -59,7 +59,6 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { doCheck = lib.elem llvmPackages.stdenv.system [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" ] && checks; diff --git a/pkgs/by-name/ca/caffeine/package.nix b/pkgs/by-name/ca/caffeine/package.nix index 36a4aaa70e15..d832921c5d40 100644 --- a/pkgs/by-name/ca/caffeine/package.nix +++ b/pkgs/by-name/ca/caffeine/package.nix @@ -63,7 +63,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ emilytrau ]; platforms = [ - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/ca/caido-cli/package.nix b/pkgs/by-name/ca/caido-cli/package.nix index 4dd939bb2417..bf9c1a9fb4ae 100644 --- a/pkgs/by-name/ca/caido-cli/package.nix +++ b/pkgs/by-name/ca/caido-cli/package.nix @@ -21,10 +21,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://caido.download/releases/v${finalAttrs.version}/caido-cli-v${finalAttrs.version}-linux-aarch64.tar.gz"; hash = "sha256-d1xzF0N6emShCQpotFiQEj1wV3hdt1DK7R+6Smlxrmg="; }; - x86_64-darwin = { - url = "https://caido.download/releases/v${finalAttrs.version}/caido-cli-v${finalAttrs.version}-mac-x86_64.zip"; - hash = "sha256-xh6kaYPJ7dwDHM1CkDzxYBHM4cKUex+XPXceqvQgWX4="; - }; aarch64-darwin = { url = "https://caido.download/releases/v${finalAttrs.version}/caido-cli-v${finalAttrs.version}-mac-aarch64.zip"; hash = "sha256-FwbKLEwjiFzZWdBS6RgsDtc/EkI9AT2CBGwdmgEdDnw="; @@ -62,7 +58,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/ca/caido-desktop/package.nix b/pkgs/by-name/ca/caido-desktop/package.nix index 3f9c146862d0..cedb8a7c3e42 100644 --- a/pkgs/by-name/ca/caido-desktop/package.nix +++ b/pkgs/by-name/ca/caido-desktop/package.nix @@ -20,10 +20,6 @@ let url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-aarch64.AppImage"; hash = "sha256-B7dw9uoG++AqT264ZlyHxGpv68fH5SlYzDKUaIM8c14="; }; - x86_64-darwin = { - url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-mac-x86_64.dmg"; - hash = "sha256-0VCLjl0Lpe+4Mgnrp6X8ApJWjAjuhkaZOxQ4P3C8MSM="; - }; aarch64-darwin = { url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-mac-aarch64.dmg"; hash = "sha256-GmpMnaGR7gYz1RvSO5xj9AA3xU1mn2IBInakmVkuG7A="; @@ -49,7 +45,6 @@ let platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/ca/cantoolz/package.nix b/pkgs/by-name/ca/cantoolz/package.nix index a037c3ebcd63..03216ec9042e 100644 --- a/pkgs/by-name/ca/cantoolz/package.nix +++ b/pkgs/by-name/ca/cantoolz/package.nix @@ -70,7 +70,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { implemented with a new module. ''; homepage = "https://github.com/CANToolz/CANToolz"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/ca/carapace-bridge/package.nix b/pkgs/by-name/ca/carapace-bridge/package.nix index 61f067249e5b..edfe49711259 100644 --- a/pkgs/by-name/ca/carapace-bridge/package.nix +++ b/pkgs/by-name/ca/carapace-bridge/package.nix @@ -8,19 +8,19 @@ buildGoModule (finalAttrs: { pname = "carapace-bridge"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "carapace-sh"; repo = "carapace-bridge"; tag = "v${finalAttrs.version}"; - hash = "sha256-+PxsIkNRG9lwmhdzW/KB+CUkjJUXpYNn82m1tqIo/NE="; + hash = "sha256-QlYRbGw7QRwMqJRJea0OoHCDQpYK7Uq6eFgc1JahEiI="; }; # buildGoModule tries to run `go mod vendor` instead of `go work vendor` on # the workspace if proxyVendor is off proxyVendor = true; - vendorHash = "sha256-5d1LTwfYJe2RCNYNpKbO/3ofayTXDHD+OFul+wuXO0w="; + vendorHash = "sha256-YB8rBIrFgOBzdBLAXf5FjzB0d0dZmNEq8vXFZg1Rd10="; postPatch = '' substituteInPlace cmd/carapace-bridge/main.go \ diff --git a/pkgs/by-name/ca/cargo-binstall/package.nix b/pkgs/by-name/ca/cargo-binstall/package.nix index 458c84524691..92faf3a87a94 100644 --- a/pkgs/by-name/ca/cargo-binstall/package.nix +++ b/pkgs/by-name/ca/cargo-binstall/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-binstall"; - version = "1.20.1"; + version = "1.21.0"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; tag = "v${finalAttrs.version}"; - hash = "sha256-G6uOBdLpn5Dp91XUL+DY4MY1dqXcs0OxpR4Ls1yTnS8="; + hash = "sha256-6msYAVCN1i2srA4DquqcdJxUrJP1jub34c/a/4RbWCg="; }; - cargoHash = "sha256-x9HHo/y6ikCOY1O5kScTBOY/nzvJ0P8EIIU6eRgzzXI="; + cargoHash = "sha256-r9iGWxrLlD83QtvZuWXIxjI2S0RO1GNwOed531FVvJk="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-bolero/package.nix b/pkgs/by-name/ca/cargo-bolero/package.nix index 55e26723c9c4..1c51065e51ad 100644 --- a/pkgs/by-name/ca/cargo-bolero/package.nix +++ b/pkgs/by-name/ca/cargo-bolero/package.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Fuzzing and property testing front-end framework for Rust"; mainProgram = "cargo-bolero"; homepage = "https://github.com/camshaft/bolero"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ ekleog ]; }; }) diff --git a/pkgs/by-name/ca/cargo-bump/package.nix b/pkgs/by-name/ca/cargo-bump/package.nix index 91920e40d5cf..9894060b4f45 100644 --- a/pkgs/by-name/ca/cargo-bump/package.nix +++ b/pkgs/by-name/ca/cargo-bump/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Increments the version number of the current project"; mainProgram = "cargo-bump"; homepage = "https://github.com/wraithan/cargo-bump"; - license = with lib.licenses; [ isc ]; + license = lib.licenses.isc; maintainers = with lib.maintainers; [ cafkafk ]; }; }) diff --git a/pkgs/by-name/ca/cargo-diet/package.nix b/pkgs/by-name/ca/cargo-diet/package.nix index fc5f821f6f60..3c55e294ef75 100644 --- a/pkgs/by-name/ca/cargo-diet/package.nix +++ b/pkgs/by-name/ca/cargo-diet/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-diet"; - version = "1.3.0"; + version = "1.3.2"; src = fetchFromGitHub { owner = "the-lean-crate"; repo = "cargo-diet"; rev = "v${finalAttrs.version}"; - hash = "sha256-YjUO8UUXWZvZZZ2Y0py5LQdVBpq8jjwvGimVAWC8Gr8="; + hash = "sha256-/f5GbNWkx/pOQgsaxg+HeI4Z9joX3pCL8u4Pu7VZg08="; }; - cargoHash = "sha256-CnaeS7mh+QDPcQgeKzNV5Vey3zsiD10NdlfdQ1kcDB8="; + cargoHash = "sha256-PK5Ru/Slz1MTD9DxVY0zratzAeXAokJZ+Kz/MznaeB0="; meta = { description = "Help computing optimal include directives for your Cargo.toml manifest"; diff --git a/pkgs/by-name/ca/cargo-feature-combinations/package.nix b/pkgs/by-name/ca/cargo-feature-combinations/package.nix index d7d52def6bcc..29d9742b1000 100644 --- a/pkgs/by-name/ca/cargo-feature-combinations/package.nix +++ b/pkgs/by-name/ca/cargo-feature-combinations/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { __structuredAttrs = true; pname = "cargo-feature-combinations"; - version = "0.2.3"; + version = "0.3.0"; src = fetchFromGitHub { owner = "romnn"; repo = "cargo-feature-combinations"; tag = "v${finalAttrs.version}"; - hash = "sha256-5QQrWdq1jTGUCnzZkzJ2WzJRpxhRtaZMLpgCIktaiPc="; + hash = "sha256-PneHMWX7IRoX4oSm8iePeI+pEPs8n3F2PW06ZWKDFcc="; }; - cargoHash = "sha256-PMZGYxdB9cbWLVtvfRtWsRqVwJWayPbrdhpKvxmq3dM="; + cargoHash = "sha256-DCfO2N6ml1a1P2hFs3gxRE9k+WYv8eqMzwL+cionwYE="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ca/cargo-hf2/package.nix b/pkgs/by-name/ca/cargo-hf2/package.nix index 9127e8b0e084..b22742de046a 100644 --- a/pkgs/by-name/ca/cargo-hf2/package.nix +++ b/pkgs/by-name/ca/cargo-hf2/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Cargo Subcommand for Microsoft HID Flashing Library for UF2 Bootloaders"; mainProgram = "cargo-hf2"; homepage = "https://lib.rs/crates/cargo-hf2"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ astrobeastie ]; }; }) diff --git a/pkgs/by-name/ca/cargo-leptos/package.nix b/pkgs/by-name/ca/cargo-leptos/package.nix index c60351525f4c..c76f676ff335 100644 --- a/pkgs/by-name/ca/cargo-leptos/package.nix +++ b/pkgs/by-name/ca/cargo-leptos/package.nix @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: { mainProgram = "cargo-leptos"; homepage = "https://github.com/leptos-rs/cargo-leptos"; changelog = "https://github.com/leptos-rs/cargo-leptos/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ benwis ]; }; }) diff --git a/pkgs/by-name/ca/cargo-license/package.nix b/pkgs/by-name/ca/cargo-license/package.nix index ff18e5aaa5f2..0fa1ba42cf61 100644 --- a/pkgs/by-name/ca/cargo-license/package.nix +++ b/pkgs/by-name/ca/cargo-license/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Cargo subcommand to see license of dependencies"; mainProgram = "cargo-license"; homepage = "https://github.com/onur/cargo-license"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ basvandijk matthiasbeyer diff --git a/pkgs/by-name/ca/cargo-llvm-cov/Cargo.lock b/pkgs/by-name/ca/cargo-llvm-cov/Cargo.lock index 4f2c0388d604..a9c07eec84e6 100644 --- a/pkgs/by-name/ca/cargo-llvm-cov/Cargo.lock +++ b/pkgs/by-name/ca/cargo-llvm-cov/Cargo.lock @@ -13,31 +13,31 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.102" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" +checksum = "2a4385e2e34eb35d6b3efe798b9eb88096925d87726c0798709bf56d9ed84af3" [[package]] name = "autocfg" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" +checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53" [[package]] name = "bitflags" -version = "2.11.0" +version = "2.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af" +checksum = "b588b76d00fde79687d7646a9b5bdf3cc0f655e0bbd080335a95d7e96f3587da" [[package]] name = "bstr" -version = "1.12.1" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab" +checksum = "1f7dc094d718f2e1c1559ad110e27eeaae14a5465d3d56dd6dbd793079fbd530" dependencies = [ "memchr", "regex-automata", - "serde", + "serde_core", ] [[package]] @@ -48,25 +48,24 @@ checksum = "ebb068a5ba5b65a7cdba869497ca2a352e88e6093c4909ddf4d12d9d3151ee9c" [[package]] name = "camino" -version = "1.2.2" +version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e629a66d692cb9ff1a1c664e41771b3dcaf961985a9774c0eb0bd1b51cf60a48" +checksum = "5f2d30e4173c4026932d51d31d6b0613b1fd3014bf3f9f8943d4ba139c437ba0" [[package]] name = "cargo-config2" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f7dacdd4a7586d602c2543e0217304bebc6502bde82154209cd8f09f24a7718" +checksum = "25ada53f7339c78084fb37d7e17f34e76537541c4fbb02fa3a2baa14b8faad37" dependencies = [ "serde", "serde_derive", "toml", - "windows-sys 0.61.2", ] [[package]] name = "cargo-llvm-cov" -version = "0.8.5" +version = "0.8.7" dependencies = [ "anyhow", "build-context", @@ -123,26 +122,25 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.3.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" +checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6" [[package]] name = "filetime" -version = "0.2.27" +version = "0.2.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98844151eee8917efc50bd9e8318cb963ae8b297431495d3f758616ea5c57db" +checksum = "5c287a33c7f0a620c38e641e7f60827713987b3c0f26e8ddc9462cc69cf75759" dependencies = [ "cfg-if", "libc", - "libredox", ] [[package]] name = "fs-err" -version = "3.3.0" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73fde052dbfc920003cfd2c8e2c6e6d4cc7c1091538c3a24226cec0665ab08c0" +checksum = "b91aa448ca50d7e79433bdf3ee8d99215430d2ec02ade5aefab2a073a1822e8a" dependencies = [ "autocfg", ] @@ -179,21 +177,9 @@ checksum = "803ec87c9cfb29b9d2633f20cba1f488db3fd53f2158b1024cbefb47ba05d413" [[package]] name = "libc" -version = "0.2.183" +version = "0.2.186" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d" - -[[package]] -name = "libredox" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1744e39d1d6a9948f4f388969627434e31128196de472883b39f148769bfe30a" -dependencies = [ - "bitflags", - "libc", - "plain", - "redox_syscall", -] +checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" [[package]] name = "linux-raw-sys" @@ -203,15 +189,15 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "memchr" -version = "2.8.0" +version = "2.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" +checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98" [[package]] name = "normpath" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf23ab2b905654b4cb177e30b629937b3868311d4e1cba859f899c041046e69b" +checksum = "b9985ef7269fa99f3b12437bb698381da2428743ab90f20393f399fa14cab21a" dependencies = [ "windows-sys 0.61.2", ] @@ -224,9 +210,9 @@ checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" [[package]] name = "opener" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2fa337e0cf13357c13ef1dc108df1333eb192f75fc170bea03fcf1fd404c2ee" +checksum = "b2b03ff07a220d0d0ec9a1f0f238951b7967a5a2e96aefcd21a117b1083415e9" dependencies = [ "bstr", "normpath", @@ -243,12 +229,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "plain" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" - [[package]] name = "proc-macro2" version = "1.0.106" @@ -260,36 +240,27 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.39.2" +version = "0.39.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958f21e8e7ceb5a1aa7fa87fab28e7c75976e0bfe7e23ff069e0a260f894067d" +checksum = "cdcc8dd4e2f670d309a5f0e83fe36dfdc05af317008fea29144da1a2ac858e5e" dependencies = [ "memchr", ] [[package]] name = "quote" -version = "1.0.45" +version = "1.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924" +checksum = "dfbc457d0c7a0759a614551b11a6409e5951f6c7537be1f1b7682b9ae9230368" dependencies = [ "proc-macro2", ] -[[package]] -name = "redox_syscall" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce70a74e890531977d37e532c34d45e9055d2409ed08ddba14529471ed0be16" -dependencies = [ - "bitflags", -] - [[package]] name = "regex" -version = "1.12.3" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276" +checksum = "f020237b6c8eed93db2e2cb53c00c60a8e1bc73da7d073199a1180401450218d" dependencies = [ "aho-corasick", "memchr", @@ -299,9 +270,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.14" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" +checksum = "8fcfdb36bda0c880c5931cdc7a2bcdc8ba4556847b9d912bca70bc94708711ad" dependencies = [ "aho-corasick", "memchr", @@ -310,15 +281,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" +checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4" [[package]] name = "rustc-demangle" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b50b8869d9fc858ce7266cce0194bd74df58b9d0e3f6df3a9fc8eb470d95c09d" +checksum = "b74b56ffa8bb2830709a538c2cbcae9aa062db0d2a42563bfb09bdaae44020eb" [[package]] name = "rustix" @@ -335,15 +306,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" +checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f" [[package]] name = "ruzstd" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ff0cc5e135c8870a775d3320910cd9b564ec036b4dc0b8741629020be63f01" +checksum = "a7c1c839d570d835527c9a5e4db7cb2198683a988cb9d7293fc8674e6bd58fc8" [[package]] name = "same-file" @@ -385,9 +356,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.149" +version = "1.0.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" +checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9" dependencies = [ "itoa", "memchr", @@ -398,9 +369,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "1.0.4" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776" +checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26" dependencies = [ "serde_core", ] @@ -429,9 +400,9 @@ checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f" [[package]] name = "syn" -version = "2.0.117" +version = "2.0.119" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99" +checksum = "872831b642d1a07999a962a351ed35b955ea2cfc8f3862091e2a240a84f17297" dependencies = [ "proc-macro2", "quote", @@ -440,9 +411,9 @@ dependencies = [ [[package]] name = "tar" -version = "0.4.45" +version = "0.4.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22692a6476a21fa75fdfc11d452fda482af402c008cdbaf3476414e122040973" +checksum = "3f6221d9a6003c78398e3b239969f352578258df48c8eb051caadae0015bc840" dependencies = [ "filetime", "libc", @@ -480,9 +451,9 @@ dependencies = [ [[package]] name = "toml" -version = "1.0.7+spec-1.1.0" +version = "1.1.3+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd28d57d8a6f6e458bc0b8784f8fdcc4b99a437936056fa122cb234f18656a96" +checksum = "53c96ecdfa941c8fc4fcaed14f99ada8ebed502eef533015095a07e3301d4c3c" dependencies = [ "serde_core", "serde_spanned", @@ -493,18 +464,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "1.0.1+spec-1.1.0" +version = "1.1.1+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b320e741db58cac564e26c607d3cc1fdc4a88fd36c879568c07856ed83ff3e9" +checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7" dependencies = [ "serde_core", ] [[package]] name = "toml_parser" -version = "1.0.10+spec-1.1.0" +version = "1.1.2+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7df25b4befd31c4816df190124375d5a20c6b6921e2cad937316de3fccd63420" +checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526" dependencies = [ "winnow", ] @@ -625,9 +596,9 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" [[package]] name = "winnow" -version = "1.0.0" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a90e88e4667264a994d34e6d1ab2d26d398dcdca8b7f52bec8668957517fc7d8" +checksum = "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81" [[package]] name = "xattr" @@ -641,6 +612,6 @@ dependencies = [ [[package]] name = "zmij" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" +checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b" diff --git a/pkgs/by-name/ca/cargo-llvm-cov/package.nix b/pkgs/by-name/ca/cargo-llvm-cov/package.nix index 853476334d0d..74e2d855cce3 100644 --- a/pkgs/by-name/ca/cargo-llvm-cov/package.nix +++ b/pkgs/by-name/ca/cargo-llvm-cov/package.nix @@ -25,7 +25,7 @@ let pname = "cargo-llvm-cov"; - version = "0.8.5"; + version = "0.8.7"; owner = "taiki-e"; homepage = "https://github.com/${owner}/${pname}"; @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: { inherit owner; repo = "cargo-llvm-cov"; rev = "v${version}"; - sha256 = "sha256-acd2qauvcVPxDjMuFXkaUxDL4kXoDSCVKDG7ki2pK/Y="; + sha256 = "sha256-flHZfjwEEIBEJHYGozlRgH9OHTJHgAR+OZxYJS/vHpQ="; }; # Upstream doesn't include the lockfile so we need to add it back diff --git a/pkgs/by-name/ca/cargo-pgo/package.nix b/pkgs/by-name/ca/cargo-pgo/package.nix index a687cb48b53b..c6804f22d59b 100644 --- a/pkgs/by-name/ca/cargo-pgo/package.nix +++ b/pkgs/by-name/ca/cargo-pgo/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Cargo subcommand for optimizing Rust binaries/libraries with PGO and BOLT"; homepage = "https://github.com/kobzol/cargo-pgo"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ dannixon ]; }; }) diff --git a/pkgs/by-name/ca/cargo-rdme/package.nix b/pkgs/by-name/ca/cargo-rdme/package.nix index f1a23f8fdd44..6cea4afc2800 100644 --- a/pkgs/by-name/ca/cargo-rdme/package.nix +++ b/pkgs/by-name/ca/cargo-rdme/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: { mainProgram = "cargo-rdme"; homepage = "https://github.com/orium/cargo-rdme"; changelog = "https://github.com/orium/cargo-rdme/blob/v${finalAttrs.version}/release-notes.md"; - license = with lib.licenses; [ mpl20 ]; + license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ GoldsteinE chrjabs diff --git a/pkgs/by-name/ca/cargo-readme/package.nix b/pkgs/by-name/ca/cargo-readme/package.nix index 6de86e184a61..0bd0b9c113d6 100644 --- a/pkgs/by-name/ca/cargo-readme/package.nix +++ b/pkgs/by-name/ca/cargo-readme/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-readme"; - version = "3.3.2"; + version = "3.3.3"; src = fetchFromGitHub { owner = "webern"; repo = "cargo-readme"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-p8QQNACU9lFig0vBQrb1u2T44Icwk10OBjGzaVLj7kk="; + sha256 = "sha256-Urp5OvM6LzLb8SY49u2Dc57NFJtyxpMkvCbb6hTUDMs="; }; - cargoHash = "sha256-kfXDMBqS4/QC+khQhQ2Jrer8TuFKlnZFS3IZ2lcVOR8="; + cargoHash = "sha256-CmYJ8acmcaWregM0zroaTFaPFV6cnS2KWf5Y4LXMcyk="; # disable doc tests cargoTestFlags = [ diff --git a/pkgs/by-name/ca/cargo-risczero/package.nix b/pkgs/by-name/ca/cargo-risczero/package.nix index 00e182b435ed..275fae3c4e6b 100644 --- a/pkgs/by-name/ca/cargo-risczero/package.nix +++ b/pkgs/by-name/ca/cargo-risczero/package.nix @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Cargo extension to help create, manage, and test RISC Zero projects"; mainProgram = "cargo-risczero"; homepage = "https://risczero.com"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = [ ]; }; }) diff --git a/pkgs/by-name/ca/cargo-rr/package.nix b/pkgs/by-name/ca/cargo-rr/package.nix index f7bd9d935d2b..df879f130c1e 100644 --- a/pkgs/by-name/ca/cargo-rr/package.nix +++ b/pkgs/by-name/ca/cargo-rr/package.nix @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Cargo subcommand \"rr\": a light wrapper around rr, the time-travelling debugger"; mainProgram = "cargo-rr"; homepage = "https://github.com/dzfranklin/cargo-rr"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ otavio matthiasbeyer diff --git a/pkgs/by-name/ca/cargo-sbom/package.nix b/pkgs/by-name/ca/cargo-sbom/package.nix index de854436a5fb..3e6a9514067e 100644 --- a/pkgs/by-name/ca/cargo-sbom/package.nix +++ b/pkgs/by-name/ca/cargo-sbom/package.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Create software bill of materials (SBOM) for Rust"; homepage = "https://github.com/psastras/sbom-rs"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ matthiasbeyer ]; diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix index 09de9e544fe2..d0ee4ba4e9fd 100644 --- a/pkgs/by-name/ca/cargo-shear/package.nix +++ b/pkgs/by-name/ca/cargo-shear/package.nix @@ -8,15 +8,15 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-shear"; - version = "1.13.1"; + version = "1.13.2"; src = fetchCrate { pname = "cargo-shear"; version = finalAttrs.version; - hash = "sha256-Luf6/kG0MgnBDyMLZGUSadPI60DOx5Jra3I3ezOGM4w="; + hash = "sha256-69OwhT4vc4xwvuVxZ0C7F/Us01TsuYJnnTKT6PHsOF8="; }; - cargoHash = "sha256-d+3ZfygD4CzHLgT45KcCw2rr313eVO7PhGZpgJpbxW8="; + cargoHash = "sha256-x0lZ8E/P9IaPSdzUo2O3t5qR2I3959So9uaAm4PBM4E="; env = { # https://github.com/Boshen/cargo-shear/blob/v1.6.2/src/lib.rs#L51-L54 @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: { mainProgram = "cargo-shear"; homepage = "https://github.com/Boshen/cargo-shear"; changelog = "https://github.com/Boshen/cargo-shear/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.cathalmullan ]; }; }) diff --git a/pkgs/by-name/ca/cargo-sonar/package.nix b/pkgs/by-name/ca/cargo-sonar/package.nix index 1732402c8734..bd53a609c21d 100644 --- a/pkgs/by-name/ca/cargo-sonar/package.nix +++ b/pkgs/by-name/ca/cargo-sonar/package.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Utility to produce some Sonar-compatible format from different Rust tools like cargo-clippy cargo-audit or cargo-outdated"; mainProgram = "cargo-sonar"; homepage = "https://gitlab.com/woshilapin/cargo-sonar"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.jonboh ]; }; }) diff --git a/pkgs/by-name/ca/cargo-typify/package.nix b/pkgs/by-name/ca/cargo-typify/package.nix index b292a4632890..74b0a06aadeb 100644 --- a/pkgs/by-name/ca/cargo-typify/package.nix +++ b/pkgs/by-name/ca/cargo-typify/package.nix @@ -50,7 +50,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "JSON Schema to Rust type converter"; homepage = "https://github.com/oxidecomputer/typify"; changelog = "https://github.com/oxidecomputer/typify/blob/${finalAttrs.src.tag}/CHANGELOG.adoc"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ iamanaws ]; mainProgram = "cargo-typify"; }; diff --git a/pkgs/by-name/ca/cargo-update/package.nix b/pkgs/by-name/ca/cargo-update/package.nix index 82b09665fd65..3edff871f022 100644 --- a/pkgs/by-name/ca/cargo-update/package.nix +++ b/pkgs/by-name/ca/cargo-update/package.nix @@ -16,14 +16,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-update"; - version = "20.0.3"; + version = "22.0.0"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-YTUMC9jY3l21uW3W+M0qUQUqmgyC4FN0uM4IYH1kuC0="; + hash = "sha256-7SjJ+v+6PzwV8dTXxSVxKrj4/yUlyGVJtt0A+WaWNc8="; }; - cargoHash = "sha256-fpcN09e12Am7+UAa9OojyxShvK2QTKeWGm/vkUkk0UU="; + cargoHash = "sha256-xRjPnZPewo/5pCDUem8+9Ko0XJ1p5HJtLLmErtZQb8w="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/ca/cargo-wipe/package.nix b/pkgs/by-name/ca/cargo-wipe/package.nix index 37c4c4ad8273..f93ade472283 100644 --- a/pkgs/by-name/ca/cargo-wipe/package.nix +++ b/pkgs/by-name/ca/cargo-wipe/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = ''Cargo subcommand "wipe": recursively finds and optionally wipes all "target" or "node_modules" folders''; mainProgram = "cargo-wipe"; homepage = "https://github.com/mihai-dinculescu/cargo-wipe"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ otavio ]; }; }) diff --git a/pkgs/by-name/ca/cargo-xwin/package.nix b/pkgs/by-name/ca/cargo-xwin/package.nix index a29905cec257..4786535a02d2 100644 --- a/pkgs/by-name/ca/cargo-xwin/package.nix +++ b/pkgs/by-name/ca/cargo-xwin/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Cross compile Cargo project to Windows MSVC target with ease"; mainProgram = "cargo-xwin"; homepage = "https://github.com/rust-cross/cargo-xwin"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ shivaraj-bh ]; }; }) diff --git a/pkgs/by-name/ca/cassandra-cpp-driver/package.nix b/pkgs/by-name/ca/cassandra-cpp-driver/package.nix index 0e7b52c9a7de..09b794d61339 100644 --- a/pkgs/by-name/ca/cassandra-cpp-driver/package.nix +++ b/pkgs/by-name/ca/cassandra-cpp-driver/package.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { library for Apache Cassandra 2.1+ using exclusively Cassandra’s binary protocol and Cassandra Query Language v3. ''; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; platforms = lib.platforms.x86_64; homepage = "https://docs.datastax.com/en/developer/cpp-driver/"; maintainers = [ lib.maintainers.npatsakula ]; diff --git a/pkgs/by-name/ca/cat9/package.nix b/pkgs/by-name/ca/cat9/package.nix index a06a11131ab4..58c97ca231fd 100644 --- a/pkgs/by-name/ca/cat9/package.nix +++ b/pkgs/by-name/ca/cat9/package.nix @@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/letoram/cat9"; description = "User shell for LASH"; - license = with lib.licenses; [ unlicense ]; + license = lib.licenses.unlicense; maintainers = [ ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/ca/catdocx/package.nix b/pkgs/by-name/ca/catdocx/package.nix index 69be98201e9d..5c2de4fb9c35 100644 --- a/pkgs/by-name/ca/catdocx/package.nix +++ b/pkgs/by-name/ca/catdocx/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { description = "Extracts plain text from docx files"; mainProgram = "catdocx"; homepage = "https://github.com/jncraton/catdocx"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = [ lib.maintainers.michalrus ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/ca/catdvi/package.nix b/pkgs/by-name/ca/catdvi/package.nix index 7433873ed170..298fff300310 100644 --- a/pkgs/by-name/ca/catdvi/package.nix +++ b/pkgs/by-name/ca/catdvi/package.nix @@ -19,6 +19,10 @@ in stdenv.mkDerivation (finalAttrs: { pname = "catdvi"; version = "0.14"; + + __structuredAttrs = true; + strictDeps = true; + src = fetchurl { url = with finalAttrs; "http://downloads.sourceforge.net/catdvi/catdvi-${version}.tar.bz2"; hash = "sha256-orVQVdQuRXp//OGkA7xRidNi4+J+tkw398LPZ+HX+k8="; @@ -51,13 +55,9 @@ stdenv.mkDerivation (finalAttrs: { '') buildPlatformTools ); - nativeBuildInputs = [ - texlive.bin.core - texlive.bin.core.dev - ]; - buildInputs = [ tex + texlive.bin.core ]; makeFlags = [ diff --git a/pkgs/by-name/cb/cbconvert/package.nix b/pkgs/by-name/cb/cbconvert/package.nix index 90ce62162bf3..6cdc7255a448 100644 --- a/pkgs/by-name/cb/cbconvert/package.nix +++ b/pkgs/by-name/cb/cbconvert/package.nix @@ -54,7 +54,7 @@ buildGoModule (finalAttrs: { description = "Comic Book converter"; homepage = "https://github.com/gen2brain/cbconvert"; changelog = "https://github.com/gen2brain/cbconvert/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ jwillikers ]; mainProgram = "cbconvert"; diff --git a/pkgs/by-name/cb/cbonsai/package.nix b/pkgs/by-name/cb/cbonsai/package.nix index ef13aaee2050..104b3045a3a1 100644 --- a/pkgs/by-name/cb/cbonsai/package.nix +++ b/pkgs/by-name/cb/cbonsai/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Grow bonsai trees in your terminal"; mainProgram = "cbonsai"; homepage = "https://gitlab.com/jallbrit/cbonsai"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/cc/cc-token/package.nix b/pkgs/by-name/cc/cc-token/package.nix index 8b45cad9987c..f8b55eed206d 100644 --- a/pkgs/by-name/cc/cc-token/package.nix +++ b/pkgs/by-name/cc/cc-token/package.nix @@ -7,7 +7,7 @@ buildGoModule { pname = "cc-token"; - version = "unstable-2025-12-04"; + version = "1.1.2-unstable-2025-12-04"; src = fetchFromGitHub { owner = "iota-uz"; diff --git a/pkgs/by-name/cc/ccextractor/fix-avcodec-close.patch b/pkgs/by-name/cc/ccextractor/fix-avcodec-close.patch deleted file mode 100644 index c000d1eed8a9..000000000000 --- a/pkgs/by-name/cc/ccextractor/fix-avcodec-close.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/lib_ccx/hardsubx.c b/src/lib_ccx/hardsubx.c -index 20b4388..fa6b5fa 100644 ---- a/src/lib_ccx/hardsubx.c -+++ b/src/lib_ccx/hardsubx.c -@@ -125,7 +125,7 @@ int hardsubx_process_data(struct lib_hardsubx_ctx *ctx, struct lib_ccx_ctx *ctx_ - if (ctx->frame) - av_frame_free(&ctx->frame); - if (ctx->rgb_frame) - av_frame_free(&ctx->rgb_frame); -- avcodec_close(ctx->codec_ctx); -+ avcodec_free_context(&ctx->codec_ctx); - avformat_close_input(&ctx->format_ctx); - } diff --git a/pkgs/by-name/cc/ccextractor/package.nix b/pkgs/by-name/cc/ccextractor/package.nix index 0db6e5fc7165..6a9502ee0b17 100644 --- a/pkgs/by-name/cc/ccextractor/package.nix +++ b/pkgs/by-name/cc/ccextractor/package.nix @@ -31,24 +31,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "ccextractor"; - version = "0.94-unstable-2025-05-20"; + version = "0.96.6"; src = fetchFromGitHub { owner = "CCExtractor"; repo = "ccextractor"; - rev = "407d0f4e93611c5b0ceb14b7fc01d4a4c2e90433"; - hash = "sha256-BfsQmCNB4HRafqJ3pC2ECiwhOgwKuIqiLjr2/bvHr7Q="; + rev = "v${finalAttrs.version}"; + hash = "sha256-nvfQX+1pM16ll7ruXcB22fWn2zQvmpUzKhD3vznEcbI="; }; patches = [ - ./remove-default-commit-hash.patch ./remove-vendored-libraries.patch - ./fix-avcodec-close.patch - (fetchpatch { - name = "CVE-2026-2245.patch"; - url = "https://github.com/CCExtractor/ccextractor/commit/fd7271bae238ccb3ae8a71304ea64f0886324925.patch"; - hash = "sha256-wZiJob5v4SVa5YBmiHuNvgphSi4PhTTb3hg4vs1lhVg="; - }) ] ++ finalAttrs.cargoDeps.vendorStaging.patches; @@ -58,8 +51,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src cargoRoot; - patches = [ ./use-rsmpeg-0.15.patch ]; - hash = "sha256-68Y8nzPHxhVIRHoPXOy9tc71177lCBuOf//z3cqyDGQ="; + hash = "sha256-0FPxU3rUoT3/Xy3mQjjQGmxkNjs++sQxjCJ1/UuRQlc="; }; nativeBuildInputs = [ @@ -94,10 +86,6 @@ stdenv.mkDerivation (finalAttrs: { # The tests are all part of one `cargo test` invocation, so let’s # get the output from it. (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--verbose") - - # TODO: This (and the corresponding patch) should probably be - # removed for the next stable release. - (lib.cmakeFeature "GIT_COMMIT_HASH" finalAttrs.src.rev) ] ++ lib.optionals enableOcr [ (lib.cmakeBool "WITH_OCR" true) @@ -140,7 +128,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = lib.optionalString enableOcr '' substituteInPlace src/lib_ccx/ocr.c \ - --replace-fail 'getenv("TESSDATA_PREFIX")' '"${tesseract}/share"' + --replace-fail 'getenv("TESSDATA_PREFIX")' '"${tesseract}/share/"' ''; meta = { diff --git a/pkgs/by-name/cc/ccextractor/remove-default-commit-hash.patch b/pkgs/by-name/cc/ccextractor/remove-default-commit-hash.patch deleted file mode 100644 index 07872941084e..000000000000 --- a/pkgs/by-name/cc/ccextractor/remove-default-commit-hash.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index d7fdda02e3...2738cab631 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -24,9 +24,6 @@ - OUTPUT_VARIABLE GIT_COMMIT_HASH - OUTPUT_STRIP_TRAILING_WHITESPACE - ) --ELSE(EXISTS "${BASE_PROJ_DIR}/.git") -- set(GIT_BRANCH "Unknown") -- set(GIT_COMMIT_HASH "Unknown") - ENDIF(EXISTS "${BASE_PROJ_DIR}/.git") - - #Get the date diff --git a/pkgs/by-name/cc/ccextractor/remove-vendored-libraries.patch b/pkgs/by-name/cc/ccextractor/remove-vendored-libraries.patch index 122707c7f21e..a5f2090ae42e 100644 --- a/pkgs/by-name/cc/ccextractor/remove-vendored-libraries.patch +++ b/pkgs/by-name/cc/ccextractor/remove-vendored-libraries.patch @@ -1,13 +1,12 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 2738cab631...5bb2b7d17a 100644 +index 95e27199..a1695a3f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -48,93 +48,20 @@ +@@ -49,74 +49,14 @@ endif() include_directories(${PROJECT_SOURCE_DIR}) include_directories(${PROJECT_SOURCE_DIR}/lib_ccx) include_directories(${PROJECT_SOURCE_DIR}/lib_ccx/zvbi) -include_directories(${PROJECT_SOURCE_DIR}/thirdparty) --include_directories(${PROJECT_SOURCE_DIR}/thirdparty/protobuf-c) include_directories(${PROJECT_SOURCE_DIR}/thirdparty/lib_hash) -include_directories(${PROJECT_SOURCE_DIR}/thirdparty/libpng) @@ -27,13 +26,11 @@ index 2738cab631...5bb2b7d17a 100644 -include_directories(${PROJECT_SOURCE_DIR}/thirdparty/freetype/include) aux_source_directory(${PROJECT_SOURCE_DIR}/thirdparty/lib_hash/ SOURCEFILE) -aux_source_directory(${PROJECT_SOURCE_DIR}/thirdparty/libpng/ SOURCEFILE) --aux_source_directory(${PROJECT_SOURCE_DIR}/thirdparty/protobuf-c/ SOURCEFILE) -aux_source_directory(${PROJECT_SOURCE_DIR}/thirdparty/zlib/ SOURCEFILE) aux_source_directory(${PROJECT_SOURCE_DIR}/lib_ccx/zvbi/ SOURCEFILE) -set(UTF8PROC_SOURCE ${PROJECT_SOURCE_DIR}/thirdparty/utf8proc/utf8proc.c) -+set(UTF8PROC_SOURCE) - +- -set(FREETYPE_SOURCE - ${PROJECT_SOURCE_DIR}/thirdparty/freetype/autofit/autofit.c - ${PROJECT_SOURCE_DIR}/thirdparty/freetype/base/ftbase.c @@ -77,10 +74,13 @@ index 2738cab631...5bb2b7d17a 100644 - ${PROJECT_SOURCE_DIR}/thirdparty/freetype/type42/type42.c - ${PROJECT_SOURCE_DIR}/thirdparty/freetype/winfonts/winfnt.c - ) ++set(UTF8PROC_SOURCE) ++ +set(FREETYPE_SOURCE) #Windows specific libraries and linker flags if(WIN32) - include_directories ("${PROJECT_SOURCE_DIR}/thirdparty/win_spec_incld/") + if(NOT MINGW) +@@ -125,17 +65,6 @@ if(WIN32) include_directories ("${PROJECT_SOURCE_DIR}/thirdparty/win_iconv/") aux_source_directory ("${PROJECT_SOURCE_DIR}/thirdparty/win_iconv/" SOURCEFILE) set (EXTRA_LIBS ${EXTRA_LIBS} ws2_32 winmm Bcrypt) @@ -98,21 +98,11 @@ index 2738cab631...5bb2b7d17a 100644 endif(WIN32) if(MSVC) -@@ -212,9 +139,6 @@ - pkg_check_modules (NANOMSG REQUIRED libnanomsg) - set (EXTRA_LIBS ${EXTRA_LIBS} ${NANOMSG_STATIC_LIBRARIES}) - -- include_directories ("${PROJECT_SOURCE_DIR}/thirdparty/protobuf-c/") -- aux_source_directory ("${PROJECT_SOURCE_DIR}/thirdparty/protobuf-c/" SOURCEFILE) -- - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_SHARING") - endif (PKG_CONFIG_FOUND AND WITH_SHARING) - diff --git a/src/lib_ccx/CMakeLists.txt b/src/lib_ccx/CMakeLists.txt -index 4f329bcaab...a334d20c4d 100644 +index a891560b..154c1c15 100644 --- a/src/lib_ccx/CMakeLists.txt +++ b/src/lib_ccx/CMakeLists.txt -@@ -13,9 +13,39 @@ +@@ -13,9 +13,39 @@ endif(WIN32) find_package(PkgConfig) pkg_check_modules (GPAC REQUIRED gpac) @@ -152,16 +142,16 @@ index 4f329bcaab...a334d20c4d 100644 if (WITH_FFMPEG) find_package(PkgConfig) -@@ -94,7 +124,7 @@ - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDISABLE_RUST") - endif (WITHOUT_RUST) +@@ -87,7 +117,7 @@ if (WITH_HARDSUBX) + set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_HARDSUBX") + endif (WITH_HARDSUBX) -file (GLOB HeaderFiles *.h) +file (GLOB_RECURSE HeaderFiles *.h) file (WRITE ccx.pc "prefix=${CMAKE_INSTALL_PREFIX}\n" "includedir=\${prefix}/include\n" "libdir=\${prefix}/lib\n\n" -@@ -102,8 +132,8 @@ +@@ -95,8 +125,8 @@ file (WRITE ccx.pc "prefix=${CMAKE_INSTALL_PREFIX}\n" "Description: Closed Caption Extraction library\n" "Version: 0.75\n" "Cflags: -I\${includedir}/\n" @@ -172,16 +162,3 @@ index 4f329bcaab...a334d20c4d 100644 ) install (TARGETS ccx DESTINATION lib) -diff --git a/src/lib_ccx/params.c b/src/lib_ccx/params.c -index eb1562e50c...984070a285 100644 ---- a/src/lib_ccx/params.c -+++ b/src/lib_ccx/params.c -@@ -14,7 +14,7 @@ - #include "../lib_hash/sha2.h" - #include - #include --#include -+#include - - #ifdef ENABLE_OCR - #include diff --git a/pkgs/by-name/cc/ccextractor/use-rsmpeg-0.15.patch b/pkgs/by-name/cc/ccextractor/use-rsmpeg-0.15.patch deleted file mode 100644 index 2f5fe1eac532..000000000000 --- a/pkgs/by-name/cc/ccextractor/use-rsmpeg-0.15.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/src/rust/Cargo.lock b/src/rust/Cargo.lock -index 5c49573775..3e855aa637 100644 ---- a/src/rust/Cargo.lock -+++ b/src/rust/Cargo.lock -@@ -665,11 +665,10 @@ - - [[package]] - name = "rsmpeg" --version = "0.14.2+ffmpeg.6.1" -+version = "0.15.1+ffmpeg.7.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "927012cd6ae43519f519741f4a69602ce3a47cf84750784da124dffd03527cc0" -+checksum = "d3ffbead667d06e0c77c4363f83d49a3481cc3838bc9a61882aa07b01e3f63e1" - dependencies = [ -- "libc", - "paste", - "rusty_ffmpeg", - "thiserror", -@@ -711,9 +710,9 @@ - - [[package]] - name = "rusty_ffmpeg" --version = "0.13.3+ffmpeg.6.1" -+version = "0.14.1+ffmpeg.7.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "716adffa5f909c8533611b1dab9ab5666bece35687845865b75ed6a990fc239c" -+checksum = "40f4db8e3e23d4a3044d53a41aba5324eae70d3e7fe82375ce833521533bc315" - dependencies = [ - "bindgen 0.69.4", - "camino", -diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml -index 4c1e73dcf0..68502915dc 100644 ---- a/src/rust/Cargo.toml -+++ b/src/rust/Cargo.toml -@@ -15,7 +15,7 @@ - env_logger = "0.8.4" - palette = "0.6.1" --rsmpeg = { version = "0.14.2", optional = true, features = [ -+rsmpeg = { version = "0.15.1", optional = true, features = [ - "link_system_ffmpeg", - ] } - tesseract-sys = { version = "0.5.15", optional = true, default-features = false } diff --git a/pkgs/by-name/cd/cdk-go/package.nix b/pkgs/by-name/cd/cdk-go/package.nix index 3774c2a61ecf..87ba783893a7 100644 --- a/pkgs/by-name/cd/cdk-go/package.nix +++ b/pkgs/by-name/cd/cdk-go/package.nix @@ -25,7 +25,7 @@ buildGoModule (finalAttrs: { description = "Container penetration toolkit"; homepage = "https://github.com/cdk-team/CDK"; changelog = "https://github.com/cdk-team/CDK/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ fab ]; mainProgram = "cdk"; broken = stdenv.hostPlatform.isDarwin; # needs to update gopsutil to at least v3.21.3 to include https://github.com/shirou/gopsutil/pull/1042 diff --git a/pkgs/by-name/ce/cel-go/package.nix b/pkgs/by-name/ce/cel-go/package.nix index 5d944d2d3b64..6ce048623ee6 100644 --- a/pkgs/by-name/ce/cel-go/package.nix +++ b/pkgs/by-name/ce/cel-go/package.nix @@ -26,18 +26,18 @@ let in buildGoModule (finalAttrs: { pname = "cel-go"; - version = "0.28.1"; + version = "0.29.2"; src = fetchFromGitHub { owner = "cel-expr"; repo = "cel-go"; tag = "v${finalAttrs.version}"; - hash = "sha256-fiFkoYVKdSdYkSMQxmC1SvEEGsalBasCl9tzsGSYwmw="; + hash = "sha256-IubOpjSE91Y2kmWrXw/jFA2QqB3Mx0d/DcJgDVI6+dc="; }; modRoot = "repl"; - vendorHash = "sha256-tMaDwKoE5tzbQD5b7EnpKqiT/CT9WDCKgoxQeyhIlXE="; + vendorHash = "sha256-xbg13CPZEK2uXa6U7T5I/6l1OFcgFOaThcKCfQkgJXI="; subPackages = [ "main" diff --git a/pkgs/by-name/ce/celestegame/celeste.nix b/pkgs/by-name/ce/celestegame/celeste.nix index 2c7900602d20..3b34646f3f64 100644 --- a/pkgs/by-name/ce/celestegame/celeste.nix +++ b/pkgs/by-name/ce/celestegame/celeste.nix @@ -162,7 +162,7 @@ stdenvNoCC.mkDerivation { meta = { inherit downloadPage description; homepage = "https://www.celestegame.com"; - license = with lib.licenses; [ unfree ]; + license = lib.licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; maintainers = with lib.maintainers; [ ulysseszhan ]; platforms = [ diff --git a/pkgs/by-name/ce/celestia/content.nix b/pkgs/by-name/ce/celestia/content.nix new file mode 100644 index 000000000000..4af7acfeac44 --- /dev/null +++ b/pkgs/by-name/ce/celestia/content.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + gettext, + imagemagick, +}: + +stdenv.mkDerivation { + pname = "celestia-content"; + version = "0-unstable-2026-07-19"; + + strictDeps = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "CelestiaProject"; + repo = "CelestiaContent"; + rev = "724b9545b72c56c1a9afeda35d48f611e4f0d20f"; + hash = "sha256-4wicyDIvBK3gD6pAgFO0YH5gRT8E7/g9Qr3YDbRKHVw="; + }; + + nativeBuildInputs = [ + cmake + gettext + imagemagick + ]; + + meta = { + description = "Data files for Celestia space simulator"; + maintainers = with lib.maintainers; [ pancaek ]; + license = + with lib.licenses; + AND [ + cc-by-30 + cc-by-40 + cc-by-nc-sa-30 + # (unused according to upstream CI, at least for now) + # cc-by-sa-30 + cc-by-sa-40 + cc0 + gpl2Plus + jpl-image + cc-by-nc-30-igo + # some files are unlicensed so far, so to be safe let's mark unfree also + unfree + ]; + }; +} diff --git a/pkgs/by-name/ce/celestia/package.nix b/pkgs/by-name/ce/celestia/package.nix new file mode 100644 index 000000000000..0c7c379628a8 --- /dev/null +++ b/pkgs/by-name/ce/celestia/package.nix @@ -0,0 +1,103 @@ +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + libglut, + libjpeg_turbo, + lua, + libGLU, + libGL, + perl, + eigen, + freetype, + cmake, + libepoxy, + libpng, + boost, + fmt, + libavif, + ffmpeg, + gperf, + gettext, + qt6Packages, + callPackage, + celestia-content ? callPackage ./content.nix { }, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "celestia"; + version = "1.6.4-unstable-2026-07-02"; + + src = fetchFromGitHub { + owner = "CelestiaProject"; + repo = "Celestia"; + rev = "ded2c69ec7b819640a6c807fc7d4280bbf08e26b"; + hash = "sha256-GDp31jwY9ifppUJ3Yy84E+x33O4+UmR/ODrHwH2HyeM="; + fetchSubmodules = true; + }; + + strictDeps = true; + __structuredAttrs = true; + + nativeBuildInputs = [ + pkg-config + cmake + gperf + gettext + qt6Packages.wrapQtAppsHook + ]; + + buildInputs = [ + qt6Packages.qtbase + libglut + lua + perl + libjpeg_turbo + eigen + libepoxy + libpng + fmt + boost + libavif + ffmpeg + freetype + libGLU + libGL + ]; + + cmakeFlags = [ + (lib.cmakeFeature "ENABLE_QT6" "ON") + (lib.cmakeFeature "ENABLE_FFMPEG" "ON") + (lib.cmakeFeature "ENABLE_LIBAVIF" "ON") + (lib.cmakeFeature "GIT_COMMIT" "${finalAttrs.src.rev}") + ]; + + enableParallelBuilding = true; + + qtWrapperArgs = [ + "--unset" + "QT_QPA_PLATFORMTHEME" + "--unset" + "QT_STYLE_OVERRIDE" + ]; + + postInstall = '' + cp -r ${celestia-content}/share/celestia/* $out/share/celestia + cp -r ${celestia-content}/share/locale/* $out/share/locale + ''; + + meta = { + homepage = "https://celestiaproject.space/"; + description = "Real-time 3D simulation of space"; + mainProgram = "celestia"; + # no tagged release for ages, remove this for now + # changelog = "https://github.com/CelestiaProject/Celestia/releases/tag/${version}"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ + returntoreality + pancaek + ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/ce/censor/package.nix b/pkgs/by-name/ce/censor/package.nix index f75d73689274..d922d13afe51 100644 --- a/pkgs/by-name/ce/censor/package.nix +++ b/pkgs/by-name/ce/censor/package.nix @@ -13,14 +13,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "censor"; - version = "0.7.2"; + version = "0.8.0"; pyproject = false; src = fetchFromCodeberg { owner = "censor"; repo = "Censor"; tag = "v${finalAttrs.version}"; - hash = "sha256-444EGJCNnRRkuTzm4HdapUvwphx9EavxeyAI0Sxh8G8="; + hash = "sha256-WxD2tK6vTYpvy/0BDzwAymdl4uCJNkgw7HBUrMrDlXQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ce/cernlib/package.nix b/pkgs/by-name/ce/cernlib/package.nix index 0dc50aa77f9b..e029773d7c89 100644 --- a/pkgs/by-name/ce/cernlib/package.nix +++ b/pkgs/by-name/ce/cernlib/package.nix @@ -67,7 +67,6 @@ stdenv.mkDerivation rec { "aarch64-linux" "i686-linux" "x86_64-linux" - "x86_64-darwin" ]; maintainers = with lib.maintainers; [ veprbl ]; license = lib.licenses.gpl2; diff --git a/pkgs/by-name/cf/cfripper/package.nix b/pkgs/by-name/cf/cfripper/package.nix index 93e0ce49fcf0..ea58101d841f 100644 --- a/pkgs/by-name/cf/cfripper/package.nix +++ b/pkgs/by-name/cf/cfripper/package.nix @@ -63,7 +63,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { description = "Tool for analysing CloudFormation templates"; homepage = "https://github.com/Skyscanner/cfripper"; changelog = "https://github.com/Skyscanner/cfripper/releases/tag/${finalAttrs.src.tag}"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; mainProgram = "cfripper"; }; diff --git a/pkgs/by-name/cf/cfspeedtest/package.nix b/pkgs/by-name/cf/cfspeedtest/package.nix index 17a7e90df2e3..d79ccec67afd 100644 --- a/pkgs/by-name/cf/cfspeedtest/package.nix +++ b/pkgs/by-name/cf/cfspeedtest/package.nix @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Unofficial CLI for speed.cloudflare.com"; homepage = "https://github.com/code-inflation/cfspeedtest"; changelog = "https://github.com/code-inflation/cfspeedtest/releases/tag/${finalAttrs.src.tag}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ colemickens stepbrobd diff --git a/pkgs/by-name/cg/cgal/package.nix b/pkgs/by-name/cg/cgal/package.nix index 9c7be9d86df0..f49fbddeae49 100644 --- a/pkgs/by-name/cg/cgal/package.nix +++ b/pkgs/by-name/cg/cgal/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "cgal"; - version = "6.1.1"; + version = "6.2"; src = fetchurl { url = "https://github.com/CGAL/cgal/releases/download/v${finalAttrs.version}/CGAL-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-UlBpNfcOJH7Sd348ZfIOhveSCMKi0OGArnR12vEclu8="; + sha256 = "sha256-+8MoFnRehxpcvetiRTF+nb8QrhqVewqx7bALT94Auo0="; }; patches = [ ./cgal_path.patch ]; diff --git a/pkgs/by-name/cg/cgns/package.nix b/pkgs/by-name/cg/cgns/package.nix index 817d5f39431f..2de3a487d504 100644 --- a/pkgs/by-name/cg/cgns/package.nix +++ b/pkgs/by-name/cg/cgns/package.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://cgns.github.io"; downloadPage = "https://github.com/cgns/cgns"; changelog = "https://github.com/cgns/cgns/releases/tag/${finalAttrs.src.tag}"; - license = with lib.licenses; [ zlib ]; + license = lib.licenses.zlib; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ qbisi ]; }; diff --git a/pkgs/by-name/ch/chalk/package.nix b/pkgs/by-name/ch/chalk/package.nix index fb794b4b81e9..3411c52109ca 100644 --- a/pkgs/by-name/ch/chalk/package.nix +++ b/pkgs/by-name/ch/chalk/package.nix @@ -9,13 +9,11 @@ let chalkVersion = "1.34.9"; chalkPathPiecesByNixSystem = { "aarch64-darwin" = "Darwin/aarch64"; - "x86_64-darwin" = "Darwin/x86_64"; "aarch64-linux" = "Linux/aarch64"; "x86_64-linux" = "Linux/x86_64"; }; chalkHashByNixSystem = { "aarch64-darwin" = "sha256-owDGsT/2tU1Y3JKWAQkYNG18dOxXIST/3bfjXJf1gXU="; - "x86_64-darwin" = "sha256-lCRYekUmXFW6V/zvbvWCqzxr0bbpvQwk1wgWtAYuPuQ="; "aarch64-linux" = "sha256-uvhjhLbVBGB5SNFbfgtpaeLULFnEm3x8fN9ffyJzSSM="; "x86_64-linux" = "sha256-lC5SwvZzYJqomRrK42roSQr4/GZScM2VdgiQ9DOSkHQ="; }; @@ -47,7 +45,6 @@ stdenv.mkDerivation { mainProgram = "chalk"; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; diff --git a/pkgs/by-name/ch/cheesecutter/package.nix b/pkgs/by-name/ch/cheesecutter/package.nix index 88b64568da1d..fc363f829648 100644 --- a/pkgs/by-name/ch/cheesecutter/package.nix +++ b/pkgs/by-name/ch/cheesecutter/package.nix @@ -83,7 +83,6 @@ stdenv.mkDerivation { platforms = [ "x86_64-linux" "i686-linux" - "x86_64-darwin" ]; maintainers = with lib.maintainers; [ OPNA2608 ]; mainProgram = "ccutter"; diff --git a/pkgs/by-name/ch/chemacs2/package.nix b/pkgs/by-name/ch/chemacs2/package.nix index 9bce24384d04..662e33d4e960 100644 --- a/pkgs/by-name/ch/chemacs2/package.nix +++ b/pkgs/by-name/ch/chemacs2/package.nix @@ -44,7 +44,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { Think of it as a bootloader for Emacs. ''; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = [ ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/ch/cherry-studio/package.nix b/pkgs/by-name/ch/cherry-studio/package.nix index 62eaa2812c3f..26a8791fd2e2 100644 --- a/pkgs/by-name/ch/cherry-studio/package.nix +++ b/pkgs/by-name/ch/cherry-studio/package.nix @@ -159,6 +159,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "cherry-studio"; platforms = with lib.platforms; linux ++ darwin; maintainers = with lib.maintainers; [ xiaoxiangmoe ]; - license = with lib.licenses; [ agpl3Only ]; + license = lib.licenses.agpl3Only; }; }) diff --git a/pkgs/by-name/ch/chez/package.nix b/pkgs/by-name/ch/chez/package.nix index 7551fc866a9e..645746d78052 100644 --- a/pkgs/by-name/ch/chez/package.nix +++ b/pkgs/by-name/ch/chez/package.nix @@ -23,7 +23,6 @@ let "x86_64-linux" = "ta6le"; "x86-linux" = "ti3le"; "aarch64-linux" = "tarm64le"; - "x86_64-darwin" = "ta6osx"; "aarch64-darwin" = "tarm64osx"; "x86_64-windows" = "ta6nt"; "aarch64-windows" = "tarm64nt"; diff --git a/pkgs/by-name/ch/chirpstack-rest-api/package.nix b/pkgs/by-name/ch/chirpstack-rest-api/package.nix index 7cef8d846206..64238e9b3c6d 100644 --- a/pkgs/by-name/ch/chirpstack-rest-api/package.nix +++ b/pkgs/by-name/ch/chirpstack-rest-api/package.nix @@ -6,16 +6,16 @@ }: buildGoModule (finalAttrs: { pname = "chirpstack-rest-api"; - version = "4.18.0"; + version = "4.19.0"; src = fetchFromGitHub { owner = "chirpstack"; repo = "chirpstack-rest-api"; rev = "v${finalAttrs.version}"; - hash = "sha256-d8DoU5iqBtWLu8I0xzM8+ny16iylAbjRku7EC1m0o50="; + hash = "sha256-DOQ6S0o9kWYdIoR/SWW29hhsVJ9gKE3cRHrunhXHXJg="; }; - vendorHash = "sha256-b0m3a0U/XgRFR1lvfOUB1yQFZZ9j558WBiymnysjuGg="; + vendorHash = "sha256-5TEXM7sigSN6NpWUC3bv4rXhuArz1j8+R8P/arXa5rg="; ldflags = [ "-s" diff --git a/pkgs/by-name/ch/chkcrontab/package.nix b/pkgs/by-name/ch/chkcrontab/package.nix index 2205eefcc159..04b8a2c8bc45 100644 --- a/pkgs/by-name/ch/chkcrontab/package.nix +++ b/pkgs/by-name/ch/chkcrontab/package.nix @@ -1,21 +1,27 @@ { lib, - python3, + python3Packages, fetchPypi, }: -with python3.pkgs; - -buildPythonApplication (finalAttrs: { +python3Packages.buildPythonApplication (finalAttrs: { pname = "chkcrontab"; version = "1.7"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; sha256 = "0gmxavjkjkvjysgf9cf5fcpk589gb75n1mn20iki82wifi1pk1jn"; }; + postPatch = '' + # cannot install the manpage as it is not present in the wheel + substituteInPlace setup.py \ + --replace-fail "'doc/chkcrontab.1'" "" + ''; + + build-system = [ python3Packages.setuptools ]; + meta = { description = "Tool to detect crontab errors"; mainProgram = "chkcrontab"; diff --git a/pkgs/by-name/ch/cholmod-extra/package.nix b/pkgs/by-name/ch/cholmod-extra/package.nix index 5426acb9b724..ce1c7c1534bc 100644 --- a/pkgs/by-name/ch/cholmod-extra/package.nix +++ b/pkgs/by-name/ch/cholmod-extra/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/jluttine/cholmod-extra"; description = "Set of additional routines for SuiteSparse CHOLMOD Module"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ jluttine ]; platforms = with lib.platforms; unix; }; diff --git a/pkgs/by-name/ch/chopchop/package.nix b/pkgs/by-name/ch/chopchop/package.nix index 4767b31ac7d1..70f9fc7902e2 100644 --- a/pkgs/by-name/ch/chopchop/package.nix +++ b/pkgs/by-name/ch/chopchop/package.nix @@ -20,7 +20,7 @@ buildGoModule (finalAttrs: { meta = { description = "CLI to search for sensitive services/files/folders"; homepage = "https://github.com/michelin/ChopChop"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/ch/chow-kick/package.nix b/pkgs/by-name/ch/chow-kick/package.nix index 729e7f93c03e..b85a99bba6e4 100644 --- a/pkgs/by-name/ch/chow-kick/package.nix +++ b/pkgs/by-name/ch/chow-kick/package.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/Chowdhury-DSP/ChowKick"; description = "Kick synthesizer based on old-school drum machine circuits"; - license = [ lib.licenses.bsd3 ]; + license = lib.licenses.bsd3; maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.linux; mainProgram = "ChowKick"; diff --git a/pkgs/by-name/ch/chow-phaser/package.nix b/pkgs/by-name/ch/chow-phaser/package.nix index 79375f699547..a2859996588c 100644 --- a/pkgs/by-name/ch/chow-phaser/package.nix +++ b/pkgs/by-name/ch/chow-phaser/package.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/jatinchowdhury18/ChowPhaser"; description = "Phaser effect based loosely on the Schulte Compact Phasing 'A'"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; mainProgram = "ChowPhaserStereo"; maintainers = with lib.maintainers; [ magnetophon ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/ch/chow-tape-model/package.nix b/pkgs/by-name/ch/chow-tape-model/package.nix index 630bd0732071..56b4b1ce1ee8 100644 --- a/pkgs/by-name/ch/chow-tape-model/package.nix +++ b/pkgs/by-name/ch/chow-tape-model/package.nix @@ -123,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/jatinchowdhury18/AnalogTapeModel"; description = "Physical modelling signal processing for analog tape recording. LV2, VST3, CLAP, and standalone"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ magnetophon ]; platforms = lib.platforms.linux; # error: 'vvtanh' was not declared in this scope; did you mean 'tanh'? diff --git a/pkgs/by-name/ch/chrome-export/package.nix b/pkgs/by-name/ch/chrome-export/package.nix index 0228861b2edf..ba40c910fb6d 100644 --- a/pkgs/by-name/ch/chrome-export/package.nix +++ b/pkgs/by-name/ch/chrome-export/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Scripts to save Google Chrome's bookmarks and history as HTML bookmarks files"; homepage = "https://github.com/bdesham/chrome-export"; - license = [ lib.licenses.isc ]; + license = lib.licenses.isc; maintainers = [ lib.maintainers.bdesham ]; platforms = python3.meta.platforms; }; diff --git a/pkgs/by-name/ci/cicero-tui/package.nix b/pkgs/by-name/ci/cicero-tui/package.nix index 793e4438d2d6..88ea58c6dd68 100644 --- a/pkgs/by-name/ci/cicero-tui/package.nix +++ b/pkgs/by-name/ci/cicero-tui/package.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Unicode tool with a terminal user interface"; homepage = "https://github.com/eyeplum/cicero-tui"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; mainProgram = "cicero"; }; diff --git a/pkgs/by-name/ci/cider-2/package.nix b/pkgs/by-name/ci/cider-2/package.nix index 1d8db2f568f6..501fd5abebf6 100644 --- a/pkgs/by-name/ci/cider-2/package.nix +++ b/pkgs/by-name/ci/cider-2/package.nix @@ -5,28 +5,27 @@ dpkg, autoPatchelfHook, makeWrapper, + gsettings-desktop-schemas, + dconf, # Required dependencies for autoPatchelfHook alsa-lib, - asar, gtk3, libgbm, libGL, nspr, nss, - widevine-cdm, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cider-2"; version = "4.0.9.1"; src = fetchurl { - url = "https://repo.cider.sh/apt/pool/main/cider-v${version}-linux-x64.deb"; + url = "https://repo.cider.sh/apt/pool/main/cider-v${finalAttrs.version}-linux-x64.deb"; hash = "sha256-MsA6lK3PsyOEx938FgJFx8l9oqwoM3FzIK5goF73lTs="; }; nativeBuildInputs = [ - asar dpkg autoPatchelfHook makeWrapper @@ -56,34 +55,29 @@ stdenv.mkDerivation rec { chmod +x $out/lib/cider/Cider + # The prefixes that follow LD_LIBRARY_PATH are typically injected via wrapGAppsHook3. + # We append them manually instead to avoid a double-wrapping. + makeWrapper $out/lib/cider/Cider $out/bin/cider-2 \ + --add-flags "\$\{NIXOS_OZONE_WL:+\$\{WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true\}\}" \ + --add-flags "--no-sandbox --disable-gpu-sandbox" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \ + --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}" \ + --prefix GIO_EXTRA_MODULES : "${dconf.lib}/lib/gio/modules" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" + runHook postInstall ''; - postInstall = '' - ${lib.getExe asar} extract $out/lib/cider/resources/app.asar ./cider-build - - ${lib.getExe asar} pack ./cider-build $out/lib/cider/resources/app.asar - rm -rf ./cider-build - - # Install Widevine CDM for DRM support - ln -sf ${widevine-cdm}/share/google/chrome/WidevineCdm $out/lib/cider/ - ''; - postFixup = '' - makeWrapper $out/lib/cider/Cider $out/bin/${pname} \ - --add-flags "\$\{NIXOS_OZONE_WL:+\$\{WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true\}\}" \ - --add-flags "--no-sandbox --disable-gpu-sandbox" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" - - mv $out/share/applications/cider.desktop $out/share/applications/${pname}.desktop - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace-warn 'Exec=cider' 'Exec=${pname}' \ - --replace-warn 'Exec=/usr/lib/cider/Cider' 'Exec=${pname}' + mv $out/share/applications/cider.desktop $out/share/applications/cider-2.desktop + substituteInPlace $out/share/applications/cider-2.desktop \ + --replace-fail Exec=cider Exec=cider-2 install -Dm444 $out/share/pixmaps/cider.png \ $out/share/icons/hicolor/256x256/apps/cider.png - rm -r $out/share/pixmaps + rm -r $out/share/{pixmaps,lintian} ''; passthru.updateScript = ./updater.sh; @@ -95,8 +89,9 @@ stdenv.mkDerivation rec { mainProgram = "cider-2"; maintainers = with lib.maintainers; [ amadejkastelic + antoineco l0r3v ]; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/ci/cilium-cli/package.nix b/pkgs/by-name/ci/cilium-cli/package.nix index b67cbfcd9337..727f3a838167 100644 --- a/pkgs/by-name/ci/cilium-cli/package.nix +++ b/pkgs/by-name/ci/cilium-cli/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "cilium-cli"; - version = "0.19.5"; + version = "0.19.6"; src = fetchFromGitHub { owner = "cilium"; repo = "cilium-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-2MxIqKuuzSEzmhdmWqYxinHKzlP7io7Tw6Ini2Sl3wQ="; + hash = "sha256-2Yj0CvhF848oeLTnonk+ItBkNqN+RZekCQjcfr6ZYUM="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ci/cinnamon/package.nix b/pkgs/by-name/ci/cinnamon/package.nix index cb28d2074460..b8dbff2dacee 100644 --- a/pkgs/by-name/ci/cinnamon/package.nix +++ b/pkgs/by-name/ci/cinnamon/package.nix @@ -224,7 +224,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/linuxmint/cinnamon"; description = "Cinnamon desktop environment"; - license = [ lib.licenses.gpl2 ]; + license = lib.licenses.gpl2; platforms = lib.platforms.linux; teams = [ lib.teams.cinnamon ]; }; diff --git a/pkgs/by-name/ci/cinny/package.nix b/pkgs/by-name/ci/cinny/package.nix index df494780e81d..02bfc4fca9cf 100644 --- a/pkgs/by-name/ci/cinny/package.nix +++ b/pkgs/by-name/ci/cinny/package.nix @@ -4,15 +4,16 @@ stdenvNoCC, writeText, conf ? { }, + pname ? "cinny", }: let - configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf); + configOverrides = writeText "${pname}-config-overrides.json" (builtins.toJSON conf); in if (conf == { }) then cinny-unwrapped else stdenvNoCC.mkDerivation { - pname = "cinny"; + inherit pname; inherit (cinny-unwrapped) version meta; dontUnpack = true; diff --git a/pkgs/by-name/ci/cirrusgo/package.nix b/pkgs/by-name/ci/cirrusgo/package.nix index d02de5a3adbe..49674d8004e5 100644 --- a/pkgs/by-name/ci/cirrusgo/package.nix +++ b/pkgs/by-name/ci/cirrusgo/package.nix @@ -21,7 +21,7 @@ buildGoModule (finalAttrs: { description = "Tool to scan SAAS and PAAS applications"; mainProgram = "cirrusgo"; homepage = "https://github.com/Ph33rr/cirrusgo"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/ci/citrix-workspace/package.nix b/pkgs/by-name/ci/citrix-workspace/package.nix index b9fb58c0cc6d..f3f0c2498c67 100644 --- a/pkgs/by-name/ci/citrix-workspace/package.nix +++ b/pkgs/by-name/ci/citrix-workspace/package.nix @@ -18,12 +18,8 @@ gdk-pixbuf, glib, glib-networking, - gnome2, gst_all_1, - gtk2, - gtk2-x11, gtk3, - gtk_engines, harfbuzzFull, heimdal, hyphen, @@ -41,7 +37,6 @@ libjson, libmanette, libnotify, - libpng12, libpulseaudio, libredirect, libseccomp, @@ -77,7 +72,6 @@ xprop, xdpyinfo, libxcb, - x264, zlib, extraCerts ? [ ], @@ -115,12 +109,12 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "citrix-workspace"; version = "26.04.0.105"; src = requireFile rec { - name = "linuxx64-${version}.tar.gz"; + name = "linuxx64-${finalAttrs.version}.tar.gz"; sha256 = "1kl6b1ldjd9gb6cmvhxf6ggvc3amq1kz0qwjlb1fp6dxx0pivwm8"; message = '' @@ -129,7 +123,7 @@ stdenv.mkDerivation rec { https://www.citrix.com/downloads/workspace-app/betas-and-tech-previews/workspace-app-tp-gcc11-for-linux.html - (if you do not find version ${version} there, try at + (if you do not find version ${finalAttrs.version} there, try at https://www.citrix.com/downloads/workspace-app/) Once you have downloaded the file, please use the following command and re-run the @@ -145,7 +139,7 @@ stdenv.mkDerivation rec { __structuredAttrs = true; sourceRoot = "."; preferLocalBuild = true; - passthru.icaroot = "${placeholder "out"}/opt/citrix-icaclient"; + passthru.icaroot = "${finalAttrs.finalPackage}/opt/citrix-icaclient"; nativeBuildInputs = [ autoPatchelfHook @@ -168,11 +162,7 @@ stdenv.mkDerivation rec { fuse3' gdk-pixbuf glib-networking - gnome2.gtkglext - gtk2 - gtk2-x11 gtk3 - gtk_engines harfbuzzFull heimdal hyphen @@ -188,7 +178,6 @@ stdenv.mkDerivation rec { libjson libmanette libnotify - libpng12 libpulseaudio libseccomp libsecret @@ -212,7 +201,6 @@ stdenv.mkDerivation rec { libxaw libxmu libxtst - x264 zlib ] ++ gstPackages; @@ -280,6 +268,15 @@ stdenv.mkDerivation rec { ''--set LD_PRELOAD "${libredirect}/lib/libredirect.so ${lib.getLib pcsclite}/lib/libpcsclite.so"'' ''--set NIX_REDIRECTS "/usr/share/zoneinfo=${tzdata}/share/zoneinfo:/etc/zoneinfo=${tzdata}/share/zoneinfo:/etc/timezone=$ICAInstDir/timezone"'' ] + ++ lib.optionals (isWfica program) [ + # wfica is an X11 client (it runs under XWayland). On a Wayland + # session Mesa's EGL loader otherwise auto-selects the Wayland + # platform for wfica's startup OpenGL probe and segfaults in + # wl_proxy_create_wrapper; pin the client to X11 (user-overridable). + # See https://github.com/NixOS/nixpkgs/issues/540102 + "--set-default GDK_BACKEND x11" + "--set-default EGL_PLATFORM x11" + ] ); wrap = program: '' @@ -335,6 +332,9 @@ stdenv.mkDerivation rec { # the tarball still contains the legacy WebKitGTK 4.0 bundle. rm -rf "$ICAInstDir/Webkit2gtk4.0" + # FHS launcher hinst generates even for non-root installs; it hardcodes + # store paths without any of the wrapper environment. + rm -f "$ICAInstDir/wfica.sh" if [ -f "$ICAInstDir/util/setlog" ]; then chmod +x "$ICAInstDir/util/setlog" ln -sf "$ICAInstDir/util/setlog" "$out/bin/citrix-setlog" @@ -404,7 +404,12 @@ stdenv.mkDerivation rec { done echo "Copy .desktop files." - cp $out/opt/citrix-icaclient/desktop/* $out/share/applications/ + cp $out/opt/citrix-icaclient/desktop/*.desktop $out/share/applications/ + + install -Dm444 "$ICAInstDir/desktop/Citrix-mime_types.xml" \ + $out/share/mime/packages/Citrix-mime_types.xml + install -Dm444 "$ICAInstDir/icons/000_Receiver_64.png" \ + $out/share/icons/hicolor/64x64/apps/Citrix-Receiver.png runHook postInstall ''; @@ -430,4 +435,4 @@ stdenv.mkDerivation rec { ]; homepage = "https://www.citrix.com/downloads/workspace-app/betas-and-tech-previews/workspace-app-tp-gcc11-for-linux.html"; }; -} +}) diff --git a/pkgs/by-name/ci/civetweb/package.nix b/pkgs/by-name/ci/civetweb/package.nix index 6736b11090e8..13c996fddcbf 100644 --- a/pkgs/by-name/ci/civetweb/package.nix +++ b/pkgs/by-name/ci/civetweb/package.nix @@ -66,6 +66,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Embedded C/C++ web server"; mainProgram = "civetweb"; homepage = "https://github.com/civetweb/civetweb"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; }; }) diff --git a/pkgs/by-name/cl/clap/package.nix b/pkgs/by-name/cl/clap/package.nix index 1f99982f11ba..5007bb7e0e1f 100644 --- a/pkgs/by-name/cl/clap/package.nix +++ b/pkgs/by-name/cl/clap/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "clap"; - version = "1.2.9"; + version = "1.2.10"; src = fetchFromGitHub { owner = "free-audio"; repo = "clap"; rev = finalAttrs.version; - hash = "sha256-iQRy4+FNT2oun2pkl89A/bPZyv2R0YyF35IhkIwA1B0="; + hash = "sha256-87vmpcfi2+bWZ0GFU91Qd52WddeuHTIDAdz9fc4ciJc="; }; postPatch = '' diff --git a/pkgs/by-name/cl/clapgrep/package.nix b/pkgs/by-name/cl/clapgrep/package.nix index f64e4e7df6e0..31325d53b528 100644 --- a/pkgs/by-name/cl/clapgrep/package.nix +++ b/pkgs/by-name/cl/clapgrep/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Search through all your files"; homepage = "https://github.com/luleyleo/clapgrep"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ pluiedev ]; mainProgram = "clapgrep"; diff --git a/pkgs/by-name/cl/claude-code/manifest.json b/pkgs/by-name/cl/claude-code/manifest.json index 964233ccd1eb..dd54af081d6b 100644 --- a/pkgs/by-name/cl/claude-code/manifest.json +++ b/pkgs/by-name/cl/claude-code/manifest.json @@ -1,47 +1,47 @@ { - "version": "2.1.207", - "commit": "bc512d56332530b2be3f5079e29ec17aa20b8553", - "buildDate": "2026-07-10T21:39:38Z", + "version": "2.1.212", + "commit": "8b2783a8f907ce5c5ad1241ecdbab0ff3301c617", + "buildDate": "2026-07-16T16:50:33Z", "platforms": { "darwin-arm64": { "binary": "claude", - "checksum": "1397a062c6889675055e3314dd956376ac51262a7734ad9e819c26975d71547a", - "size": 241237136 + "checksum": "09ecba2ab2df9b6ee5b0695e26f65dea60fb3b6af3d3542ee09f466838d1e574", + "size": 244530512 }, "darwin-x64": { "binary": "claude", - "checksum": "8a4355d251a60c90d8cf08f32fdb22a8157dd3d085542f95d0da0475f9a2c57c", - "size": 249273680 + "checksum": "7681a0634c89fa4474e53c0c794e992944aebf3409a7a2b87ea9f9b0194ea341", + "size": 254080272 }, "linux-arm64": { "binary": "claude", - "checksum": "8bc14a284065383460f37981d724b8f7aa7ca93c9849d2fe367e08f03383f454", - "size": 256228080 + "checksum": "66e88634a8573a002702e6a9de0d80cb9bb7c9072f9e6f4486778539057dfd3c", + "size": 260946672 }, "linux-x64": { "binary": "claude", - "checksum": "85e7e988a392d859f90802ca21fb26e89d3c9ab527f5ed0b08df3955e34d5c83", - "size": 259402552 + "checksum": "044a88cf3a5180776617fd3da1238dcbf9141ddec449a39cf7d2af1ac78e684e", + "size": 264096568 }, "linux-arm64-musl": { "binary": "claude", - "checksum": "ec3b657344dcf6693f434fe11ffe4592381d31d4e6a7976649c1a610770dcc74", - "size": 249476280 + "checksum": "6996b65fc90aa1e0b8f80824df77295d93fa43b12388915a762b58fd982a1d16", + "size": 254194872 }, "linux-x64-musl": { "binary": "claude", - "checksum": "09a43ff41e33cbb0c4903a4939353933ee8f0d1964abab4b837004a951edb9ee", - "size": 254091648 + "checksum": "a17757970a1f7ef0c47a31ea8fa40798fd7796854ba9422e1a4175f3f149de2c", + "size": 258756992 }, "win32-x64": { "binary": "claude.exe", - "checksum": "781fdc2c89868b1cb05cc22c253ef142a0b44e7cc36236aecd6335745c7d42d0", - "size": 249485472 + "checksum": "fe639693fd7e9a881c799867711abb7666dec2a5fefbaba41af6a09e71bcbefa", + "size": 255334560 }, "win32-arm64": { "binary": "claude.exe", - "checksum": "fa0c887a3f944ba1915766b525538b82b029ca8078ed6ee180c3b83c1b862521", - "size": 243952800 + "checksum": "adaa6e3dadb8016755ccd1907a5f249c1bc9bdb6c71d3f7dcea7d5db8f72d0a5", + "size": 249684640 } }, "sdkCompat": { @@ -61,7 +61,10 @@ "0.3.201", "0.3.202", "0.3.204", - "0.3.205" + "0.3.205", + "0.3.207", + "0.3.208", + "0.3.209" ], "harnessSchema": 1 } diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index ccf91a8aab7d..4eba181c8c9c 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -97,7 +97,6 @@ stdenv.mkDerivation (finalAttrs: { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" "aarch64-linux" "x86_64-linux" ]; diff --git a/pkgs/by-name/cl/claude-mergetool/package.nix b/pkgs/by-name/cl/claude-mergetool/package.nix index f323cdc2ed54..29cf3dfd9a55 100644 --- a/pkgs/by-name/cl/claude-mergetool/package.nix +++ b/pkgs/by-name/cl/claude-mergetool/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/9999years/claude-mergetool"; changelog = "https://github.com/9999years/claude-mergetool/releases/tag/v${version}"; description = "Resolve Git/jj merge conflicts automatically with claude-code"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers._9999years ]; mainProgram = "claude-mergetool"; }; diff --git a/pkgs/by-name/cl/click/package.nix b/pkgs/by-name/cl/click/package.nix index 15f231edc31f..1afd7f01f9a9 100644 --- a/pkgs/by-name/cl/click/package.nix +++ b/pkgs/by-name/cl/click/package.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Command Line Interactive Controller for Kubernetes"; homepage = "https://github.com/databricks/click"; - license = [ lib.licenses.asl20 ]; + license = lib.licenses.asl20; maintainers = [ lib.maintainers.mbode ]; mainProgram = "click"; }; diff --git a/pkgs/by-name/cl/clipnotify/package.nix b/pkgs/by-name/cl/clipnotify/package.nix index bb3cc6b00a38..74bd082e9e40 100644 --- a/pkgs/by-name/cl/clipnotify/package.nix +++ b/pkgs/by-name/cl/clipnotify/package.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "clipnotify"; - version = "unstable-2018-02-20"; + version = "0-unstable-2018-02-20"; src = fetchFromGitHub { owner = "cdown"; diff --git a/pkgs/by-name/cl/cloudbrute/package.nix b/pkgs/by-name/cl/cloudbrute/package.nix index f56d867aa8d5..381e9540ae66 100644 --- a/pkgs/by-name/cl/cloudbrute/package.nix +++ b/pkgs/by-name/cl/cloudbrute/package.nix @@ -26,7 +26,7 @@ buildGoModule (finalAttrs: { Alibaba, Vultr, Linode). ''; homepage = "https://github.com/0xsha/CloudBrute"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/cl/clouddrive2/package.nix b/pkgs/by-name/cl/clouddrive2/package.nix index 3d92141714e2..8eb9b9a0c30e 100644 --- a/pkgs/by-name/cl/clouddrive2/package.nix +++ b/pkgs/by-name/cl/clouddrive2/package.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation (finalAttrs: { { x86_64-linux = "sha256-X5WAnHyXdAkWrN/AbkDE0eNH4mwdPcZ0Cs5Q21KB6/w="; aarch64-linux = "sha256-somHyDBG94pGQB+IZd404H1tX0X2qC8LeIcXeihU6yA="; - x86_64-darwin = "sha256-O28IQTelQSZj9P4ETYaeQfxvN5Etxed4ZwvfJB4vBM8="; aarch64-darwin = "sha256-GaL2bCwQdtI3bq2wkwza1OEHFvhppdZpUIq3QRQ0vN8="; } .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); @@ -58,7 +57,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/cl/clouddrive2/update.sh b/pkgs/by-name/cl/clouddrive2/update.sh index 200bb47700fe..1e121ba98260 100755 --- a/pkgs/by-name/cl/clouddrive2/update.sh +++ b/pkgs/by-name/cl/clouddrive2/update.sh @@ -15,7 +15,6 @@ fi for i in \ "x86_64-linux linux-x86_64" \ "aarch64-linux linux-aarch64" \ - "x86_64-darwin macos-x86_64" \ "aarch64-darwin macos-aarch64"; do set -- $i prefetch=$(nix-prefetch-url "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v$latestVersion/clouddrive-2-$2-$latestVersion.tgz") diff --git a/pkgs/by-name/cl/cloudflare-warp/package.nix b/pkgs/by-name/cl/cloudflare-warp/package.nix index fca8a5bc535e..809f6f028740 100644 --- a/pkgs/by-name/cl/cloudflare-warp/package.nix +++ b/pkgs/by-name/cl/cloudflare-warp/package.nix @@ -27,7 +27,7 @@ let version = "2026.3.846.0"; - sources = rec { + sources = { x86_64-linux = fetchurl { url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}_amd64.deb"; hash = "sha256-1SKTK0QW+3CcqBLqHbIsPny/6ekyjZe9qRcjYOMnR58="; @@ -40,7 +40,6 @@ let url = "https://downloads.cloudflareclient.com/v1/download/macos/version/${version}"; hash = "sha256-cDmoM0nIYYQyurJeeiVSX0IWJdIY0pVLmjIae5mEXI4="; }; - x86_64-darwin = aarch64-darwin; }; in stdenv.mkDerivation (finalAttrs: { @@ -222,7 +221,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/cl/cloudflared/package.nix b/pkgs/by-name/cl/cloudflared/package.nix index 384532faa0c8..9d18a1b6c502 100644 --- a/pkgs/by-name/cl/cloudflared/package.nix +++ b/pkgs/by-name/cl/cloudflared/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "cloudflared"; - version = "2026.6.1"; + version = "2026.7.2"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; tag = finalAttrs.version; - hash = "sha256-TQW0XnYS96sX/+dTGocKzz91fJG58cSV3jGZI3TBaeg="; + hash = "sha256-fuJfvm5c63koMl46sJmZOiWuNKpOwH17MD20XD7q6s0="; }; vendorHash = null; diff --git a/pkgs/by-name/cl/cloudmonkey/package.nix b/pkgs/by-name/cl/cloudmonkey/package.nix index 34f60d86ea4b..b93780123a74 100644 --- a/pkgs/by-name/cl/cloudmonkey/package.nix +++ b/pkgs/by-name/cl/cloudmonkey/package.nix @@ -20,7 +20,7 @@ buildGoModule (finalAttrs: { meta = { description = "CLI for Apache CloudStack"; homepage = "https://github.com/apache/cloudstack-cloudmonkey"; - license = [ lib.licenses.asl20 ]; + license = lib.licenses.asl20; maintainers = [ lib.maintainers.womfoo ]; mainProgram = "cloudstack-cloudmonkey"; }; diff --git a/pkgs/by-name/cl/cloudquery/package.nix b/pkgs/by-name/cl/cloudquery/package.nix new file mode 100644 index 000000000000..fb602644e68a --- /dev/null +++ b/pkgs/by-name/cl/cloudquery/package.nix @@ -0,0 +1,62 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, + installShellFiles, + versionCheckHook, +}: + +buildGoModule (finalAttrs: { + pname = "cloudquery"; + version = "6.41.0"; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "cloudquery"; + repo = "cloudquery"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ybHyZnJTtOacywgjJ+PiH8KJNn1DgBNJ4yMMtu4y/vw="; + }; + + modRoot = "cli"; + + vendorHash = "sha256-zXYYheZtWFuOZ/9AH+h/Qjf4+UZ6RRb9grk/mrJZxTU="; + + subPackages = [ + "." + ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/cloudquery/cloudquery/cli/v${lib.versions.major finalAttrs.version}/cmd.Version=${finalAttrs.version}" + ]; + + doInstallCheck = true; + + nativeBuildInputs = [ + installShellFiles + versionCheckHook + ]; + + postInstall = '' + mv $out/bin/cli $out/bin/cloudquery + + installShellCompletion --cmd cloudquery \ + --bash <($out/bin/cloudquery completion bash) \ + --fish <($out/bin/cloudquery completion fish) \ + --zsh <($out/bin/cloudquery completion zsh) + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Data pipelines for cloud config and security data"; + homepage = "https://github.com/cloudquery/cloudquery"; + changelog = "https://github.com/cloudquery/cloudquery/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ jlesquembre ]; + mainProgram = "cloudquery"; + }; +}) diff --git a/pkgs/by-name/cl/clusterctl/package.nix b/pkgs/by-name/cl/clusterctl/package.nix index 385ff7aff0e8..047d640963a7 100644 --- a/pkgs/by-name/cl/clusterctl/package.nix +++ b/pkgs/by-name/cl/clusterctl/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "clusterctl"; - version = "1.13.3"; + version = "1.13.4"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${finalAttrs.version}"; - hash = "sha256-ValaeZiYlSXydMwmcGMcBXETWweu3d4XRb+fHnangp4="; + hash = "sha256-x/u4lWacCz3GpUCyC8ty4nPPQblEs9G7vucqSJSupEQ="; }; - vendorHash = "sha256-GeZUJozumnxXGIJ4moXxuLDATeJDRbTeGDdscZIvjh0="; + vendorHash = "sha256-73hCBGzE9LB59L+GurlZeTV6K/FLJgtjQc3ku4JR+iM="; subPackages = [ "cmd/clusterctl" ]; diff --git a/pkgs/by-name/cm/cmc/package.nix b/pkgs/by-name/cm/cmc/package.nix index 07e0370365d0..dde599bdddd6 100644 --- a/pkgs/by-name/cm/cmc/package.nix +++ b/pkgs/by-name/cm/cmc/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/TimidRobot/cmc"; description = "Manages SSH ControlMaster sessions"; mainProgram = "cmc"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ chordtoll ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/cn/cni-plugin-flannel/package.nix b/pkgs/by-name/cn/cni-plugin-flannel/package.nix index f838aa3c82c1..136fb2887c3d 100644 --- a/pkgs/by-name/cn/cni-plugin-flannel/package.nix +++ b/pkgs/by-name/cn/cni-plugin-flannel/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cni-plugin-flannel"; - version = "1.9.1-flannel1"; + version = "1.9.1-flannel2"; src = fetchFromGitHub { owner = "flannel-io"; repo = "cni-plugin"; rev = "v${version}"; - sha256 = "sha256-iCSYr7S4oC8a5ijBgqMO/Gn0x/2had372Tx7lkg+X9I="; + sha256 = "sha256-ApPv1sQQZSevvP9gem9bTRWRZzHtcDHWNFTwEdCPJ6s="; }; - vendorHash = "sha256-PVkhwoGepRhD6VFJxhPA2tZ+zOkhQw0aI2yIWVYQnz8="; + vendorHash = "sha256-WoVjhj2r4hVLBFYUYwpwuB7rpvoZFBDLpaEbLrxuFj4="; ldflags = [ "-s" diff --git a/pkgs/by-name/cn/cnstrokeorder/package.nix b/pkgs/by-name/cn/cnstrokeorder/package.nix index 44d4d21b886f..02b0f35635cb 100644 --- a/pkgs/by-name/cn/cnstrokeorder/package.nix +++ b/pkgs/by-name/cn/cnstrokeorder/package.nix @@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation rec { meta = { description = "Chinese font that shows stroke order for HSK 1-4"; homepage = "http://rtega.be/chmn/index.php?subpage=68"; - license = [ lib.licenses.arphicpl ]; + license = lib.licenses.arphicpl; maintainers = with lib.maintainers; [ johnazoidberg ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/cn/cntb/package.nix b/pkgs/by-name/cn/cntb/package.nix index 29b4af7a2f05..c570b3295b31 100644 --- a/pkgs/by-name/cn/cntb/package.nix +++ b/pkgs/by-name/cn/cntb/package.nix @@ -5,13 +5,13 @@ }: buildGoModule (finalAttrs: { pname = "cntb"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "contabo"; repo = "cntb"; rev = "v${finalAttrs.version}"; - hash = "sha256-si6mJ5jHGrgnKp0NP92iFOtGf8x8LG7fqnGccBKXThI="; + hash = "sha256-FR55cvsEEKR+zdvHrJWtmIv/fUn2nAY7JKd2DUlhb4M="; # docs contains two files with the same name but different cases, # this leads to a different hash on case insensitive filesystems (e.g. darwin) # https://github.com/contabo/cntb/issues/34 @@ -22,7 +22,7 @@ buildGoModule (finalAttrs: { subPackages = [ "." ]; - vendorHash = "sha256-W1087nbI6Gd9uy8HPTlms6mXfmj/IzcGIW2AXYRBQG4="; + vendorHash = "sha256-uM7RaVF95WsNok3W7smfX952+Ojl2saGO41QRIFG824="; ldflags = [ "-X contabo.com/cli/cntb/cmd.version=${finalAttrs.src.rev}" diff --git a/pkgs/by-name/co/coc-rust-analyzer/package.nix b/pkgs/by-name/co/coc-rust-analyzer/package.nix index 5fe6b0180c79..ef84afa75456 100644 --- a/pkgs/by-name/co/coc-rust-analyzer/package.nix +++ b/pkgs/by-name/co/coc-rust-analyzer/package.nix @@ -7,13 +7,13 @@ buildNpmPackage { pname = "coc-rust-analyzer"; - version = "0-unstable-2026-07-01"; + version = "0-unstable-2026-07-14"; src = fetchFromGitHub { owner = "fannheyward"; repo = "coc-rust-analyzer"; - rev = "056c78eb619bdf985d4414cbf73abfc5226d5c04"; - hash = "sha256-1WhU2GYUU2l3tKpb5F6VxY61HPOHqtuS6hbI+upCmH8="; + rev = "4e0c84fdbfb8252cc88d0d8ef8af6642a00b8abc"; + hash = "sha256-XTerfjqPyyFlt4y1g1LlAN/JV0aXWEbwCb03YqkMySM="; }; npmDepsHash = "sha256-ifDAM08pfdbqPl9G5s5cx8hGzldNuVc0DcXDyCGgkkI="; diff --git a/pkgs/by-name/co/cockpit-files/package.nix b/pkgs/by-name/co/cockpit-files/package.nix index 60ad181b1230..e2d15ae8d224 100644 --- a/pkgs/by-name/co/cockpit-files/package.nix +++ b/pkgs/by-name/co/cockpit-files/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/cockpit-project/cockpit-files"; changelog = "https://github.com/cockpit-project/cockpit-files/releases/tag/${finalAttrs.version}"; platforms = lib.platforms.linux; - license = [ lib.licenses.lgpl21 ]; + license = lib.licenses.lgpl21; teams = [ lib.teams.cockpit ]; }; }) diff --git a/pkgs/by-name/co/cockpit-machines/package.nix b/pkgs/by-name/co/cockpit-machines/package.nix index b58acdbcee30..96f4fb87e736 100644 --- a/pkgs/by-name/co/cockpit-machines/package.nix +++ b/pkgs/by-name/co/cockpit-machines/package.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/cockpit-project/cockpit-machines"; changelog = "https://github.com/cockpit-project/cockpit-machines/releases/tag/${finalAttrs.version}"; platforms = lib.platforms.linux; - license = [ lib.licenses.lgpl21 ]; + license = lib.licenses.lgpl21; teams = [ lib.teams.cockpit ]; }; }) diff --git a/pkgs/by-name/co/cockpit-podman/package.nix b/pkgs/by-name/co/cockpit-podman/package.nix index 7a5278395eed..f2419ca2f855 100644 --- a/pkgs/by-name/co/cockpit-podman/package.nix +++ b/pkgs/by-name/co/cockpit-podman/package.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/cockpit-project/cockpit-podman"; changelog = "https://github.com/cockpit-project/cockpit-podman/releases/tag/${finalAttrs.version}"; platforms = lib.platforms.linux; - license = [ lib.licenses.lgpl21 ]; + license = lib.licenses.lgpl21; teams = [ lib.teams.cockpit ]; }; }) diff --git a/pkgs/by-name/co/coconutbattery/package.nix b/pkgs/by-name/co/coconutbattery/package.nix index 687f839e3d81..40733c9f1667 100644 --- a/pkgs/by-name/co/coconutbattery/package.nix +++ b/pkgs/by-name/co/coconutbattery/package.nix @@ -31,12 +31,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { It shows you live information about the battery quality in your Mac, iPhone and iPad. ''; homepage = "https://www.coconut-flavour.com/coconutbattery"; - license = with lib.licenses; [ unfree ]; + license = lib.licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; maintainers = with lib.maintainers; [ stepbrobd ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" ]; }; }) diff --git a/pkgs/by-name/co/code-cursor/sources.json b/pkgs/by-name/co/code-cursor/sources.json index 31ac9cbdd27f..d9bb6464be94 100644 --- a/pkgs/by-name/co/code-cursor/sources.json +++ b/pkgs/by-name/co/code-cursor/sources.json @@ -1,22 +1,18 @@ { - "version": "3.11.13", + "version": "3.11.19", "vscodeVersion": "1.125.0", "sources": { "x86_64-linux": { - "url": "https://downloads.cursor.com/production/3f21b08f0b436a07be29fbfe00b304fa15553353/linux/x64/Cursor-3.11.13-x86_64.AppImage", - "hash": "sha256-MXBXgGe7HXiL3kAMKxBSRTZxWMbh15D5dfXw6iemG9g=" + "url": "https://downloads.cursor.com/production/bf249e6efb5b097f23d7e21d7283429f0760b74a/linux/x64/Cursor-3.11.19-x86_64.AppImage", + "hash": "sha256-EE5QuTM16sib4MYAkz34PLbAOXjb7hcdwVtrYSEKt/I=" }, "aarch64-linux": { - "url": "https://downloads.cursor.com/production/3f21b08f0b436a07be29fbfe00b304fa15553353/linux/arm64/Cursor-3.11.13-aarch64.AppImage", - "hash": "sha256-UCjZFxXjzeovYrZWp6xrZGp+eH4uGo41Tl9Uj9q16W4=" - }, - "x86_64-darwin": { - "url": "https://downloads.cursor.com/production/3f21b08f0b436a07be29fbfe00b304fa15553353/darwin/x64/Cursor-darwin-x64.dmg", - "hash": "sha256-FbSBuRaWKjTD7vdg0GvFsizmbpNvnNyzB6yAljMAtSs=" + "url": "https://downloads.cursor.com/production/bf249e6efb5b097f23d7e21d7283429f0760b74a/linux/arm64/Cursor-3.11.19-aarch64.AppImage", + "hash": "sha256-lFAK6xTIA3d0kmjybDYsMTYZhDbr/xasDG/NuZmE83Y=" }, "aarch64-darwin": { - "url": "https://downloads.cursor.com/production/3f21b08f0b436a07be29fbfe00b304fa15553353/darwin/arm64/Cursor-darwin-arm64.dmg", - "hash": "sha256-j1k40mFZDWnNTl/IwCB39JZ+Zc4/JwEthNh8SPCXAZE=" + "url": "https://downloads.cursor.com/production/bf249e6efb5b097f23d7e21d7283429f0760b74a/darwin/arm64/Cursor-darwin-arm64.dmg", + "hash": "sha256-WQ2OfTaGqELWTfjgU4n5tgfgTHQSA06RxERa6pkdukU=" } } } diff --git a/pkgs/by-name/co/code-cursor/update.sh b/pkgs/by-name/co/code-cursor/update.sh index d0d7308c81e1..da907c7aa003 100755 --- a/pkgs/by-name/co/code-cursor/update.sh +++ b/pkgs/by-name/co/code-cursor/update.sh @@ -17,7 +17,6 @@ VSCODE="" for pair in \ x86_64-linux:linux-x64 \ aarch64-linux:linux-arm64 \ - x86_64-darwin:darwin-x64 \ aarch64-darwin:darwin-arm64 do IFS=: read -r sys platform <<< "$pair" diff --git a/pkgs/by-name/co/code-server/package.nix b/pkgs/by-name/co/code-server/package.nix index 87c5dd768006..469afda541e2 100644 --- a/pkgs/by-name/co/code-server/package.nix +++ b/pkgs/by-name/co/code-server/package.nix @@ -62,7 +62,6 @@ let { x86_64-linux = "linux-x64"; aarch64-linux = "linux-arm64"; - x86_64-darwin = "darwin-x64"; aarch64-darwin = "darwin-arm64"; } .${system}; @@ -356,7 +355,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" ]; mainProgram = "code-server"; }; diff --git a/pkgs/by-name/co/codeberg-cli/package.nix b/pkgs/by-name/co/codeberg-cli/package.nix index 9ab51d274a81..7abab8e37b30 100644 --- a/pkgs/by-name/co/codeberg-cli/package.nix +++ b/pkgs/by-name/co/codeberg-cli/package.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "CLI Tool for Codeberg similar to gh and glab"; homepage = "https://codeberg.org/Aviac/codeberg-cli"; - license = with lib.licenses; [ agpl3Plus ]; + license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ robwalt ]; mainProgram = "berg"; }; diff --git a/pkgs/by-name/co/codecov-cli/package.nix b/pkgs/by-name/co/codecov-cli/package.nix index 676417a9ec6b..f5043d0dc516 100644 --- a/pkgs/by-name/co/codecov-cli/package.nix +++ b/pkgs/by-name/co/codecov-cli/package.nix @@ -2,7 +2,20 @@ lib, python3Packages, fetchFromGitHub, + fetchPypi, }: +let + # Due to bug: + # https://github.com/codecov/codecov-cli/issues/721 + click_8_2 = python3Packages.click.overridePythonAttrs (old: rec { + version = "8.2.1"; + src = fetchPypi { + pname = "click"; + inherit version; + hash = "sha256-J8SRzAXZaNJx1aHbE+O1oYRjbZ2TDxSMULA48NBkYgI="; + }; + }); +in python3Packages.buildPythonApplication rec { pname = "codecov-cli"; @@ -21,12 +34,11 @@ python3Packages.buildPythonApplication rec { build-system = with python3Packages; [ setuptools ]; pythonRelaxDeps = [ - "click" "responses" ]; dependencies = with python3Packages; [ - click + click_8_2 ijson pyyaml responses diff --git a/pkgs/by-name/co/codegraph/package.nix b/pkgs/by-name/co/codegraph/package.nix index 21642fdc283d..7f068105e424 100644 --- a/pkgs/by-name/co/codegraph/package.nix +++ b/pkgs/by-name/co/codegraph/package.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation (finalAttrs: { { "aarch64-darwin" = "codegraph-darwin-arm64"; "aarch64-linux" = "codegraph-linux-arm64"; - "x86_64-darwin" = "codegraph-darwin-x64"; "x86_64-linux" = "codegraph-linux-x64"; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -82,10 +81,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/colbymchenry/codegraph/releases/download/v${finalAttrs.version}/codegraph-linux-arm64.tar.gz"; hash = "sha256-DWLF6yci+NGdIPehvZdEReGNUpTLWb4Ragw9Vc6HWR8="; }; - "x86_64-darwin" = fetchurl { - url = "https://github.com/colbymchenry/codegraph/releases/download/v${finalAttrs.version}/codegraph-darwin-x64.tar.gz"; - hash = "sha256-Q2+WlDz9km6m0KhFTxiDPSElTV/Zs9IkMXsUJhMt75U="; - }; "x86_64-linux" = fetchurl { url = "https://github.com/colbymchenry/codegraph/releases/download/v${finalAttrs.version}/codegraph-linux-x64.tar.gz"; hash = "sha256-+1hf9QGNb6qkbSgrYfT2ibx5Z+2KG0Z6XFVt187ZtUI="; diff --git a/pkgs/by-name/co/codeium/package.nix b/pkgs/by-name/co/codeium/package.nix index 1de6073e6d26..31b4c65bbf5f 100644 --- a/pkgs/by-name/co/codeium/package.nix +++ b/pkgs/by-name/co/codeium/package.nix @@ -15,7 +15,6 @@ let { x86_64-linux = "linux_x64"; aarch64-linux = "linux_arm"; - x86_64-darwin = "macos_x64"; aarch64-darwin = "macos_arm"; } @@ -25,7 +24,6 @@ let { x86_64-linux = "sha256-hx5q0JRwvmE63uOpht7+6d7/jCLeknrj2RwiiMkBllc="; aarch64-linux = "sha256-r0gGxwhVkQ5MLTmcrBCJpKfsizAJLJYPw1VdfiHJ3i8="; - x86_64-darwin = "sha256-LI+qp82dorbZCyibCVwx04tiCoRz3SkT1kUyAFlKWys="; aarch64-darwin = "sha256-c0BDLK1ilDOdNYbOqzFNoJFeBUlWI7/+z7HaosM/D4o="; } .${system} or throwSystem; @@ -84,7 +82,6 @@ stdenv.mkDerivation (finalAttrs: { "aarch64-darwin" "aarch64-linux" "x86_64-linux" - "x86_64-darwin" ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; }; diff --git a/pkgs/by-name/co/codeium/update.sh b/pkgs/by-name/co/codeium/update.sh index 268886b576a0..1c3bfabb32dd 100755 --- a/pkgs/by-name/co/codeium/update.sh +++ b/pkgs/by-name/co/codeium/update.sh @@ -24,12 +24,10 @@ CODEIUM_VER=$(curl -s "https://api.github.com/repos/Exafunction/codeium/releases CODEIUM_LINUX_X64_HASH=$(fetch_arch "$CODEIUM_VER" "linux_x64") CODEIUM_LINUX_AARCH64_HASH=$(fetch_arch "$CODEIUM_VER" "linux_arm") -CODEIUM_DARWIN_X64_HASH=$(fetch_arch "$CODEIUM_VER" "macos_x64") CODEIUM_DARWIN_AARCH64_HASH=$(fetch_arch "$CODEIUM_VER" "macos_arm") sed -i "s/version = \".*\"/version = \"$CODEIUM_VER\"/" "$NIX_DRV" replace_hash "x86_64-linux" "$CODEIUM_LINUX_X64_HASH" replace_hash "aarch64-linux" "$CODEIUM_LINUX_AARCH64_HASH" -replace_hash "x86_64-darwin" "$CODEIUM_DARWIN_X64_HASH" replace_hash "aarch64-darwin" "$CODEIUM_DARWIN_AARCH64_HASH" diff --git a/pkgs/by-name/co/coder/package.nix b/pkgs/by-name/co/coder/package.nix index 377621ee1af2..db0fc4b16120 100644 --- a/pkgs/by-name/co/coder/package.nix +++ b/pkgs/by-name/co/coder/package.nix @@ -18,7 +18,6 @@ let version = "2.33.11"; hash = { x86_64-linux = "sha256-NY9xyLc6Pr1wWPnr4fLo6t+7B7Gin/BlTH3tdxQk30k="; - x86_64-darwin = "sha256-yEHu+ekyZSUd66L9sR8ihVLFnDe9N/kFKLGHOFfx9es="; aarch64-linux = "sha256-Wc9hhotJKcb1fdjfh9pWxVs/e4YpBua1PyAhMRJbUAY="; aarch64-darwin = "sha256-7A6BxOg4A3Ua5SXjnh5gtG/LE94iGuRQPe/S9UjX/oc="; }; @@ -27,7 +26,6 @@ let version = "2.34.5"; hash = { x86_64-linux = "sha256-B0roCJqTu6o89nHbVA3b9eHKj/VmJ9i1j4blF1I76yU="; - x86_64-darwin = "sha256-+7QhdfwFqh9SZBJOgOqS0Y49dUsWM6PC0/oBhfuAkfM="; aarch64-linux = "sha256-UDyEhBAlvgSHWLPtbNXHj6X2gle1Y3fjQLSKHzwc/XI="; aarch64-darwin = "sha256-VhliikNdqi7AauYlKQvMroEjR3jZZnhNw0HTtJFw5zg="; }; @@ -46,7 +44,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { { x86_64-linux = "linux_amd64"; aarch64-linux = "linux_arm64"; - x86_64-darwin = "darwin_amd64"; aarch64-darwin = "darwin_arm64"; } .${system}; @@ -55,7 +52,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { { x86_64-linux = "tar.gz"; aarch64-linux = "tar.gz"; - x86_64-darwin = "zip"; aarch64-darwin = "zip"; } .${system}; @@ -104,7 +100,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ bpmct developmentcats - ghuntley kylecarbs phorcys420 ]; diff --git a/pkgs/by-name/co/coder/update.sh b/pkgs/by-name/co/coder/update.sh index 7f5e29d10b00..65a4dd6fcc84 100755 --- a/pkgs/by-name/co/coder/update.sh +++ b/pkgs/by-name/co/coder/update.sh @@ -13,7 +13,6 @@ LATEST_MAINLINE_VERSION=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} --fail # Define the platforms declare -A ARCHS=(["x86_64-linux"]="linux_amd64.tar.gz" ["aarch64-linux"]="linux_arm64.tar.gz" - ["x86_64-darwin"]="darwin_amd64.zip" ["aarch64-darwin"]="darwin_arm64.zip") update_version_and_hashes() { diff --git a/pkgs/by-name/co/codesearch/package.nix b/pkgs/by-name/co/codesearch/package.nix index bc55d87aaaa8..ef378b6f9396 100644 --- a/pkgs/by-name/co/codesearch/package.nix +++ b/pkgs/by-name/co/codesearch/package.nix @@ -25,7 +25,7 @@ buildGoModule (finalAttrs: { meta = { description = "Fast, indexed regexp search over large file trees"; homepage = "https://github.com/google/codesearch"; - license = [ lib.licenses.bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ bennofs ]; }; }) diff --git a/pkgs/by-name/co/codex-acp/librusty_v8.nix b/pkgs/by-name/co/codex-acp/librusty_v8.nix index c2f00c5fe62e..58ee83b3833e 100644 --- a/pkgs/by-name/co/codex-acp/librusty_v8.nix +++ b/pkgs/by-name/co/codex-acp/librusty_v8.nix @@ -12,7 +12,6 @@ fetchurl { { x86_64-linux = "sha256-5ktNmeSuKTouhGJEqJuAF4uhA4LBP7WRwfppaPUpEVM="; aarch64-linux = "sha256-2/FlsHyBvbBUvARrQ9I+afz3vMGkwbW0d2mDpxBi7Ng="; - x86_64-darwin = "sha256-YwzSQPG77NsHFBfcGDh6uBz2fFScHFFaC0/Pnrpke7c="; aarch64-darwin = "sha256-v+LJvjKlbChUbw+WWCXuaPv2BkBfMQzE4XtEilaM+Yo="; } .${stdenv.hostPlatform.system} diff --git a/pkgs/by-name/co/codex-acp/update.sh b/pkgs/by-name/co/codex-acp/update.sh index 2a8328e7bcf5..aa434ded6b25 100755 --- a/pkgs/by-name/co/codex-acp/update.sh +++ b/pkgs/by-name/co/codex-acp/update.sh @@ -141,7 +141,6 @@ fetchurl { { x86_64-linux = "${V8_HASH_X86_64_LINUX}"; aarch64-linux = "${V8_HASH_AARCH64_LINUX}"; - x86_64-darwin = "${V8_HASH_X86_64_DARWIN}"; aarch64-darwin = "${V8_HASH_AARCH64_DARWIN}"; } .\${stdenv.hostPlatform.system} @@ -198,9 +197,8 @@ export CODEX_HASH V8_HASH_X86_64_LINUX="$(prefetch_sri "https://github.com/denoland/rusty_v8/releases/download/v${V8_VERSION}/librusty_v8_release_x86_64-unknown-linux-gnu.a.gz")" V8_HASH_AARCH64_LINUX="$(prefetch_sri "https://github.com/denoland/rusty_v8/releases/download/v${V8_VERSION}/librusty_v8_release_aarch64-unknown-linux-gnu.a.gz")" -V8_HASH_X86_64_DARWIN="$(prefetch_sri "https://github.com/denoland/rusty_v8/releases/download/v${V8_VERSION}/librusty_v8_release_x86_64-apple-darwin.a.gz")" V8_HASH_AARCH64_DARWIN="$(prefetch_sri "https://github.com/denoland/rusty_v8/releases/download/v${V8_VERSION}/librusty_v8_release_aarch64-apple-darwin.a.gz")" -export V8_VERSION V8_HASH_X86_64_LINUX V8_HASH_AARCH64_LINUX V8_HASH_X86_64_DARWIN V8_HASH_AARCH64_DARWIN +export V8_VERSION V8_HASH_X86_64_LINUX V8_HASH_AARCH64_LINUX V8_HASH_AARCH64_DARWIN update-source-version "$ATTR_PATH" "$latest_version" "$src_hash" --ignore-same-version update_codex_pins diff --git a/pkgs/by-name/co/codex/librusty_v8.nix b/pkgs/by-name/co/codex/librusty_v8.nix index 213a3174cee3..9b38127fc5f6 100644 --- a/pkgs/by-name/co/codex/librusty_v8.nix +++ b/pkgs/by-name/co/codex/librusty_v8.nix @@ -6,7 +6,6 @@ fetchLibrustyV8 { shas = { x86_64-linux = "sha256-5ktNmeSuKTouhGJEqJuAF4uhA4LBP7WRwfppaPUpEVM="; aarch64-linux = "sha256-2/FlsHyBvbBUvARrQ9I+afz3vMGkwbW0d2mDpxBi7Ng="; - x86_64-darwin = "sha256-YwzSQPG77NsHFBfcGDh6uBz2fFScHFFaC0/Pnrpke7c="; aarch64-darwin = "sha256-v+LJvjKlbChUbw+WWCXuaPv2BkBfMQzE4XtEilaM+Yo="; }; } diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix index 6fa2aff8ea20..ad87fcd174e5 100644 --- a/pkgs/by-name/co/codex/package.nix +++ b/pkgs/by-name/co/codex/package.nix @@ -26,13 +26,13 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "codex"; - version = "0.144.1"; + version = "0.144.4"; src = fetchFromGitHub { owner = "openai"; repo = "codex"; tag = "rust-v${finalAttrs.version}"; - hash = "sha256-KHgrqIZyAmLhTZSRYbb7huBO8neOib/B1Vx/oPW2nEU="; + hash = "sha256-NmYZxjNFPkRWN4rw+eeka10pJt6/oU3ZoLXBxj3dPRU="; }; sourceRoot = "${finalAttrs.src.name}/codex-rs"; diff --git a/pkgs/by-name/co/codexbar/package.nix b/pkgs/by-name/co/codexbar/package.nix index e91c7026221c..62684d7c3540 100644 --- a/pkgs/by-name/co/codexbar/package.nix +++ b/pkgs/by-name/co/codexbar/package.nix @@ -3,29 +3,34 @@ stdenvNoCC, fetchurl, nix-update-script, + makeWrapper, unzip, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "codexbar"; - version = "0.41.0"; + version = "0.43.0"; __structuredAttrs = true; strictDeps = true; src = fetchurl { url = "https://github.com/steipete/CodexBar/releases/download/v${finalAttrs.version}/CodexBar-macos-universal-${finalAttrs.version}.zip"; - hash = "sha256-M3i05Yu15uTLd/bO5E5bYen3dYo1iTEI/z7+VxeFhY0="; + hash = "sha256-dKr5/7HzgqDXUwkHGj1z534ekTajyUFNSrpg+vK/4Yw="; }; sourceRoot = "."; - nativeBuildInputs = [ unzip ]; + nativeBuildInputs = [ + makeWrapper + unzip + ]; installPhase = '' runHook preInstall mkdir -p $out/Applications - cp -r *.app $out/Applications + cp -r CodexBar.app $out/Applications + makeWrapper $out/Applications/CodexBar.app/Contents/MacOS/CodexBar $out/bin/codexbar runHook postInstall ''; @@ -44,5 +49,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { ]; platforms = lib.platforms.darwin; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + mainProgram = "codexbar"; }; }) diff --git a/pkgs/by-name/co/cog/package.nix b/pkgs/by-name/co/cog/package.nix index 7cfc53f6f6b7..017d59d0c538 100644 --- a/pkgs/by-name/co/cog/package.nix +++ b/pkgs/by-name/co/cog/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "cog"; - version = "0.1.22"; + version = "0.1.23"; src = fetchFromGitHub { owner = "grafana"; repo = "cog"; tag = "v${finalAttrs.version}"; - hash = "sha256-hYXTZlV8128cKchF2vMkr4QJxYI+yJA75LtuTmMpR5U="; + hash = "sha256-uMlxFWMdrFF61FBinXi03QP1dGdQxaQWIyqv9eQCBP4="; }; - vendorHash = "sha256-5y6spoRzl4yJ5GpiHHvGHJIdEFnsUdpIiuoWmym5GJY="; + vendorHash = "sha256-MY+rS6lF2p8cTDB2faxBwu1VpyMy/ZvadpRdGC8/SRU="; subPackages = [ "cmd/cli" ]; diff --git a/pkgs/by-name/co/collectl/package.nix b/pkgs/by-name/co/collectl/package.nix index 8251bf100985..279557a86322 100644 --- a/pkgs/by-name/co/collectl/package.nix +++ b/pkgs/by-name/co/collectl/package.nix @@ -68,13 +68,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "collectl"; - version = "4.3.20.2"; + version = "4.3.20.3"; src = fetchFromGitHub { owner = "sharkcz"; repo = "collectl"; rev = finalAttrs.version; - hash = "sha256-xIfimx7IbC5WHLCLPXGAhL9gkC4F+/JHDFYb0wwAK3I="; + hash = "sha256-hokovb6uqPiMFlDS0g2F/J1rHTkyNBegcgOC3g3ykEs="; }; strictDeps = true; diff --git a/pkgs/by-name/co/colorgrind/package.nix b/pkgs/by-name/co/colorgrind/package.nix index 70b9ce0d16e4..649a57ea10d9 100644 --- a/pkgs/by-name/co/colorgrind/package.nix +++ b/pkgs/by-name/co/colorgrind/package.nix @@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation { meta = { description = "Perl wrapper for Valgrind with ANSI escape code colored output"; homepage = "http://renatocf.github.io/colorgrind/"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ pluiedev ]; mainProgram = "colorgrind"; }; diff --git a/pkgs/by-name/co/colorized-logs/package.nix b/pkgs/by-name/co/colorized-logs/package.nix index f08531461b96..48987505dff2 100644 --- a/pkgs/by-name/co/colorized-logs/package.nix +++ b/pkgs/by-name/co/colorized-logs/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Tools for logs with ANSI color"; homepage = "https://github.com/kilobyte/colorized-logs"; changelog = "https://github.com/kilobyte/colorized-logs/blob/v${finalAttrs.version}/ChangeLog"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ CobaltCause ]; }; diff --git a/pkgs/by-name/co/colstr/package.nix b/pkgs/by-name/co/colstr/package.nix index 1d5b693b9f2b..716c8126acd9 100644 --- a/pkgs/by-name/co/colstr/package.nix +++ b/pkgs/by-name/co/colstr/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Deterministically output each input argument in a color assigned to it"; homepage = "https://git.sleeping.town/wonder/colstr"; - license = with lib.licenses; [ cc0 ]; + license = lib.licenses.cc0; maintainers = with lib.maintainers; [ annaaurora ]; mainProgram = "colstr"; platforms = lib.platforms.all; diff --git a/pkgs/by-name/co/commix/package.nix b/pkgs/by-name/co/commix/package.nix index 3c46fb420986..b218a18532d5 100644 --- a/pkgs/by-name/co/commix/package.nix +++ b/pkgs/by-name/co/commix/package.nix @@ -39,7 +39,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { mainProgram = "commix"; homepage = "https://github.com/commixproject/commix"; changelog = "https://github.com/commixproject/commix/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/co/communique/package.nix b/pkgs/by-name/co/communique/package.nix new file mode 100644 index 000000000000..bf46339cb802 --- /dev/null +++ b/pkgs/by-name/co/communique/package.nix @@ -0,0 +1,47 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + cacert, + gitMinimal, + ripgrep, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "communique"; + version = "1.2.1"; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "jdx"; + repo = "communique"; + tag = "v${finalAttrs.version}"; + hash = "sha256-lQN6LViO3Ta6eCbU6j76OFN95R6A0hP3Pfc38KrHDng="; + }; + + cargoHash = "sha256-RJzjpDhxpi7Zmzw9kl48yq6//zTYOeJ+SrgAfqq/tl4="; + + nativeCheckInputs = [ + cacert + gitMinimal + ripgrep + ]; + + __darwinAllowLocalNetworking = true; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Editorialized release notes powered by AI"; + homepage = "https://github.com/jdx/communique"; + changelog = "https://github.com/jdx/communique/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Br1ght0ne ]; + mainProgram = "communique"; + }; +}) diff --git a/pkgs/by-name/co/composer-require-checker/package.nix b/pkgs/by-name/co/composer-require-checker/package.nix index 4a32672c5deb..8eef375c54b3 100644 --- a/pkgs/by-name/co/composer-require-checker/package.nix +++ b/pkgs/by-name/co/composer-require-checker/package.nix @@ -25,7 +25,7 @@ php.buildComposerProject2 (finalAttrs: { description = "CLI tool to check whether a specific composer package uses imported symbols that aren't part of its direct composer dependencies"; homepage = "https://github.com/maglnet/ComposerRequireChecker/"; changelog = "https://github.com/maglnet/ComposerRequireChecker/releases/tag/${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "composer-require-checker"; maintainers = [ lib.maintainers.patka ]; }; diff --git a/pkgs/by-name/co/concord-tui/package.nix b/pkgs/by-name/co/concord-tui/package.nix index b6554a5202e1..f2ea41311f2e 100644 --- a/pkgs/by-name/co/concord-tui/package.nix +++ b/pkgs/by-name/co/concord-tui/package.nix @@ -9,19 +9,20 @@ stdenv, # TODO: Clean up on `staging` lld, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "concord-tui"; - version = "2.3.5"; + version = "2.4.1"; src = fetchFromGitHub { owner = "chojs23"; repo = "concord"; tag = "v${finalAttrs.version}"; - hash = "sha256-UYhwDV4tay3DqjGZNfnFNVXclAyjZKqp+gbIjXUzudE="; + hash = "sha256-3c5jxpJrBr6vYnbcJIYD06d932Da94hXUZA5FLa3kkU="; }; - cargoHash = "sha256-S1ij7AukfmDosZz0TW9AVuriUFw4Eq0Pk6KxhcOr17o="; + cargoHash = "sha256-6iAyKsS+FoNCKkMvbL70vKSPoAaKQtUDiAQGaEMuxWk="; buildInputs = [ opus @@ -47,6 +48,8 @@ rustPlatform.buildRustPackage (finalAttrs: { NIX_CFLAGS_LINK = "-fuse-ld=${lib.getExe' lld "ld64.lld"}"; }; + passthru.updateScript = nix-update-script { }; + meta = { description = "Feature-rich TUI client for Discord, written in Rust"; homepage = "https://github.com/chojs23/concord"; diff --git a/pkgs/by-name/co/conda/package.nix b/pkgs/by-name/co/conda/package.nix index 16f5322bb1b3..8bd71cb42b5e 100644 --- a/pkgs/by-name/co/conda/package.nix +++ b/pkgs/by-name/co/conda/package.nix @@ -143,7 +143,7 @@ buildFHSEnv { "aarch64-linux" "x86_64-linux" ]; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ jluttine ]; }; } diff --git a/pkgs/by-name/co/confluencepot/package.nix b/pkgs/by-name/co/confluencepot/package.nix index 87732ffe870b..a5bfaaa3c2fe 100644 --- a/pkgs/by-name/co/confluencepot/package.nix +++ b/pkgs/by-name/co/confluencepot/package.nix @@ -39,7 +39,7 @@ buildGoModule (finalAttrs: { ConfluencePot is a simple honeypot for the Atlassian Confluence unauthenticated and remote OGNL injection vulnerability (CVE-2022-26134). ''; - license = with lib.licenses; [ agpl3Plus ]; + license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ fab ]; mainProgram = "confluencepot"; }; diff --git a/pkgs/by-name/co/confluent-cli/package.nix b/pkgs/by-name/co/confluent-cli/package.nix index 4e3d2fabc11d..8ae7ef9ed628 100644 --- a/pkgs/by-name/co/confluent-cli/package.nix +++ b/pkgs/by-name/co/confluent-cli/package.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation (finalAttrs: { system = selectSystem { x86_64-linux = "linux_amd64"; aarch64-linux = "linux_arm64"; - x86_64-darwin = "darwin_amd64"; aarch64-darwin = "darwin_arm64"; }; in @@ -28,7 +27,6 @@ stdenv.mkDerivation (finalAttrs: { hash = selectSystem { x86_64-linux = "sha256-52zPTIuJOS+MMG1+pA+f0HI7VvBHLsRnSq5zWorHsiQ="; aarch64-linux = "sha256-hdhMSZR593rcjch4EVdRshC72aTp1c3dTQBlLCDMsVg="; - x86_64-darwin = "sha256-ybzj3fv+7Wdix9ez7cARazhpkxMGi/EO8NbpneWGN4I="; aarch64-darwin = "sha256-YOVGl47XOvvHDtm2/VzzLOeFCA6sw8BuDHQWZgzNNtE="; }; }; diff --git a/pkgs/by-name/co/confluent-cli/update.sh b/pkgs/by-name/co/confluent-cli/update.sh index e237957438f0..402304aa903e 100755 --- a/pkgs/by-name/co/confluent-cli/update.sh +++ b/pkgs/by-name/co/confluent-cli/update.sh @@ -23,7 +23,6 @@ fi for i in \ "x86_64-linux linux_amd64" \ "aarch64-linux linux_arm64" \ - "x86_64-darwin darwin_amd64" \ "aarch64-darwin darwin_arm64"; do set -- $i hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/$latestVersion/confluent_${latestVersion}_$2.tar.gz")) diff --git a/pkgs/by-name/co/convco/package.nix b/pkgs/by-name/co/convco/package.nix index 9bd51a9efc5b..30a0eea2d75f 100644 --- a/pkgs/by-name/co/convco/package.nix +++ b/pkgs/by-name/co/convco/package.nix @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Conventional commit cli"; mainProgram = "convco"; homepage = "https://github.com/convco/convco"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ hoverbear cafkafk diff --git a/pkgs/by-name/co/copilot-language-server/package.nix b/pkgs/by-name/co/copilot-language-server/package.nix index 851e409fad4b..a942e14695cf 100644 --- a/pkgs/by-name/co/copilot-language-server/package.nix +++ b/pkgs/by-name/co/copilot-language-server/package.nix @@ -10,11 +10,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "copilot-language-server"; - version = "1.517.0"; + version = "1.521.0"; src = fetchzip { url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-js-${finalAttrs.version}.zip"; - hash = "sha256-BzvUARAI8DOEYHPMavJdtSkr+ZCj/E+mM9wQtmEGyjY="; + hash = "sha256-uHt22/756jxh34HhIbMEu3nGebbTF1325ylWuKzZzEI="; stripRoot = false; }; @@ -58,7 +58,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/co/coturn/package.nix b/pkgs/by-name/co/coturn/package.nix index 142647a7f086..24eaad35921a 100644 --- a/pkgs/by-name/co/coturn/package.nix +++ b/pkgs/by-name/co/coturn/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { description = "TURN server"; homepage = "https://coturn.net/"; changelog = "https://github.com/coturn/coturn/blob/${finalAttrs.version}/ChangeLog"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ _0x4A6F ]; broken = stdenv.hostPlatform.isDarwin; # 2018-10-21 diff --git a/pkgs/by-name/co/coze/package.nix b/pkgs/by-name/co/coze/package.nix index 07ebefa970c2..a2019e841897 100644 --- a/pkgs/by-name/co/coze/package.nix +++ b/pkgs/by-name/co/coze/package.nix @@ -25,7 +25,7 @@ buildGoModule (finalAttrs: { description = "CLI client for Coze, a cryptographic JSON messaging specification"; mainProgram = "coze"; homepage = "https://github.com/Cyphrme/CozeCLI"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ qbit ]; }; }) diff --git a/pkgs/by-name/cp/cpp-ipfs-http-client/package.nix b/pkgs/by-name/cp/cpp-ipfs-http-client/package.nix index 0dae81d299c6..5b46ca14a230 100644 --- a/pkgs/by-name/cp/cpp-ipfs-http-client/package.nix +++ b/pkgs/by-name/cp/cpp-ipfs-http-client/package.nix @@ -41,7 +41,6 @@ stdenv.mkDerivation { license = lib.licenses.mit; platforms = [ "x86_64-linux" - "x86_64-darwin" ]; # The last successful Darwin Hydra build was in 2023 broken = stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/cp/cpplint/package.nix b/pkgs/by-name/cp/cpplint/package.nix index f28a21289b99..44c42719e0bf 100644 --- a/pkgs/by-name/cp/cpplint/package.nix +++ b/pkgs/by-name/cp/cpplint/package.nix @@ -2,6 +2,7 @@ lib, python3Packages, fetchFromGitHub, + fetchpatch2, versionCheckHook, }: @@ -17,6 +18,20 @@ python3Packages.buildPythonApplication (finalAttrs: { hash = "sha256-4crTuqynQt8Nyjqea6DpREtLy7ydRF0hNVnc7tUnO1k="; }; + # Fix Python 3.14 test failures. Remove with the next release. + patches = [ + (fetchpatch2 { + name = "drop-codecs-open.patch"; + url = "https://github.com/cpplint/cpplint/commit/89bff410afed72e58d23ae084de4103986ea8630.patch?full_index=1"; + hash = "sha256-Jdeewj3GM7GMoRF7+Qz/9n1hc8PYPcXLgtSGwSUpT1E="; + }) + (fetchpatch2 { + name = "use-universal-newlines.patch"; + url = "https://github.com/cpplint/cpplint/commit/d15a8715a6e848f784fda700758c4ac2d252fd31.patch?full_index=1"; + hash = "sha256-Oo2doknEGnuxDJA0y17n1DCaKwadtMW/14a5wnIgfkw="; + }) + ]; + # We use pytest-cov-stub instead postPatch = '' substituteInPlace pyproject.toml \ @@ -41,6 +56,6 @@ python3Packages.buildPythonApplication (finalAttrs: { description = "Static code checker for C++"; changelog = "https://github.com/cpplint/cpplint/releases/tag/${finalAttrs.version}"; mainProgram = "cpplint"; - license = [ lib.licenses.bsd3 ]; + license = lib.licenses.bsd3; }; }) diff --git a/pkgs/by-name/cr/crackql/package.nix b/pkgs/by-name/cr/crackql/package.nix index b3474f3f65c8..7860eb4fe424 100644 --- a/pkgs/by-name/cr/crackql/package.nix +++ b/pkgs/by-name/cr/crackql/package.nix @@ -42,7 +42,7 @@ python3.pkgs.buildPythonApplication { description = "GraphQL password brute-force and fuzzing utility"; mainProgram = "crackql"; homepage = "https://github.com/nicholasaleks/CrackQL"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/cr/cratedb/package.nix b/pkgs/by-name/cr/cratedb/package.nix index 8119c0d7f7fd..1f652d880999 100644 --- a/pkgs/by-name/cr/cratedb/package.nix +++ b/pkgs/by-name/cr/cratedb/package.nix @@ -72,7 +72,7 @@ maven.buildMavenPackage { ''; homepage = "https://cratedb.com/database"; changelog = "https://cratedb.com/docs/crate/reference/en/latest/appendices/release-notes/${version}.html"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; platforms = with lib.platforms; unix ++ windows; # FIXME: Somehow dependencies are platform-dependent. Somehow. broken = stdenvNoCC.hostPlatform.system != "x86_64-linux"; diff --git a/pkgs/by-name/cr/crates-lsp/package.nix b/pkgs/by-name/cr/crates-lsp/package.nix index c297cebaf644..fee204199ea1 100644 --- a/pkgs/by-name/cr/crates-lsp/package.nix +++ b/pkgs/by-name/cr/crates-lsp/package.nix @@ -22,13 +22,12 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Language Server implementation for Cargo.toml"; homepage = "https://github.com/MathiasPius/crates-lsp"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; platforms = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" - "x86_64-darwin" "x86_64-windows" ]; maintainers = with lib.maintainers; [ steveej ]; diff --git a/pkgs/by-name/cr/crates-tui/package.nix b/pkgs/by-name/cr/crates-tui/package.nix index f601887ddc7f..c56137165e9c 100644 --- a/pkgs/by-name/cr/crates-tui/package.nix +++ b/pkgs/by-name/cr/crates-tui/package.nix @@ -34,13 +34,12 @@ rustPlatform.buildRustPackage { meta = { description = "TUI for exploring crates.io using Ratatui"; homepage = "https://github.com/ratatui/crates-tui"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; # See Cargo.toml: workspaces.metadata.dist.targets # Other platforms may work but YMMV platforms = [ "x86_64-linux" "aarch64-darwin" - "x86_64-darwin" "x86_64-windows" ]; maintainers = with lib.maintainers; [ pluiedev ]; diff --git a/pkgs/by-name/cr/crc32c/package.nix b/pkgs/by-name/cr/crc32c/package.nix index 221e67c07488..e34105895448 100644 --- a/pkgs/by-name/cr/crc32c/package.nix +++ b/pkgs/by-name/cr/crc32c/package.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/google/crc32c"; description = "CRC32C implementation with support for CPU-specific acceleration instructions"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ cpcloud ]; }; }) diff --git a/pkgs/by-name/cr/crlfuzz/package.nix b/pkgs/by-name/cr/crlfuzz/package.nix index b30c3b4c3b05..6115ffa3a269 100644 --- a/pkgs/by-name/cr/crlfuzz/package.nix +++ b/pkgs/by-name/cr/crlfuzz/package.nix @@ -23,7 +23,7 @@ buildGoModule (finalAttrs: { description = "Tool to scan for CRLF vulnerability"; mainProgram = "crlfuzz"; homepage = "https://github.com/dwisiswant0/crlfuzz"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/cr/crowdin-cli/package.nix b/pkgs/by-name/cr/crowdin-cli/package.nix index acf0adfbf76e..6ecda3150328 100644 --- a/pkgs/by-name/cr/crowdin-cli/package.nix +++ b/pkgs/by-name/cr/crowdin-cli/package.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "crowdin-cli"; - version = "4.14.3"; + version = "4.14.4"; src = fetchurl { url = "https://github.com/crowdin/crowdin-cli/releases/download/${finalAttrs.version}/crowdin-cli.zip"; - hash = "sha256-Jtj1WcKkJF0toa2/xK/cR0r4+lzzMFkoQnG6jCFSAM4="; + hash = "sha256-dHRFgAY+nWZq46VpC4tc/A2QR+f73ypn1aMxTI9g1F0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cr/crunch/package.nix b/pkgs/by-name/cr/crunch/package.nix index 067a5e3a6644..0b328ac4dcb0 100644 --- a/pkgs/by-name/cr/crunch/package.nix +++ b/pkgs/by-name/cr/crunch/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "crunch"; homepage = "https://sourceforge.net/projects/crunch-wordlist/"; platforms = lib.platforms.unix; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = [ ]; }; }) diff --git a/pkgs/by-name/cr/cryfs/package.nix b/pkgs/by-name/cr/cryfs/package.nix deleted file mode 100644 index 4505ab2bad8b..000000000000 --- a/pkgs/by-name/cr/cryfs/package.nix +++ /dev/null @@ -1,147 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - pkg-config, - python3, - boost, - curl, - fuse, - gtest, - openssl, - range-v3, - spdlog, - llvmPackages, - writableTmpDirAsHomeHook, - versionCheckHook, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "cryfs"; - version = "1.0.3"; - - src = fetchFromGitHub { - owner = "cryfs"; - repo = "cryfs"; - tag = finalAttrs.version; - hash = "sha256-DbXZxPACisAcdaqaqRiBK2Su/Wp6E9Mh+w62EkJrpYA="; - }; - - postPatch = '' - patchShebangs src/ - '' - # Set Boost_USE_STATIC_LIBS via CMake command line. (see cmakeFlags below) - + '' - substituteInPlace cmake-utils/Dependencies.cmake \ - --replace-fail "set(Boost_USE_STATIC_LIBS OFF)" "" - '' - # Downsize large file test as 4.5G is too big for Hydra. - + '' - substituteInPlace test/cpp-utils/data/DataTest.cpp \ - --replace-fail "(4.5L*1024*1024*1024)" "(0.5L*1024*1024*1024)" - ''; - - nativeBuildInputs = [ - cmake - pkg-config - python3 - ]; - - strictDeps = true; - - buildInputs = [ - boost - curl - fuse - gtest - openssl - range-v3 - spdlog - ] - ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; - - cmakeFlags = [ - (lib.cmakeFeature "DEPENDENCY_CONFIG" "../cmake-utils/DependenciesFromLocalSystem.cmake") - (lib.cmakeBool "CRYFS_UPDATE_CHECKS" false) - (lib.cmakeBool "Boost_USE_STATIC_LIBS" stdenv.hostPlatform.isStatic) # This option is case sensitive. - (lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck) - ]; - - # macFUSE needs to be installed for the tests to succeed on Darwin. - doCheck = !stdenv.hostPlatform.isDarwin; - - nativeCheckInputs = [ - writableTmpDirAsHomeHook - ]; - - checkPhase = - let - runTest = - { - path, - filter ? null, - }: - "command ./${path}${lib.optionalString (!isNull filter) " '--gtest_filter=${filter}'"}"; - in - '' - runHook preCheck - - pushd test/ - '' - # See the test runner at https://github.com/cryfs/cryfs/blob/1.0.3/.github/workflows/actions/run_tests/action.yaml. - + (lib.concatLines [ - (runTest { - path = "gitversion/gitversion-test"; - }) - (runTest { - path = "cpp-utils/cpp-utils-test"; - filter = - if stdenv.hostPlatform.isStatic then "*-BacktraceTest.*:*.AssertMessageContainsBacktrace" else null; - }) - (runTest { - path = "parallelaccessstore/parallelaccessstore-test"; - }) - (runTest { - path = "blockstore/blockstore-test"; - }) - (runTest { - path = "blobstore/blobstore-test"; - }) - (runTest { - path = "cryfs/cryfs-test"; - }) - # Skip tests trying to access /dev/fuse inside the build sandbox. - (runTest { - path = "fspp/fspp-test"; - filter = ""; # Skip all tests. - }) - (runTest { - path = "cryfs-cli/cryfs-cli-test"; - filter = "*-CliTest.WorksWithCommasInBasedir:CliTest_IntegrityCheck.*:CliTest_Setup.*:CliTest_Unmount.*:RunningInForeground*"; - }) - ]) - + '' - popd - - runHook postCheck - ''; - - doInstallCheck = true; - - nativeInstallCheckInputs = [ - versionCheckHook - ]; - - meta = { - description = "Cryptographic filesystem for the cloud"; - homepage = "https://www.cryfs.org/"; - changelog = "https://github.com/cryfs/cryfs/raw/${finalAttrs.version}/ChangeLog.txt"; - license = lib.licenses.lgpl3Only; - maintainers = with lib.maintainers; [ - peterhoeg - sigmasquadron - ]; - platforms = lib.systems.inspect.patterns.isUnix; - }; -}) diff --git a/pkgs/by-name/cs/csharp-ls/package.nix b/pkgs/by-name/cs/csharp-ls/package.nix index decfbf629b2a..f74f4d300085 100644 --- a/pkgs/by-name/cs/csharp-ls/package.nix +++ b/pkgs/by-name/cs/csharp-ls/package.nix @@ -11,9 +11,9 @@ in buildDotnetGlobalTool (finalAttrs: { pname = "csharp-ls"; - version = "0.25.0"; + version = "0.26.0"; - nugetHash = "sha256-w+zbCCR7ns8a5TqAOlwi5nE3AKWF9xhWG2jLmKbpzeI="; + nugetHash = "sha256-KwOYeu8Hu3CL/lanv7NwNkx8ggPmmqZ3o3WUu+IaFbA="; inherit dotnet-sdk; dotnet-runtime = dotnet-sdk; diff --git a/pkgs/by-name/cu/cubelify/package.nix b/pkgs/by-name/cu/cubelify/package.nix index d4f08b49ddb5..40ffb90e59ca 100644 --- a/pkgs/by-name/cu/cubelify/package.nix +++ b/pkgs/by-name/cu/cubelify/package.nix @@ -33,7 +33,7 @@ appimageTools.wrapType2 rec { meta = { description = "Powerful and feature-rich Hypixel anti-sniping stats overlay"; homepage = "https://cubelify.com/"; - license = with lib.licenses; [ unfree ]; + license = lib.licenses.unfree; mainProgram = "cubelify"; maintainers = with lib.maintainers; [ yunfachi ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/by-name/cu/cudatext/deps.json b/pkgs/by-name/cu/cudatext/deps.json index ba7392d2130e..8afb270805e0 100644 --- a/pkgs/by-name/cu/cudatext/deps.json +++ b/pkgs/by-name/cu/cudatext/deps.json @@ -11,13 +11,13 @@ }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2026.05.06", - "hash": "sha256-qqFYaY9Bm6yMSlMlO/Uwot2Ix0TsxEb21d7X/zCvTyQ=" + "rev": "2026.07.13", + "hash": "sha256-6SEQ3WLXHlxze+8Ob/TEA4MJT7Ow1kE1Ti7qL19fwrA=" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2026.06.12", - "hash": "sha256-JTUxakTv9MVbMQArJJC995kSCD37Xs1rvLmDoyQhHf4=" + "rev": "2026.06.24", + "hash": "sha256-mjvWki4rUSvSYCmqM2eLDwbsKHkSSnq4noZYJDby1rY=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", @@ -31,8 +31,8 @@ }, "ATSynEdit_Ex": { "owner": "Alexey-T", - "rev": "2026.06.10", - "hash": "sha256-WZnGdl0lt8nOKKZsqPIcSRTVXYEixGKDHtMPveOvE5E=" + "rev": "2026.07.08", + "hash": "sha256-mwFBB75vSCLiL1XQ0yR/Tf9ykTevdyAIYtYnusF77T0=" }, "Python-for-Lazarus": { "owner": "Alexey-T", diff --git a/pkgs/by-name/cu/cudatext/package.nix b/pkgs/by-name/cu/cudatext/package.nix index 6f2445c3172a..cdd7e988b932 100644 --- a/pkgs/by-name/cu/cudatext/package.nix +++ b/pkgs/by-name/cu/cudatext/package.nix @@ -42,13 +42,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "cudatext"; - version = "1.234.4.1"; + version = "1.235.0.3"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; tag = finalAttrs.version; - hash = "sha256-/2OXF0ggbBvgAlQTeQcjxITd8UbdOc9Hruml112XoEU="; + hash = "sha256-J8Ht+VPoRrtR9TcNEgsX/3Ci1Z7+SAbeSh9KzGIENvw="; }; patches = [ ./proc_globdata.patch ]; diff --git a/pkgs/by-name/cu/cue/package.nix b/pkgs/by-name/cu/cue/package.nix index 4f0fce9998ec..fdecd5294637 100644 --- a/pkgs/by-name/cu/cue/package.nix +++ b/pkgs/by-name/cu/cue/package.nix @@ -12,13 +12,13 @@ buildGoModule (finalAttrs: { pname = "cue"; - version = "0.17.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "cue-lang"; repo = "cue"; tag = "v${finalAttrs.version}"; - hash = "sha256-+mfGN2IX83JMwLsduBfj2h7Eeve6mmLpmXGFRxz/UfI="; + hash = "sha256-77IRLWlBlJ76yr9UzVpKuxZ9XbYFdGDdv/jPUojw8yc="; }; vendorHash = "sha256-dTUg6EnU6xKCGve9ksxqBF3BaoBdVlXFU8pTyZtV+RA="; diff --git a/pkgs/by-name/cu/cursor-cli/package.nix b/pkgs/by-name/cu/cursor-cli/package.nix index 8d3f8946c574..195956b2ed5e 100644 --- a/pkgs/by-name/cu/cursor-cli/package.nix +++ b/pkgs/by-name/cu/cursor-cli/package.nix @@ -17,10 +17,6 @@ let url = "https://downloads.cursor.com/lab/2026.06.26-7079533/linux/arm64/agent-cli-package.tar.gz"; hash = "sha256-WcMurHV8Pm/2Y1HvNJGZYqjgt3OzHwn5oW5W27egueE="; }; - x86_64-darwin = fetchurl { - url = "https://downloads.cursor.com/lab/2026.06.26-7079533/darwin/x64/agent-cli-package.tar.gz"; - hash = "sha256-5J2SA5AoyOxT9Ng58MnyCFtNllQCYhbO5MQZaONwgsk="; - }; aarch64-darwin = fetchurl { url = "https://downloads.cursor.com/lab/2026.06.26-7079533/darwin/arm64/agent-cli-package.tar.gz"; hash = "sha256-UO8SRA6depwO9SNhvYl9uOy9Dp625vHVNiyfxtmq3c4="; diff --git a/pkgs/by-name/cu/cursor-cli/update.sh b/pkgs/by-name/cu/cursor-cli/update.sh index 82484933310f..26b370557183 100755 --- a/pkgs/by-name/cu/cursor-cli/update.sh +++ b/pkgs/by-name/cu/cursor-cli/update.sh @@ -22,7 +22,7 @@ if [[ "$latestVersion" == "$currentVersion" ]]; then exit 0 fi -declare -A platforms=( [x86_64-linux]="linux/x64" [aarch64-linux]="linux/arm64" [x86_64-darwin]="darwin/x64" [aarch64-darwin]="darwin/arm64" ) +declare -A platforms=( [x86_64-linux]="linux/x64" [aarch64-linux]="linux/arm64" [aarch64-darwin]="darwin/arm64" ) for platform in "${!platforms[@]}"; do url="https://downloads.cursor.com/lab/$release/${platforms[$platform]}/agent-cli-package.tar.gz" diff --git a/pkgs/by-name/cu/cutecosmic/package.nix b/pkgs/by-name/cu/cutecosmic/package.nix index cbdd6ae9c449..12835a8cc0f5 100644 --- a/pkgs/by-name/cu/cutecosmic/package.nix +++ b/pkgs/by-name/cu/cutecosmic/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cutecosmic"; - version = "0.1-unstable-2026-03-25"; + version = "0.1-unstable-2026-07-11"; src = fetchFromGitHub { owner = "IgKh"; repo = "cutecosmic"; - rev = "441c5ac05b85dd7afeaf02689af7de7428717c6b"; - hash = "sha256-NMRP9QeN+57pUyA0/xynITJyWrCu/Eg2ZvGzDBzfmvQ="; + rev = "3f518924fbccc1b62f4d9e8db6c9eda7490959c9"; + hash = "sha256-bombgw+vxn8LQ60ZWMrIJuwejsyJd+2dNkAjQBzVj3w="; }; cargoDeps = rustPlatform.fetchCargoVendor { diff --git a/pkgs/by-name/cy/cyclonedds/package.nix b/pkgs/by-name/cy/cyclonedds/package.nix index ec54083be952..1e1c1dd38acb 100644 --- a/pkgs/by-name/cy/cyclonedds/package.nix +++ b/pkgs/by-name/cy/cyclonedds/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Eclipse Cyclone DDS project"; homepage = "https://cyclonedds.io/"; - license = with lib.licenses; [ epl20 ]; + license = lib.licenses.epl20; maintainers = with lib.maintainers; [ bachp ]; }; }) diff --git a/pkgs/by-name/cy/cypress/package.nix b/pkgs/by-name/cy/cypress/package.nix index 11170463fc34..8673e221f023 100644 --- a/pkgs/by-name/cy/cypress/package.nix +++ b/pkgs/by-name/cy/cypress/package.nix @@ -29,10 +29,6 @@ let platform = "darwin-arm64"; hash = "sha256-8qvMsC+tRKK12jC2r1A54kS/PZ6q+sErvLvTkse6Kn4="; }; - x86_64-darwin = { - platform = "darwin-x64"; - hash = "sha256-cCLJloLcuCDgTEiMMJKY6rYiPPhZfFfqXFP5NAMhw4Q="; - }; }; inherit (stdenv.hostPlatform) system; binary = diff --git a/pkgs/by-name/cy/cyrus-imapd/package.nix b/pkgs/by-name/cy/cyrus-imapd/package.nix index 8e95b5a449a5..f08795ea7e87 100644 --- a/pkgs/by-name/cy/cyrus-imapd/package.nix +++ b/pkgs/by-name/cy/cyrus-imapd/package.nix @@ -66,13 +66,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "cyrus-imapd"; - version = "3.12.2"; + version = "3.12.3"; src = fetchFromGitHub { owner = "cyrusimap"; repo = "cyrus-imapd"; tag = "cyrus-imapd-${finalAttrs.version}"; - hash = "sha256-zPEaxETzG4Aj8JYP/aZpN2xXrD+O22io/HzI4LK+s/o="; + hash = "sha256-2HTrFjFlFFqF1TWtClPSOJSCgmomjSgEU7o2UPgd/Cs="; }; nativeBuildInputs = [ @@ -191,7 +191,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.cyrusimap.org"; description = "Email, contacts and calendar server"; changelog = "https://www.cyrusimap.org/imap/download/release-notes/${lib.versions.majorMinor finalAttrs.version}/x/${finalAttrs.version}.html"; - license = with lib.licenses; [ bsdOriginal ]; + license = lib.licenses.bsdOriginal; mainProgram = "cyradm"; maintainers = with lib.maintainers; [ moraxyc diff --git a/pkgs/by-name/cz/czkawka/package.nix b/pkgs/by-name/cz/czkawka/package.nix index 5c226e630e4e..1fd27332a6de 100644 --- a/pkgs/by-name/cz/czkawka/package.nix +++ b/pkgs/by-name/cz/czkawka/package.nix @@ -126,7 +126,7 @@ let homepage = "https://github.com/qarmin/czkawka"; description = "Simple, fast and easy to use app to remove unnecessary files from your computer"; changelog = "https://github.com/qarmin/czkawka/raw/${self.version}/Changelog.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "czkawka_gui"; maintainers = with lib.maintainers; [ yanganto diff --git a/pkgs/by-name/da/dae/package.nix b/pkgs/by-name/da/dae/package.nix index 6ac073aeb8fb..844bd9eea49a 100644 --- a/pkgs/by-name/da/dae/package.nix +++ b/pkgs/by-name/da/dae/package.nix @@ -10,17 +10,17 @@ buildGoModule (finalAttrs: { pname = "dae"; - version = "1.1.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "daeuniverse"; repo = "dae"; tag = "v${finalAttrs.version}"; - hash = "sha256-Kc51VQuqObxKXVXGv5CnDm4/3XYqjPvrpAQSVb2vxSM="; + hash = "sha256-hzX3b86BHvxXQZotSteiHoyBMF/P4WubeuJ6xpxa8ac="; fetchSubmodules = true; }; - vendorHash = "sha256-juxIsZt1T33epN8CbzDc02MmlW5PtYa4pcGxuX9OpH4="; + vendorHash = "sha256-S2dNFvMeZqGhzu+sIBGeaET4bQXfeucao6XR4QSTpog="; proxyVendor = true; diff --git a/pkgs/by-name/da/daisydisk/package.nix b/pkgs/by-name/da/daisydisk/package.nix index 784b352b8d82..3419cee31b3e 100644 --- a/pkgs/by-name/da/daisydisk/package.nix +++ b/pkgs/by-name/da/daisydisk/package.nix @@ -51,7 +51,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "Find out what’s taking up your disk space and recover it in the most efficient and easy way"; homepage = "https://daisydiskapp.com/"; changelog = "https://daisydiskapp.com/releases"; - license = [ lib.licenses.unfree ]; + license = lib.licenses.unfree; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; maintainers = with lib.maintainers; [ DimitarNestorov ]; platforms = lib.platforms.darwin; diff --git a/pkgs/by-name/da/darkly/package.nix b/pkgs/by-name/da/darkly/package.nix index 9dad017633cf..b2fc28ac9e5f 100644 --- a/pkgs/by-name/da/darkly/package.nix +++ b/pkgs/by-name/da/darkly/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/Bali10050/Darkly"; changelog = "https://github.com/Bali10050/Darkly/releases/tag/v${finalAttrs.version}"; platforms = lib.platforms.linux; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ pluiedev ]; mainProgram = "darkly-settings6"; }; diff --git a/pkgs/by-name/da/darktable/package.nix b/pkgs/by-name/da/darktable/package.nix index c954ded2f1f6..00b9c8d1264e 100644 --- a/pkgs/by-name/da/darktable/package.nix +++ b/pkgs/by-name/da/darktable/package.nix @@ -103,7 +103,8 @@ stdenv.mkDerivation rec { pkg-config wrapGAppsHook3 saxon # Use Saxon instead of libxslt to fix XSLT generate-id() consistency issues - ]; + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.lld ]; buildInputs = [ SDL2 @@ -184,6 +185,12 @@ stdenv.mkDerivation rec { "-DUSE_KWALLET=OFF" ]; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + # Work around ld64's libc++ hardening issue. + # TODO: Remove once #536365 reaches this branch. + NIX_CFLAGS_LINK = "-fuse-ld=lld"; + }; + # darktable changed its rpath handling in commit # 83c70b876af6484506901e6b381304ae0d073d3c and as a result the # binaries can't find libdarktable.so, so change LD_LIBRARY_PATH in @@ -230,7 +237,6 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ flosse mrVanDalo - paperdigits freyacodes ]; }; diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index cb4cf4679e46..6627d34277af 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -28,13 +28,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { suffix = selectSystem { x86_64-linux = "linux-x86_64.tar.gz"; aarch64-linux = "linux-aarch64.tar.gz"; - x86_64-darwin = "macos-x86_64.dmg"; aarch64-darwin = "macos-aarch64.dmg"; }; hash = selectSystem { x86_64-linux = "sha256-atbQ00lq589FlNem85NgzTKGyhTRpFII8OSfVfYQuD0="; aarch64-linux = "sha256-Sde0q31hXMqX2oxfhgj5EcpeUYYFZJy61usaJVpZkLM="; - x86_64-darwin = "sha256-EmTHuzEc4beM52hC2T7poZ1SOKa9kO2Rp3NnctlsBYo="; aarch64-darwin = "sha256-PwuFwEE+aBEG/ykwNrEBl20yfrade8BdUUHdLJGBkwc="; }; in diff --git a/pkgs/by-name/db/dbeaver-bin/update.sh b/pkgs/by-name/db/dbeaver-bin/update.sh index 8ab7bd75fcef..8a1e992dcef1 100755 --- a/pkgs/by-name/db/dbeaver-bin/update.sh +++ b/pkgs/by-name/db/dbeaver-bin/update.sh @@ -18,7 +18,6 @@ fi for i in \ "x86_64-linux linux-x86_64.tar.gz" \ "aarch64-linux linux-aarch64.tar.gz" \ - "x86_64-darwin macos-x86_64.dmg" \ "aarch64-darwin macos-aarch64.dmg" do # shellcheck disable=SC2086 # $i is intentionally splitted to $1 and $2 diff --git a/pkgs/by-name/db/dbgate/package.nix b/pkgs/by-name/db/dbgate/package.nix index aba4e08601d0..8a8c8d042914 100644 --- a/pkgs/by-name/db/dbgate/package.nix +++ b/pkgs/by-name/db/dbgate/package.nix @@ -20,10 +20,6 @@ let url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_x86_64.AppImage"; hash = "sha256-QR44QZ5QNz/q9Cfp/d5EYjlG84ZmCtBFe8a4aMFEhjQ="; }; - x86_64-darwin = { - url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_x64.dmg"; - hash = "sha256-pTE8Na078B2njCrpuN0xt75PkjwepXnuhphB8Qqcsls="; - }; aarch64-darwin = { url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_universal.dmg"; hash = "sha256-luk0vWRc4x3QMYAPquTWiSW9FqTe1IsBm9qOoOeHOps="; @@ -42,7 +38,6 @@ let mainProgram = "dbgate"; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; diff --git a/pkgs/by-name/db/dbgate/update.sh b/pkgs/by-name/db/dbgate/update.sh index 1e893aaa7706..d37000bac6a1 100755 --- a/pkgs/by-name/db/dbgate/update.sh +++ b/pkgs/by-name/db/dbgate/update.sh @@ -15,7 +15,6 @@ fi for system in \ x86_64-linux \ aarch64-linux \ - x86_64-darwin \ aarch64-darwin; do hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix-instantiate --eval -E "with import ./. {}; dbgate.src.url" --system "$system" | tr -d '"'))) update-source-version dbgate $latestVersion $hash --system=$system --ignore-same-version diff --git a/pkgs/by-name/db/dblab/package.nix b/pkgs/by-name/db/dblab/package.nix index dd286edde6a0..c58488066f67 100644 --- a/pkgs/by-name/db/dblab/package.nix +++ b/pkgs/by-name/db/dblab/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "dblab"; - version = "0.43.0"; + version = "0.44.1"; src = fetchFromGitHub { owner = "danvergara"; repo = "dblab"; tag = "v${finalAttrs.version}"; - hash = "sha256-SH5iSXo5QEZiguP2fW2mYMXWY4sPP4ImV+Y89hhm+ys="; + hash = "sha256-zf/51s9RoK59XLYWHSuZEt8/KfuZtZkRAfH6UCDHH6A="; }; vendorHash = "sha256-widzVKA85qslxuuO/ledG+IUvr+vw2HUiD3kVbe2D2A="; diff --git a/pkgs/by-name/db/dblatex/package.nix b/pkgs/by-name/db/dblatex/package.nix index 3bed1f8cc05f..e3bd013ed712 100644 --- a/pkgs/by-name/db/dblatex/package.nix +++ b/pkgs/by-name/db/dblatex/package.nix @@ -1,8 +1,9 @@ { lib, stdenv, + fetchpatch, fetchurl, - python311, + python3, libxslt, texliveBasic, enableAllFeatures ? false, @@ -62,8 +63,26 @@ stdenv.mkDerivation rec { sha256 = "0yd09nypswy3q4scri1dg7dr99d7gd6r2dwx0xm81l9f4y32gs0n"; }; + patches = [ + (fetchpatch { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/dblatex/-/raw/067a586a688635a8ad6c15b1bd8ef3b16eb3f9f4/dblatex-0.3.12-replace-imp-by-importlib.patch"; + hash = "sha256-ND9fS8KkQKnML6EwJFSUFhqiIn4yEvu1KOxTRPjXsd0="; + }) + (fetchpatch { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/dblatex/-/raw/067a586a688635a8ad6c15b1bd8ef3b16eb3f9f4/dblatex-0.3.12-adjust-submodule-imports.patch"; + hash = "sha256-0wOn2IvCSCtrE0rM56yw3FcGggTsDk3owQa1UmFsbVo="; + }) + (fetchpatch { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/dblatex/-/raw/067a586a688635a8ad6c15b1bd8ef3b16eb3f9f4/dblatex-0.3.12-script_path.patch"; + hash = "sha256-JGN9NxOiqoZ0Yz5ZbYwsis3tujBA2OWX5PZtrc/iTJY="; + }) + ]; + + nativeBuildInputs = [ + (python3.withPackages (ps: [ ps.setuptools_80 ])) + ]; + buildInputs = [ - python311 libxslt tex ] @@ -100,7 +119,7 @@ stdenv.mkDerivation rec { dontBuild = true; installPhase = '' - ${python311.interpreter} ./setup.py install --prefix="$out" --use-python-path --verbose + python ./setup.py install --prefix="$out" --use-python-path --verbose ''; passthru = { inherit tex; }; diff --git a/pkgs/by-name/db/dbmate/package.nix b/pkgs/by-name/db/dbmate/package.nix index 37f6029cba35..0cf43002520c 100644 --- a/pkgs/by-name/db/dbmate/package.nix +++ b/pkgs/by-name/db/dbmate/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "dbmate"; - version = "2.33.0"; + version = "2.34.1"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; tag = "v${finalAttrs.version}"; - hash = "sha256-qdW7hutxjdhT8ypQOmVrcTMzuySy0zkS8SeTbvaGVK4="; + hash = "sha256-rDnXLNltUxtzJRw3kc1nQ0HnrWZYQKA+o1nup/WsD7E="; }; - vendorHash = "sha256-kKj3KOWq1IeQcR2/QJYsKZh6Kxryj0y687CKzyeO4ZM="; + vendorHash = "sha256-+P9K/uOLFhsSwOxWPvTVu5MBCkP+9rGAA9efmgw4R60="; tags = [ "fts5" ]; diff --git a/pkgs/by-name/dc/dcp/package.nix b/pkgs/by-name/dc/dcp/package.nix index 6dffa4736f19..89a9bd5850ea 100644 --- a/pkgs/by-name/dc/dcp/package.nix +++ b/pkgs/by-name/dc/dcp/package.nix @@ -15,13 +15,13 @@ buildGoModule (finalAttrs: { pname = "dcp"; - version = "0.25.2"; + version = "0.25.5"; src = fetchFromGitHub { owner = "microsoft"; repo = "dcp"; tag = "v${finalAttrs.version}"; - hash = "sha256-afQa5arDC9GD0jzzKBSc+zHrNmHpn91HdcWDeFzpbzQ="; + hash = "sha256-umcrTAPWAInbjdZYhY0xEbI7heGwr+8FGMI7BIWSdD0="; }; vendorHash = "sha256-hcuVUUr3kr3iBmSEhHy365LIWGGLFTYnBRa5jnt7kPw="; diff --git a/pkgs/by-name/dc/dcrctl/package.nix b/pkgs/by-name/dc/dcrctl/package.nix index 053a60b5121f..dddad707dab3 100644 --- a/pkgs/by-name/dc/dcrctl/package.nix +++ b/pkgs/by-name/dc/dcrctl/package.nix @@ -25,7 +25,7 @@ buildGoModule (finalAttrs: { meta = { homepage = "https://decred.org"; description = "Secure Decred wallet daemon written in Go (golang)"; - license = with lib.licenses; [ isc ]; + license = lib.licenses.isc; maintainers = [ ]; mainProgram = "dcrctl"; }; diff --git a/pkgs/by-name/dc/dcrd/package.nix b/pkgs/by-name/dc/dcrd/package.nix index e69ffc91c3d1..1f349723c597 100644 --- a/pkgs/by-name/dc/dcrd/package.nix +++ b/pkgs/by-name/dc/dcrd/package.nix @@ -32,7 +32,7 @@ buildGoModule (finalAttrs: { meta = { homepage = "https://decred.org"; description = "Decred daemon in Go (golang)"; - license = with lib.licenses; [ isc ]; + license = lib.licenses.isc; maintainers = with lib.maintainers; [ juaningan ]; }; }) diff --git a/pkgs/by-name/dc/dcrwallet/package.nix b/pkgs/by-name/dc/dcrwallet/package.nix index 10a9b712bbee..81f24d57ea57 100644 --- a/pkgs/by-name/dc/dcrwallet/package.nix +++ b/pkgs/by-name/dc/dcrwallet/package.nix @@ -29,7 +29,7 @@ buildGoModule (finalAttrs: { meta = { homepage = "https://decred.org"; description = "Secure Decred wallet daemon written in Go (golang)"; - license = with lib.licenses; [ isc ]; + license = lib.licenses.isc; maintainers = with lib.maintainers; [ juaningan ]; mainProgram = "dcrwallet"; }; diff --git a/pkgs/by-name/dd/ddccontrol-db/package.nix b/pkgs/by-name/dd/ddccontrol-db/package.nix index 29b822324792..49a6ffce8564 100644 --- a/pkgs/by-name/dd/ddccontrol-db/package.nix +++ b/pkgs/by-name/dd/ddccontrol-db/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ddccontrol-db"; - version = "20260702"; + version = "20260714"; src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol-db"; tag = finalAttrs.version; - sha256 = "sha256-Jv/NYaynTvvV9zQLtvRfUBYzORWOCqP82/mVMR4Evjg="; + sha256 = "sha256-9X22Vt1LbaVLrjFqafnPPfsKQdLPBKxQR7cz75yqML0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/dd/ddsmt/package.nix b/pkgs/by-name/dd/ddsmt/package.nix index 22e4cf83a734..810c774b93aa 100644 --- a/pkgs/by-name/dd/ddsmt/package.nix +++ b/pkgs/by-name/dd/ddsmt/package.nix @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication { meta = { description = "Delta debugger for SMT benchmarks in SMT-LIB v2"; homepage = "https://ddsmt.readthedocs.io/"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = [ ]; }; } diff --git a/pkgs/by-name/de/deadbeef/package.nix b/pkgs/by-name/de/deadbeef/package.nix index bd5af326d7c2..919017ab9d6b 100644 --- a/pkgs/by-name/de/deadbeef/package.nix +++ b/pkgs/by-name/de/deadbeef/package.nix @@ -77,7 +77,7 @@ clangStdenv.mkDerivation (finalAttrs: { buildInputs = [ jansson - swift-corelibs-libdispatch + (swift-corelibs-libdispatch.override { useSwift = false; }) gtk3 gsettings-desktop-schemas ] diff --git a/pkgs/by-name/de/debase/package.nix b/pkgs/by-name/de/debase/package.nix index 5afb703d27a7..424d38460dc5 100644 --- a/pkgs/by-name/de/debase/package.nix +++ b/pkgs/by-name/de/debase/package.nix @@ -77,7 +77,6 @@ stdenv.mkDerivation rec { platforms = [ # Only these systems are supported by Makefile "x86_64-linux" - "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; diff --git a/pkgs/by-name/de/deniseemu/package.nix b/pkgs/by-name/de/deniseemu/package.nix index dfc536f64bec..4e2106e24685 100644 --- a/pkgs/by-name/de/deniseemu/package.nix +++ b/pkgs/by-name/de/deniseemu/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://bitbucket.org/piciji/denise"; downloadPage = "https://sourceforge.net/projects/deniseemu/"; description = "C64 / Amiga Emulator"; - license = [ lib.licenses.gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.matthewcroughan ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix index 01096528ff05..284eb950d8d2 100644 --- a/pkgs/by-name/de/deno/package.nix +++ b/pkgs/by-name/de/deno/package.nix @@ -295,7 +295,6 @@ rustPlatform.buildRustPackage (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/de/depotdownloader/package.nix b/pkgs/by-name/de/depotdownloader/package.nix index 43768226ed97..108ef26ed1f5 100644 --- a/pkgs/by-name/de/depotdownloader/package.nix +++ b/pkgs/by-name/de/depotdownloader/package.nix @@ -32,7 +32,6 @@ buildDotnetModule rec { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "DepotDownloader"; diff --git a/pkgs/by-name/de/descent3/package.nix b/pkgs/by-name/de/descent3/package.nix index 5027a8bc12e7..bf77dcebd4b1 100644 --- a/pkgs/by-name/de/descent3/package.nix +++ b/pkgs/by-name/de/descent3/package.nix @@ -15,7 +15,7 @@ runCommand "descent3-${descent3-unwrapped.version}" meta = descent3-unwrapped.meta // { # The code that produces the wrapper is in the Nixpkgs repo, and the # Nixpkgs repo is MIT Licensed. - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; longDescription = '' Playing Descent 3 using the Nix package manager is a little bit awkward at the moment. This wrapper makes it slightly less awkward. Here’s how diff --git a/pkgs/by-name/de/deterministic-uname/package.nix b/pkgs/by-name/de/deterministic-uname/package.nix index f83c4ef9c0d5..7f2047400999 100644 --- a/pkgs/by-name/de/deterministic-uname/package.nix +++ b/pkgs/by-name/de/deterministic-uname/package.nix @@ -61,7 +61,7 @@ replaceVarsWith { not intercept these calls, builds made on different kernels will produce different results. ''; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ artturin ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/de/devin-desktop/info.json b/pkgs/by-name/de/devin-desktop/info.json index 38321f0ea022..592f3a25bdb2 100644 --- a/pkgs/by-name/de/devin-desktop/info.json +++ b/pkgs/by-name/de/devin-desktop/info.json @@ -1,14 +1,14 @@ { "aarch64-darwin": { - "version": "3.4.22", + "version": "3.4.27", "vscodeVersion": "1.110.1", - "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/0c84d3332806347c90e571331f48dd13a957d880/Devin-darwin-arm64-3.4.22.zip", - "sha256": "ed6f3bd022cbac6cef8757beeaafebf65641724a5e7897e4d62a03b87161627f" + "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/0d4bf12ed4a7597cb8ae9016fe8474468aad98a2/Devin-darwin-arm64-3.4.27.zip", + "sha256": "c42b0671c246ef295807e822809cb82dfe65831d4879d68f25334f754babec8d" }, "x86_64-linux": { - "version": "3.4.22", + "version": "3.4.27", "vscodeVersion": "1.110.1", - "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/0c84d3332806347c90e571331f48dd13a957d880/Devin-linux-x64-3.4.22.tar.gz", - "sha256": "02bfb58af6d898cc41337a761a34ae69f55f05c8c28e3611a5cf2c431610b072" + "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/0d4bf12ed4a7597cb8ae9016fe8474468aad98a2/Devin-linux-x64-3.4.27.tar.gz", + "sha256": "80850124b31331f63c24a201d1317bdacdfb438fb2bcc9b31c9b7a6391391619" } } diff --git a/pkgs/by-name/de/dezoomify-rs/package.nix b/pkgs/by-name/de/dezoomify-rs/package.nix index 96df189c77aa..5b69579ed744 100644 --- a/pkgs/by-name/de/dezoomify-rs/package.nix +++ b/pkgs/by-name/de/dezoomify-rs/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "dezoomify-rs"; - version = "2.16.0"; + version = "2.17.0"; __structuredAttrs = true; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "lovasoa"; repo = "dezoomify-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-45Vlgle605s3uvPh+Lr+KAk72AzIoolnSuhFzRCORC4="; + hash = "sha256-iRcRMzUW3K0pzRP9Y7ID29Kxpi3dPxRCC4WY+2ydAyE="; }; nativeBuildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage (finalAttrs: { passthru.updateScript = nix-update-script { }; - cargoHash = "sha256-tfeknHPrY11rSmHyEAUvJgCLDwmIpo9jk8BLgzgQCrc="; + cargoHash = "sha256-Tou+t4rbN/KfUAr9AVWD/aAzz+u50v9UZwo5mGXmjy4="; # hyper uses SystemConfiguration.framework to read system proxy settings. # Allow access to the Mach service to prevent the tests from failing. diff --git a/pkgs/by-name/di/dict-cc-py/package.nix b/pkgs/by-name/di/dict-cc-py/package.nix index 77f97174f87d..ab871a5c5310 100644 --- a/pkgs/by-name/di/dict-cc-py/package.nix +++ b/pkgs/by-name/di/dict-cc-py/package.nix @@ -32,7 +32,7 @@ python3.pkgs.buildPythonPackage { description = "Unofficial command line client for dict.cc"; mainProgram = "dict.cc.py"; homepage = "https://github.com/rbaron/dict.cc.py"; - license = with lib.licenses; [ cc0 ]; + license = lib.licenses.cc0; maintainers = [ ]; }; } diff --git a/pkgs/by-name/di/diffedit3/package.nix b/pkgs/by-name/di/diffedit3/package.nix index b82cd45dc91a..95eba3db3711 100644 --- a/pkgs/by-name/di/diffedit3/package.nix +++ b/pkgs/by-name/di/diffedit3/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { homepage = "https://github.com/ilyagr/diffedit3"; description = "3-pane diff editor"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; mainProgram = "diffedit3"; maintainers = with lib.maintainers; [ thoughtpolice ]; }; diff --git a/pkgs/by-name/di/diffr/package.nix b/pkgs/by-name/di/diffr/package.nix index 10ecfdd6f64a..8f67ff8645cd 100644 --- a/pkgs/by-name/di/diffr/package.nix +++ b/pkgs/by-name/di/diffr/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Yet another diff highlighting tool"; mainProgram = "diffr"; homepage = "https://github.com/mookid/diffr"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ ]; }; }) diff --git a/pkgs/by-name/di/dirb/package.nix b/pkgs/by-name/di/dirb/package.nix index dbf59823052d..7b8eed782016 100644 --- a/pkgs/by-name/di/dirb/package.nix +++ b/pkgs/by-name/di/dirb/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Web content scanner"; homepage = "https://dirb.sourceforge.net/"; maintainers = with lib.maintainers; [ bennofs ]; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/di/direwolf-unstable/package.nix b/pkgs/by-name/di/direwolf-unstable/package.nix index 039ef7e2e0fb..e4b74e0b8e17 100644 --- a/pkgs/by-name/di/direwolf-unstable/package.nix +++ b/pkgs/by-name/di/direwolf-unstable/package.nix @@ -12,13 +12,13 @@ inherit hamlibSupport gpsdSupport extraScripts; }).overrideAttrs (oldAttrs: { - version = "1.8.1-unstable-2026-07-06"; + version = "1.8.1-unstable-2026-07-16"; src = fetchFromGitHub { owner = "wb2osz"; repo = "direwolf"; - rev = "160cbb40a3828e47bc977b6f7d5499d1f1cf56e5"; - hash = "sha256-q08QuyWGYqLLz77JXlkJetrYMVQwQVUgjIXz9J4Y9VA="; + rev = "078b2e8484be379d4e1eab139c6fd57c188c1754"; + hash = "sha256-Wje8GsdMcUptQEVsG7Ww8nW3PUuk/Y67zsjf+KjPPB8="; }; dontVersionCheck = true; diff --git a/pkgs/by-name/di/discord-gamesdk/package.nix b/pkgs/by-name/di/discord-gamesdk/package.nix index 8f9fff09dd6e..4163284b8099 100644 --- a/pkgs/by-name/di/discord-gamesdk/package.nix +++ b/pkgs/by-name/di/discord-gamesdk/package.nix @@ -47,7 +47,6 @@ stdenv.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" "x86_64-windows" ]; diff --git a/pkgs/by-name/di/disk-inventory-x/package.nix b/pkgs/by-name/di/disk-inventory-x/package.nix deleted file mode 100644 index 86d35df055f6..000000000000 --- a/pkgs/by-name/di/disk-inventory-x/package.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - lib, - stdenvNoCC, - fetchurl, - undmg, -}: -stdenvNoCC.mkDerivation (finalAttrs: { - pname = "disk-inventory-x"; - version = "1.3"; - - src = fetchurl { - url = "https://www.derlien.com/diskinventoryx/downloads/Disk%20Inventory%20X%20${finalAttrs.version}.dmg"; - sha256 = "1rfqp8ia6ficvqxynn43f1pba4rfmhf61kn2ihysbnjs8c33bbvq"; - }; - sourceRoot = "."; - - nativeBuildInputs = [ undmg ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/Applications - cp -r *.app $out/Applications - - runHook postInstall - ''; - - meta = { - description = "Disk usage utility for Mac OS X"; - homepage = "https://www.derlien.com"; - license = lib.licenses.gpl3Plus; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with lib.maintainers; [ emilytrau ]; - platforms = [ "x86_64-darwin" ]; - }; -}) diff --git a/pkgs/by-name/di/dismap/package.nix b/pkgs/by-name/di/dismap/package.nix index 064e0c4bb23b..7f595788b3b0 100644 --- a/pkgs/by-name/di/dismap/package.nix +++ b/pkgs/by-name/di/dismap/package.nix @@ -21,7 +21,7 @@ buildGoModule (finalAttrs: { description = "Asset discovery and identification tools"; mainProgram = "dismap"; homepage = "https://github.com/zhzyker/dismap"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/di/distgen/package.nix b/pkgs/by-name/di/distgen/package.nix index 90d85f3f986d..a0016d48d390 100644 --- a/pkgs/by-name/di/distgen/package.nix +++ b/pkgs/by-name/di/distgen/package.nix @@ -6,12 +6,12 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "distgen"; - version = "2.3"; + version = "2.4"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-EDRCGf4laHZs//E3w5FxlkuTfbVLxnaGmQF/xjwaKDQ="; + hash = "sha256-4XaZF4WmGhoGgQ3KlggIWLHAypZYA8QpkN7ARMijoPs="; }; build-system = with python3.pkgs; [ diff --git a/pkgs/by-name/di/diswall/package.nix b/pkgs/by-name/di/diswall/package.nix index ec5ebaebf32c..273b0be8a4c4 100644 --- a/pkgs/by-name/di/diswall/package.nix +++ b/pkgs/by-name/di/diswall/package.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: { intruder to get any system information. ''; homepage = "https://www.diswall.stream"; - license = with lib.licenses; [ gpl3 ]; + license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ izorkin ]; mainProgram = "diswall"; }; diff --git a/pkgs/by-name/dm/dmd/binary.nix b/pkgs/by-name/dm/dmd/binary.nix index 395468f59ac5..fec299c9976d 100644 --- a/pkgs/by-name/dm/dmd/binary.nix +++ b/pkgs/by-name/dm/dmd/binary.nix @@ -86,7 +86,6 @@ stdenv.mkDerivation { maintainers = [ lib.maintainers.lionello ]; homepage = "https://dlang.org/"; platforms = [ - "x86_64-darwin" "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/by-name/dm/dmd/generic.nix b/pkgs/by-name/dm/dmd/generic.nix index 971addbeaf51..4408faabee09 100644 --- a/pkgs/by-name/dm/dmd/generic.nix +++ b/pkgs/by-name/dm/dmd/generic.nix @@ -242,7 +242,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "i686-linux" - "x86_64-darwin" ]; # ld: section __DATA/__thread_bss has type zero-fill but non-zero file offset file '/private/tmp/nix-build-dmd-2.109.1.drv-0/.rdmd-301/rdmd-build.d-A1CF043A7D87C5E88A58F3C0EF5A0DF7/objs/build.o' for architecture x86_64 # clang-16: error: linker command failed with exit code 1 (use -v to see invocation) diff --git a/pkgs/by-name/dm/dmenu-rs/package.nix b/pkgs/by-name/dm/dmenu-rs/package.nix index 70ac55438b09..993749044cfc 100644 --- a/pkgs/by-name/dm/dmenu-rs/package.nix +++ b/pkgs/by-name/dm/dmenu-rs/package.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: { "Pixel perfect port of dmenu, rewritten in Rust with extensive plugin support" + lib.optionalString enablePlugins ", with all upstream plugins enabled"; homepage = "https://github.com/Shizcow/dmenu-rs"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ benjaminedwardwebb ]; platforms = lib.platforms.linux; broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; diff --git a/pkgs/by-name/dn/dnsmasq/package.nix b/pkgs/by-name/dn/dnsmasq/package.nix index c46aee2aebeb..e757543b412a 100644 --- a/pkgs/by-name/dn/dnsmasq/package.nix +++ b/pkgs/by-name/dn/dnsmasq/package.nix @@ -4,7 +4,7 @@ fetchurl, pkg-config, nettle, - libidn, + libidn2, libnetfilter_conntrack, nftables, buildPackages, @@ -16,7 +16,7 @@ let copts = lib.concatStringsSep " " ( [ - "-DHAVE_IDN" + "-DHAVE_LIBIDN2" "-DHAVE_DNSSEC" ] ++ lib.optionals dbusSupport [ @@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ nettle - libidn + libidn2 ] ++ lib.optionals dbusSupport [ dbus ] ++ lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/pkgs/by-name/dn/dnsmon-go/package.nix b/pkgs/by-name/dn/dnsmon-go/package.nix index 9fa7ae6bd15d..2757812bf968 100644 --- a/pkgs/by-name/dn/dnsmon-go/package.nix +++ b/pkgs/by-name/dn/dnsmon-go/package.nix @@ -25,7 +25,7 @@ buildGoModule { meta = { description = "Tool to collect DNS traffic"; homepage = "https://github.com/jonpulsifer/dnsmon-go"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "dnsmon-go"; }; diff --git a/pkgs/by-name/dn/dnstwist/package.nix b/pkgs/by-name/dn/dnstwist/package.nix index 99e4d20638d4..135402b4d8de 100644 --- a/pkgs/by-name/dn/dnstwist/package.nix +++ b/pkgs/by-name/dn/dnstwist/package.nix @@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { description = "Domain name permutation engine for detecting homograph phishing attacks"; homepage = "https://github.com/elceef/dnstwist"; changelog = "https://github.com/elceef/dnstwist/releases/tag/${finalAttrs.version}"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; mainProgram = "dnstwist"; }; diff --git a/pkgs/by-name/do/doh-proxy-rust/package.nix b/pkgs/by-name/do/doh-proxy-rust/package.nix index 18aaa31e1614..1d55facdf152 100644 --- a/pkgs/by-name/do/doh-proxy-rust/package.nix +++ b/pkgs/by-name/do/doh-proxy-rust/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { homepage = "https://github.com/jedisct1/doh-server"; description = "Fast, mature, secure DoH server proxy written in Rust"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ stephank ]; mainProgram = "doh-proxy"; }; diff --git a/pkgs/by-name/do/dolt/package.nix b/pkgs/by-name/do/dolt/package.nix index d29b29491c35..1cf640005cbb 100644 --- a/pkgs/by-name/do/dolt/package.nix +++ b/pkgs/by-name/do/dolt/package.nix @@ -7,18 +7,18 @@ buildGoModule (finalAttrs: { pname = "dolt"; - version = "2.1.9"; + version = "2.2.1"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; tag = "v${finalAttrs.version}"; - hash = "sha256-AtCEygxUHlC73zWsBvYrdxLtSO2FtQd+NSthPnP2cvA="; + hash = "sha256-SyoTBkIjZ1yZQXYo1qcdU18Yo84U1xjkNYU4pYlX748="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" ]; - vendorHash = "sha256-pBrTYPPPbDAKjok4ti8kjzxLPH4Xg1fqKQZx2QvEoVE="; + vendorHash = "sha256-/NC/yKi/XJB0fhfgeH4Arao0lr+i16YsDGWlS5pmx+0="; proxyVendor = true; doCheck = false; diff --git a/pkgs/by-name/do/dotter/package.nix b/pkgs/by-name/do/dotter/package.nix index f99741bb48f6..58c4798435a5 100644 --- a/pkgs/by-name/do/dotter/package.nix +++ b/pkgs/by-name/do/dotter/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "dotter"; - version = "0.13.4"; + version = "0.13.5"; src = fetchFromGitHub { owner = "SuperCuber"; repo = "dotter"; rev = "v${finalAttrs.version}"; - hash = "sha256-cxabaCxbwP2YbnG2XfmVJWFTw9LGO0D1dlLy6fuux+M="; + hash = "sha256-xA/6j+wMTPx9p4aOHaqixlzUZcqgRazfJ1PwKaByTrw="; }; - cargoHash = "sha256-KLU+4CYqTKEH8wuvinVS0Zs+nFgOer2ho8LXnLDNVKY="; + cargoHash = "sha256-0yBuaTwP2IxZjRzC8jMhZ8eNDdFHKyJjSP0ZH15F3LI="; nativeCheckInputs = [ which diff --git a/pkgs/by-name/do/dovecot/fix-lua-build.patch b/pkgs/by-name/do/dovecot/fix-lua-build.patch new file mode 100644 index 000000000000..23d2dcb9bcd3 --- /dev/null +++ b/pkgs/by-name/do/dovecot/fix-lua-build.patch @@ -0,0 +1,28 @@ +diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am +index 7474e76fb6..e7fc4aad0f 100644 +--- a/src/auth/Makefile.am ++++ b/src/auth/Makefile.am +@@ -21,12 +21,11 @@ LUA_LIB = + AUTH_LUA_LIBS = + AUTH_LUA_LDADD = + if HAVE_LUA +- ++AUTH_LUA_LDADD += $(LUA_LIBS) + if AUTH_LUA_PLUGIN + LUA_LIB += libauthdb_lua.la + else + AUTH_LUA_LIBS += $(LIBDOVECOT_LUA) +-AUTH_LUA_LDADD += $(LUA_LIBS) + endif + endif + +@@ -200,7 +199,7 @@ endif + endif + + if HAVE_LUA +-auth_libs += $(LIBDOVECOT_LUA) $(LUA_LIBS) ++auth_libs += $(LIBDOVECOT_LUA) + endif + + if AUTH_LUA_PLUGIN + diff --git a/pkgs/by-name/do/dovecot/generic.nix b/pkgs/by-name/do/dovecot/generic.nix index 40326745401c..7c54332c89ab 100644 --- a/pkgs/by-name/do/dovecot/generic.nix +++ b/pkgs/by-name/do/dovecot/generic.nix @@ -78,9 +78,9 @@ stdenv.mkDerivation (finalAttrs: { bison perl pkg-config + autoreconfHook ] ++ lib.optionals (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ autoreconfHook ] ++ lib.optional (withMySQL && lib.versionOlder version "2.4") fake_mysql_config; buildInputs = [ @@ -125,7 +125,10 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-liconv"; + env = { + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-liconv"; + LUA_PATH = lib.optionalString withLua "${lua5_3.pkgs.json}/share/lua/${lua5_3.luaversion}/?.lua"; + }; postPatch = '' sed -i -E \ diff --git a/pkgs/by-name/do/dovecot/package.nix b/pkgs/by-name/do/dovecot/package.nix index ccd716f729e3..aae29eb5e8fd 100644 --- a/pkgs/by-name/do/dovecot/package.nix +++ b/pkgs/by-name/do/dovecot/package.nix @@ -4,5 +4,6 @@ import ./generic.nix { patches = _: [ # Fix loading extended modules. ./load-extended-modules.patch + ./fix-lua-build.patch ]; } diff --git a/pkgs/by-name/dp/dprint/package.nix b/pkgs/by-name/dp/dprint/package.nix index 00d6545bc097..4af408029750 100644 --- a/pkgs/by-name/dp/dprint/package.nix +++ b/pkgs/by-name/dp/dprint/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "dprint"; - version = "0.55.1"; + version = "0.55.2"; # Prefer repository rather than crate here # - They have Cargo.lock in the repository @@ -21,10 +21,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "dprint"; repo = "dprint"; tag = finalAttrs.version; - hash = "sha256-OXXLpKgP2cUuPl7ikgZVPFgJiLY0Zy8MmBkz8Kp2+XM="; + hash = "sha256-80YdmDyyofBoHhLcldI9l1chpI6NKScyLQneJ068q/U="; }; - cargoHash = "sha256-IDxJPicTq0/7LI/07QfJrteaKAHDoeKdzpbEv871xxE="; + cargoHash = "sha256-b6N4cKzsYRJEhvxVAtc+kfQJeDJMD7IpkGm14e9Icuo="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/dp/dput-ng/package.nix b/pkgs/by-name/dp/dput-ng/package.nix index 7caf42e88a6a..7b62937839db 100644 --- a/pkgs/by-name/dp/dput-ng/package.nix +++ b/pkgs/by-name/dp/dput-ng/package.nix @@ -64,7 +64,7 @@ python3.pkgs.buildPythonApplication { meta = { description = "Next-generation Debian package upload tool"; homepage = "https://dput.readthedocs.io/en/latest/"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ pluiedev ]; mainProgram = "dput"; diff --git a/pkgs/by-name/dr/draupnir/package.nix b/pkgs/by-name/dr/draupnir/package.nix index 4152c07609d2..590a7a4e298f 100644 --- a/pkgs/by-name/dr/draupnir/package.nix +++ b/pkgs/by-name/dr/draupnir/package.nix @@ -13,6 +13,7 @@ cctools, nixosTests, nix-update-script, + fetchpatch2, }: let nodeSources = srcOnly nodejs_24; @@ -36,7 +37,14 @@ buildNpmPackage (finalAttrs: { ] ++ lib.optional stdenv.hostPlatform.isDarwin cctools.libtool; - npmDepsHash = "sha256-DvQM9Kr9Hc7/1OEZadZ1GvpAjfRmbdIcA6UDuFBQ+vo="; + patches = [ + (fetchpatch2 { + url = "https://github.com/the-draupnir-project/Draupnir/commit/4e63164046153c656050c6d0a325c79f1492153a.patch?full_index=1"; + hash = "sha256-dVG0BAE8pATfGdcHvTV8jTC+OQP0gMB7v396MtJlG4o="; + }) + ]; + + npmDepsHash = "sha256-7WAfSFfPQJ9d/U9hk5wypasSoU2JwkoCq/nKAnzFf1o="; preBuild = '' # install proper version and branch info diff --git a/pkgs/by-name/dt/dtop/package.nix b/pkgs/by-name/dt/dtop/package.nix index 6d7cd35ae900..025430f7b0b3 100644 --- a/pkgs/by-name/dt/dtop/package.nix +++ b/pkgs/by-name/dt/dtop/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "dtop"; - version = "0.7.7"; + version = "0.7.9"; src = fetchFromGitHub { owner = "amir20"; repo = "dtop"; tag = "v${finalAttrs.version}"; - hash = "sha256-kYSOJCQfoYXhdZ3cyRv/+Ifov4VzOv0gqvjueVMmnuQ="; + hash = "sha256-1OHtMV2GmZQIx2pVujOXoQOkc6hJdJZjca4kk4HyESM="; }; - cargoHash = "sha256-fspIjgctyhQwyDygrSrtJBb/EYxY8o00/UJy/z89yso="; + cargoHash = "sha256-OHjgG5qHBz0Q74uWLkN9Ok0NiVeT71qpEjzFdMFWlfs="; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; diff --git a/pkgs/by-name/du/dua/package.nix b/pkgs/by-name/du/dua/package.nix index 60685251dcf5..7c1579211686 100644 --- a/pkgs/by-name/du/dua/package.nix +++ b/pkgs/by-name/du/dua/package.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "dua"; - version = "2.37.1"; + version = "2.38.0"; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-FVkq+iLkVcug/SzQtzmupHc1nh+orqyOnqv0xr1Dg/Q="; + hash = "sha256-vvCEWTkDoJvlz3hKay/179zkrDUU4rjeLtxZtw2YFLY="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; }; - cargoHash = "sha256-8lRpN3KcrK9x446buGVnHl0CcHVoLWl0slB7CAw37G8="; + cargoHash = "sha256-bYnRng0bPdGC9Y/jVjqWgFcoMM04F1BF02IwATq8Ohw="; checkFlags = [ # Skip interactive tests @@ -56,7 +56,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Tool to conveniently learn about the disk usage of directories"; homepage = "https://github.com/Byron/dua-cli"; changelog = "https://github.com/Byron/dua-cli/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ killercup defelo diff --git a/pkgs/by-name/du/dub/package.nix b/pkgs/by-name/du/dub/package.nix index 457af1c63539..27e2de5e22f9 100644 --- a/pkgs/by-name/du/dub/package.nix +++ b/pkgs/by-name/du/dub/package.nix @@ -163,7 +163,6 @@ stdenv.mkDerivation (finalAttrs: { "x86_64-linux" "i686-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/du/dummyhttp/package.nix b/pkgs/by-name/du/dummyhttp/package.nix index d148a7579701..d3eee27af110 100644 --- a/pkgs/by-name/du/dummyhttp/package.nix +++ b/pkgs/by-name/du/dummyhttp/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Super simple HTTP server that replies a fixed body with a fixed response code"; homepage = "https://github.com/svenstaro/dummyhttp"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ ]; mainProgram = "dummyhttp"; }; diff --git a/pkgs/by-name/du/dupe-krill/package.nix b/pkgs/by-name/du/dupe-krill/package.nix index a975ccf16da1..c42c2a51afcd 100644 --- a/pkgs/by-name/du/dupe-krill/package.nix +++ b/pkgs/by-name/du/dupe-krill/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Fast file deduplicator"; homepage = "https://github.com/kornelski/dupe-krill"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ urbas ]; mainProgram = "dupe-krill"; }; diff --git a/pkgs/by-name/du/durden/package.nix b/pkgs/by-name/du/durden/package.nix index 57ec7ed07277..9c55d8718774 100644 --- a/pkgs/by-name/du/durden/package.nix +++ b/pkgs/by-name/du/durden/package.nix @@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { features in Arcan, and as a very competent entry to the advanced-user side of the desktop environment spectrum. ''; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = [ ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/dw/dwproton-bin/package.nix b/pkgs/by-name/dw/dwproton-bin/package.nix index 0d10c39ca128..350041457939 100644 --- a/pkgs/by-name/dw/dwproton-bin/package.nix +++ b/pkgs/by-name/dw/dwproton-bin/package.nix @@ -11,11 +11,11 @@ proton-ge-bin.overrideAttrs ( inherit steamDisplayName; pname = "dwproton-bin"; - version = "dwproton-11.0-5"; + version = "dwproton-11.0-7"; src = fetchzip { url = "https://dawn.wine/dawn-winery/dwproton/releases/download/${finalAttrs.version}/${finalAttrs.version}-x86_64.tar.xz"; - hash = "sha256-2x4xotJ2aJYbg+G2TDPqyU7uuoc/hZQon9CA6SFGin0="; + hash = "sha256-M8wcC7pKFs0Qena5NN9ylq2TykRfPK7JiHnzP6DkZv0="; }; preFixup = '' diff --git a/pkgs/by-name/dw/dwt1-shell-color-scripts/package.nix b/pkgs/by-name/dw/dwt1-shell-color-scripts/package.nix index 013557a892fb..ddc4e794bf60 100644 --- a/pkgs/by-name/dw/dwt1-shell-color-scripts/package.nix +++ b/pkgs/by-name/dw/dwt1-shell-color-scripts/package.nix @@ -49,7 +49,7 @@ stdenvNoCC.mkDerivation { meta = { homepage = "https://gitlab.com/dwt1/shell-color-scripts"; description = "Collection of shell color scripts collected by dt (Derek Taylor)"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ ]; platforms = lib.platforms.all; mainProgram = "colorscript"; diff --git a/pkgs/by-name/dx/dxmt/package.nix b/pkgs/by-name/dx/dxmt/package.nix deleted file mode 100644 index 2545292cb01b..000000000000 --- a/pkgs/by-name/dx/dxmt/package.nix +++ /dev/null @@ -1,132 +0,0 @@ -{ - lib, - stdenv, - pkgsCross, - fetchFromGitHub, - buildPackages, - cmake, - git, - python3, - meson, - ninja, - tinyxxd, - sqlite, - libz, - ncurses, - libxml2, - wine64, - darwin, - symlinkJoin, -}: -let - dxmt-llvm = stdenv.mkDerivation rec { - pname = "dxmt-llvm"; - version = "15.0.7"; - - src = fetchFromGitHub { - owner = "llvm"; - repo = "llvm-project"; - tag = version; - hash = "sha256-wjuZQyXQ/jsmvy6y1aksCcEDXGBjuhpgngF3XQJ/T4s="; - }; - - nativeBuildInputs = [ - cmake - git - ninja - python3 - ]; - - cmakeFlags = [ - "-DLLVM_ENABLE_ZSTD=OFF" - "-DLLVM_BUILD_TOOLS=Off" - "-S ../llvm" - ]; - }; - inherit (darwin) xcode; - - dxmt = pkgsCross.mingwW64.stdenv.mkDerivation (finalAttrs: { - pname = "dxmt"; - version = "0.80"; - - src = fetchFromGitHub { - owner = "3shain"; - repo = "dxmt"; - rev = "v${finalAttrs.version}"; - hash = "sha256-HNSKqEYu8se8DyzwRbqfmHRRyBXyW6D5ddPaEdnkuL4="; - fetchSubmodules = true; - }; - - patches = [ - ./winecrt0.patch - ]; - - postPatch = '' - substituteInPlace src/airconv/darwin/meson.build --replace-fail -lcurses -lncurses - - sed -e "/find_program('xcrun')/d" \ - -e "s,metalir_generator = generator(xcrun,metalir_generator = generator(find_program('${xcode}/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/metal')," \ - -e "s,metallib_generator = generator(xcrun,metallib_generator = generator(find_program('${xcode}/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/metallib')," \ - -e "s/'-sdk', 'macosx', 'metal\(lib\)\{0,1\}', //" \ - -i meson.build - ''; - - nativeBuildInputs = [ - meson - ninja - tinyxxd - buildPackages.stdenv.cc - ]; - - buildInputs = [ - sqlite - libz - ncurses - libxml2 - ]; - - mesonFlags = [ - (lib.mesonOption "native_llvm_path" "${dxmt-llvm}") - (lib.mesonOption "wine_install_path" "${wine64}") - ]; - - preBuild = '' - export HOME=$TMPDIR - ''; - - __structuredAttrs = true; - strictDeps = true; - - meta = { - description = "Metal-based translation layer for Direct3D 10/11"; - homepage = "https://github.com/3shain/dxmt"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.feyorsh ]; - platforms = lib.platforms.windows; - hydraPlatforms = [ ]; - }; - }); -in -symlinkJoin { - name = "dxmt-${dxmt.version}"; - - paths = [ dxmt ]; - - passthru = { - inherit dxmt; - }; - - __structuredAttrs = true; - strictDeps = true; - - meta = { - inherit (dxmt.meta) - description - homepage - maintainers - license - ; - platforms = [ "x86_64-darwin" ]; - hydraPlatforms = [ ]; - }; -} diff --git a/pkgs/by-name/dx/dxmt/winecrt0.patch b/pkgs/by-name/dx/dxmt/winecrt0.patch deleted file mode 100644 index f4d0830659bb..000000000000 --- a/pkgs/by-name/dx/dxmt/winecrt0.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git c/src/winemetal/meson.build i/src/winemetal/meson.build -index 858d4b3..d937e29 100644 ---- c/src/winemetal/meson.build -+++ i/src/winemetal/meson.build -@@ -26,8 +26,19 @@ elif wine_install_path != '' - if not wine_install_path.startswith('/') - wine_install_path = join_paths(meson.project_source_root(), wine_install_path) - endif -- lib_winecrt0 = cc.find_library('winecrt0', dirs : [ join_paths(wine_install_path,'lib/wine', windows_builtin_install_dir) ]) -- lib_ntdll = cc.find_library('ntdll', dirs : [ join_paths(wine_install_path, 'lib/wine', windows_builtin_install_dir)], static: true) -+ winecrt0_unix_archive = custom_target( -+ 'winecrt0_fixup', -+ output : 'libwinecrt0_fixed.a', -+ command : [ -+ 'sh', '-c', -+ 'ar p "$1" unix_lib.o > unix_lib.o && ar crs "$2" unix_lib.o', -+ 'sh', -+ join_paths(wine_install_path, 'lib/wine', windows_builtin_install_dir, 'libwinecrt0.a'), -+ '@OUTPUT@', -+ ], -+ ) -+ lib_winecrt0 = declare_dependency(sources : winecrt0_unix_archive) -+ lib_ntdll = cc.find_library('ntdll', dirs : [ join_paths(wine_install_path, 'lib/wine', windows_builtin_install_dir)]) - lib_dbghelp = cc.find_library('dbghelp', dirs : [ join_paths(wine_install_path, 'lib/wine', windows_builtin_install_dir) ]) - winebuild = join_paths(wine_install_path, 'bin/winebuild') - else -@@ -59,4 +70,4 @@ custom_target('postprocess_lib', - - if cpu_family == 'x86_64' or cpu_family == 'aarch64' - subdir('unix') --endif -\ No newline at end of file -+endif diff --git a/pkgs/by-name/dx/dxvk/package.nix b/pkgs/by-name/dx/dxvk/package.nix index 144bfe33609b..f4af351b33c1 100644 --- a/pkgs/by-name/dx/dxvk/package.nix +++ b/pkgs/by-name/dx/dxvk/package.nix @@ -84,7 +84,6 @@ stdenvNoCC.mkDerivation ( maintainers = [ lib.maintainers.reckenrode ]; license = lib.licenses.zlib; platforms = [ - "x86_64-darwin" "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/by-name/e-/e-imzo-manager/package.nix b/pkgs/by-name/e-/e-imzo-manager/package.nix index 23e3a43b7a0b..07764992fc81 100644 --- a/pkgs/by-name/e-/e-imzo-manager/package.nix +++ b/pkgs/by-name/e-/e-imzo-manager/package.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://git.oss.uzinfocom.uz/xinux/e-imzo-manager"; mainProgram = "E-IMZO-Manager"; description = "GTK application for managing E-IMZO keys"; - license = with lib.licenses; [ agpl3Plus ]; + license = lib.licenses.agpl3Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ orzklv diff --git a/pkgs/by-name/ea/ea/package.nix b/pkgs/by-name/ea/ea/package.nix index 107c19da4cc9..2bed9e08e2a7 100644 --- a/pkgs/by-name/ea/ea/package.nix +++ b/pkgs/by-name/ea/ea/package.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Makes file paths from CLI output actionable"; homepage = "https://github.com/dduan/ea"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ deejayem ]; mainProgram = "ea"; }; diff --git a/pkgs/by-name/ea/each/package.nix b/pkgs/by-name/ea/each/package.nix index b2bd7c2b65e7..d16a519959bd 100644 --- a/pkgs/by-name/ea/each/package.nix +++ b/pkgs/by-name/ea/each/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Command-line tool for processing CSV, JSON and other structured data"; mainProgram = "each"; homepage = "https://github.com/arraypad/each"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ thiagokokada ]; }; }) diff --git a/pkgs/by-name/ea/earlybird/package.nix b/pkgs/by-name/ea/earlybird/package.nix index d9b50c704da9..d9a0d8cf3769 100644 --- a/pkgs/by-name/ea/earlybird/package.nix +++ b/pkgs/by-name/ea/earlybird/package.nix @@ -2,32 +2,61 @@ lib, buildGoModule, fetchFromGitHub, + gitMinimal, + poppler-utils, + wv, + unrtf, + html-tidy, + makeWrapper, + # TODO add justext when github.com/JalfResi/justext becomes available + # justext }: buildGoModule (finalAttrs: { pname = "earlybird"; - version = "4.0.0"; + version = "4.6.0"; src = fetchFromGitHub { owner = "americanexpress"; repo = "earlybird"; - rev = "v${finalAttrs.version}"; - hash = "sha256-guSm/ha4ICaOcoynvAwFeojE6ikaCykMcdfskD/ehTw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-P8kA9MJA+2jtVOYLBu0oG9xTUTGCtiX4R+4ecmXDAAw="; }; - vendorHash = "sha256-39jXqCXAwg/C+9gEXiS1X58OD61nMNQifnhgVGEF6ck="; + vendorHash = "sha256-pQ8gSDHsdDT/cgvRB0OSqnMZz2W5vAzFBzph0xksC2o="; ldflags = [ "-s" "-w" ]; + nativeBuildInputs = [ + makeWrapper + gitMinimal + ]; + + checkFlags = [ + "--skip=Test_parseGitFiles" + ]; + + postFixup = '' + wrapProgram $out/bin/earlybird \ + --prefix PATH : ${ + lib.makeBinPath [ + poppler-utils + wv + unrtf + html-tidy + ] + } + ''; + meta = { description = "Sensitive data detection tool capable of scanning source code repositories for passwords, key files, and more"; mainProgram = "earlybird"; homepage = "https://github.com/americanexpress/earlybird"; changelog = "https://github.com/americanexpress/earlybird/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; - maintainers = [ ]; + maintainers = with lib.maintainers; [ tbutter ]; }; }) diff --git a/pkgs/by-name/ec/eccodes/package.nix b/pkgs/by-name/ec/eccodes/package.nix index 32c9129f541a..3b7425f56866 100644 --- a/pkgs/by-name/ec/eccodes/package.nix +++ b/pkgs/by-name/ec/eccodes/package.nix @@ -17,11 +17,11 @@ }: gccStdenv.mkDerivation rec { pname = "eccodes"; - version = "2.47.0"; + version = "2.48.0"; src = fetchurl { url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz"; - hash = "sha256-gtqBmqm1GDHcFLO/KRi/7lCxzVOgUIjQw/RJN1iq4JQ="; + hash = "sha256-Yuj6XKE30TgYml/dbVsiBcicwmM44/Qoaro9ibScn5o="; }; postPatch = '' diff --git a/pkgs/by-name/ec/ecdsatool/package.nix b/pkgs/by-name/ec/ecdsatool/package.nix index 4110f5f4a4d3..b9a90e88f595 100644 --- a/pkgs/by-name/ec/ecdsatool/package.nix +++ b/pkgs/by-name/ec/ecdsatool/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { description = "Create and manipulate ECC NISTP256 keypairs"; mainProgram = "ecdsatool"; homepage = "https://github.com/kaniini/ecdsatool/"; - license = with lib.licenses; [ free ]; + license = lib.licenses.free; platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/ed/eduke32/package.nix b/pkgs/by-name/ed/eduke32/package.nix index afd2cb120202..ad46cb0fcbf8 100644 --- a/pkgs/by-name/ed/eduke32/package.nix +++ b/pkgs/by-name/ed/eduke32/package.nix @@ -181,7 +181,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Enhanced port of Duke Nukem 3D for various platforms"; homepage = "https://eduke32.com"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ qubitnano ]; diff --git a/pkgs/by-name/ef/effitask/package.nix b/pkgs/by-name/ef/effitask/package.nix index 7fc694d37356..11ea7bf263fe 100644 --- a/pkgs/by-name/ef/effitask/package.nix +++ b/pkgs/by-name/ef/effitask/package.nix @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; homepage = "https://github.com/todotxt-rs/effitask"; maintainers = with lib.maintainers; [ davidak ]; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "effitask"; }; }) diff --git a/pkgs/by-name/el/electron-mail/package.nix b/pkgs/by-name/el/electron-mail/package.nix index 335241bfcf75..965e6ad8746d 100644 --- a/pkgs/by-name/el/electron-mail/package.nix +++ b/pkgs/by-name/el/electron-mail/package.nix @@ -21,10 +21,6 @@ let url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-mac-arm64.dmg"; hash = "sha256-V32Wi0oCU9dLfzqxg3OdseiILX7wPiBGNz7KuG0vlZY="; }; - x86_64-darwin = fetchurl { - url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-mac-x64.dmg"; - hash = "sha256-I1UvFMSdAwkqgkhn+mkBGslA8v+VTajO/Za0lJ5uYZ8="; - }; }; src = sources.${stdenvNoCC.hostPlatform.system}; @@ -45,7 +41,6 @@ let platforms = [ "x86_64-linux" "aarch64-darwin" - "x86_64-darwin" ]; changelog = "https://github.com/vladimiry/ElectronMail/releases/tag/v${version}"; }; diff --git a/pkgs/by-name/el/element-desktop/package.nix b/pkgs/by-name/el/element-desktop/package.nix index 327c5e1029f3..344d7db401f6 100644 --- a/pkgs/by-name/el/element-desktop/package.nix +++ b/pkgs/by-name/el/element-desktop/package.nix @@ -30,13 +30,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "element-desktop"; - version = "1.12.22"; + version = "1.12.23"; src = fetchFromGitHub { owner = "element-hq"; repo = "element-web"; tag = "v${finalAttrs.version}"; - hash = "sha256-TtC4KUnaKy/gmh5CbkPTWKCFjdeKvt8esFt3awdkA/g="; + hash = "sha256-IdQZqwGk05APb38hEoin74/5FeRgjCLrdli+R6iaoUA="; }; pnpmDeps = fetchPnpmDeps { @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { ; inherit pnpm; fetcherVersion = 4; - hash = "sha256-wTOdipfWUH0gjTTHJTP8np2D77bNoFCThCg5eRMJXS8="; + hash = "sha256-WVQaq7kqlEdKodOkErUCeYLh0xnH1NTHzgNyjn1+1y0="; }; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; diff --git a/pkgs/by-name/el/element-web-unwrapped/package.nix b/pkgs/by-name/el/element-web-unwrapped/package.nix index fda412a8495c..45dd152435f0 100644 --- a/pkgs/by-name/el/element-web-unwrapped/package.nix +++ b/pkgs/by-name/el/element-web-unwrapped/package.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "element-web"; - version = "1.12.22"; + version = "1.12.23"; src = fetchFromGitHub { owner = "element-hq"; repo = "element-web"; tag = "v${finalAttrs.version}"; - hash = "sha256-TtC4KUnaKy/gmh5CbkPTWKCFjdeKvt8esFt3awdkA/g="; + hash = "sha256-IdQZqwGk05APb38hEoin74/5FeRgjCLrdli+R6iaoUA="; }; pnpmDeps = fetchPnpmDeps { @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) version src; inherit pnpm; fetcherVersion = 4; - hash = "sha256-wTOdipfWUH0gjTTHJTP8np2D77bNoFCThCg5eRMJXS8="; + hash = "sha256-WVQaq7kqlEdKodOkErUCeYLh0xnH1NTHzgNyjn1+1y0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/el/elephant/package.nix b/pkgs/by-name/el/elephant/package.nix index 93df5966a194..b2e446a8e4ce 100644 --- a/pkgs/by-name/el/elephant/package.nix +++ b/pkgs/by-name/el/elephant/package.nix @@ -31,16 +31,16 @@ let in buildGoModule (finalAttrs: { pname = "elephant"; - version = "2.21.0"; + version = "2.22.0"; src = fetchFromGitHub { owner = "abenz1267"; repo = "elephant"; rev = "v${finalAttrs.version}"; - hash = "sha256-h7Rw0vlb0n0Jsk21WJPm7H+1T1bG+PEuxE5cJ2TZl8A="; + hash = "sha256-frlaSpCf/e94OqO5Glp1NW96bemc+BhrKoPu+4X1FyI="; }; - vendorHash = "sha256-EWXZ+9/QDRpidpVHBcfJgp0xoc3YtRsiC/UTk1R+FSY="; + vendorHash = "sha256-ssX+ZQ6v+XcwC/RuIZ+rO/9zZwZnotudj8bvZNM7M3g="; buildInputs = [ protobuf ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/el/elf2uf2-rs/package.nix b/pkgs/by-name/el/elf2uf2-rs/package.nix index 434781557bcb..a5e240ffaa25 100644 --- a/pkgs/by-name/el/elf2uf2-rs/package.nix +++ b/pkgs/by-name/el/elf2uf2-rs/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Convert ELF files to UF2 for USB Flashing Bootloaders"; mainProgram = "elf2uf2-rs"; homepage = "https://github.com/JoNil/elf2uf2-rs"; - license = with lib.licenses; [ bsd0 ]; + license = lib.licenses.bsd0; platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ polygon diff --git a/pkgs/by-name/el/elfx86exts/package.nix b/pkgs/by-name/el/elfx86exts/package.nix index 657b6a2ff6b8..b123e6e16c9f 100644 --- a/pkgs/by-name/el/elfx86exts/package.nix +++ b/pkgs/by-name/el/elfx86exts/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; homepage = "https://github.com/pkgw/elfx86exts"; maintainers = with lib.maintainers; [ rmcgibbo ]; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "elfx86exts"; }; }) diff --git a/pkgs/by-name/el/elpa/package.nix b/pkgs/by-name/el/elpa/package.nix index 650d59f93de4..0a8e5366a971 100644 --- a/pkgs/by-name/el/elpa/package.nix +++ b/pkgs/by-name/el/elpa/package.nix @@ -28,13 +28,13 @@ assert blas.isILP64 == scalapack.isILP64; stdenv.mkDerivation (finalAttrs: { pname = "elpa"; - version = "2026.02.001"; + version = "2026.02.002"; passthru = { inherit (blas) isILP64; }; src = fetchurl { url = "https://elpa.mpcdf.mpg.de/software/tarball-archive/Releases/${finalAttrs.version}/elpa-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-o3nyf029J7LuRQF6/sZW0GQwHpcVDIdGSb39ZJV7de0="; + sha256 = "sha256-AuPFn+xTzY62akzBX6T78ZDPllQiciP7itVXE+lCeTI="; }; patches = [ diff --git a/pkgs/by-name/em/emacspeak/package.nix b/pkgs/by-name/em/emacspeak/package.nix index a0bc83a38c07..f171cd5bf800 100644 --- a/pkgs/by-name/em/emacspeak/package.nix +++ b/pkgs/by-name/em/emacspeak/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/tvraman/emacspeak/"; description = "Emacs extension that provides spoken output"; changelog = "https://github.com/tvraman/emacspeak/blob/${finalAttrs.src.rev}/etc/NEWS"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "emacspeak"; maintainers = [ ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/em/email/package.nix b/pkgs/by-name/em/email/package.nix index 9aba58c1d25f..4ab0524bc94b 100644 --- a/pkgs/by-name/em/email/package.nix +++ b/pkgs/by-name/em/email/package.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation { meta = { description = "Command line SMTP client"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; homepage = "https://deanproxy.com/code"; platforms = lib.platforms.unix; mainProgram = "email"; diff --git a/pkgs/by-name/em/emmy-lua-code-style/package.nix b/pkgs/by-name/em/emmy-lua-code-style/package.nix index 7cf1f72aafd1..e4597f81aadf 100644 --- a/pkgs/by-name/em/emmy-lua-code-style/package.nix +++ b/pkgs/by-name/em/emmy-lua-code-style/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Fast, powerful, and feature-rich Lua formatting and checking tool"; mainProgram = "CodeFormat"; platforms = lib.platforms.unix; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.nobbz ]; }; }) diff --git a/pkgs/by-name/em/emmylua-ls/package.nix b/pkgs/by-name/em/emmylua-ls/package.nix index 3f3def1bca0a..a50b5b411ad0 100644 --- a/pkgs/by-name/em/emmylua-ls/package.nix +++ b/pkgs/by-name/em/emmylua-ls/package.nix @@ -9,13 +9,13 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "emmylua_ls"; - version = "0.23.2"; + version = "0.24.0"; src = fetchFromGitHub { owner = "EmmyLuaLs"; repo = "emmylua-analyzer-rust"; tag = finalAttrs.version; - hash = "sha256-xjKTYzkfFWKyQzg6I2aafKBGn7XjkE8CCQ9AP8ebu/I="; + hash = "sha256-oijk0SFTjpIak9AetBfctMXJ/72bRGjuaib9adx1yac="; }; __structuredAttrs = true; @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildAndTestSubdir = "crates/emmylua_ls"; - cargoHash = "sha256-tVmATUh35h19AsmMCrijJ0rdBHYU6uMj2PE1iiiuDCE="; + cargoHash = "sha256-8uzkj7uCV3XzdagsrePwt2DE4MV12xlbwsaBONUymFQ="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/en/engauge-digitizer/package.nix b/pkgs/by-name/en/engauge-digitizer/package.nix index c331bdaa9c95..b8f331deae1d 100644 --- a/pkgs/by-name/en/engauge-digitizer/package.nix +++ b/pkgs/by-name/en/engauge-digitizer/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Engauge Digitizer is a tool for recovering graph data from an image file"; mainProgram = "engauge"; homepage = "https://markummitchell.github.io/engauge-digitizer"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.sheepforce ]; }; diff --git a/pkgs/by-name/en/enpass-mac/package.nix b/pkgs/by-name/en/enpass-mac/package.nix index c03fd6eb77b1..34e3cfcdb9e9 100644 --- a/pkgs/by-name/en/enpass-mac/package.nix +++ b/pkgs/by-name/en/enpass-mac/package.nix @@ -84,7 +84,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "Choose your own safest place to store passwords"; homepage = "https://www.enpass.io"; changelog = "https://www.enpass.io/release-notes/macos-website-ver/"; - license = [ lib.licenses.unfree ]; + license = lib.licenses.unfree; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; maintainers = with lib.maintainers; [ DimitarNestorov ]; platforms = lib.platforms.darwin; diff --git a/pkgs/by-name/en/enum4linux-ng/package.nix b/pkgs/by-name/en/enum4linux-ng/package.nix index d77b60db798d..00ea0ff0f690 100644 --- a/pkgs/by-name/en/enum4linux-ng/package.nix +++ b/pkgs/by-name/en/enum4linux-ng/package.nix @@ -39,7 +39,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { ''; homepage = "https://github.com/cddmp/enum4linux-ng"; changelog = "https://github.com/cddmp/enum4linux-ng/releases/tag/${finalAttrs.src.tag}"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ fab ]; mainProgram = "enum4linux-ng"; }; diff --git a/pkgs/by-name/en/envoy-bin/package.nix b/pkgs/by-name/en/envoy-bin/package.nix index 47ad70b28786..fcbf5d0a0033 100644 --- a/pkgs/by-name/en/envoy-bin/package.nix +++ b/pkgs/by-name/en/envoy-bin/package.nix @@ -7,7 +7,7 @@ versionCheckHook, }: let - version = "1.38.2"; + version = "1.39.0"; inherit (stdenvNoCC.hostPlatform) system; throwSystem = throw "envoy-bin is not available for ${system}."; @@ -20,8 +20,8 @@ let hash = { - aarch64-linux = "sha256-nHFdDu2KrzqZgw7glwvDtevH1CIbvB4vP/chBWHanX0="; - x86_64-linux = "sha256-h3RKH8mY1ncHjJcDEToZLQgwutxoiGYkQWMoR/yziJk="; + aarch64-linux = "sha256-7lOk9TdVZvFZRNycsDr7H8Io3zj2FzfGd/E5ITIVr88="; + x86_64-linux = "sha256-RAna3IeTHY+GdjFMvYMHHLZRJftP6sP2M1gAWA36khg="; } .${system} or throwSystem; in diff --git a/pkgs/by-name/ep/epson-202101w/package.nix b/pkgs/by-name/ep/epson-202101w/package.nix new file mode 100644 index 000000000000..53c2c0a969f5 --- /dev/null +++ b/pkgs/by-name/ep/epson-202101w/package.nix @@ -0,0 +1,92 @@ +{ + lib, + stdenv, + fetchurl, + rpmextract, + autoreconfHook, + autoPatchelfHook, + file, + libjpeg, + cups, +}: + +let + version = "1.0.2"; +in +stdenv.mkDerivation { + pname = "epson-202101w"; + inherit version; + + __structuredAttrs = true; + strictDeps = true; + + src = fetchurl { + # NOTE: Don't forget to update the webarchive link too! + urls = [ + "https://download3.ebz.epson.net/dsc/f/03/00/15/15/02/f5cba2761f2f501363cdbf7e1b9b9879b0715aa5/epson-inkjet-printer-202101w-1.0.2-1.src.rpm" + "https://web.archive.org/web/20250609030209if_/https://download3.ebz.epson.net/dsc/f/03/00/15/15/02/f5cba2761f2f501363cdbf7e1b9b9879b0715aa5/epson-inkjet-printer-202101w-1.0.2-1.src.rpm" + ]; + sha256 = "17lz5cccknabp8cbkplhv1sn92m5w5md01rhhycbngp10zdmyhcz"; + }; + + nativeBuildInputs = [ + rpmextract + autoreconfHook + autoPatchelfHook + file + ]; + + buildInputs = [ + libjpeg + cups + (lib.getLib stdenv.cc.cc) + ]; + + unpackPhase = '' + rpmextract $src + tar -zxf epson-inkjet-printer-202101w-${version}.tar.gz + tar -zxf epson-inkjet-printer-filter-${version}.tar.gz + for ppd in epson-inkjet-printer-202101w-${version}/ppds/*; do + substituteInPlace $ppd --replace "/opt/epson-inkjet-printer-202101w" "$out" + substituteInPlace $ppd --replace "/cups/lib" "/lib/cups" + done + cd epson-inkjet-printer-filter-${version} + ''; + + preConfigure = '' + chmod +x configure + ''; + + postInstall = '' + cd ../epson-inkjet-printer-202101w-${version} + cp -a lib64 resource watermark $out + mkdir -p $out/share/cups/model/epson-inkjet-printer-202101w + cp -a ppds $out/share/cups/model/epson-inkjet-printer-202101w/ + cp -a Manual.txt $out/doc/ + cp -a README $out/doc/README.driver + ''; + + meta = { + homepage = "https://www.openprinting.org/driver/epson-202101w"; + description = "Epson printer driver (L1210, L1250, L3200, L3210)"; + longDescription = '' + This software is a filter program used with the Common UNIX Printing + System (CUPS) under Linux. It supplies high quality printing with + Seiko Epson Color Ink Jet Printers. + + To use the driver adjust your configuration.nix file: + services.printing = { + enable = true; + drivers = [ pkgs.epson-202101w ]; + }; + ''; + license = with lib.licenses; [ + lgpl21 + epson + ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + caguiclajmg + ]; + }; +} diff --git a/pkgs/by-name/er/erlang-language-platform/package.nix b/pkgs/by-name/er/erlang-language-platform/package.nix index 6288fddca42a..89109ff74a3d 100644 --- a/pkgs/by-name/er/erlang-language-platform/package.nix +++ b/pkgs/by-name/er/erlang-language-platform/package.nix @@ -65,7 +65,6 @@ stdenv.mkDerivation rec { "aarch64-linux" "x86_64-linux" "aarch64-darwin" - "x86_64-darwin" ]; maintainers = with lib.maintainers; [ offsetcyan ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; diff --git a/pkgs/by-name/er/erofs-utils/package.nix b/pkgs/by-name/er/erofs-utils/package.nix index 868184eafe4e..e7f6e7a7bd21 100644 --- a/pkgs/by-name/er/erofs-utils/package.nix +++ b/pkgs/by-name/er/erofs-utils/package.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/about/"; description = "Userspace utilities for linux-erofs file system"; changelog = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/tree/ChangeLog?h=v${finalAttrs.version}"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ nikstur jmbaur diff --git a/pkgs/by-name/er/erosmb/package.nix b/pkgs/by-name/er/erosmb/package.nix index 45a519260591..145516f799fe 100644 --- a/pkgs/by-name/er/erosmb/package.nix +++ b/pkgs/by-name/er/erosmb/package.nix @@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { description = "SMB network scanner"; homepage = "https://github.com/viktor02/EroSmb"; changelog = "https://github.com/viktor02/EroSmb/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "erosmb"; }; diff --git a/pkgs/by-name/es/esphome/dashboard.nix b/pkgs/by-name/es/esphome/dashboard.nix index 180acf1ef55c..0359539d239a 100644 --- a/pkgs/by-name/es/esphome/dashboard.nix +++ b/pkgs/by-name/es/esphome/dashboard.nix @@ -54,7 +54,7 @@ buildPythonPackage (finalAttrs: { meta = { description = "ESPHome dashboard"; homepage = "https://esphome.io/"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ hexa ]; }; }) diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix index 9a69084ffd7a..936f0caabe46 100644 --- a/pkgs/by-name/es/esphome/package.nix +++ b/pkgs/by-name/es/esphome/package.nix @@ -18,16 +18,7 @@ let packageOverrides = self: super: { esphome-dashboard = self.callPackage ./dashboard.nix { }; - paho-mqtt = super.paho-mqtt.overridePythonAttrs (oldAttrs: rec { - version = "1.6.1"; - src = fetchFromGitHub { - inherit (oldAttrs.src) owner repo; - tag = "v${version}"; - hash = "sha256-9nH6xROVpmI+iTKXfwv2Ar1PAmWbEunI3HO0pZyK6Rg="; - }; - build-system = with self; [ setuptools ]; - doCheck = false; - }); + paho-mqtt = self.paho-mqtt_1; }; }; in diff --git a/pkgs/by-name/et/ete-unwrapped/package.nix b/pkgs/by-name/et/ete-unwrapped/package.nix index 1b396ad00ce0..c8f8479f8b5d 100644 --- a/pkgs/by-name/et/ete-unwrapped/package.nix +++ b/pkgs/by-name/et/ete-unwrapped/package.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Improved Wolfenstein: Enemy Territory Engine"; homepage = "https://github.com/etfdevs/ETe"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ ashleyghooper drupol diff --git a/pkgs/by-name/et/etlegacy-assets/package.nix b/pkgs/by-name/et/etlegacy-assets/package.nix index f4443287a060..d0259a237b2d 100644 --- a/pkgs/by-name/et/etlegacy-assets/package.nix +++ b/pkgs/by-name/et/etlegacy-assets/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { meta = { description = "ET: Legacy assets only"; homepage = "https://etlegacy.com"; - license = with lib.licenses; [ cc-by-nc-sa-30 ]; + license = lib.licenses.cc-by-nc-sa-30; longDescription = '' ET: Legacy, an open source project fully compatible client and server for the popular online FPS game Wolfenstein: Enemy Territory - whose diff --git a/pkgs/by-name/et/etlegacy-unwrapped/package.nix b/pkgs/by-name/et/etlegacy-unwrapped/package.nix index 73b9e82e8e6e..25b878fa6369 100644 --- a/pkgs/by-name/et/etlegacy-unwrapped/package.nix +++ b/pkgs/by-name/et/etlegacy-unwrapped/package.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation { meta = { description = "ET: Legacy is an open source project based on the code of Wolfenstein: Enemy Territory which was released in 2010 under the terms of the GPLv3 license"; homepage = "https://etlegacy.com"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; longDescription = '' ET: Legacy, an open source project fully compatible client and server for the popular online FPS game Wolfenstein: Enemy Territory - whose diff --git a/pkgs/by-name/ev/evans/package.nix b/pkgs/by-name/ev/evans/package.nix index c7f8e974a554..5d66dfad7e8f 100644 --- a/pkgs/by-name/ev/evans/package.nix +++ b/pkgs/by-name/ev/evans/package.nix @@ -23,7 +23,7 @@ buildGoModule (finalAttrs: { description = "More expressive universal gRPC client"; mainProgram = "evans"; homepage = "https://evans.syfm.me/"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ diogox ]; }; }) diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix index 89a475328079..3b14b2c3110f 100644 --- a/pkgs/by-name/ev/evcc/package.nix +++ b/pkgs/by-name/ev/evcc/package.nix @@ -17,16 +17,16 @@ }: let - version = "0.311.1"; + version = "0.312.0"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; tag = version; - hash = "sha256-dxP28NPW+V30XIzh2w++Glrb2xfZ0tpp4H+qOM13yt8="; + hash = "sha256-GUHKrjCGm9LRQX5INdzSMPBV19FtaV8DTN3HIEUrxR4="; }; - vendorHash = "sha256-Eh07T9FAoeoUfhJsK6DPmwE2rJX55Ijzp4ydxJc8/bQ="; + vendorHash = "sha256-x4iwvzf7iv6TyLEkTnqztDQrBD+3lT1yycB7yTD4xO4="; commonMeta = { license = lib.licenses.mit; diff --git a/pkgs/by-name/ev/eventstore/package.nix b/pkgs/by-name/ev/eventstore/package.nix index 156cc0d5983d..9b7b80e40dbf 100644 --- a/pkgs/by-name/ev/eventstore/package.nix +++ b/pkgs/by-name/ev/eventstore/package.nix @@ -82,7 +82,6 @@ buildDotnetModule rec { ]; platforms = [ "x86_64-linux" - "x86_64-darwin" ]; inherit mainProgram; }; diff --git a/pkgs/by-name/ev/everest-bin/package.nix b/pkgs/by-name/ev/everest-bin/package.nix index 2d0ba6e4a1a3..808d1351a3c3 100644 --- a/pkgs/by-name/ev/everest-bin/package.nix +++ b/pkgs/by-name/ev/everest-bin/package.nix @@ -8,15 +8,15 @@ let pname = "everest"; - version = "6314"; + version = "6397"; phome = "$out/lib/Celeste"; in stdenvNoCC.mkDerivation { inherit pname version; src = fetchzip { - url = "https://github.com/EverestAPI/Everest/releases/download/stable-1.6314.0/main.zip"; + url = "https://github.com/EverestAPI/Everest/releases/download/stable-1.6397.0/main.zip"; extension = "zip"; - hash = "sha256-YM6zjANINWQlTNu3EJFKIVl9VhVY4Ednjp+I+6Ap7dI="; + hash = "sha256-zU9FCDe5NDfuxnV+KdI0g9XiqAZM/tI1XZOXifYLblE="; }; buildInputs = [ icu @@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation { ''; meta = { description = "Celeste mod loader (don't install; use celestegame instead)"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ ulysseszhan ]; homepage = "https://everestapi.github.io"; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/by-name/ev/everest/package.nix b/pkgs/by-name/ev/everest/package.nix index b05e536acf03..5b1fb0162381 100644 --- a/pkgs/by-name/ev/everest/package.nix +++ b/pkgs/by-name/ev/everest/package.nix @@ -11,8 +11,8 @@ let pname = "everest"; - version = "6314"; - rev = "a3112074ae83766af9f8cf48295689bbd8166730"; + version = "6397"; + rev = "985fd82290fe47798bcd46cbbaa7574fe02780c8"; phome = "$out/lib/Celeste"; in buildDotnetModule { @@ -25,7 +25,7 @@ buildDotnetModule { fetchSubmodules = true; # TODO: use leaveDotGit = true and modify external/MonoMod in postFetch to please SourceLink # Microsoft.SourceLink.Common.targets(53,5): warning : Source control information is not available - the generated source link is empty. - hash = "sha256-yZLhjP09ocn8lbb6SuklcEHvqz/GV2/wlxpjYm/gr08="; + hash = "sha256-p/blM1lXeR2MBjfgMlJuseYZgQj3ziaiY9x3V+vH15s="; }; nativeBuildInputs = [ autoPatchelfHook ]; @@ -102,7 +102,7 @@ buildDotnetModule { meta = { description = "Celeste mod loader (don't install; use celestegame instead)"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ ulysseszhan ]; homepage = "https://everestapi.github.io"; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/by-name/ev/evmdis/package.nix b/pkgs/by-name/ev/evmdis/package.nix index 5d028fc29d8f..c7d7fbff6166 100644 --- a/pkgs/by-name/ev/evmdis/package.nix +++ b/pkgs/by-name/ev/evmdis/package.nix @@ -27,7 +27,7 @@ buildGoModule { homepage = "https://github.com/Arachnid/evmdis"; description = "Ethereum EVM disassembler"; mainProgram = "evmdis"; - license = [ lib.licenses.asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ asymmetric ]; }; } diff --git a/pkgs/by-name/ev/evremap/package.nix b/pkgs/by-name/ev/evremap/package.nix index 37f4f2679a46..580a63f3c2e7 100644 --- a/pkgs/by-name/ev/evremap/package.nix +++ b/pkgs/by-name/ev/evremap/package.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage { description = "Keyboard input remapper for Linux/Wayland systems"; homepage = "https://github.com/wez/evremap"; maintainers = with lib.maintainers; [ pluiedev ]; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "evremap"; }; } diff --git a/pkgs/by-name/ew/eww/package.nix b/pkgs/by-name/ew/eww/package.nix index b079226da18d..53fc9eea0f50 100644 --- a/pkgs/by-name/ew/eww/package.nix +++ b/pkgs/by-name/ew/eww/package.nix @@ -15,13 +15,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "eww"; - version = "0.6.0-unstable-2026-03-05"; + version = "0.6.0-unstable-2026-07-05"; src = fetchFromGitHub { owner = "elkowar"; repo = "eww"; - rev = "865cf631d5bbb5f9fccc99b3f4cc80b9eeada18c"; - hash = "sha256-fL12XFMsf/efSlbzQc7cCI366CwETkM6sWpEfcF9s6A="; + rev = "4ded06345553e4c2bcf8179fc7438e53c5e54d89"; + hash = "sha256-fnI8XgBowMxs/j9FGf+pQI2U8YjN8pTRqkVmFm8PBHE="; }; cargoHash = "sha256-Kf99eojqXvdbZ3eRS8GBgyLYNpZKJGIJtsOsvhhSVDk="; diff --git a/pkgs/by-name/ex/expresslrs-configurator/package.nix b/pkgs/by-name/ex/expresslrs-configurator/package.nix index 4a63c931b5a8..467ee1798c86 100644 --- a/pkgs/by-name/ex/expresslrs-configurator/package.nix +++ b/pkgs/by-name/ex/expresslrs-configurator/package.nix @@ -12,7 +12,7 @@ let pname = "expresslrs-configurator"; - version = "1.7.11"; + version = "1.8.1"; installPath = "share/${pname}"; resourcesPath = "${installPath}/resources"; in @@ -22,7 +22,7 @@ stdenv.mkDerivation { src = fetchzip { url = "https://github.com/ExpressLRS/ExpressLRS-Configurator/releases/download/v${version}/${pname}-${version}.zip"; stripRoot = false; - hash = "sha256-BIbJzNWjYFbbwCEWoym3g6XBpQGi2owbf2XsQiXwHmw="; + hash = "sha256-3f2/ifXLs/gHZVVDI0EUBP05FEHH8exDvBzALDXq0Wo="; }; nativeBuildInputs = [ @@ -52,10 +52,6 @@ stdenv.mkDerivation { cp -r $src/locales $src/resources $out/${installPath}/ chmod -R u+w $out/${resourcesPath} - # broken symlink - rm -f $out/${resourcesPath}/app.asar.unpacked/node_modules/@serialport/bindings-cpp/build/node_gyp_bins/python3 - touch $out/${resourcesPath}/app.asar.unpacked/node_modules/@serialport/bindings-cpp/build/node_gyp_bins/python3 - # patch asar absolute paths asar extract $out/${resourcesPath}/app.asar $TMPDIR/app substituteInPlace $TMPDIR/app/dist/main/main.js \ @@ -70,6 +66,7 @@ stdenv.mkDerivation { makeWrapper '${lib.getExe electron}' "$out/bin/${pname}" \ --add-flags "$out/${resourcesPath}/app.asar" \ --prefix PATH : ${lib.makeBinPath [ git ]} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ (lib.getLib stdenv.cc.cc) ]} \ --set ELECTRON_OVERRIDE_DIST_PATH "${electron}/lib/electron" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto}}" diff --git a/pkgs/by-name/ex/external-editor-revived/package.nix b/pkgs/by-name/ex/external-editor-revived/package.nix index 29f29d11471f..57be8c4ead17 100644 --- a/pkgs/by-name/ex/external-editor-revived/package.nix +++ b/pkgs/by-name/ex/external-editor-revived/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Native messaging host for the Thunderbird addon allowing to edit mails in external programs"; homepage = "https://github.com/Frederick888/external-editor-revived"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ mofrim ]; mainProgram = "external-editor-revived"; }; diff --git a/pkgs/by-name/ex/extrude/package.nix b/pkgs/by-name/ex/extrude/package.nix index 2612f6629a0e..973a3381fe2e 100644 --- a/pkgs/by-name/ex/extrude/package.nix +++ b/pkgs/by-name/ex/extrude/package.nix @@ -21,7 +21,7 @@ buildGoModule (finalAttrs: { description = "Tool to analyse binaries for missing security features"; mainProgram = "extrude"; homepage = "https://github.com/liamg/extrude"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/fa/fabric-ai/package.nix b/pkgs/by-name/fa/fabric-ai/package.nix index 8a62a2677564..f44a85433ad4 100644 --- a/pkgs/by-name/fa/fabric-ai/package.nix +++ b/pkgs/by-name/fa/fabric-ai/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "fabric-ai"; - version = "1.4.455"; + version = "1.4.459"; src = fetchFromGitHub { owner = "danielmiessler"; repo = "fabric"; tag = "v${finalAttrs.version}"; - hash = "sha256-folZ+Y5l76SKo65RJAK7kZX6DJ/AL+iLkcV8NX+1DTA="; + hash = "sha256-HlOctDrdp1iksU2PU3LDDqaHdCtyTzJhToNkU7cqMPU="; }; - vendorHash = "sha256-DfI0SYMX1wfJ8V0tFYpjzCgqhR7H/0J1p5R3aNcrXTw="; + vendorHash = "sha256-l7LeD4FV7TCuqek36R8FcrXcjHmTwGkQpJobp15Auts="; # Fabric introduced plugin tests that fail in the nix build sandbox. doCheck = false; diff --git a/pkgs/by-name/fa/factorio/versions.json b/pkgs/by-name/fa/factorio/versions.json index 1aace8201fa6..13296e1da5bb 100644 --- a/pkgs/by-name/fa/factorio/versions.json +++ b/pkgs/by-name/fa/factorio/versions.json @@ -3,14 +3,14 @@ "alpha": { "experimental": { "candidateHashFilenames": [ - "factorio_linux_2.1.9.tar.xz" + "factorio_linux_2.1.10.tar.xz" ], - "name": "factorio_alpha_x64-2.1.9.tar.xz", + "name": "factorio_alpha_x64-2.1.10.tar.xz", "needsAuth": true, - "sha256": "9e2d3d9a6f323c2d34215f264751599d9c9a87a9af2c7c4bdcbee8fb8d7c7245", + "sha256": "3c3f885061fe3f066574797edd5e59bd9e848f0373dcd944c59d2b79bfbfb6b3", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.1.9/alpha/linux64", - "version": "2.1.9" + "url": "https://factorio.com/get-download/2.1.10/alpha/linux64", + "version": "2.1.10" }, "stable": { "candidateHashFilenames": [ @@ -51,14 +51,14 @@ "expansion": { "experimental": { "candidateHashFilenames": [ - "factorio-space-age_linux_2.1.9.tar.xz" + "factorio-space-age_linux_2.1.10.tar.xz" ], - "name": "factorio_expansion_x64-2.1.9.tar.xz", + "name": "factorio_expansion_x64-2.1.10.tar.xz", "needsAuth": true, - "sha256": "481d1b1b7f4652f6dd5bd1f3a20a3f8aaddfe8f6866f8bde086986601be190e5", + "sha256": "35e42240a70c56e046489cb1cca8b6c7e17cf5fd4bdfb52c08422497bb57bb6c", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.1.9/expansion/linux64", - "version": "2.1.9" + "url": "https://factorio.com/get-download/2.1.10/expansion/linux64", + "version": "2.1.10" }, "stable": { "candidateHashFilenames": [ @@ -75,15 +75,15 @@ "headless": { "experimental": { "candidateHashFilenames": [ - "factorio-headless_linux_2.1.9.tar.xz", - "factorio_headless_x64_2.1.9.tar.xz" + "factorio-headless_linux_2.1.10.tar.xz", + "factorio_headless_x64_2.1.10.tar.xz" ], - "name": "factorio_headless_x64-2.1.9.tar.xz", + "name": "factorio_headless_x64-2.1.10.tar.xz", "needsAuth": false, - "sha256": "2cf94327877c92b95857356f7629f674a1314abd2c09e5c992f345707d165980", + "sha256": "5aab961c026a35d5ee28b2846260812098ed8b362b1251edf6bbd15c7355cb6c", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.1.9/headless/linux64", - "version": "2.1.9" + "url": "https://factorio.com/get-download/2.1.10/headless/linux64", + "version": "2.1.10" }, "stable": { "candidateHashFilenames": [ diff --git a/pkgs/by-name/fa/fail2ban/package.nix b/pkgs/by-name/fa/fail2ban/package.nix index 989edc8c7a3b..4c615a737eaf 100644 --- a/pkgs/by-name/fa/fail2ban/package.nix +++ b/pkgs/by-name/fa/fail2ban/package.nix @@ -110,6 +110,8 @@ python3.pkgs.buildPythonApplication (finalAttrs: { homepage = "https://www.fail2ban.org/"; description = "Program that scans log files for repeated failing login attempts and bans IP addresses"; license = lib.licenses.gpl2Plus; - maintainers = [ ]; + maintainers = with lib.maintainers; [ + Deric-W + ]; }; }) diff --git a/pkgs/by-name/fa/fake-gcs-server/package.nix b/pkgs/by-name/fa/fake-gcs-server/package.nix index 786dc24d2f60..82a4f6e0466b 100644 --- a/pkgs/by-name/fa/fake-gcs-server/package.nix +++ b/pkgs/by-name/fa/fake-gcs-server/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "fake-gcs-server"; - version = "1.54.0"; + version = "1.55.0"; src = fetchFromGitHub { owner = "fsouza"; repo = "fake-gcs-server"; tag = "v${finalAttrs.version}"; - hash = "sha256-mskNNTytnqqFXP4REMz7KLgWL0ma/8hlQKSAABOGuvk="; + hash = "sha256-XbwiPWhudTUhiCA91n8av7oQ0USPA/vXHePfS7/jnOg="; }; - vendorHash = "sha256-KNappojVBU1F9F3FqindXVDzOIy7IwYd7xVzbqQk6QE="; + vendorHash = "sha256-9zovcKQ3eiYWHCxUBXI39kgnjD4mR/4GGAZz65f7Of4="; # Unit tests fail to start the emulator server in some environments (e.g. Hydra) for some reason. # diff --git a/pkgs/by-name/fa/falkor/package.nix b/pkgs/by-name/fa/falkor/package.nix index 3bcf0da92424..900257712a8d 100644 --- a/pkgs/by-name/fa/falkor/package.nix +++ b/pkgs/by-name/fa/falkor/package.nix @@ -43,7 +43,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { description = "Electron-based gaming hub"; homepage = "https://github.com/Team-Falkor/falkor"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ icedborn ]; platforms = [ "x86_64-linux" ]; hydraPlatforms = [ ]; diff --git a/pkgs/by-name/fa/fasmg/package.nix b/pkgs/by-name/fa/fasmg/package.nix index dec77f1f04d4..1ea5b4b1977b 100644 --- a/pkgs/by-name/fa/fasmg/package.nix +++ b/pkgs/by-name/fa/fasmg/package.nix @@ -32,10 +32,6 @@ stdenv.mkDerivation (finalAttrs: { bin = "fasmg.x64"; asm = "source/linux/x64/fasmg.asm"; }; - x86_64-darwin = { - bin = "source/macos/x64/fasmg"; - asm = "source/macos/x64/fasmg.asm"; - }; x86-linux = { bin = "fasmg"; asm = "source/linux/fasmg.asm"; diff --git a/pkgs/by-name/fa/fastfetch-unwrapped/package.nix b/pkgs/by-name/fa/fastfetch-unwrapped/package.nix index 3fe6b67b2fa9..cae780fd2c07 100644 --- a/pkgs/by-name/fa/fastfetch-unwrapped/package.nix +++ b/pkgs/by-name/fa/fastfetch-unwrapped/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fastfetch-unwrapped"; - version = "2.65.2"; + version = "2.66.0"; strictDeps = true; __structuredAttrs = true; @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "fastfetch-cli"; repo = "fastfetch"; tag = finalAttrs.version; - hash = "sha256-yRKxETZEIlpl42y+adp9wpQhD6ZDebdfGj4SL1zxr3w="; + hash = "sha256-ttszEPEywszDGHoYKZYXM2WAUcuOSIj589LeEWxtRaU="; }; outputs = [ diff --git a/pkgs/by-name/fa/faust-benchmark-tools/package.nix b/pkgs/by-name/fa/faust-benchmark-tools/package.nix new file mode 100644 index 000000000000..138232f6bc92 --- /dev/null +++ b/pkgs/by-name/fa/faust-benchmark-tools/package.nix @@ -0,0 +1,142 @@ +{ + lib, + stdenv, + faust, + makeWrapper, + llvm, + ncurses, + zlib, + libxml2, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "faust-benchmark-tools"; + inherit (faust) version src; + + __structuredAttrs = true; + strictDeps = true; + + # The benchmark tools live in their own directory with their own Makefile, + # decoupled from the main CMake build. + sourceRoot = "${finalAttrs.src.name}/tools/benchmark"; + + nativeBuildInputs = [ + makeWrapper + ]; + + buildInputs = [ + # The benchmark binaries link ${faust}/lib/libfaust.a statically and + # include headers from ${faust}/include. The runtime scripts find `faust`, + # `faustpath`, and `faustoptflags` via the PATH wrap in postFixup. + faust + llvm + ncurses + zlib + libxml2 + ]; + + postPatch = '' + # --build rather than --host: under strictDeps there is no host bash in + # scope, so --host silently leaves the shebangs alone. This package is + # native-only anyway (see meta). + patchShebangs --build faustbench faust2object faust-tester + ''; + + makeFlags = [ + "FAUST=${faust}/bin/faust" + # Upstream's Makefile hardcodes ../../build on Darwin (they can't run an + # arm64 faust on their x86 CI runner) and only derives these from FAUST on + # other platforms. We build natively, so point them at the real faust + # output unconditionally. + "LIB=${faust}/lib" + "INC=${faust}/include" + "FARCH=${faust}/share/faust" + # The Makefile only shells out to `llvm-config` when LLVM is unset + # (`ifndef LLVM`), so setting it here avoids needing llvm-config on PATH. + "LLVM=$(shell ${lib.getDev llvm}/bin/llvm-config --link-static --ldflags --libs all --system-libs)" + # Restrict to the non-audio, non-GUI tools. Avoids pulling in + # gtk2/jack2/libsamplerate/liblo. The Makefile uses `TARGETS ?= …`. + "TARGETS=dynamic-faust faustbench-llvm faustbench-llvm-interp faustbench-interp interp-tracer" + ]; + + enableParallelBuilding = true; + + # Upstream's `install` target doesn't create its target directories, and + # unconditionally installs the wasm/iOS tools and faustbench.cpp regardless + # of TARGETS, which would defeat the restriction above. + installPhase = '' + runHook preInstall + + install -Dm755 -t $out/bin \ + dynamic-faust \ + faustbench-llvm \ + faustbench-llvm-interp \ + faustbench-interp \ + interp-tracer \ + faustbench \ + faust2object \ + faust-tester + + # faustbench reads this file at runtime to assemble its C++ test harness. + install -Dm644 faustbench.cpp $out/share/faust/faustbench.cpp + + runHook postInstall + ''; + + postFixup = '' + # `faustbench` reads $FAUSTLIB/faustbench.cpp, but $FAUSTLIB is set by + # faustpath to ${faust}/share/faust which does not contain our copy. + # Redirect to the copy we just installed. + substituteInPlace $out/bin/faustbench \ + --replace-fail '$FAUSTLIB/faustbench.cpp' "$out/share/faust/faustbench.cpp" + + # Plain PATH wrap is enough for faust-tester (just calls faust2plot from + # faust). faustbench and faust2object compile C++ at runtime, so they need + # the build environment exported too. + wrapProgram $out/bin/faust-tester \ + --prefix PATH : "$out/bin:${lib.makeBinPath [ faust ]}" + + # Mirror what faust.wrapWithBuildEnv does for the two compile-driving + # scripts, so users get a working $CXX and friends without a dev shell. + # (wrapWithBuildEnv itself is a whole-derivation builder — dontBuild, its + # own installPhase copying from tools/faust2appls — so it can't wrap + # binaries we compile here.) + nix_cc_wrapper_target_host="$(printenv | grep ^NIX_CC_WRAPPER_TARGET_HOST | sed 's/=.*//')" + nix_bintools_wrapper_target_host="$(printenv | grep ^NIX_BINTOOLS_WRAPPER_TARGET_HOST | sed 's/=.*//')" + for s in faustbench faust2object; do + wrapProgram $out/bin/$s \ + --prefix PATH : "$out/bin:${lib.makeBinPath [ faust ]}:$PATH" \ + --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH" \ + --set NIX_CFLAGS_COMPILE "$NIX_CFLAGS_COMPILE" \ + --set NIX_LDFLAGS "$NIX_LDFLAGS -lpthread" \ + --set "$nix_cc_wrapper_target_host" "''${!nix_cc_wrapper_target_host}" \ + --set "$nix_bintools_wrapper_target_host" "''${!nix_bintools_wrapper_target_host}" + done + ''; + + # Version is inherited from `faust`; bumping faust auto-bumps this. No + # passthru.updateScript needed. + + meta = { + description = "Benchmarking, tracing, and dynamic-compilation tools for the Faust compiler"; + longDescription = '' + A subset of the tools from the upstream Faust `tools/benchmark/` + directory: dynamic-faust, faustbench-llvm, faustbench-llvm-interp, + faustbench-interp, interp-tracer (binaries built against libfaust.a), + plus the scripts faustbench, faust2object, and faust-tester. + + This package intentionally excludes the JACK/GTK runners (dynamic-jack-gtk, + faust-osc-controller, signal-tester, box-tester) and the WASM bench + tools to keep the closure small. They can be packaged separately if + needed. + ''; + homepage = "https://github.com/grame-cncm/faust/tree/master-dev/tools/benchmark"; + changelog = "https://github.com/grame-cncm/faust/blob/${finalAttrs.version}/Changes.txt"; + license = lib.licenses.gpl3Plus; + # Cross is not wired up: llvm-config is executed at build time from + # buildInputs, and faust2object invokes it again at runtime on the host. + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ magnetophon ]; + mainProgram = "faustbench"; + }; +}) diff --git a/pkgs/by-name/fc/fceux/package.nix b/pkgs/by-name/fc/fceux/package.nix index 4cf042e1d37d..659c2398c982 100644 --- a/pkgs/by-name/fc/fceux/package.nix +++ b/pkgs/by-name/fc/fceux/package.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://www.fceux.com"; description = "Nintendo Entertainment System (NES) Emulator"; changelog = "https://github.com/TASEmulators/fceux/blob/${finalAttrs.src.rev}/changelog.txt"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "fceux"; maintainers = with lib.maintainers; [ kuflierl ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/fe/febio-studio/package.nix b/pkgs/by-name/fe/febio-studio/package.nix index 09613f96e9b3..4e8f0c929665 100644 --- a/pkgs/by-name/fe/febio-studio/package.nix +++ b/pkgs/by-name/fe/febio-studio/package.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "FEBio Suite Solver"; mainProgram = "FEBioStudio"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; homepage = "https://febio.org/"; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ Scriptkiddi ]; diff --git a/pkgs/by-name/fe/febio/package.nix b/pkgs/by-name/fe/febio/package.nix index 28427d15792b..96acb051ab6c 100644 --- a/pkgs/by-name/fe/febio/package.nix +++ b/pkgs/by-name/fe/febio/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Software tool for nonlinear finite element analysis in biomechanics and biophysics"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; homepage = "https://febio.org/"; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ Scriptkiddi ]; diff --git a/pkgs/by-name/fe/fedimint/package.nix b/pkgs/by-name/fe/fedimint/package.nix index 86dfd656f004..6b6e350358f2 100644 --- a/pkgs/by-name/fe/fedimint/package.nix +++ b/pkgs/by-name/fe/fedimint/package.nix @@ -79,7 +79,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Federated E-Cash Mint"; homepage = "https://github.com/fedimint/fedimint"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ dpc ]; mainProgram = "fedimint-cli"; }; diff --git a/pkgs/by-name/fe/feishu-cli/package.nix b/pkgs/by-name/fe/feishu-cli/package.nix index 1c8ef3b171d0..73d830b8c7ec 100644 --- a/pkgs/by-name/fe/feishu-cli/package.nix +++ b/pkgs/by-name/fe/feishu-cli/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "feishu-cli"; - version = "1.34.0"; + version = "1.35.0"; src = fetchFromGitHub { owner = "riba2534"; repo = "feishu-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-LyWUk64tt2mxs9+4U4BkF3Kb8O/B94iJqGLsTohOWNI="; + hash = "sha256-0FEVwpONZcN2DsYVzlY5EDsQwN81DjP9Xc857ro4quw="; }; vendorHash = "sha256-vRefU38o9Q4Q96aXoUXUggcRsfQePjlUrSsNERJH3YU="; diff --git a/pkgs/by-name/fe/fermyon-spin/package.nix b/pkgs/by-name/fe/fermyon-spin/package.nix index 44a7f6761d0c..83735f7ba65b 100644 --- a/pkgs/by-name/fe/fermyon-spin/package.nix +++ b/pkgs/by-name/fe/fermyon-spin/package.nix @@ -14,7 +14,6 @@ let { x86_64-linux = "linux-amd64"; aarch64-linux = "linux-aarch64"; - x86_64-darwin = "macos-amd64"; aarch64-darwin = "macos-aarch64"; } .${system} or (throw "Unsupported system: ${system}"); @@ -22,7 +21,6 @@ let packageHashes = { x86_64-linux = "sha256-eVI8/JNCTVVbNJPH6gfg+0guH9mXLymoO+oLp9dkvwA="; aarch64-linux = "sha256-84ESEqr07JxqcxxRWrUFKmS+Uvws3RsVtC9EgXqCqdw="; - x86_64-darwin = "sha256-X/Hl/vIsepm/jf6srSYim6Ucy3TN0XQgdOluep6Ohrw="; aarch64-darwin = "sha256-0WpDjZJhw/jB55G5IUdgvwOaYlqRCY5itk5sVjogYn4="; }; @@ -69,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Framework for building, deploying, and running fast, secure, and composable cloud microservices with WebAssembly"; homepage = "https://github.com/spinframework/spin"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; mainProgram = "spin"; maintainers = [ ]; platforms = builtins.attrNames packageHashes; diff --git a/pkgs/by-name/fe/fermyon-spin/update.py b/pkgs/by-name/fe/fermyon-spin/update.py index 2a2129a5926e..7fbff7d295f2 100755 --- a/pkgs/by-name/fe/fermyon-spin/update.py +++ b/pkgs/by-name/fe/fermyon-spin/update.py @@ -7,7 +7,6 @@ from os.path import join, dirname # We set oldHash and newHash fields in the inner dict later. systems = { "x86_64-linux": {"os": "linux", "arch": "amd64"}, - "x86_64-darwin": {"os": "macos", "arch": "amd64"}, "aarch64-linux": {"os": "linux", "arch": "aarch64"}, "aarch64-darwin": {"os": "macos", "arch": "aarch64"}, } diff --git a/pkgs/by-name/ff/fflogs/package.nix b/pkgs/by-name/ff/fflogs/package.nix deleted file mode 100644 index 2de7dfe9bf3c..000000000000 --- a/pkgs/by-name/ff/fflogs/package.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - appimageTools, - fetchurl, -}: - -let - pname = "fflogs"; - version = "9.3.65"; - src = fetchurl { - url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage"; - hash = "sha256-HsanoX1iJpLC8p64H4enlo20X6LOBNAxkubwPBp5juA="; - }; - extracted = appimageTools.extractType2 { inherit pname version src; }; -in -appimageTools.wrapType2 { - inherit pname version src; - - extraInstallCommands = '' - mkdir -p $out/share/applications - mkdir -p $out/share/icons/hicolor/512x512/apps - cp -r ${extracted}/usr/share/icons/hicolor/512x512/apps/'FF Logs Uploader.png' $out/share/icons/hicolor/512x512/apps/fflogs.png - chmod -R +w $out/share/ - test ! -e $out/share/icons/hicolor/0x0 # check for regression of https://github.com/electron-userland/electron-builder/issues/5294 - cp ${extracted}/'FF Logs Uploader.desktop' $out/share/applications/fflogs.desktop - sed -i 's@^Exec=AppRun --no-sandbox@Exec=fflogs@g' $out/share/applications/fflogs.desktop - sed -i 's@^Icon=FF Logs Uploader@Icon=fflogs@g' $out/share/applications/fflogs.desktop - ''; - - meta = { - description = "Application for uploading Final Fantasy XIV combat logs to fflogs.com"; - homepage = "https://www.fflogs.com/client/download"; - downloadPage = "https://github.com/RPGLogs/Uploaders-fflogs/releases/latest"; - license = lib.licenses.unfree; # no license listed - mainProgram = "fflogs"; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ keysmashes ]; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/by-name/fi/filebrowser/package.nix b/pkgs/by-name/fi/filebrowser/package.nix index d93bf831e01f..0fcaa3ca2041 100644 --- a/pkgs/by-name/fi/filebrowser/package.nix +++ b/pkgs/by-name/fi/filebrowser/package.nix @@ -15,13 +15,13 @@ }: let - version = "2.63.15"; + version = "2.63.18"; src = fetchFromGitHub { owner = "filebrowser"; repo = "filebrowser"; tag = "v${version}"; - hash = "sha256-O2USjwP1g+yDZpz0628YTRN2BUUnmjFvS+0qc6JU294="; + hash = "sha256-0j0i6bKKbyUi4O0wBT+xYjvywjRzAGd0/13Yh/dG5GA="; }; frontend = stdenvNoCC.mkDerivation (finalAttrs: { @@ -64,7 +64,7 @@ buildGoModule { pname = "filebrowser"; inherit version src; - vendorHash = "sha256-WXbXD75acK4woS7UC0G73pY48aGmp1l0spDc3sGYXMg="; + vendorHash = "sha256-BXw+fURCh1qNlwWo49aXIpSM339bV3Gwn9Ov8HLEVF0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/fi/filen-cli/package.nix b/pkgs/by-name/fi/filen-cli/package.nix index d4202deff945..f49e06e0318c 100644 --- a/pkgs/by-name/fi/filen-cli/package.nix +++ b/pkgs/by-name/fi/filen-cli/package.nix @@ -59,7 +59,6 @@ let { aarch64-darwin = "sha256-+nTCiCEXsEz7YqRZkHlP3CWL7e7OPdds33BTwfqTL5c="; aarch64-linux = "sha256-uvL498mHFXwoZpeCwsup4Iyh4l5buVnqLRBMyGVRIlA="; - x86_64-darwin = "sha256-5nEB6JQLmHasxcIReoiLLLRdSiaT1CRAmGFVyqdd+VY="; x86_64-linux = "sha256-Ky+ewpdd5nKvRzXwEAUgT7P/OW3v6fdb2r6SGxZ/JEc="; } .${stdenv.hostPlatform.system} @@ -143,7 +142,6 @@ stdenv.mkDerivation { platforms = [ "aarch64-darwin" "aarch64-linux" - "x86_64-darwin" "x86_64-linux" ]; }; diff --git a/pkgs/by-name/fi/filtr/package.nix b/pkgs/by-name/fi/filtr/package.nix index 64ee9511d35d..4ba17c3a3d3e 100644 --- a/pkgs/by-name/fi/filtr/package.nix +++ b/pkgs/by-name/fi/filtr/package.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "filtr"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "tiagolr"; repo = "filtr"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-LW21Hv0Gs7csgHg9tMPa4fmZGAby64uDAOdkwhOSwx4="; + hash = "sha256-diOM6Y2HrOP5wXg4tVXms7TYOSM16t06ZDg1/Q1L/zc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix index d9afbec8e06e..6b6bd3e8eaf4 100644 --- a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix +++ b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix @@ -16,13 +16,13 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "firefly-iii-data-importer"; - version = "2.3.2"; + version = "2.3.4"; src = fetchFromGitHub { owner = "firefly-iii"; repo = "data-importer"; tag = "v${finalAttrs.version}"; - hash = "sha256-JLN13SCpMXByu3rWSclcsLBGCLFMzHGHOM+bWLJ2MPw="; + hash = "sha256-869oPalwVdc7Ge8zcG6OniTZ6zhLOknlvFQkEHzLg0M="; }; buildInputs = [ php ]; @@ -42,12 +42,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { composerStrictValidation = true; strictDeps = true; - vendorHash = "sha256-QobjMMPEhLvsTwlJJvf4nUi1PcZEDOaU8EzexluOI90="; + vendorHash = "sha256-GEioAwqo9BHzoP4/uetqiQgv+O9Qzqyo/AcW9VP23n0="; npmDeps = fetchNpmDeps { inherit (finalAttrs) src; name = "${finalAttrs.pname}-npm-deps"; - hash = "sha256-NkxCvC0EPMLi7GV5GG1+5niL3KIaqBsleo11/gzaX/s="; + hash = "sha256-FEEC89/7cEuKU4mY27Pm5nr5EkOoL7BWZRAOpCZK61I="; }; composerRepository = php.mkComposerRepository { diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix index 1aa932517d06..565619aecf2e 100644 --- a/pkgs/by-name/fi/fish/package.nix +++ b/pkgs/by-name/fi/fish/package.nix @@ -150,13 +150,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fish"; - version = "4.8.0"; + version = "4.8.1"; src = fetchFromGitHub { owner = "fish-shell"; repo = "fish-shell"; tag = finalAttrs.version; - hash = "sha256-ttjLM1uBY8sL+jVcxdHUnHYlRFe5jGjnkgBLy17qGso="; + hash = "sha256-i9Ng9RYqlMGRShu2sDSXCZ6KD7n7A0TKzLdyatXjBmY="; }; env = { @@ -169,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src patches; - hash = "sha256-w8MuabpZ5ronQL3iaXbLErxPlTe1Mg8OsRb5foR59II="; + hash = "sha256-ikHv1WP38ClHGZy3StiyGS+lDHOjBT8ohJ/HdJwtYgw="; }; patches = [ diff --git a/pkgs/by-name/fi/fittrackee/package.nix b/pkgs/by-name/fi/fittrackee/package.nix index f261ac07eae6..ed8611772707 100644 --- a/pkgs/by-name/fi/fittrackee/package.nix +++ b/pkgs/by-name/fi/fittrackee/package.nix @@ -1,49 +1,51 @@ { - fetchFromGitHub, + fetchFromCodeberg, + fetchNpmDeps, lib, stdenv, + nodejs_24, + npmHooks, postgresql, postgresqlTestHook, python3Packages, }: python3Packages.buildPythonApplication (finalAttrs: { pname = "fittrackee"; - version = "0.11.2"; + version = "1.3.3"; pyproject = true; - src = fetchFromGitHub { - owner = "SamR1"; + src = fetchFromCodeberg { + owner = "FitTrackee"; repo = "FitTrackee"; tag = "v${finalAttrs.version}"; - hash = "sha256-A9gebHxNCpYUUIm7IjyySojIIyuTxfYCUeUufpUM1iA="; + hash = "sha256-XWR9gg52pfg0lHoFikQ2wVhvkPCTjTTndBYqBzYPB8s="; }; + makeCacheWritable = true; + npmRoot = "fittrackee_client"; + + npmDeps = fetchNpmDeps { + inherit (finalAttrs) pname version src; + hash = "sha256-HEgof2ln+mBxM63Dv8Lc/bfx3ozoJCRYYyJOz6jh+Vs="; + sourceRoot = "${finalAttrs.src.name}/fittrackee_client"; + }; + + nativeBuildInputs = [ + nodejs_24 + npmHooks.npmConfigHook + ]; + + preBuild = '' + pushd fittrackee_client + npm run build-only + popd + ''; + build-system = [ python3Packages.poetry-core ]; - # The upstream project changed the behavior of the CLI when --set-admin and --set-role are used together. - # Previously, it would raise an error, but now it issues a deprecation warning. - # This patch updates the test assertion to expect the new deprecation warning message. - # See upstream commit 6eda1b6119b3e41bdf8896e74b4a07d3c9e97609. - postPatch = '' - substituteInPlace fittrackee/tests/users/test_users_commands.py \ - --replace '"--set-admin and --set-role can not be used together."' '"WARNING: --set-admin is deprecated. Please use --set-role option instead."' - ''; - - pythonRelaxDeps = [ - "authlib" - "fitdecode" - "flask" - "flask-limiter" - "flask-migrate" - "nh3" - "lxml" - "pyopenssl" - "pytz" - "sqlalchemy" - "xmltodict" - ]; + pythonRelaxDeps = true; dependencies = with python3Packages; @@ -53,21 +55,31 @@ python3Packages.buildPythonApplication (finalAttrs: { click dramatiq dramatiq-abort + feedgenerator fitdecode flask + flask-babel flask-bcrypt flask-dramatiq flask-limiter flask-migrate flask-sqlalchemy + geoalchemy2 + geopandas gpxpy gunicorn humanize jsonschema + lxml + mistune nh3 + numpy + pandas psycopg2-binary pyjwt pyopenssl + pyproj + python-magic pytz shortuuid sqlalchemy @@ -76,7 +88,9 @@ python3Packages.buildPythonApplication (finalAttrs: { xmltodict ] ++ dramatiq.optional-dependencies.redis - ++ flask-limiter.optional-dependencies.redis; + ++ flask-limiter.optional-dependencies.redis + ++ geoalchemy2.optional-dependencies.shapely + ++ staticmap3.optional-dependencies.filecache; pythonImportsCheck = [ "fittrackee" ]; @@ -84,7 +98,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pytestCheckHook freezegun postgresqlTestHook - postgresql + (postgresql.withPackages (ps: with ps; [ postgis ])) time-machine ]; @@ -93,6 +107,7 @@ python3Packages.buildPythonApplication (finalAttrs: { ]; postgresqlTestSetupPost = '' + echo "CREATE EXTENSION postgis; CREATE EXTENSION postgis_topology;" | PGUSER=postgres psql test_db export DATABASE_TEST_URL=postgresql://$PGUSER/$PGDATABASE?host=$PGHOST ''; @@ -105,8 +120,8 @@ python3Packages.buildPythonApplication (finalAttrs: { meta = { description = "Self-hosted outdoor activity tracker"; - homepage = "https://github.com/SamR1/FitTrackee"; - changelog = "https://github.com/SamR1/FitTrackee/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + homepage = "https://docs.fittrackee.org/"; + changelog = "https://codeberg.org/FitTrackee/FitTrackee/src/tag/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ tebriel diff --git a/pkgs/by-name/fl/flac2mp3/package.nix b/pkgs/by-name/fl/flac2mp3/package.nix index 8d2ef887ec22..33ce91412280 100644 --- a/pkgs/by-name/fl/flac2mp3/package.nix +++ b/pkgs/by-name/fl/flac2mp3/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Tool to convert audio files from flac to mp3 format including the copying of tags"; homepage = "https://github.com/robinbowes/flac2mp3"; changelog = "https://github.com/robinbowes/flac2mp3/releases/tag/${finalAttrs.version}"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ lilahummel ]; }; }) diff --git a/pkgs/by-name/fl/flamp/package.nix b/pkgs/by-name/fl/flamp/package.nix index 841a43c6a9f5..43a893f92198 100644 --- a/pkgs/by-name/fl/flamp/package.nix +++ b/pkgs/by-name/fl/flamp/package.nix @@ -36,7 +36,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ stteague ]; platforms = lib.platforms.unix; - broken = stdenv.system == "x86_64-darwin"; mainProgram = "flamp"; }; }) diff --git a/pkgs/by-name/fl/flannel/package.nix b/pkgs/by-name/fl/flannel/package.nix index 34ed44d4c61c..d873f3e8c261 100644 --- a/pkgs/by-name/fl/flannel/package.nix +++ b/pkgs/by-name/fl/flannel/package.nix @@ -7,7 +7,7 @@ buildGoModule rec { pname = "flannel"; - version = "0.28.6"; + version = "0.28.7"; rev = "v${version}"; vendorHash = "sha256-io2xUh5jM2x7P01MIpPgLAVXC/CAL22zrC6kfi4uYFs="; @@ -16,7 +16,7 @@ buildGoModule rec { inherit rev; owner = "flannel-io"; repo = "flannel"; - sha256 = "sha256-djPi4dgG9iR7K5c9NhMVJI1xdBmCX39+G/zt6dDRZx8="; + sha256 = "sha256-K810ikYfDdOtOUTSGqeAwczxNO/XPB+2RbelHBc8tok="; }; ldflags = [ "-X github.com/flannel-io/flannel/pkg/version.Version=${rev}" ]; diff --git a/pkgs/by-name/fl/flare/engine.nix b/pkgs/by-name/fl/flare/engine.nix index 8b9e26d8e2d4..55ed135f8d7e 100644 --- a/pkgs/by-name/fl/flare/engine.nix +++ b/pkgs/by-name/fl/flare/engine.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { aanderse McSinyx ]; - license = [ lib.licenses.gpl3Plus ]; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/fl/flare/game.nix b/pkgs/by-name/fl/flare/game.nix index c3868c8d2b3d..0ec86b74347b 100644 --- a/pkgs/by-name/fl/flare/game.nix +++ b/pkgs/by-name/fl/flare/game.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { aanderse McSinyx ]; - license = [ lib.licenses.cc-by-sa-30 ]; + license = lib.licenses.cc-by-sa-30; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/fl/flashprog/package.nix b/pkgs/by-name/fl/flashprog/package.nix index 3f7d9aa58be8..96baeb034583 100644 --- a/pkgs/by-name/fl/flashprog/package.nix +++ b/pkgs/by-name/fl/flashprog/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://flashprog.org"; description = "Utility for reading, writing, erasing and verifying flash ROM chips"; changelog = "https://flashprog.org/wiki/Flashprog/v${finalAttrs.version}"; - license = with lib.licenses; [ gpl2 ]; + license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ felixsinger funkeleinhorn diff --git a/pkgs/by-name/fl/flat-remix-icon-theme/package.nix b/pkgs/by-name/fl/flat-remix-icon-theme/package.nix index eb89a4959e9f..410a02fe5734 100644 --- a/pkgs/by-name/fl/flat-remix-icon-theme/package.nix +++ b/pkgs/by-name/fl/flat-remix-icon-theme/package.nix @@ -49,7 +49,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { description = "Flat remix is a pretty simple icon theme inspired on material design"; homepage = "https://drasite.com/flat-remix"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; # breeze-icons and pantheon.elementary-icon-theme dependencies are restricted to linux platforms = lib.platforms.linux; maintainers = [ ]; diff --git a/pkgs/by-name/fl/flatcc/package.nix b/pkgs/by-name/fl/flatcc/package.nix index 23300be4a0e1..62d30133edb2 100644 --- a/pkgs/by-name/fl/flatcc/package.nix +++ b/pkgs/by-name/fl/flatcc/package.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "flatcc"; homepage = "https://github.com/dvidelabs/flatcc"; changelog = "https://github.com/dvidelabs/flatcc/blob/${finalAttrs.src.tag}/CHANGELOG.md"; - license = [ lib.licenses.asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ onny ]; }; }) diff --git a/pkgs/by-name/fl/flawfinder/package.nix b/pkgs/by-name/fl/flawfinder/package.nix index dfbf11197fce..658c6c30740e 100644 --- a/pkgs/by-name/fl/flawfinder/package.nix +++ b/pkgs/by-name/fl/flawfinder/package.nix @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { description = "Tool to examines C/C++ source code for security flaws"; mainProgram = "flawfinder"; homepage = "https://dwheeler.com/flawfinder/"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ fab ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/fl/flclash/package.nix b/pkgs/by-name/fl/flclash/package.nix index 5efb29de1a11..85f3e0d8f4f0 100644 --- a/pkgs/by-name/fl/flclash/package.nix +++ b/pkgs/by-name/fl/flclash/package.nix @@ -31,7 +31,7 @@ let meta = { description = "Proxy client based on ClashMeta, simple and easy to use"; homepage = "https://github.com/chen08209/FlClash"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ VZstless ]; }; diff --git a/pkgs/by-name/fl/flexget/package.nix b/pkgs/by-name/fl/flexget/package.nix index f9ef4f9cfdf0..fdbd7777d799 100644 --- a/pkgs/by-name/fl/flexget/package.nix +++ b/pkgs/by-name/fl/flexget/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "flexget"; - version = "3.19.26"; + version = "3.19.28"; pyproject = true; src = fetchFromGitHub { owner = "Flexget"; repo = "Flexget"; tag = "v${finalAttrs.version}"; - hash = "sha256-QWVCCV8R1gBw647slTtOYX7IQZNC2EmQQiloQNlgcUQ="; + hash = "sha256-NEBE39rqYegFO7f1fd0rTIZzkamuQM+5d3dD/zYHCoU="; }; pythonRelaxDeps = true; diff --git a/pkgs/by-name/fl/flood/package.nix b/pkgs/by-name/fl/flood/package.nix index 519b00b12135..c413e958d102 100644 --- a/pkgs/by-name/fl/flood/package.nix +++ b/pkgs/by-name/fl/flood/package.nix @@ -10,13 +10,13 @@ }: buildNpmPackage (finalAttrs: { pname = "flood"; - version = "4.14.2"; + version = "4.15.0"; src = fetchFromGitHub { owner = "jesec"; repo = "flood"; tag = "v${finalAttrs.version}"; - hash = "sha256-gSjkpAGkvgRRh8WDpL/F7fS8KDxHRJUuWVqHGcFEGAc="; + hash = "sha256-wd+9owJi9W9pf6c1JuO0X/6JWxLq8XIypj6r4rQUemM="; }; nativeBuildInputs = [ pnpm_10 ]; @@ -31,7 +31,7 @@ buildNpmPackage (finalAttrs: { ; pnpm = pnpm_10; fetcherVersion = 4; - hash = "sha256-yNRC5sCBn002gxUfHMUvh3DZeVYOokfz4MTvqXR2MzI="; + hash = "sha256-a1PoQ5pXw1SgyGFRa3+7AOr6vpyGyHxkMU7KQEFlZ04="; }; passthru = { diff --git a/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json b/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json index 47abcca624ef..c10dfd437b94 100644 --- a/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json +++ b/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json @@ -12,10 +12,6 @@ "aarch64-darwin": { "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.15.2/floorp-macOS-universal.dmg", "sha256": "c4e64d732cd687e6711230d84cac687e8e4d28cc056f66a665fbf03ac2861b7b" - }, - "x86_64-darwin": { - "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.15.2/floorp-macOS-universal.dmg", - "sha256": "c4e64d732cd687e6711230d84cac687e8e4d28cc056f66a665fbf03ac2861b7b" } } } diff --git a/pkgs/by-name/fl/floorp-bin-unwrapped/update.sh b/pkgs/by-name/fl/floorp-bin-unwrapped/update.sh index 3d0b87d688f2..f912437dd84b 100755 --- a/pkgs/by-name/fl/floorp-bin-unwrapped/update.sh +++ b/pkgs/by-name/fl/floorp-bin-unwrapped/update.sh @@ -34,10 +34,9 @@ jq ' elif .url | contains("linux-x86_64") then {key: "x86_64-linux", value: .} elif .url | contains("macOS-universal") then - [{key: "aarch64-darwin", value: .}, {key: "x86_64-darwin", value: .}] + {key: "aarch64-darwin", value: .} else null end ) - | flatten | from_entries ) } diff --git a/pkgs/by-name/fl/flowblade/package.nix b/pkgs/by-name/fl/flowblade/package.nix index c69c98bd04f9..344a23a7c4c6 100644 --- a/pkgs/by-name/fl/flowblade/package.nix +++ b/pkgs/by-name/fl/flowblade/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Multitrack Non-Linear Video Editor"; homepage = "https://jliljebl.github.io/flowblade/"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ polygon ]; mainProgram = "flowblade"; diff --git a/pkgs/by-name/fl/fluux-messenger/package.nix b/pkgs/by-name/fl/fluux-messenger/package.nix index 43e12c6d985b..d6cda40b0798 100644 --- a/pkgs/by-name/fl/fluux-messenger/package.nix +++ b/pkgs/by-name/fl/fluux-messenger/package.nix @@ -18,24 +18,25 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "fluux-messenger"; - version = "0.16.2"; + version = "0.17.1"; __structuredAttrs = true; strictDeps = true; src = fetchFromGitHub { + name = "${finalAttrs.pname}-${finalAttrs.version}-source"; owner = "processone"; repo = "fluux-messenger"; - rev = "v${finalAttrs.version}"; - hash = "sha256-G5VDcFHp+mIYBXh7Vju/8bGB3CPD1dyZKq8zAOKn3UY="; + tag = "v${finalAttrs.version}"; + hash = "sha256-aT7X11BOmksEcCLk5hkokfLx7Q8Jk2zTWskoN8aZha0="; }; cargoRoot = "apps/fluux/src-tauri"; - cargoHash = "sha256-/jaEpC0f6B1zTxN7MHv/DESFnRTSAd3qi9rrnXurcPQ="; + cargoHash = "sha256-fEHe7enJzdEauou1xWfM94WHL1uAP1sfY2JN1ZmZmEE="; npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; inherit (finalAttrs) src; - hash = "sha256-XAzE4I13GN4Gfi6g4VX5ZwM2DhVycKz7cGBQroAFvf8="; + hash = "sha256-4Op4jykCtc9oFBIn8vOUqxGr7/OloIhPD1JT+q4dX7Y="; }; nativeBuildInputs = [ @@ -69,10 +70,13 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "XMPP client for communities and organizations"; + longDescription = "A modern, Web and Desktop cross-platform XMPP client for communities and organizations, built with a reusable Typescript SDK and Tauri for desktop"; + changelog = "https://github.com/processone/fluux-messenger/blob/${finalAttrs.src.tag}/CHANGELOG.md"; homepage = "https://github.com/processone/fluux-messenger"; license = lib.licenses.agpl3Plus; mainProgram = "fluux"; maintainers = [ lib.maintainers.haansn08 ]; platforms = lib.platforms.all; + # see also https://github.com/processone/fluux-messenger/blob/main/fluux-messenger.doap }; }) diff --git a/pkgs/by-name/fl/fluxcd-operator/package.nix b/pkgs/by-name/fl/fluxcd-operator/package.nix index b952bde62d17..9a34b5c495cb 100644 --- a/pkgs/by-name/fl/fluxcd-operator/package.nix +++ b/pkgs/by-name/fl/fluxcd-operator/package.nix @@ -9,13 +9,13 @@ }: buildGoModule (finalAttrs: { pname = "fluxcd-operator"; - version = "0.54.0"; + version = "0.55.0"; src = fetchFromGitHub { owner = "controlplaneio-fluxcd"; repo = "flux-operator"; tag = "v${finalAttrs.version}"; - hash = "sha256-Bxzqm4I+wTj1k8ppa4cohsowmgc7H76EuHCYlCiJ5Qk="; + hash = "sha256-MWtjoTQuB6G/f9MnKOkIKlbI5tvaP5TLb5PvEySNLFM="; }; vendorHash = "sha256-DW+dnakqnpSiV7MlzshGEzoy3Osv93dAsJYe4cR0sJ4="; diff --git a/pkgs/by-name/fl/fluxcd/package.nix b/pkgs/by-name/fl/fluxcd/package.nix index 27d051d0008e..f2ea364767e1 100644 --- a/pkgs/by-name/fl/fluxcd/package.nix +++ b/pkgs/by-name/fl/fluxcd/package.nix @@ -9,10 +9,10 @@ }: let - version = "2.9.1"; - srcHash = "sha256-aVJpUigIkGXsjvb40hEkZ2OiUghGcte3Msq4DMLIcbU="; - vendorHash = "sha256-TG41xOrAAVBsE6CJ4av6y3bxfudk6gV49+/xB9Qu5ME="; - manifestsHash = "sha256-DeTjdgOZyvrpQvIoXyVUfRIbHoJ9o74FRuTpVgT1/3I="; + version = "2.9.2"; + srcHash = "sha256-a4925TZIqYqSk4/gyjwTeThOaQiIt1S3Md7b9eu7H20="; + vendorHash = "sha256-iPj7F/7u5MrxoZJ4qk6XONeUmAXkMckpXK/P0HNQ78A="; + manifestsHash = "sha256-uSfH2hcz1+rqHc9szCe4V40mTl6d+Li308WW9xLVXWs="; manifests = fetchzip { url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz"; diff --git a/pkgs/by-name/fl/flywheel-cli/package.nix b/pkgs/by-name/fl/flywheel-cli/package.nix index dfc2a3b68421..aab993c1f79b 100644 --- a/pkgs/by-name/fl/flywheel-cli/package.nix +++ b/pkgs/by-name/fl/flywheel-cli/package.nix @@ -5,31 +5,13 @@ unzip, }: -let - inherit (stdenv.hostPlatform) system; - throwSystem = throw "Unsupported system: ${system}"; - - os = - { - x86_64-darwin = "darwin"; - x86_64-linux = "linux"; - } - .${system} or throwSystem; - - sha256 = - { - x86_64-darwin = "sha256-OIyEu3Hsobui9s5+T9nC10SxMw0MhgmTA4SN9Ridyzo="; - x86_64-linux = "sha256-SxBjRd95hoh2zwX6IDnkZnTWVduQafPHvnWw8qTuM78="; - } - .${system} or throwSystem; -in stdenv.mkDerivation (finalAttrs: { pname = "flywheel-cli"; version = "16.2.0"; src = fetchurl { - url = "https://storage.googleapis.com/flywheel-dist/cli/${finalAttrs.version}/fw-${os}_amd64-${finalAttrs.version}.zip"; - inherit sha256; + url = "https://storage.googleapis.com/flywheel-dist/cli/${finalAttrs.version}/fw-linux_amd64-${finalAttrs.version}.zip"; + hash = "sha256-SxBjRd95hoh2zwX6IDnkZnTWVduQafPHvnWw8qTuM78="; }; nativeBuildInputs = [ unzip ]; @@ -40,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - install -Dt $out/bin ./${os}_amd64/fw + install -Dt $out/bin ./linux_amd64/fw runHook postInstall ''; @@ -52,7 +34,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ rbreslow ]; platforms = [ - "x86_64-darwin" "x86_64-linux" ]; }; diff --git a/pkgs/by-name/fm/fm-go/package.nix b/pkgs/by-name/fm/fm-go/package.nix index 568b37d94345..e7a1e2b32a09 100644 --- a/pkgs/by-name/fm/fm-go/package.nix +++ b/pkgs/by-name/fm/fm-go/package.nix @@ -22,7 +22,7 @@ let homepage = "https://github.com/mistakenelf/fm"; description = "Terminal based file manager"; changelog = "https://github.com/mistakenelf/fm/releases/tag/${finalAttrs.src.rev}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "fm"; maintainers = [ ]; }; diff --git a/pkgs/by-name/fm/fmodex/package.nix b/pkgs/by-name/fm/fmodex/package.nix index 36d0e24d9250..702efa275e19 100644 --- a/pkgs/by-name/fm/fmodex/package.nix +++ b/pkgs/by-name/fm/fmodex/package.nix @@ -61,7 +61,6 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" "i686-linux" - "x86_64-darwin" ]; maintainers = [ lib.maintainers.lassulus ]; }; diff --git a/pkgs/by-name/fn/fnox/package.nix b/pkgs/by-name/fn/fnox/package.nix index 06f3efe03306..93c2e7d90d1e 100644 --- a/pkgs/by-name/fn/fnox/package.nix +++ b/pkgs/by-name/fn/fnox/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { __structuredAttrs = true; pname = "fnox"; - version = "1.30.0"; + version = "1.31.0"; src = fetchFromGitHub { owner = "jdx"; repo = "fnox"; tag = "v${finalAttrs.version}"; - hash = "sha256-maG2+KBPBsZqRvs/Iddl7egs478s3IWOF+lJKQrjyjs="; + hash = "sha256-BwuMuiJiC5QbtlfZz/aqSXQmjyf0jUWv2sNdKEK3LJY="; }; - cargoHash = "sha256-s3Cv7uAZlk67IiolLkFgcwonfYi9qUh8xXqyNPIPesM="; + cargoHash = "sha256-vU1LA6vvNpLFRXj07WmtCoWDdJezqMoI/t7q7E77JUk="; nativeBuildInputs = [ perl diff --git a/pkgs/by-name/fo/font-config-info/package.nix b/pkgs/by-name/fo/font-config-info/package.nix index 9ee14d3d1762..688c62d2854a 100644 --- a/pkgs/by-name/fo/font-config-info/package.nix +++ b/pkgs/by-name/fo/font-config-info/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Prints a Linux system's font configuration"; homepage = "https://github.com/derat/font-config-info"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ romildo ]; mainProgram = "font-config-info"; diff --git a/pkgs/by-name/fo/fontfor/package.nix b/pkgs/by-name/fo/fontfor/package.nix index 4b52ad8f006a..99a8d5b0ec20 100644 --- a/pkgs/by-name/fo/fontfor/package.nix +++ b/pkgs/by-name/fo/fontfor/package.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Find fonts which can show a specified character and preview them in browser"; homepage = "https://github.com/7sDream/fontfor"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; mainProgram = "fontfor"; }; diff --git a/pkgs/by-name/fo/ford/package.nix b/pkgs/by-name/fo/ford/package.nix index c2f5f3ebfd4c..3f2dcec9710b 100644 --- a/pkgs/by-name/fo/ford/package.nix +++ b/pkgs/by-name/fo/ford/package.nix @@ -58,7 +58,7 @@ python3Packages.buildPythonApplication (finalAttrs: { description = "Fortran documentation system"; mainProgram = "ford"; homepage = "https://github.com/Fortran-FOSS-Programmers/ford"; - license = [ lib.licenses.gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = [ lib.maintainers.sheepforce ]; }; }) diff --git a/pkgs/by-name/fo/forecast/package.nix b/pkgs/by-name/fo/forecast/package.nix index bf90ea627b69..25db7b50a01d 100644 --- a/pkgs/by-name/fo/forecast/package.nix +++ b/pkgs/by-name/fo/forecast/package.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage { pname = "forecast"; - version = "0-unstable-2026-01-27"; + version = "0-unstable-2026-07-12"; src = fetchFromGitHub { owner = "cosmic-utils"; repo = "forecast"; - rev = "b82babc843d5e9c58a6635d3b1941ac185ae4906"; - hash = "sha256-QoZ854+2/4+VMZbOI/M167qjDPahtzbV/NH8Y46uBs8="; + rev = "0de1b7502979eb3704445c98ce8dbb7969e109da"; + hash = "sha256-9IZDDIhZY+YC0SOie5z0Ed5UAvBcf+soZ0RRz8sr71w="; }; - cargoHash = "sha256-di7zjwI0/6NB2cAih3d7iqwSb+o/607jbgJN1MtbZX8="; + cargoHash = "sha256-F5AlYm9bzJJUrDiY712dbwpCR3lzvQNFKXHzIDG+TVQ="; nativeBuildInputs = [ libcosmicAppHook diff --git a/pkgs/by-name/fo/forgejo/generic.nix b/pkgs/by-name/fo/forgejo/generic.nix index 413b070c3143..e1b7277aba7f 100644 --- a/pkgs/by-name/fo/forgejo/generic.nix +++ b/pkgs/by-name/fo/forgejo/generic.nix @@ -12,7 +12,7 @@ bash, brotli, buildGoModule, - fetchpatch, + coreutils, forgejo, git, gzip, @@ -116,6 +116,23 @@ buildGoModule rec { # TestRunHookPrePostReceive (cmd/hook_test.go) needs .git to pass git init + '' + # Unlike NixOS, the Nix build sandbox has no /usr/bin/env and we + # can't just create it, so Forgejo trying to execute git hooks + # that have #!/usr/bin/env as shebang fails with: + # + # To /build/repos44353414/user2/repo1.wiki.git + # ! [remote rejected] fda09356fb8b1da00546f764933f9dacda1b44ea -> master (pre-receive hook declined) + # error: failed to push some refs to '/build/repos44353414/user2/repo1.wiki.git' + # - remote: fatal: cannot exec '/build/appdata2719412950/home/hooks/pre-receive': No such file or directory + # + # We also can't just call patchShebangs because the hooks are + # created just in time by the test suite. Patching the source of + # the hooks after go build but before go test is oddly enough + # the least invasive hack to have those tests pass. + + lib.optionalString (lib.versionAtLeast version "16") '' + substituteInPlace modules/git/hook_generate.go \ + --replace-fail "#!/usr/bin/env" "#!${lib.getExe' coreutils "env"}" ''; checkFlags = @@ -124,6 +141,11 @@ buildGoModule rec { "TestPassword" # requires network: api.pwnedpasswords.com "TestCaptcha" # requires network: hcaptcha.com "TestDNSUpdate" # requires network: release.forgejo.org + ] + ++ lib.optionals (lib.versionAtLeast version "16") [ + "TestMigrateRepository" # requires network: codeberg.org + ] + ++ [ "TestMigrateWhiteBlocklist" # requires network: gitlab.com (DNS) "TestURLAllowedSSH/Pushmirror_URL" # requires network git.gay (DNS) "TestBleveDeleteIssue" # Known Flake-y https://github.com/NixOS/nixpkgs/issues/509878 diff --git a/pkgs/by-name/fo/forgejo/lts.nix b/pkgs/by-name/fo/forgejo/lts.nix deleted file mode 120000 index 8d225ed3269a..000000000000 --- a/pkgs/by-name/fo/forgejo/lts.nix +++ /dev/null @@ -1 +0,0 @@ -package.nix \ No newline at end of file diff --git a/pkgs/by-name/fo/forgejo/lts.nix b/pkgs/by-name/fo/forgejo/lts.nix new file mode 100644 index 000000000000..6c4609ae7b43 --- /dev/null +++ b/pkgs/by-name/fo/forgejo/lts.nix @@ -0,0 +1,11 @@ +import ./generic.nix { + version = "15.0.5"; + hash = "sha256-S+x/YEfQrYIzHLnZ7LDLnkMYVN3TajwS7SHydM8uMPQ="; + npmDepsHash = "sha256-BZSYjEsjUqMYWu3EUP+K35hqSOniv8Y6ek5bEC2vTPg="; + vendorHash = "sha256-00QiJ8W76FdG96fmsIRLkaYlMQTZoIRmRd/qYGyPuig="; + lts = true; + nixUpdateExtraArgs = [ + "--override-filename" + "pkgs/by-name/fo/forgejo/lts.nix" + ]; +} diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix index 29c9b2a22a96..a192df6c43b6 100644 --- a/pkgs/by-name/fo/forgejo/package.nix +++ b/pkgs/by-name/fo/forgejo/package.nix @@ -1,9 +1,9 @@ import ./generic.nix { - version = "15.0.4"; - hash = "sha256-8AMq5CT4q7aaF5gj9d5+JINp5rrI5U98juI9BA0wVVo="; - npmDepsHash = "sha256-BZSYjEsjUqMYWu3EUP+K35hqSOniv8Y6ek5bEC2vTPg="; - vendorHash = "sha256-00QiJ8W76FdG96fmsIRLkaYlMQTZoIRmRd/qYGyPuig="; - lts = true; + version = "16.0.0"; + hash = "sha256-BZawFbrtcxftX4/Yk32aoVRQ6Kg+k1FhN9IoH6dxvVY="; + npmDepsHash = "sha256-UhivpUqNJvc3zHxdRVAWT9x68jG1KnQa8yS4KkL2W5g="; + vendorHash = "sha256-cb6f7ZX3pG95EEZotGXn6+YUJN59SFNVHFTejFJ6y28="; + lts = false; nixUpdateExtraArgs = [ "--override-filename" "pkgs/by-name/fo/forgejo/package.nix" diff --git a/pkgs/by-name/fo/fortls/package.nix b/pkgs/by-name/fo/fortls/package.nix index d6b771aa8aa3..a08b22726716 100644 --- a/pkgs/by-name/fo/fortls/package.nix +++ b/pkgs/by-name/fo/fortls/package.nix @@ -54,7 +54,7 @@ python3Packages.buildPythonApplication (finalAttrs: { description = "Fortran Language Server"; mainProgram = "fortls"; homepage = "https://github.com/fortran-lang/fortls"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.sheepforce ]; }; }) diff --git a/pkgs/by-name/fo/fortran-language-server/package.nix b/pkgs/by-name/fo/fortran-language-server/package.nix index 383732e2e574..04a61238dd86 100644 --- a/pkgs/by-name/fo/fortran-language-server/package.nix +++ b/pkgs/by-name/fo/fortran-language-server/package.nix @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication (finalAttrs: { description = "FORTRAN Language Server for the Language Server Protocol"; mainProgram = "fortls"; homepage = "https://pypi.org/project/fortran-language-server/"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.sheepforce ]; }; }) diff --git a/pkgs/by-name/fo/fotema/package.nix b/pkgs/by-name/fo/fotema/package.nix index 723d9ab9d6aa..272bfd80ab1f 100644 --- a/pkgs/by-name/fo/fotema/package.nix +++ b/pkgs/by-name/fo/fotema/package.nix @@ -102,7 +102,7 @@ clangStdenv.mkDerivation (finalAttrs: { meta = { description = "Photo gallery for Linux"; homepage = "https://github.com/blissd/fotema"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ pluiedev ]; mainProgram = "fotema"; diff --git a/pkgs/by-name/fo/foxglove-cli/package.nix b/pkgs/by-name/fo/foxglove-cli/package.nix index 659e167c9c2c..c90023a5e8c4 100644 --- a/pkgs/by-name/fo/foxglove-cli/package.nix +++ b/pkgs/by-name/fo/foxglove-cli/package.nix @@ -11,16 +11,16 @@ }: buildGoModule (finalAttrs: { pname = "foxglove-cli"; - version = "1.0.31"; + version = "1.0.32"; src = fetchFromGitHub { owner = "foxglove"; repo = "foxglove-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-BBvkvh1OZ+HJHJzSxCf8aCQklpZ536bkLNVlbKX9obY="; + hash = "sha256-bc2YNCkTbO6qO2PyBI4UH7O48GNMgDfKKXWXjYaznBI="; }; - vendorHash = "sha256-nRd9d3LJIrWoO+CQdbWLs249rOYmzfIf4u6x5dBDA2Y="; + vendorHash = "sha256-IXmkO7WIvy4ETMMHHJF6hS8ACRat/vnoiqaXyhw8u+M="; env.CGO_ENABLED = 0; tags = [ "netgo" ]; diff --git a/pkgs/by-name/fp/fprettify/package.nix b/pkgs/by-name/fp/fprettify/package.nix index 7eceee491925..e3b73c8ca265 100644 --- a/pkgs/by-name/fp/fprettify/package.nix +++ b/pkgs/by-name/fp/fprettify/package.nix @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication (finalAttrs: { description = "Auto-formatter for modern Fortran code that imposes strict whitespace formatting, written in Python"; mainProgram = "fprettify"; homepage = "https://pypi.org/project/fprettify/"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = [ ]; }; }) diff --git a/pkgs/by-name/fr/frama-c/package.nix b/pkgs/by-name/fr/frama-c/package.nix index e5e751dbe005..fea4bd606332 100644 --- a/pkgs/by-name/fr/frama-c/package.nix +++ b/pkgs/by-name/fr/frama-c/package.nix @@ -129,7 +129,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.lgpl21; maintainers = with lib.maintainers; [ thoughtpolice - amiddelk luc65r ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/fr/fre/package.nix b/pkgs/by-name/fr/fre/package.nix index 78eec456b62e..ae6b16cf83a4 100644 --- a/pkgs/by-name/fr/fre/package.nix +++ b/pkgs/by-name/fr/fre/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "CLI tool for tracking your most-used directories and files"; homepage = "https://github.com/camdencheek/fre"; changelog = "https://github.com/camdencheek/fre/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ gaykitty ]; mainProgram = "fre"; }; diff --git a/pkgs/by-name/fr/free42/package.nix b/pkgs/by-name/fr/free42/package.nix index a38818417b30..96a639a3260c 100644 --- a/pkgs/by-name/fr/free42/package.nix +++ b/pkgs/by-name/fr/free42/package.nix @@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://thomasokken.com/free42/"; changelog = "https://thomasokken.com/free42/history.html"; description = "Software clone of the HP-42S calculator"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ elfenermarcell ]; mainProgram = "free42dec"; platforms = with lib.platforms; unix; diff --git a/pkgs/by-name/fr/freelens-bin/package.nix b/pkgs/by-name/fr/freelens-bin/package.nix index adc3239312c1..25aea7c42f28 100644 --- a/pkgs/by-name/fr/freelens-bin/package.nix +++ b/pkgs/by-name/fr/freelens-bin/package.nix @@ -27,10 +27,6 @@ let url = "https://github.com/freelensapp/freelens/releases/download/v${version}/Freelens-${version}-linux-arm64.AppImage"; hash = "sha256-Pw6RPa6T9jN7XAfOqj6lDFzTqhwOT1DgK35cANyBAOE="; }; - x86_64-darwin = { - url = "https://github.com/freelensapp/freelens/releases/download/v${version}/Freelens-${version}-macos-amd64.dmg"; - hash = "sha256-6qn/3Zly7nvj9XxihUdmkguLWw0a7Y321Xv7EnJzjkc="; - }; aarch64-darwin = { url = "https://github.com/freelensapp/freelens/releases/download/v${version}/Freelens-${version}-macos-arm64.dmg"; hash = "sha256-ARIvUMkkdUK5O6xdplXJ/JkPdezO/16HvO2P21W6y8I="; diff --git a/pkgs/by-name/fr/freepv/package.nix b/pkgs/by-name/fr/freepv/package.nix index 8ccd3ff08afc..e37de84d89f9 100644 --- a/pkgs/by-name/fr/freepv/package.nix +++ b/pkgs/by-name/fr/freepv/package.nix @@ -57,6 +57,6 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Open source panorama viewer using GL"; homepage = "https://freepv.sourceforge.net/"; - license = [ lib.licenses.lgpl21 ]; + license = lib.licenses.lgpl21; }; }) diff --git a/pkgs/by-name/fr/freerdp/package.nix b/pkgs/by-name/fr/freerdp/package.nix index 994be73f4e3a..d6ef4cb0bf35 100644 --- a/pkgs/by-name/fr/freerdp/package.nix +++ b/pkgs/by-name/fr/freerdp/package.nix @@ -72,13 +72,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "freerdp"; - version = "3.27.1"; + version = "3.29.0"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; tag = finalAttrs.version; - hash = "sha256-4U3QC1hka+qTQ0F7GqKPiMVwkkFeJvbjNtom5A7V/Sg="; + hash = "sha256-LTRV1vRTMR8015iFXZIEjz6ApN5kg1+T2nGZWJ873zY="; }; postPatch = '' diff --git a/pkgs/by-name/fr/fresh-editor/package.nix b/pkgs/by-name/fr/fresh-editor/package.nix index b33990aa1c9c..270143a61da4 100644 --- a/pkgs/by-name/fr/fresh-editor/package.nix +++ b/pkgs/by-name/fr/fresh-editor/package.nix @@ -13,16 +13,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "fresh"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "sinelaw"; repo = "fresh"; tag = "v${finalAttrs.version}"; - hash = "sha256-fVBDjcX0AjUTH+vKV5H4NYmknJYfHNHRizuzjQTHYpA="; + hash = "sha256-ycB5wEDYlyTDdIk5lE26c2YFMmDGGqcMuSqwqDSyxs0="; }; - cargoHash = "sha256-bsIyf63U7/GNZnCD8g6RBykCiArwlD5v1YhrZNsf1is="; + cargoHash = "sha256-HWuHKn+vJC3cdS6bKp5iw9VSTRHn/Q5Zsj6OHvmfYp0="; __structuredAttrs = true; diff --git a/pkgs/by-name/fr/fricas/package.nix b/pkgs/by-name/fr/fricas/package.nix index 9eeadf410d0a..31bfcbd3a581 100644 --- a/pkgs/by-name/fr/fricas/package.nix +++ b/pkgs/by-name/fr/fricas/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fricas"; - version = "1.3.12"; + version = "1.3.13"; src = fetchFromGitHub { owner = "fricas"; repo = "fricas"; - rev = finalAttrs.version; - sha256 = "sha256-GUGJR65K1bPC0D36l4Yyj3GOsWtUrSKLu6JnlfjHzDc="; + tag = finalAttrs.version; + hash = "sha256-vpClJwB91pCgc6DWy0I2XTfSWkt+7nEAkUK9zz4qh4A="; }; buildInputs = [ @@ -34,23 +34,16 @@ stdenv.mkDerivation (finalAttrs: { libxdmcp ]; - # Remove when updating to next version - configurePhase = '' - runHook preConfigure - - ./configure --prefix=$out --with-lisp='sbcl --dynamic-space-size 3072' - - runHook postConfigure - ''; - dontStrip = true; meta = { homepage = "https://fricas.github.io"; description = "Advanced computer algebra system"; + changelog = "https://github.com/fricas/fricas/blob/${finalAttrs.src.tag}/ChangeLog"; license = lib.licenses.bsd3; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.sprock ]; + maintainers = [ ]; + mainProgram = "fricas"; }; }) diff --git a/pkgs/by-name/fr/frodo4/package.nix b/pkgs/by-name/fr/frodo4/package.nix index a4d37b3a3e3d..9f49ba742498 100644 --- a/pkgs/by-name/fr/frodo4/package.nix +++ b/pkgs/by-name/fr/frodo4/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/cebix/frodo4"; description = "C64 emulator with emphasis on graphical accuracy"; mainProgram = "Frodo"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ chordtoll ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/fr/frugally-deep/package.nix b/pkgs/by-name/fr/frugally-deep/package.nix index c7861f0995a9..900bbb1b3995 100644 --- a/pkgs/by-name/fr/frugally-deep/package.nix +++ b/pkgs/by-name/fr/frugally-deep/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Header-only library for using Keras (TensorFlow) models in C++"; homepage = "https://github.com/Dobiasd/frugally-deep"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/fu/function-runner/package.nix b/pkgs/by-name/fu/function-runner/package.nix index 4810ce602426..65c2870b8119 100644 --- a/pkgs/by-name/fu/function-runner/package.nix +++ b/pkgs/by-name/fu/function-runner/package.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "function-runner"; - version = "9.2.0"; + version = "9.2.1"; __structuredAttrs = true; @@ -17,10 +17,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "Shopify"; repo = "function-runner"; tag = "v${finalAttrs.version}"; - hash = "sha256-+y4XQ4Oq4RdAMAD2mNtBAVb+8TqDbCNalXNo56UUOD4="; + hash = "sha256-IhlQEeKGWcE2lVhcLbOqUQU+DboxMDc/9eDlzlfcprg="; }; - cargoHash = "sha256-2XkfABzi55J/uO/2zO5QLLNx8pIb+YqowNPdJeMNdDI="; + cargoHash = "sha256-mf1kIDsNIk5oXIuvki9zt3D7qJOUtPOvDC8jbLjCMtE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/fu/functiontrace-server/package.nix b/pkgs/by-name/fu/functiontrace-server/package.nix index 0584ab933271..95583d1fab82 100644 --- a/pkgs/by-name/fu/functiontrace-server/package.nix +++ b/pkgs/by-name/fu/functiontrace-server/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Server for FunctionTrace, a graphical Python profiler"; homepage = "https://functiontrace.com"; - license = with lib.licenses; [ prosperity30 ]; + license = lib.licenses.prosperity30; maintainers = with lib.maintainers; [ tehmatt ]; }; } diff --git a/pkgs/by-name/fu/furnace/package.nix b/pkgs/by-name/fu/furnace/package.nix index 0591915c2523..5a37b6718bf3 100644 --- a/pkgs/by-name/fu/furnace/package.nix +++ b/pkgs/by-name/fu/furnace/package.nix @@ -124,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Multi-system chiptune tracker compatible with DefleMask modules"; homepage = "https://github.com/tildearrow/furnace"; changelog = "https://github.com/tildearrow/furnace/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ OPNA2608 ]; platforms = lib.platforms.all; mainProgram = "furnace"; diff --git a/pkgs/by-name/fu/fuzzdb/package.nix b/pkgs/by-name/fu/fuzzdb/package.nix index 4ca1eb4cb191..bb67c638b5c3 100644 --- a/pkgs/by-name/fu/fuzzdb/package.nix +++ b/pkgs/by-name/fu/fuzzdb/package.nix @@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation { meta = { description = "Comprehensive collection of attack patterns and predictable resource names used for security testing and fuzzing application"; homepage = "https://github.com/fuzzdb-project/fuzzdb"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = [ ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/fw/fwanalyzer/package.nix b/pkgs/by-name/fw/fwanalyzer/package.nix index 6460d68cb5ac..330e29854586 100644 --- a/pkgs/by-name/fw/fwanalyzer/package.nix +++ b/pkgs/by-name/fw/fwanalyzer/package.nix @@ -39,7 +39,7 @@ buildGoModule (finalAttrs: { meta = { description = "Tool to analyze filesystem images"; homepage = "https://github.com/cruise-automation/fwanalyzer"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; mainProgram = "fwanalyzer"; }; diff --git a/pkgs/by-name/fx/fx-cast-bridge/package.nix b/pkgs/by-name/fx/fx-cast-bridge/package.nix index b5276379abc0..1acb35b25238 100644 --- a/pkgs/by-name/fx/fx-cast-bridge/package.nix +++ b/pkgs/by-name/fx/fx-cast-bridge/package.nix @@ -72,7 +72,6 @@ buildNpmPackage rec { platforms = [ "x86_64-linux" "aarch64-darwin" - "x86_64-darwin" ]; # aarch64-linux wasn't support in upstream according to README broken = stdenv.hostPlatform.isDarwin; mainProgram = "fx_cast_bridge"; diff --git a/pkgs/by-name/fy/fyi/package.nix b/pkgs/by-name/fy/fyi/package.nix index c8218a4e8c19..e1ea4eaed3e9 100644 --- a/pkgs/by-name/fy/fyi/package.nix +++ b/pkgs/by-name/fy/fyi/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://codeberg.org/dnkl/fyi/releases/tag/${finalAttrs.version}"; description = "Command line utility to create desktop notifications"; homepage = "https://codeberg.org/dnkl/fyi"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; mainProgram = "fyi"; maintainers = with lib.maintainers; [ marnym ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/fz/fzf-git-sh/package.nix b/pkgs/by-name/fz/fzf-git-sh/package.nix index 3ee7e3a4e096..813841875655 100644 --- a/pkgs/by-name/fz/fzf-git-sh/package.nix +++ b/pkgs/by-name/fz/fzf-git-sh/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "fzf-git-sh"; - version = "0-unstable-2026-06-16"; + version = "0-unstable-2026-07-06"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf-git.sh"; - rev = "d76cd4df21f2ca5aafeab8b31118c4df133472c0"; - hash = "sha256-lK8rbwu5PhCOY3ODWW6U/R/O3AA4c4etxCQogHja9nA="; + rev = "fdf632c53262dfcc44fc09d591e462e9f8fcae83"; + hash = "sha256-3ho7Kn84q36bj9N+Nj+5XEdkXIN4xwYk7h7g/ou3TRM="; }; dontBuild = true; diff --git a/pkgs/by-name/fz/fzf-zsh-plugin/package.nix b/pkgs/by-name/fz/fzf-zsh-plugin/package.nix index 705e4a99b5f1..f955a1c27f89 100644 --- a/pkgs/by-name/fz/fzf-zsh-plugin/package.nix +++ b/pkgs/by-name/fz/fzf-zsh-plugin/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "fzf-zsh-plugin"; - version = "1.0.0-unstable-2026-06-30"; + version = "1.0.0-unstable-2026-07-09"; src = fetchFromGitHub { owner = "unixorn"; repo = "fzf-zsh-plugin"; - rev = "6f953534d4c69a7340d27b7dcf14f406a22bed61"; - hash = "sha256-RQrxCU7f3LSepUYm0+2ljvJfzVh8yp4NMJHxssA60Vk="; + rev = "92187cbc8fe91b7c5ab3a186e566682f64286879"; + hash = "sha256-JedEqrcaJmVL8PF850xP7csgvFzDpcCqW8lJ/5WHklY="; }; strictDeps = true; diff --git a/pkgs/by-name/ga/galaxis/package.nix b/pkgs/by-name/ga/galaxis/package.nix index c25ae4dfc9cf..e404df1eaadb 100644 --- a/pkgs/by-name/ga/galaxis/package.nix +++ b/pkgs/by-name/ga/galaxis/package.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { game's simpler deductions. ''; homepage = "http://catb.org/~esr/galaxis/"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "galaxis"; maintainers = [ ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/ga/game-rs/package.nix b/pkgs/by-name/ga/game-rs/package.nix index 7c0a7cfe0598..9cf7b03f00ed 100644 --- a/pkgs/by-name/ga/game-rs/package.nix +++ b/pkgs/by-name/ga/game-rs/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Minimal CLI game launcher for linux"; homepage = "https://github.com/amanse/game-rs"; changelog = "https://github.com/Amanse/game-rs/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ amanse ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/ga/gamma-launcher/package.nix b/pkgs/by-name/ga/gamma-launcher/package.nix index 0f13de6e90f3..c0a29cdfd513 100644 --- a/pkgs/by-name/ga/gamma-launcher/package.nix +++ b/pkgs/by-name/ga/gamma-launcher/package.nix @@ -17,14 +17,14 @@ let in python3Packages.buildPythonApplication rec { pname = "gamma-launcher"; - version = "3.0"; + version = "3.1"; pyproject = true; src = fetchFromGitHub { owner = "Mord3rca"; repo = "gamma-launcher"; tag = "v${version}"; - hash = "sha256-bvlNmpl2L9MAhZMyHwosXrypH1CQrSI1RQwo+sXO7/w="; + hash = "sha256-FLxJfP1fl3efRk9iAIAsMUrjQcUNa04GjiAKrYequF8="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/ga/gauge/plugins/go/data.json b/pkgs/by-name/ga/gauge/plugins/go/data.json index b4c9904bbea4..6a423125a65c 100644 --- a/pkgs/by-name/ga/gauge/plugins/go/data.json +++ b/pkgs/by-name/ga/gauge/plugins/go/data.json @@ -4,10 +4,6 @@ "url": "https://github.com/getgauge-contrib/gauge-go/releases/download/v0.4.0/gauge-go-0.4.0-darwin.arm64.zip", "hash": "sha256-tMo3+gQPnldCARm0WB7UYSMwaVpz90N2BiTzmvIFTg0=" }, - "x86_64-darwin": { - "url": "https://github.com/getgauge-contrib/gauge-go/releases/download/v0.4.0/gauge-go-0.4.0-darwin.x86_64.zip", - "hash": "sha256-zfrEDRyflvvp4Hf2+42RL+5ooY0iBU0bkO2caOAGp74=" - }, "x86_64-linux": { "url": "https://github.com/getgauge-contrib/gauge-go/releases/download/v0.4.0/gauge-go-0.4.0-linux.x86_64.zip", "hash": "sha256-JEHjk51vYCFAcj9xant2vBU3BZI0krYbfZk9ALjdIs0=" diff --git a/pkgs/by-name/ga/gauge/plugins/go/default.nix b/pkgs/by-name/ga/gauge/plugins/go/default.nix index 09b89bb82f7d..a766b71a0117 100644 --- a/pkgs/by-name/ga/gauge/plugins/go/default.nix +++ b/pkgs/by-name/ga/gauge/plugins/go/default.nix @@ -17,7 +17,6 @@ makeGaugePlugin { sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" "x86_64-linux" ]; }; diff --git a/pkgs/by-name/ga/gauge/plugins/html-report/data.json b/pkgs/by-name/ga/gauge/plugins/html-report/data.json index c307371ca4fd..8e797b972857 100644 --- a/pkgs/by-name/ga/gauge/plugins/html-report/data.json +++ b/pkgs/by-name/ga/gauge/plugins/html-report/data.json @@ -4,10 +4,6 @@ "url": "https://github.com/getgauge/html-report/releases/download/v4.3.2/html-report-4.3.2-darwin.arm64.zip", "hash": "sha256-30RW9I9QTGncnwNTj0/rLlVCQ1wo8oJ2Q0gchHk+ioM=" }, - "x86_64-darwin": { - "url": "https://github.com/getgauge/html-report/releases/download/v4.3.2/html-report-4.3.2-darwin.x86_64.zip", - "hash": "sha256-6dC1gObS4msHr+KyKZufDpDQ9MgAIfqUPSIW7jWewtU=" - }, "aarch64-linux": { "url": "https://github.com/getgauge/html-report/releases/download/v4.3.2/html-report-4.3.2-linux.arm64.zip", "hash": "sha256-sayeQCuoJbeDWK7s/86ApMhzxHhxsyBB4D9QCMxJ/p8=" diff --git a/pkgs/by-name/ga/gauge/plugins/html-report/default.nix b/pkgs/by-name/ga/gauge/plugins/html-report/default.nix index 4d07f023de9b..c41c1add4ba2 100644 --- a/pkgs/by-name/ga/gauge/plugins/html-report/default.nix +++ b/pkgs/by-name/ga/gauge/plugins/html-report/default.nix @@ -17,7 +17,6 @@ makeGaugePlugin { sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" "aarch64-linux" "x86_64-linux" ]; diff --git a/pkgs/by-name/ga/gauge/plugins/java/data.json b/pkgs/by-name/ga/gauge/plugins/java/data.json index 1c0861f5cdb6..ef7944717914 100644 --- a/pkgs/by-name/ga/gauge/plugins/java/data.json +++ b/pkgs/by-name/ga/gauge/plugins/java/data.json @@ -4,10 +4,6 @@ "url": "https://github.com/getgauge/gauge-java/releases/download/v0.12.0/gauge-java-0.12.0-darwin.arm64.zip", "hash": "sha256-vN0FqYT/73+OPGIYEsPwB+eSQ6n5SrFwlHfFybBDpEo=" }, - "x86_64-darwin": { - "url": "https://github.com/getgauge/gauge-java/releases/download/v0.12.0/gauge-java-0.12.0-darwin.x86_64.zip", - "hash": "sha256-loKFJzvFshMY206t1z01d4q5jTxKtB0o7nmN4qFWDDQ=" - }, "aarch64-linux": { "url": "https://github.com/getgauge/gauge-java/releases/download/v0.12.0/gauge-java-0.12.0-linux.arm64.zip", "hash": "sha256-z6nclV/gUDR/jTA4DKaP1HVwuM3U3IVljbYzrlGF15A=" diff --git a/pkgs/by-name/ga/gauge/plugins/java/default.nix b/pkgs/by-name/ga/gauge/plugins/java/default.nix index 95843d20f914..662d80a47c24 100644 --- a/pkgs/by-name/ga/gauge/plugins/java/default.nix +++ b/pkgs/by-name/ga/gauge/plugins/java/default.nix @@ -22,7 +22,6 @@ makeGaugePlugin { ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" "aarch64-linux" "x86_64-linux" ]; diff --git a/pkgs/by-name/ga/gauge/plugins/make-gauge-plugin.nix b/pkgs/by-name/ga/gauge/plugins/make-gauge-plugin.nix index 36025ca24492..e720d8694304 100644 --- a/pkgs/by-name/ga/gauge/plugins/make-gauge-plugin.nix +++ b/pkgs/by-name/ga/gauge/plugins/make-gauge-plugin.nix @@ -37,7 +37,6 @@ let ; # Upstream uses a different naming scheme for platforms systemMap = { - "x86_64-darwin" = "darwin.x86_64"; "aarch64-darwin" = "darwin.arm64"; "aarch64-linux" = "linux.arm64"; "x86_64-linux" = "linux.x86_64"; diff --git a/pkgs/by-name/ga/gauge/plugins/ruby/data.json b/pkgs/by-name/ga/gauge/plugins/ruby/data.json index 3fb1653b0465..219525a8b9ff 100644 --- a/pkgs/by-name/ga/gauge/plugins/ruby/data.json +++ b/pkgs/by-name/ga/gauge/plugins/ruby/data.json @@ -4,10 +4,6 @@ "url": "https://github.com/getgauge/gauge-ruby/releases/download/v0.9.3/gauge-ruby-0.9.3-darwin.arm64.zip", "hash": "sha256-s0/hTqVP4Pa1yk474TYUF1dbXy+NbrtJjwBxRXShXqQ=" }, - "x86_64-darwin": { - "url": "https://github.com/getgauge/gauge-ruby/releases/download/v0.9.3/gauge-ruby-0.9.3-darwin.x86_64.zip", - "hash": "sha256-NNPIR6ZueZ3coavMM9AeqC+O/I/xcfnEo8KTiQivvQs=" - }, "aarch64-linux": { "url": "https://github.com/getgauge/gauge-ruby/releases/download/v0.9.3/gauge-ruby-0.9.3-linux.arm64.zip", "hash": "sha256-vd3KZ1Lc2F81xknc6+tPNxLjZWD8oCMBsCAuw2iJURw=" diff --git a/pkgs/by-name/ga/gauge/plugins/ruby/default.nix b/pkgs/by-name/ga/gauge/plugins/ruby/default.nix index 3754cd9f617a..17d1976f0de1 100644 --- a/pkgs/by-name/ga/gauge/plugins/ruby/default.nix +++ b/pkgs/by-name/ga/gauge/plugins/ruby/default.nix @@ -17,7 +17,6 @@ makeGaugePlugin { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" "aarch64-linux" "x86_64-linux" ]; diff --git a/pkgs/by-name/ga/gauge/plugins/screenshot/data.json b/pkgs/by-name/ga/gauge/plugins/screenshot/data.json index dd06efc09a7a..f0a50c659b92 100644 --- a/pkgs/by-name/ga/gauge/plugins/screenshot/data.json +++ b/pkgs/by-name/ga/gauge/plugins/screenshot/data.json @@ -1,9 +1,5 @@ { "version": "0.3.2", - "x86_64-darwin": { - "url": "https://github.com/getgauge/gauge_screenshot/releases/download/v0.3.2/screenshot-0.3.2-darwin.x86_64.zip", - "hash": "sha256-0qOdBQv6TCiwHizvbb47Sj0aUcMtID4qQ3v5D3XGkXg=" - }, "aarch64-darwin": { "url": "https://github.com/getgauge/gauge_screenshot/releases/download/v0.3.2/screenshot-0.3.2-darwin.arm64.zip", "hash": "sha256-hsFevOBgKbUIMpNcEyv/2A/agIuInIjLTdhmg0C54pQ=" diff --git a/pkgs/by-name/ga/gauge/plugins/screenshot/default.nix b/pkgs/by-name/ga/gauge/plugins/screenshot/default.nix index b769266051a3..c6572efbc623 100644 --- a/pkgs/by-name/ga/gauge/plugins/screenshot/default.nix +++ b/pkgs/by-name/ga/gauge/plugins/screenshot/default.nix @@ -16,7 +16,6 @@ makeGaugePlugin { maintainers = [ ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = [ - "x86_64-darwin" "aarch64-darwin" "aarch64-linux" "x86_64-linux" diff --git a/pkgs/by-name/ga/gauge/plugins/xml-report/data.json b/pkgs/by-name/ga/gauge/plugins/xml-report/data.json index d3b3daf86634..10db9f0700d3 100644 --- a/pkgs/by-name/ga/gauge/plugins/xml-report/data.json +++ b/pkgs/by-name/ga/gauge/plugins/xml-report/data.json @@ -1,9 +1,5 @@ { "version": "0.5.2", - "x86_64-darwin": { - "url": "https://github.com/getgauge/xml-report/releases/download/v0.5.2/xml-report-0.5.2-darwin.x86_64.zip", - "hash": "sha256-YVH9Eh9EVDdJp8F/PXMz4egVpo8ULJmvWjWHH4iH2iI=" - }, "aarch64-darwin": { "url": "https://github.com/getgauge/xml-report/releases/download/v0.5.2/xml-report-0.5.2-darwin.arm64.zip", "hash": "sha256-UW3Axcti8r9dEfiupj2r+mcLGpFBwYQf/7mDNyynReE=" diff --git a/pkgs/by-name/ga/gauge/plugins/xml-report/default.nix b/pkgs/by-name/ga/gauge/plugins/xml-report/default.nix index 4335ff94fc35..6ebfc058ee1f 100644 --- a/pkgs/by-name/ga/gauge/plugins/xml-report/default.nix +++ b/pkgs/by-name/ga/gauge/plugins/xml-report/default.nix @@ -16,7 +16,6 @@ makeGaugePlugin { maintainers = [ ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; platforms = [ - "x86_64-darwin" "aarch64-darwin" "aarch64-linux" "x86_64-linux" diff --git a/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix b/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix index 7ca004b43a97..d598c14c8ce1 100644 --- a/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix +++ b/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { { aarch64-darwin = "darwin-arm64"; aarch64-linux = "aarch64"; - x86_64-darwin = "darwin-x86_64"; x86_64-linux = "x86_64"; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -30,7 +29,6 @@ stdenv.mkDerivation rec { { aarch64-darwin = "fb6921db95d345dc7e5e487dd43b745e3a5b4d5c0c7ca4f707347148760317b4"; aarch64-linux = "c8824bffd057afce2259f7618254e840715f33523a3d4e4294f471208f976764"; - x86_64-darwin = "1ab00742d1ed0926e6f227df39d767f8efab46f5250505c29cb81f548222d794"; x86_64-linux = "95c011cee430e64dd6087c75c800f04b9c49832cc1000127a92a97f9c8d83af4"; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -104,7 +102,6 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/gc/gcsfuse/package.nix b/pkgs/by-name/gc/gcsfuse/package.nix index 6eb0b0bf6f7a..b32232d2ac71 100644 --- a/pkgs/by-name/gc/gcsfuse/package.nix +++ b/pkgs/by-name/gc/gcsfuse/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "gcsfuse"; - version = "3.10.0"; + version = "3.11.0"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; rev = "v${finalAttrs.version}"; - hash = "sha256-6eaBMCw1FH+H3QwZBSDM3nr7qy4Sb23GguNKwcYdJJc="; + hash = "sha256-T+HzH8hdtCzYiXz6eA1IbGNZwAqvE2fLQkAqatV6nzY="; }; - vendorHash = "sha256-iY0+iCIExTcYZP7ob1yAXd6zBhGMzK0pyFThAfgN4Yc="; + vendorHash = "sha256-olkKP8z6E+wYm8f5LMEZqWy/RDFlRJtts/zpJwJDoPc="; subPackages = [ "." diff --git a/pkgs/by-name/gd/gdscript-formatter/package.nix b/pkgs/by-name/gd/gdscript-formatter/package.nix index 006afb7e1012..a35349559076 100644 --- a/pkgs/by-name/gd/gdscript-formatter/package.nix +++ b/pkgs/by-name/gd/gdscript-formatter/package.nix @@ -8,20 +8,20 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "gdscript-formatter"; - version = "0.20.1"; + version = "0.21.0"; src = fetchFromGitHub { owner = "GDQuest"; repo = "GDScript-formatter"; tag = finalAttrs.version; - hash = "sha256-T0NURMu/AWRC+z3VSv20cpdUEq+nczsdp+C9SlvObmg="; + hash = "sha256-lmKnTeGb7HFQ+xD3pxjiE9s+IvKwiMrrsKNB3OsIXcE="; # Needed due to .gitattributes being used for the Godot addon and export-ignoring all files deepClone = true; # Avoid hash differences due to differences in .git leaveDotGit = false; }; - cargoHash = "sha256-JGvtjxHfkMknilFCRJS3VzvN6yifDx0nTNTQua0qmlI="; + cargoHash = "sha256-38qzBoPLcI2dMCTaoEg3seNUrFcAf7RjAc6dv+BRcNg="; cargoBuildFlags = [ "--bin=gdscript-formatter" diff --git a/pkgs/by-name/gd/gdu/package.nix b/pkgs/by-name/gd/gdu/package.nix index 622769eafb27..e03a4ec1db9d 100644 --- a/pkgs/by-name/gd/gdu/package.nix +++ b/pkgs/by-name/gd/gdu/package.nix @@ -63,7 +63,7 @@ buildGoModule (finalAttrs: { ''; homepage = "https://github.com/dundee/gdu"; changelog = "https://github.com/dundee/gdu/releases/tag/${finalAttrs.src.tag}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab zowoq diff --git a/pkgs/by-name/ge/geesefs/package.nix b/pkgs/by-name/ge/geesefs/package.nix index be5ea1e7a896..658c16b34943 100644 --- a/pkgs/by-name/ge/geesefs/package.nix +++ b/pkgs/by-name/ge/geesefs/package.nix @@ -27,7 +27,7 @@ buildGoModule { meta = { homepage = "https://github.com/yandex-cloud/geesefs"; description = "Finally, a good FUSE FS implementation over S3"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.flokli ]; platforms = lib.platforms.unix; mainProgram = "geesefs"; diff --git a/pkgs/by-name/ge/geogram/package.nix b/pkgs/by-name/ge/geogram/package.nix index 87f89e888151..6aae896f16fc 100644 --- a/pkgs/by-name/ge/geogram/package.nix +++ b/pkgs/by-name/ge/geogram/package.nix @@ -101,7 +101,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; maintainers = with lib.maintainers; [ tmarkus ]; diff --git a/pkgs/by-name/ge/geographiclib/package.nix b/pkgs/by-name/ge/geographiclib/package.nix index 9f915f128d89..34069f754fd7 100644 --- a/pkgs/by-name/ge/geographiclib/package.nix +++ b/pkgs/by-name/ge/geographiclib/package.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation (finalAttrs: { }; outputs = [ - "dev" "doc" "out" ]; diff --git a/pkgs/by-name/ge/geoipupdate/package.nix b/pkgs/by-name/ge/geoipupdate/package.nix index 210c27fd5198..7ee20c77422c 100644 --- a/pkgs/by-name/ge/geoipupdate/package.nix +++ b/pkgs/by-name/ge/geoipupdate/package.nix @@ -24,7 +24,7 @@ buildGoModule (finalAttrs: { meta = { description = "Automatic GeoIP database updater"; homepage = "https://github.com/maxmind/geoipupdate"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ das_j helsinki-Jo diff --git a/pkgs/by-name/ge/gerbolyze/package.nix b/pkgs/by-name/ge/gerbolyze/package.nix index 690e38ca3313..a5a13ccc60c1 100644 --- a/pkgs/by-name/ge/gerbolyze/package.nix +++ b/pkgs/by-name/ge/gerbolyze/package.nix @@ -32,7 +32,7 @@ let meta = { description = "SVG-flatten SVG downconverter"; homepage = "https://github.com/jaseg/gerbolyze"; - license = with lib.licenses; [ agpl3Plus ]; + license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ wulfsta ]; mainProgram = "svg-flatten"; platforms = lib.platforms.linux; @@ -91,7 +91,7 @@ python3Packages.buildPythonApplication { meta = { description = "Directly render SVG overlays into Gerber and Excellon files"; homepage = "https://github.com/jaseg/gerbolyze"; - license = with lib.licenses; [ agpl3Plus ]; + license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ wulfsta ]; mainProgram = "gerbolyze"; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/ge/geticons/package.nix b/pkgs/by-name/ge/geticons/package.nix index 8d50d39c9325..1ca57bd976f8 100644 --- a/pkgs/by-name/ge/geticons/package.nix +++ b/pkgs/by-name/ge/geticons/package.nix @@ -23,6 +23,6 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "CLI utility to get icons for apps on your system or other generic icons by name"; mainProgram = "geticons"; homepage = "https://git.sr.ht/~zethra/geticons"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; }; }) diff --git a/pkgs/by-name/gg/gg-jj/package.nix b/pkgs/by-name/gg/gg-jj/package.nix index 69e7aa478d9f..4d1a93bce638 100644 --- a/pkgs/by-name/gg/gg-jj/package.nix +++ b/pkgs/by-name/gg/gg-jj/package.nix @@ -82,7 +82,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "GUI for the version control system Jujutsu"; homepage = "https://github.com/gulbanana/gg"; changelog = "https://github.com/gulbanana/gg/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; inherit (cargo-tauri.hook.meta) platforms; maintainers = with lib.maintainers; [ pluiedev ]; mainProgram = "gg"; diff --git a/pkgs/by-name/gg/ggmorse/package.nix b/pkgs/by-name/gg/ggmorse/package.nix index 51a4ce819e28..e11f6879e877 100644 --- a/pkgs/by-name/gg/ggmorse/package.nix +++ b/pkgs/by-name/gg/ggmorse/package.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation { pname = "ggmorse"; - version = "0.1.0-unstable-2024-05-31"; + version = "0-unstable-2024-05-31"; src = fetchFromGitHub { owner = "ggerganov"; diff --git a/pkgs/by-name/gh/ghdl/package.nix b/pkgs/by-name/gh/ghdl/package.nix index 3f843bafb4da..b56327e67e8b 100644 --- a/pkgs/by-name/gh/ghdl/package.nix +++ b/pkgs/by-name/gh/ghdl/package.nix @@ -150,7 +150,6 @@ stdenv.mkDerivation (finalAttrs: { ]; platforms = [ "x86_64-linux" - "x86_64-darwin" ] ++ lib.optionals (backendIsLLVM || backendIsLLVMJit || backendIsGCC) [ "aarch64-linux" ] ++ lib.optionals (backendIsLLVM || backendIsLLVMJit) [ "aarch64-darwin" ]; diff --git a/pkgs/by-name/gh/ghdorker/package.nix b/pkgs/by-name/gh/ghdorker/package.nix index 96c5bf424647..d0ac4064bca7 100644 --- a/pkgs/by-name/gh/ghdorker/package.nix +++ b/pkgs/by-name/gh/ghdorker/package.nix @@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { description = "Extensible GitHub dorking tool"; mainProgram = "ghdorker"; homepage = "https://github.com/dtaivpp/ghdorker"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/gi/gir-rs/package.nix b/pkgs/by-name/gi/gir-rs/package.nix index 5bb5ce06c398..a4b16ffd69f6 100644 --- a/pkgs/by-name/gi/gir-rs/package.nix +++ b/pkgs/by-name/gi/gir-rs/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage { meta = { description = "Tool to generate rust bindings and user API for glib-based libraries"; homepage = "https://github.com/gtk-rs/gir/"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ anish ]; mainProgram = "gir"; }; diff --git a/pkgs/by-name/gi/git-absorb/package.nix b/pkgs/by-name/gi/git-absorb/package.nix index 711a366e1d26..e2cc2d6c46df 100644 --- a/pkgs/by-name/gi/git-absorb/package.nix +++ b/pkgs/by-name/gi/git-absorb/package.nix @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { homepage = "https://github.com/tummychow/git-absorb"; description = "git commit --fixup, but automatic"; - license = [ lib.licenses.bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ matthiasbeyer ]; diff --git a/pkgs/by-name/gi/git-credential-manager/package.nix b/pkgs/by-name/gi/git-credential-manager/package.nix index 71cddaeae4cf..bcefa224c2cd 100644 --- a/pkgs/by-name/gi/git-credential-manager/package.nix +++ b/pkgs/by-name/gi/git-credential-manager/package.nix @@ -58,7 +58,7 @@ buildDotnetModule rec { meta = { description = "Secure, cross-platform Git credential storage with authentication to GitHub, Azure Repos, and other popular Git hosting services"; homepage = "https://github.com/git-ecosystem/git-credential-manager"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ _999eagle ]; longDescription = '' diff --git a/pkgs/by-name/gi/git-gamble/package.nix b/pkgs/by-name/gi/git-gamble/package.nix index 3ce94ac84e06..80b21f663197 100644 --- a/pkgs/by-name/gi/git-gamble/package.nix +++ b/pkgs/by-name/gi/git-gamble/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "git-gamble"; - version = "2.14.2"; + version = "2.14.4"; src = fetchFromGitLab { owner = "pinage404"; repo = "git-gamble"; - rev = "version/${finalAttrs.version}"; - hash = "sha256-UPiktBeMPZf9vrKz5XFyMzBJtxCe0ojJabeIwhyo9/g="; + rev = "v${finalAttrs.version}"; + hash = "sha256-DjwdoM9/W1UeD/XqVMXTyzjdcJLfHiAqRA3r//rkn1U="; }; - cargoHash = "sha256-yMlb3c2V3NUFw/GDPyCqTCSz+YLn3F9wmeP12jTySCI="; + cargoHash = "sha256-X3kJT0pscCH9sQxV3NkX0hL2sccTJHgMj0UeIpJOWJ4="; nativeCheckInputs = [ gitMinimal ]; preCheck = '' @@ -27,17 +27,20 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; checkFlags = [ # this test can be flaky ; help is needed to stabilize it in upstream - "--skip=git_time_keeper::white_box::lock_file::create_as_many_as_lock_files_when_starting_several_times" + "--skip=git_gamble::cancel_command_with_signal::fail_when_git_is_killed" ]; nativeBuildInputs = [ - installShellFiles makeWrapper + installShellFiles ]; postInstall = '' wrapProgram $out/bin/git-gamble \ --prefix PATH : "${lib.makeBinPath [ gitMinimal ]}" + wrapProgram $out/bin/git-time-keeper \ + --prefix PATH : "${lib.makeBinPath [ gitMinimal ]}" + export PATH="$PATH:$out/bin/" sh ./script/generate_completion.sh target/release/shell_completions/ @@ -53,14 +56,14 @@ rustPlatform.buildRustPackage (finalAttrs: { passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex" - "version/(.*)" + "v(.*)" ]; }; meta = { description = "Tool that blends TDD (Test Driven Development) + TCR (`test && commit || revert`)"; homepage = "https://git-gamble.is-cool.dev"; - changelog = "https://gitlab.com/pinage404/git-gamble/-/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + changelog = "https://git-gamble.is-cool.dev/changelog/${finalAttrs.version}.html"; license = lib.licenses.isc; sourceProvenance = [ lib.sourceTypes.fromSource ]; maintainers = [ lib.maintainers.pinage404 ]; diff --git a/pkgs/by-name/gi/git-gr/package.nix b/pkgs/by-name/gi/git-gr/package.nix index fdfd2141f396..5fc3aa0fb75a 100644 --- a/pkgs/by-name/gi/git-gr/package.nix +++ b/pkgs/by-name/gi/git-gr/package.nix @@ -57,7 +57,7 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/9999years/git-gr"; changelog = "https://github.com/9999years/git-gr/releases/tag/v${version}"; description = "Gerrit CLI client"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers._9999years ]; mainProgram = "git-gr"; }; diff --git a/pkgs/by-name/gi/git-metrics/package.nix b/pkgs/by-name/gi/git-metrics/package.nix index d5b1bb5b5590..1072b3574423 100644 --- a/pkgs/by-name/gi/git-metrics/package.nix +++ b/pkgs/by-name/gi/git-metrics/package.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { homepage = "https://github.com/jdrouet/git-metrics"; description = "Git extension to be able to track metrics about your project, within the git repository"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ matthiasbeyer ]; diff --git a/pkgs/by-name/gi/git-point/package.nix b/pkgs/by-name/gi/git-point/package.nix index 1420708e1cbc..75482bdd8d41 100644 --- a/pkgs/by-name/gi/git-point/package.nix +++ b/pkgs/by-name/gi/git-point/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage { lib.maintainers.qyriad lib.maintainers.philiptaron ]; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; sourceProvenance = [ lib.sourceTypes.fromSource ]; platforms = lib.platforms.all; mainProgram = "git-point"; diff --git a/pkgs/by-name/gi/git-privacy/package.nix b/pkgs/by-name/gi/git-privacy/package.nix index 21a2b06b9188..ecd8ed84e55c 100644 --- a/pkgs/by-name/gi/git-privacy/package.nix +++ b/pkgs/by-name/gi/git-privacy/package.nix @@ -46,7 +46,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { meta = { description = "Tool to redact Git author and committer dates"; homepage = "https://github.com/EMPRI-DEVOPS/git-privacy"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ fab ]; mainProgram = "git-privacy"; }; diff --git a/pkgs/by-name/gi/git-prole/package.nix b/pkgs/by-name/gi/git-prole/package.nix index 42d96fef65ec..e23acdab7709 100644 --- a/pkgs/by-name/gi/git-prole/package.nix +++ b/pkgs/by-name/gi/git-prole/package.nix @@ -53,7 +53,7 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/9999years/git-prole"; changelog = "https://github.com/9999years/git-prole/releases/tag/v${version}"; description = "`git-worktree(1)` manager"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers._9999years ]; mainProgram = "git-prole"; }; diff --git a/pkgs/by-name/gi/git-upstream/package.nix b/pkgs/by-name/gi/git-upstream/package.nix index b63abd7f7981..c2a5f88777ab 100644 --- a/pkgs/by-name/gi/git-upstream/package.nix +++ b/pkgs/by-name/gi/git-upstream/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/9999years/git-upstream"; changelog = "https://github.com/9999years/git-upstream/releases/tag/v${finalAttrs.version}"; description = "Shortcut for `git push --set-upstream`"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers._9999years ]; mainProgram = "git-upstream"; }; diff --git a/pkgs/by-name/gi/git-vanity-hash/package.nix b/pkgs/by-name/gi/git-vanity-hash/package.nix index 6179ecc4a2cc..911893091641 100644 --- a/pkgs/by-name/gi/git-vanity-hash/package.nix +++ b/pkgs/by-name/gi/git-vanity-hash/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage { meta = { homepage = "https://github.com/prasmussen/git-vanity-hash"; description = "Tool for creating commit hashes with a specific prefix"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.kaction ]; mainProgram = "git-vanity-hash"; }; diff --git a/pkgs/by-name/gi/git-workspace/package.nix b/pkgs/by-name/gi/git-workspace/package.nix index 4e8a50ce7305..3c7615de3170 100644 --- a/pkgs/by-name/gi/git-workspace/package.nix +++ b/pkgs/by-name/gi/git-workspace/package.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Sync personal and work git repositories from multiple providers"; homepage = "https://github.com/orf/git-workspace"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ misuzu ]; mainProgram = "git-workspace"; }; diff --git a/pkgs/by-name/gi/git2cl/package.nix b/pkgs/by-name/gi/git2cl/package.nix index 35ad49505986..4dd5912ec30a 100644 --- a/pkgs/by-name/gi/git2cl/package.nix +++ b/pkgs/by-name/gi/git2cl/package.nix @@ -1,24 +1,25 @@ { - fetchgit, + fetchFromGitLab, lib, - stdenv, perl, + stdenv, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "git2cl"; - version = "unstable-2008-08-27"; + version = "3.0"; - src = fetchgit { - url = "git://repo.or.cz/git2cl.git"; - rev = "8373c9f74993e218a08819cbcdbab3f3564bbeba"; - sha256 = "b0d39379640c8a12821442431e2121f7908ce1cc88ec8ec6bede218ea8c21f2f"; + src = fetchFromGitLab { + owner = "jas"; + repo = "git2cl"; + tag = "v${finalAttrs.version}"; + hash = "sha256-KEEUKSP7+05VIb/EhuCy0t1qP/UU0iqNzU4AacbdpTg="; }; buildInputs = [ perl ]; installPhase = '' install -D -m755 git2cl $out/bin/git2cl - install -D -m644 README $out/share/doc/git2cl/README + install -D -m644 README.md $out/share/doc/git2cl/README.md ''; meta = { @@ -27,4 +28,4 @@ stdenv.mkDerivation { platforms = lib.platforms.unix; mainProgram = "git2cl"; }; -} +}) diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix index ceb96f569302..ce1fbf8d160e 100644 --- a/pkgs/by-name/gi/gitaly/package.nix +++ b/pkgs/by-name/gi/gitaly/package.nix @@ -98,7 +98,7 @@ buildGoModule ( meta = { homepage = "https://gitlab.com/gitlab-org/gitaly"; description = "Git RPC service for handling all the git calls made by GitLab"; - platforms = lib.platforms.linux ++ [ "x86_64-darwin" ]; + platforms = lib.platforms.linux; teams = [ lib.teams.gitlab ]; license = lib.licenses.mit; }; diff --git a/pkgs/by-name/gi/gitea/package.nix b/pkgs/by-name/gi/gitea/package.nix index dfae5dbc37ec..1191c645692f 100644 --- a/pkgs/by-name/gi/gitea/package.nix +++ b/pkgs/by-name/gi/gitea/package.nix @@ -13,14 +13,14 @@ openssh, fetchPnpmDeps, pnpmConfigHook, - pnpm_10, + pnpm_11, stdenv, sqliteSupport ? true, nixosTests, }: let - pnpm = pnpm_10; + pnpm = pnpm_11; frontend = stdenv.mkDerivation (finalAttrs: { pname = "gitea-frontend"; @@ -30,7 +30,7 @@ let inherit (finalAttrs) pname version src; inherit pnpm; fetcherVersion = 4; - hash = "sha256-FroVRhNzCLtbW9Z0s6xr4l0mIX+hY4KOomZAhPILWlY="; + hash = "sha256-VAXSj+AYV6uEdCAD/sEzeydqn4cqNL+ITfrGq41jaLI="; }; nativeBuildInputs = [ @@ -53,18 +53,18 @@ let in buildGoModule (finalAttrs: { pname = "gitea"; - version = "1.26.4"; + version = "1.27.0"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; tag = "v${finalAttrs.version}"; - hash = "sha256-xfLhiQMygYKgSMrvmH2V/LIMeaA4ovOeUDT4RUwhvgo="; + hash = "sha256-Pn1V4U43d4lTKRO7AftgKDDWls2z+3IeZgPBaKZlbow="; }; proxyVendor = true; - vendorHash = "sha256-VyzfBZnxnubNIdf+xwLav4W4DgapcLLKN1aKrZ9NbDg="; + vendorHash = "sha256-YRBMGWKIZgMxOXaXG2bIBj1XzkhSwiMyfRy+yQGw+Bo="; outputs = [ "out" @@ -79,14 +79,14 @@ buildGoModule (finalAttrs: { overrideModAttrs = _: { postPatch = '' substituteInPlace go.mod \ - --replace-fail "go 1.26.3" "go 1.26" + --replace-fail "go 1.26.4" "go 1.26.0" ''; }; postPatch = '' substituteInPlace modules/setting/server.go --subst-var data substituteInPlace go.mod \ - --replace-fail "go 1.26.3" "go 1.26" + --replace-fail "go 1.26.4" "go 1.26.0" ''; subPackages = [ "." ]; @@ -112,6 +112,7 @@ buildGoModule (finalAttrs: { mkdir -p $out cp -R ./options/locale $out/locale + mv $out/bin/gitea{.dev,} wrapProgram $out/bin/gitea \ --prefix PATH : ${ lib.makeBinPath [ diff --git a/pkgs/by-name/gi/github-backup/package.nix b/pkgs/by-name/gi/github-backup/package.nix index f6594a73161a..6cccde5e58e8 100644 --- a/pkgs/by-name/gi/github-backup/package.nix +++ b/pkgs/by-name/gi/github-backup/package.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "github-backup"; - version = "0.63.0"; + version = "0.64.0"; pyproject = true; src = fetchFromGitHub { owner = "josegonzalez"; repo = "python-github-backup"; tag = finalAttrs.version; - hash = "sha256-B7psPUxkhPCzxPJZiZu9IXsNUVvMu1mOdOIu+KlPjag="; + hash = "sha256-UPHwohx2qN/vT5a1Km0UqW2SB7br6yAZJ1xKYKX4H70="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/gi/github-copilot-cli/package.nix b/pkgs/by-name/gi/github-copilot-cli/package.nix index 7bf30b233a2a..300fb5ba4bdf 100644 --- a/pkgs/by-name/gi/github-copilot-cli/package.nix +++ b/pkgs/by-name/gi/github-copilot-cli/package.nix @@ -89,7 +89,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/gi/github-copilot-intellij-agent/package.nix b/pkgs/by-name/gi/github-copilot-intellij-agent/package.nix index 626d1836645d..0748ab05d59d 100644 --- a/pkgs/by-name/gi/github-copilot-intellij-agent/package.nix +++ b/pkgs/by-name/gi/github-copilot-intellij-agent/package.nix @@ -88,7 +88,6 @@ stdenv.mkDerivation rec { mainProgram = "copilot-agent"; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; diff --git a/pkgs/by-name/gi/github-runner/package.nix b/pkgs/by-name/gi/github-runner/package.nix index d88a6d2583be..e8d0ede191e6 100644 --- a/pkgs/by-name/gi/github-runner/package.nix +++ b/pkgs/by-name/gi/github-runner/package.nix @@ -378,7 +378,6 @@ buildDotnetModule (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/gi/gitjacker/package.nix b/pkgs/by-name/gi/gitjacker/package.nix index e97fc4f7e786..ac3f19c6b720 100644 --- a/pkgs/by-name/gi/gitjacker/package.nix +++ b/pkgs/by-name/gi/gitjacker/package.nix @@ -39,7 +39,7 @@ buildGoModule (finalAttrs: { even where directory listings are disabled. ''; homepage = "https://github.com/liamg/gitjacker"; - license = with lib.licenses; [ unlicense ]; + license = lib.licenses.unlicense; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/gi/gitkraken/package.nix b/pkgs/by-name/gi/gitkraken/package.nix index 2d42936b67ca..ddc70a42368d 100644 --- a/pkgs/by-name/gi/gitkraken/package.nix +++ b/pkgs/by-name/gi/gitkraken/package.nix @@ -66,11 +66,6 @@ let hash = "sha256-CX/NxvLrxia92vSIjWXzIiBdTfhZ8TW7a5g1hEt+Y/k="; }; - x86_64-darwin = fetchzip { - url = "https://api.gitkraken.dev/releases/production/darwin/x64/${version}/GitKraken-v${version}.zip"; - hash = "sha256-B4vFDrDy3s/d5MyGOP3pv/pGpUfpJFhvI8EWSqJhiyg="; - }; - aarch64-darwin = fetchzip { url = "https://api.gitkraken.dev/releases/production/darwin/arm64/${version}/GitKraken-v${version}.zip"; hash = "sha256-JEgqJ6smqDG/2KFApRSYTuL1Ch1sIkhGDMjqVsgQUmc="; diff --git a/pkgs/by-name/gi/gitkraken/update.sh b/pkgs/by-name/gi/gitkraken/update.sh index 8c75dc1a4977..3330868113c0 100755 --- a/pkgs/by-name/gi/gitkraken/update.sh +++ b/pkgs/by-name/gi/gitkraken/update.sh @@ -14,7 +14,6 @@ version=$(curl -fsSL https://api.gitkraken.dev/releases/production/linux/x64/REL # Hardcoded URLs to compute hashes declare -A tarballs=( ["x86_64-linux"]="https://api.gitkraken.dev/releases/production/linux/x64/${version}/gitkraken-amd64.tar.gz" - ["x86_64-darwin"]="https://api.gitkraken.dev/releases/production/darwin/x64/${version}/GitKraken-v${version}.zip" ["aarch64-darwin"]="https://api.gitkraken.dev/releases/production/darwin/arm64/${version}/GitKraken-v${version}.zip" ) diff --git a/pkgs/by-name/gi/gitlab-timelogs/package.nix b/pkgs/by-name/gi/gitlab-timelogs/package.nix index 5df5d02c4620..d508ca6946d2 100644 --- a/pkgs/by-name/gi/gitlab-timelogs/package.nix +++ b/pkgs/by-name/gi/gitlab-timelogs/package.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; homepage = "https://github.com/phip1611/gitlab-timelogs"; changelog = "https://github.com/phip1611/gitlab-timelogs/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ blitz phip1611 diff --git a/pkgs/by-name/gi/gitte/package.nix b/pkgs/by-name/gi/gitte/package.nix index 301d404677d9..f6e6d0192c24 100644 --- a/pkgs/by-name/gi/gitte/package.nix +++ b/pkgs/by-name/gi/gitte/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://codeberg.org/ckruse/Gitte"; mainProgram = "gitte"; description = "GTK4/libadwaita Git client"; - license = with lib.licenses; [ agpl3Plus ]; + license = lib.licenses.agpl3Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ ckruse diff --git a/pkgs/by-name/gi/gittyup/package.nix b/pkgs/by-name/gi/gittyup/package.nix index 92e92539c16c..cc83cfa7fe7a 100644 --- a/pkgs/by-name/gi/gittyup/package.nix +++ b/pkgs/by-name/gi/gittyup/package.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Graphical Git client designed to help you understand and manage your source code history"; homepage = "https://murmele.github.io/Gittyup"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fliegendewurst phijor diff --git a/pkgs/by-name/gk/gk-cli/package.nix b/pkgs/by-name/gk/gk-cli/package.nix index cce70ae497fe..58cd2315a577 100644 --- a/pkgs/by-name/gk/gk-cli/package.nix +++ b/pkgs/by-name/gk/gk-cli/package.nix @@ -85,11 +85,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-nDVehD0TTNTvhuDU8RB4lZiVcEJpB+l6EGkzckC7JuU="; stripRoot = false; }; - x86_64-darwin = fetchzip { - url = "${base_url}darwin_amd64.zip"; - hash = "sha256-Lhuqb5592T6VcTMVmAdIDfGMXaS4dSu0wbQeHheXXk4="; - stripRoot = false; - }; aarch64-windows = fetchzip { url = "${base_url}windows_arm64.zip"; hash = "sha256-sXHeqR4AW/sRPp74PieXI1n4VGV94CnrcMF1ovAek8E="; diff --git a/pkgs/by-name/gl/glab/package.nix b/pkgs/by-name/gl/glab/package.nix index 2b9d3eabec65..fc64a8eddc9a 100644 --- a/pkgs/by-name/gl/glab/package.nix +++ b/pkgs/by-name/gl/glab/package.nix @@ -13,13 +13,13 @@ buildGoModule (finalAttrs: { pname = "glab"; - version = "1.106.0"; + version = "1.108.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-GO4SeXr/kT8vvg7v/ehreu9g3ZDeXIC7jKB9/Cg4ze4="; + hash = "sha256-JVUeCq21D5ajBiGU+fR6MHGF1Nz6i1aQFUiJZsw2zUI="; leaveDotGit = true; postFetch = '' cd "$out" @@ -28,7 +28,7 @@ buildGoModule (finalAttrs: { ''; }; - vendorHash = "sha256-fwsefYGNnx9OkITaZ0Z9Xc+1/Pj4FxEX+194C93d5K0="; + vendorHash = "sha256-Ss5JnTa9KfOw5fElleu+HcDHVW5Bz8QxZ++YrCF2jCY="; ldflags = [ "-s" diff --git a/pkgs/by-name/gl/glasgow/package.nix b/pkgs/by-name/gl/glasgow/package.nix index 9c9a4c44f328..c193c2029b45 100644 --- a/pkgs/by-name/gl/glasgow/package.nix +++ b/pkgs/by-name/gl/glasgow/package.nix @@ -2,13 +2,30 @@ lib, python3, fetchFromGitHub, + fetchPypi, sdcc, yosys, icestorm, nextpnr, }: -python3.pkgs.buildPythonApplication rec { +let + # glasgow uses importlib_resources' open_text(), removed in 7.x; pin it to 6.x. + pythonPackages = python3.pkgs.overrideScope ( + final: prev: { + importlib-resources = prev.importlib-resources.overridePythonAttrs (old: rec { + version = "6.5.2"; + src = fetchPypi { + pname = "importlib_resources"; + inherit version; + hash = "sha256-GF+Hre9bzCiESdmPtPugfOp4vANkVd1ExfxKL+eP7Sw="; + }; + doCheck = false; + }); + } + ); +in +pythonPackages.buildPythonApplication rec { pname = "glasgow"; version = "0-unstable-2025-12-22"; # Similar to `pdm show`, but without the commit counter @@ -36,10 +53,10 @@ python3.pkgs.buildPythonApplication rec { ]; build-system = [ - python3.pkgs.pdm-backend + pythonPackages.pdm-backend ]; - dependencies = with python3.pkgs; [ + dependencies = with pythonPackages; [ aiohttp amaranth cobs @@ -54,7 +71,7 @@ python3.pkgs.buildPythonApplication rec { nativeCheckInputs = [ # pytestCheckHook discovers way less tests - python3.pkgs.unittestCheckHook + pythonPackages.unittestCheckHook icestorm nextpnr yosys @@ -67,14 +84,18 @@ python3.pkgs.buildPythonApplication rec { __darwinAllowLocalNetworking = true; preBuild = '' - make -C firmware GIT_REV_SHORT=${firmwareGitRev} LIBFX2=${python3.pkgs.fx2}/share/libfx2 + make -C firmware GIT_REV_SHORT=${firmwareGitRev} LIBFX2=${pythonPackages.fx2}/share/libfx2 # Normalize the .ihex file, see ./software/deploy-firmware.sh. - ${python3.withPackages (p: [ p.fx2 ])}/bin/python firmware/normalize.py \ + ${pythonPackages.python.withPackages (p: [ p.fx2 ])}/bin/python firmware/normalize.py \ firmware/glasgow.ihex firmware/glasgow.ihex # Ensure the compiled firmware is exactly the same as the one shipped in the repo. - cmp -s firmware/glasgow.ihex software/glasgow/hardware/firmware.ihex + if ! cmp -s firmware/glasgow.ihex software/glasgow/hardware/firmware.ihex; then + echo >&2 "Firmware doesn't reproduce!" + diff -u software/glasgow/hardware/firmware.ihex firmware/glasgow.ihex + exit 1 + fi cd software export PDM_BUILD_SCM_VERSION="${pdmVersion}" diff --git a/pkgs/by-name/gl/glaze/package.nix b/pkgs/by-name/gl/glaze/package.nix index 28c216a5d45d..96bf10e34cd2 100644 --- a/pkgs/by-name/gl/glaze/package.nix +++ b/pkgs/by-name/gl/glaze/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "glaze"; - version = "7.8.4"; + version = "7.9.0"; src = fetchFromGitHub { owner = "stephenberry"; repo = "glaze"; tag = "v${finalAttrs.version}"; - hash = "sha256-AyDdyj3uN+IZWGItO87NLMIXRU8Irq8gBI3Q3zqKKzU="; + hash = "sha256-vNhxBdGaM70YABfwczvJcAFIYdEGIUGE8Sp2sgkTcaQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/gl/glew/package.nix b/pkgs/by-name/gl/glew/package.nix index db1e2c5f1b55..cff1bbb2067a 100644 --- a/pkgs/by-name/gl/glew/package.nix +++ b/pkgs/by-name/gl/glew/package.nix @@ -21,6 +21,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-tkeQ+UuSas1+j4TF1gAKhstDlnvR5oiwMIkHl5nJ6Ik="; }; + patches = [ + # Allow a single GLEW build to support both EGL and GLX. + # + # Originally developed for the AUR glew-egl-glx package and later adopted by + # Arch Linux. Carry an updated copy in-tree after it was removed from Arch's + # packaging repository. + ./patches/egl+glx.patch + ]; + outputs = [ "bin" "out" diff --git a/pkgs/by-name/gl/glew/patches/egl+glx.patch b/pkgs/by-name/gl/glew/patches/egl+glx.patch new file mode 100644 index 000000000000..9853f8e53236 --- /dev/null +++ b/pkgs/by-name/gl/glew/patches/egl+glx.patch @@ -0,0 +1,172 @@ +--- a/src/glew.c ++++ b/src/glew.c +@@ -36,6 +36,10 @@ + # include GLEW_INCLUDE + #endif + ++#if defined(GLEW_EGL) ++# include ++#endif ++ + #if defined(GLEW_OSMESA) + # define GLAPI extern + # ifndef APIENTRY +@@ -47,8 +51,6 @@ + # undef APIENTRY + # undef GLEW_APIENTRY_DEFINED + # endif +-#elif defined(GLEW_EGL) +-# include + #elif defined(_WIN32) + /* + * If NOGDI is defined, wingdi.h won't be included by windows.h, and thus +@@ -65,8 +67,7 @@ + + #include /* For size_t */ + +-#if defined(GLEW_EGL) +-#elif defined(GLEW_REGAL) ++#if defined(GLEW_REGAL) + + /* In GLEW_REGAL mode we call directly into the linked + libRegal.so glGetProcAddressREGAL for looking up +@@ -167,23 +168,37 @@ void* NSGLGetProcAddress (const GLubyte *name) + * Define glewGetProcAddress. + */ + #if defined(GLEW_REGAL) +-# define glewGetProcAddress(name) regalGetProcAddress((const GLchar *)name) ++# define _glewGetProcAddress(name) regalGetProcAddress((const GLchar *)name) + #elif defined(GLEW_OSMESA) +-# define glewGetProcAddress(name) OSMesaGetProcAddress((const char *)name) +-#elif defined(GLEW_EGL) +-# define glewGetProcAddress(name) eglGetProcAddress((const char *)name) ++# define _glewGetProcAddress(name) OSMesaGetProcAddress((const char *)name) + #elif defined(_WIN32) +-# define glewGetProcAddress(name) wglGetProcAddress((LPCSTR)name) ++# define _glewGetProcAddress(name) wglGetProcAddress((LPCSTR)name) + #elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX) +-# define glewGetProcAddress(name) NSGLGetProcAddress(name) ++# define _glewGetProcAddress(name) NSGLGetProcAddress(name) + #elif defined(__sgi) || defined(__sun) || defined(__HAIKU__) +-# define glewGetProcAddress(name) dlGetProcAddress(name) ++# define _glewGetProcAddress(name) dlGetProcAddress(name) + #elif defined(__ANDROID__) +-# define glewGetProcAddress(name) NULL /* TODO */ ++# define _glewGetProcAddress(name) NULL /* TODO */ + #elif defined(__native_client__) +-# define glewGetProcAddress(name) NULL /* TODO */ ++# define _glewGetProcAddress(name) NULL /* TODO */ + #else /* __linux */ +-# define glewGetProcAddress(name) (*glXGetProcAddressARB)(name) ++# define _glewGetProcAddress(name) (*glXGetProcAddressARB)(name) ++#endif ++ ++#if defined(GLEW_EGL) ++static GLboolean _EGL_available = GL_FALSE; ++static void (*glewGetProcAddress (const GLubyte *name)) (void) ++{ ++ void (*addr)(void); ++ if (_EGL_available) ++ { ++ addr = eglGetProcAddress((const char *)name); ++ if (addr) return addr; ++ } ++ return _glewGetProcAddress(name); ++} ++#else ++# define glewGetProcAddress(name) _glewGetProcAddress(name) + #endif + + /* +@@ -19783,9 +19798,7 @@ GLenum GLEWAPIENTRY glewContextInit (void) + } + + +-#if defined(GLEW_OSMESA) +- +-#elif defined(GLEW_EGL) ++#if defined(GLEW_EGL) + + PFNEGLCHOOSECONFIGPROC __eglewChooseConfig = NULL; + PFNEGLCOPYBUFFERSPROC __eglewCopyBuffers = NULL; +@@ -21074,8 +21087,8 @@ GLenum eglewInit (EGLDisplay display) + PFNEGLQUERYSTRINGPROC queryString = NULL; + + /* Load necessary entry points */ +- initialize = (PFNEGLINITIALIZEPROC) glewGetProcAddress("eglInitialize"); +- queryString = (PFNEGLQUERYSTRINGPROC) glewGetProcAddress("eglQueryString"); ++ initialize = (PFNEGLINITIALIZEPROC) eglGetProcAddress("eglInitialize"); ++ queryString = (PFNEGLQUERYSTRINGPROC) eglGetProcAddress("eglQueryString"); + if (!initialize || !queryString) + return 1; + +@@ -21669,7 +21682,9 @@ GLenum eglewInit (EGLDisplay display) + return GLEW_OK; + } + +-#elif defined(_WIN32) ++#endif ++ ++#if defined(_WIN32) + + PFNWGLSETSTEREOEMITTERSTATE3DLPROC __wglewSetStereoEmitterState3DL = NULL; + +@@ -23750,13 +23765,26 @@ GLenum GLEWAPIENTRY glewInit (void) + GLenum r; + #if defined(GLEW_EGL) + PFNEGLGETCURRENTDISPLAYPROC getCurrentDisplay = NULL; ++ EGLDisplay display; + #endif + r = glewContextInit(); + if ( r != 0 ) return r; + #if defined(GLEW_EGL) +- getCurrentDisplay = (PFNEGLGETCURRENTDISPLAYPROC) glewGetProcAddress("eglGetCurrentDisplay"); +- return eglewInit(getCurrentDisplay()); +-#elif defined(GLEW_OSMESA) || defined(__ANDROID__) || defined(__native_client__) || defined(__HAIKU__) ++ getCurrentDisplay = (PFNEGLGETCURRENTDISPLAYPROC) eglGetProcAddress("eglGetCurrentDisplay"); ++ if (getCurrentDisplay) ++ display = getCurrentDisplay(); ++ else ++ display = EGL_NO_DISPLAY; ++ if (display != EGL_NO_DISPLAY) ++ { ++ r = eglewInit(display); ++ if ( r == 0 ) { ++ _EGL_available = GL_TRUE; ++ return r; ++ } ++ } ++#endif ++#if defined(GLEW_OSMESA) || defined(__ANDROID__) || defined(__native_client__) || defined(__HAIKU__) + return r; + #elif defined(_WIN32) + return wglewInit(); +@@ -30675,7 +30703,7 @@ GLboolean GLEWAPIENTRY glewIsSupported (const char* name) + return ret; + } + +-#if defined(_WIN32) && !defined(GLEW_EGL) && !defined(GLEW_OSMESA) ++#if defined(_WIN32) && !defined(GLEW_OSMESA) + + GLboolean GLEWAPIENTRY wglewIsSupported (const char* name) + { +@@ -31118,7 +31146,7 @@ GLboolean GLEWAPIENTRY wglewIsSupported (const char* name) + return ret; + } + +-#elif !defined(GLEW_OSMESA) && !defined(GLEW_EGL) && !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && !defined(__APPLE__) || defined(GLEW_APPLE_GLX) ++#elif !defined(GLEW_OSMESA) && !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && !defined(__APPLE__) || defined(GLEW_APPLE_GLX) + + GLboolean glxewIsSupported (const char* name) + { +@@ -31702,7 +31730,9 @@ GLboolean glxewIsSupported (const char* name) + return ret; + } + +-#elif defined(GLEW_EGL) ++#endif ++ ++#if defined(GLEW_EGL) + + GLboolean eglewIsSupported (const char* name) + { diff --git a/pkgs/by-name/gl/global-platform-pro/package.nix b/pkgs/by-name/gl/global-platform-pro/package.nix index 67d99f61406f..a6e44b81cadb 100644 --- a/pkgs/by-name/gl/global-platform-pro/package.nix +++ b/pkgs/by-name/gl/global-platform-pro/package.nix @@ -87,7 +87,7 @@ maven.buildMavenPackage rec { fromSource binaryBytecode # deps ]; - license = with lib.licenses; [ lgpl3 ]; + license = lib.licenses.lgpl3; mainProgram = "gp"; }; } diff --git a/pkgs/by-name/gl/glooctl/package.nix b/pkgs/by-name/gl/glooctl/package.nix index 0c8f258217dc..f4a854bae6d6 100644 --- a/pkgs/by-name/gl/glooctl/package.nix +++ b/pkgs/by-name/gl/glooctl/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "glooctl"; - version = "1.21.11"; + version = "1.21.12"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${finalAttrs.version}"; - hash = "sha256-inW2L8BzZnupDmgOR53pPQlATQRoTo4/VGDZD8fvUQ8="; + hash = "sha256-7qVyVTvkWxSU9SiOdnpyHf+x6sJizkNkaa0yK3NKdF4="; }; vendorHash = "sha256-BMaRuW8NUIsTnPvIbMWd4tgt7IUUU7VjK64DMNP5hC0="; diff --git a/pkgs/by-name/gl/glslviewer/package.nix b/pkgs/by-name/gl/glslviewer/package.nix index a367e8b89296..5e6e02cae010 100644 --- a/pkgs/by-name/gl/glslviewer/package.nix +++ b/pkgs/by-name/gl/glslviewer/package.nix @@ -44,6 +44,8 @@ stdenv.mkDerivation (finalAttrs: { python3 ]; + # https://github.com/patriciogonzalezvivo/vera/pull/31/changes + patches = [ ./patches/0001-fix-miniaudio-device-id-handling.patch ]; postInstall = '' substituteInPlace $out/share/thumbnailers/glslViewer.thumbnailer \ --replace-fail "TryExec=glslThumbnailer" "TryExec=$out/bin/glslThumbnailer" \ diff --git a/pkgs/by-name/gl/glslviewer/patches/0001-fix-miniaudio-device-id-handling.patch b/pkgs/by-name/gl/glslviewer/patches/0001-fix-miniaudio-device-id-handling.patch new file mode 100644 index 000000000000..d98c869ae71f --- /dev/null +++ b/pkgs/by-name/gl/glslviewer/patches/0001-fix-miniaudio-device-id-handling.patch @@ -0,0 +1,8 @@ +--- a/deps/vera/src/gl/textureStreamAudio.cpp ++++ b/deps/vera/src/gl/textureStreamAudio.cpp +@@ -59,7 +59,6 @@ TextureStreamAudio::TextureStreamAudio(): TextureStream() { + m_dft_buffer = (float*)av_malloc_array(sizeof(float), m_buf_len); + m_buffer_wr.resize(m_buf_len, 0); + m_buffer_re.resize(m_buf_len, 0); +- m_dft_buffer = nullptr; + } diff --git a/pkgs/by-name/gn/gnomecast/package.nix b/pkgs/by-name/gn/gnomecast/package.nix index 0cd942d37a7d..52c4764a50fe 100644 --- a/pkgs/by-name/gn/gnomecast/package.nix +++ b/pkgs/by-name/gn/gnomecast/package.nix @@ -49,7 +49,7 @@ buildPythonApplication { meta = { description = "Native Linux GUI for Chromecasting local files"; homepage = "https://github.com/keredson/gnomecast"; - license = with lib.licenses; [ gpl3 ]; + license = lib.licenses.gpl3; broken = stdenv.hostPlatform.isDarwin; mainProgram = "gnomecast"; }; diff --git a/pkgs/by-name/gn/gnu-shepherd/package.nix b/pkgs/by-name/gn/gnu-shepherd/package.nix index 3b8be6079788..9a1635b415bf 100644 --- a/pkgs/by-name/gn/gnu-shepherd/package.nix +++ b/pkgs/by-name/gn/gnu-shepherd/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://www.gnu.org/software/shepherd/"; description = "Service manager that looks after the herd of system services"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ kloenk ]; }; diff --git a/pkgs/tools/text/gnugrep/gnulib-float-h-tests-port-to-C23-PowerPC-GCC.patch b/pkgs/by-name/gn/gnugrep/gnulib-float-h-tests-port-to-C23-PowerPC-GCC.patch similarity index 100% rename from pkgs/tools/text/gnugrep/gnulib-float-h-tests-port-to-C23-PowerPC-GCC.patch rename to pkgs/by-name/gn/gnugrep/gnulib-float-h-tests-port-to-C23-PowerPC-GCC.patch diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/by-name/gn/gnugrep/package.nix similarity index 100% rename from pkgs/tools/text/gnugrep/default.nix rename to pkgs/by-name/gn/gnugrep/package.nix diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/by-name/gn/gnupatch/package.nix similarity index 100% rename from pkgs/tools/text/gnupatch/default.nix rename to pkgs/by-name/gn/gnupatch/package.nix diff --git a/pkgs/by-name/go/go-audit/package.nix b/pkgs/by-name/go/go-audit/package.nix index 5688247ca788..bead40959749 100644 --- a/pkgs/by-name/go/go-audit/package.nix +++ b/pkgs/by-name/go/go-audit/package.nix @@ -23,7 +23,7 @@ buildGoModule (finalAttrs: { meta = { description = "Alternative to the auditd daemon"; homepage = "https://github.com/slackhq/go-audit"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; platforms = lib.platforms.linux; mainProgram = "go-audit"; diff --git a/pkgs/by-name/go/go-cve-search/package.nix b/pkgs/by-name/go/go-cve-search/package.nix index 307f9b5f2d3d..cea8622b7ef1 100644 --- a/pkgs/by-name/go/go-cve-search/package.nix +++ b/pkgs/by-name/go/go-cve-search/package.nix @@ -29,7 +29,7 @@ buildGoModule (finalAttrs: { ''; homepage = "https://github.com/s-index/go-cve-search"; changelog = "https://github.com/s-index/go-cve-search/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/go/go-licenses/package.nix b/pkgs/by-name/go/go-licenses/package.nix index bab6b8313b4c..ff47e3c966a8 100644 --- a/pkgs/by-name/go/go-licenses/package.nix +++ b/pkgs/by-name/go/go-licenses/package.nix @@ -50,7 +50,7 @@ buildGoModule (finalAttrs: { description = "Reports on the licenses used by a Go package and its dependencies"; mainProgram = "go-licenses"; homepage = "https://github.com/google/go-licenses"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ Luflosi ]; }; }) diff --git a/pkgs/by-name/go/go365/package.nix b/pkgs/by-name/go/go365/package.nix index 86e06f8ad4cd..c55fce455215 100644 --- a/pkgs/by-name/go/go365/package.nix +++ b/pkgs/by-name/go/go365/package.nix @@ -26,7 +26,7 @@ buildGoModule (finalAttrs: { description = "Office 365 enumeration tool"; homepage = "https://github.com/optiv/Go365"; changelog = "https://github.com/optiv/Go365/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "Go365"; }; diff --git a/pkgs/by-name/go/gobi_loader/package.nix b/pkgs/by-name/go/gobi_loader/package.nix index 13f44029265a..96cb504b090b 100644 --- a/pkgs/by-name/go/gobi_loader/package.nix +++ b/pkgs/by-name/go/gobi_loader/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Firmware loader for Qualcomm Gobi USB chipsets"; homepage = "https://www.codon.org.uk/~mjg59/gobi_loader/"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ _0x4A6F ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/go/godsvg/package.nix b/pkgs/by-name/go/godsvg/package.nix index 13affaf2ac5a..de1255ca0c0a 100644 --- a/pkgs/by-name/go/godsvg/package.nix +++ b/pkgs/by-name/go/godsvg/package.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "godsvg"; - version = "1.0-alpha15"; + version = "1.0-alpha16"; src = fetchFromGitHub { owner = "MewPurPur"; repo = "GodSVG"; tag = "v${finalAttrs.version}"; - hash = "sha256-vEwkpYMIqiqCFVNE7UzEts/lSS9zR+AgvvSr+vj0Aas="; + hash = "sha256-MuPEPnoBmqAg0vLQ7rQidWHA2DFpfNx7evPYeG311co="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/go/goeland/package.nix b/pkgs/by-name/go/goeland/package.nix index 4cc79004aea0..9788a3810bec 100644 --- a/pkgs/by-name/go/goeland/package.nix +++ b/pkgs/by-name/go/goeland/package.nix @@ -34,7 +34,7 @@ buildGoModule (finalAttrs: { ''; homepage = "https://github.com/slurdge/goeland"; changelog = "https://github.com/slurdge/goeland/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.sweenu ]; }; }) diff --git a/pkgs/by-name/go/gogdl/package.nix b/pkgs/by-name/go/gogdl/package.nix index 3c5df2a78ba0..85547311f399 100644 --- a/pkgs/by-name/go/gogdl/package.nix +++ b/pkgs/by-name/go/gogdl/package.nix @@ -31,7 +31,7 @@ python3Packages.buildPythonApplication (finalAttrs: { description = "GOG Downloading module for Heroic Games Launcher"; mainProgram = "gogdl"; homepage = "https://github.com/Heroic-Games-Launcher/heroic-gogdl"; - license = with lib.licenses; [ gpl3 ]; + license = lib.licenses.gpl3; maintainers = [ ]; }; }) diff --git a/pkgs/by-name/go/golden-cheetah-bin/package.nix b/pkgs/by-name/go/golden-cheetah-bin/package.nix index 43468179bff4..c3b8399f43da 100644 --- a/pkgs/by-name/go/golden-cheetah-bin/package.nix +++ b/pkgs/by-name/go/golden-cheetah-bin/package.nix @@ -12,7 +12,6 @@ let description = "Performance software for cyclists, runners and triathletes. This version includes the API Tokens for e.g. Strava"; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" ]; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/go/gomapenum/package.nix b/pkgs/by-name/go/gomapenum/package.nix index 2247aa56a9be..7dc199b84350 100644 --- a/pkgs/by-name/go/gomapenum/package.nix +++ b/pkgs/by-name/go/gomapenum/package.nix @@ -25,7 +25,7 @@ buildGoModule (finalAttrs: { description = "Tools for user enumeration and password bruteforce"; mainProgram = "gomapenum"; homepage = "https://github.com/nodauf/GoMapEnum"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/go/gomobile/package.nix b/pkgs/by-name/go/gomobile/package.nix index 4b00da7f414b..f25c06b753b0 100644 --- a/pkgs/by-name/go/gomobile/package.nix +++ b/pkgs/by-name/go/gomobile/package.nix @@ -71,7 +71,7 @@ buildGoModule { meta = { description = "Tool for building and running mobile apps written in Go"; homepage = "https://pkg.go.dev/golang.org/x/mobile/cmd/gomobile"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ jakubgs ]; }; } diff --git a/pkgs/by-name/go/gomuks-web/package.nix b/pkgs/by-name/go/gomuks-web/package.nix index 8e63af527577..0ee8671cb9a6 100644 --- a/pkgs/by-name/go/gomuks-web/package.nix +++ b/pkgs/by-name/go/gomuks-web/package.nix @@ -11,17 +11,17 @@ buildGoModule (finalAttrs: { pname = "gomuks-web"; - version = "26.06"; + version = "26.07"; src = fetchFromGitHub { owner = "gomuks"; repo = "gomuks"; tag = "v0.${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}.0"; - hash = "sha256-Q4hu3bcB16iuqASZvlv7nDvxj8CFX66qWp6DHIUTmh4="; + hash = "sha256-OgcmRBuVFTPzAVgNVDUZcfdgxHi4mtUcbmfTRPx/f9M="; }; proxyVendor = true; - vendorHash = "sha256-iuSu5MvNRt+eCZ9wxUwMo6X0joos7q9WPyXBwhn/0yE="; + vendorHash = "sha256-wNscq9FDJb9+WqKCBZ9YD+EQ/Sc2PAznunKP6hrs+Ms="; nativeBuildInputs = [ nodejs @@ -37,7 +37,7 @@ buildGoModule (finalAttrs: { npmRoot = "web"; npmDeps = fetchNpmDeps { src = "${finalAttrs.src}/web"; - hash = "sha256-RiOes+tmAxhA9IkyA6yWQXTjjXyZg2Z8FmPTgcmCg/g="; + hash = "sha256-C+zEMI2wmO3EvefpswTk9Tq3AV1Acfi+w3oO5WpxLIQ="; }; }; diff --git a/pkgs/by-name/go/goofys/package.nix b/pkgs/by-name/go/goofys/package.nix index 0a678d455e2d..3bf49d7232a4 100644 --- a/pkgs/by-name/go/goofys/package.nix +++ b/pkgs/by-name/go/goofys/package.nix @@ -29,7 +29,7 @@ buildGoModule { meta = { homepage = "https://github.com/kahing/goofys"; description = "High-performance, POSIX-ish Amazon S3 file system written in Go"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ ]; broken = stdenv.hostPlatform.isDarwin; # needs to update gopsutil to at least v3.21.3 to include https://github.com/shirou/gopsutil/pull/1042 mainProgram = "goofys"; diff --git a/pkgs/by-name/go/google-app-engine-go-sdk/package.nix b/pkgs/by-name/go/google-app-engine-go-sdk/package.nix index 6cea608e8941..16ef0b8e1665 100644 --- a/pkgs/by-name/go/google-app-engine-go-sdk/package.nix +++ b/pkgs/by-name/go/google-app-engine-go-sdk/package.nix @@ -49,7 +49,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.asl20; platforms = [ "x86_64-linux" - "x86_64-darwin" ]; maintainers = with lib.maintainers; [ lufia ]; }; diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index 36e78cd0f4c6..1a63064b22f6 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -179,11 +179,11 @@ let linux = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "150.0.7871.114"; + version = "150.0.7871.128"; src = fetchurl { url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-DxnmjcpXSEljLiUinxWFPSvqwz+gZJj+7UPzRii8LVM="; + hash = "sha256-g+1ZyFh467j6U5FevnBmyvxY0cBMHJVElIbm+dmaHvs="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -289,11 +289,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "150.0.7871.115"; + version = "150.0.7871.129"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/acd57hhfrcygivr2dnxpq2q56zka_150.0.7871.115/GoogleChrome-150.0.7871.115.dmg"; - hash = "sha256-AB16I7Tl/E4F4ydXHSLeyoKAWNwP7JSL0wLyrUvn3FE="; + url = "http://dl.google.com/release2/chrome/ggb3e3myl2poiiaqd2bbvqlrqa_150.0.7871.129/GoogleChrome-150.0.7871.129.dmg"; + hash = "sha256-ym9rF6yrGMSibQDM4gKlAbOsIHnV1tPxyNq9KNLnR0I="; }; dontPatch = true; diff --git a/pkgs/by-name/go/google-cloud-cpp/package.nix b/pkgs/by-name/go/google-cloud-cpp/package.nix index cf3d824a9fd6..a2919dea36d1 100644 --- a/pkgs/by-name/go/google-cloud-cpp/package.nix +++ b/pkgs/by-name/go/google-cloud-cpp/package.nix @@ -161,7 +161,7 @@ stdenv.mkDerivation (finalAttrs: { requiredSystemFeatures = [ "big-parallel" ]; meta = { - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; homepage = "https://github.com/googleapis/google-cloud-cpp"; description = "C++ Idiomatic Clients for Google Cloud Platform services"; changelog = "https://github.com/googleapis/google-cloud-cpp/blob/v${finalAttrs.version}/CHANGELOG.md"; diff --git a/pkgs/by-name/go/google-cloud-sdk/data.nix b/pkgs/by-name/go/google-cloud-sdk/data.nix index 5f38c0ca139b..48f65e093eed 100644 --- a/pkgs/by-name/go/google-cloud-sdk/data.nix +++ b/pkgs/by-name/go/google-cloud-sdk/data.nix @@ -7,10 +7,6 @@ url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-570.0.0-linux-x86_64.tar.gz"; sha256 = "1qx246cy1mcngky4gcg65lzzw64anab9hqpmp6v7dqfqfld64p5k"; }; - x86_64-darwin = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-570.0.0-darwin-x86_64.tar.gz"; - sha256 = "1gk6rrj8p30zraw3n2ajy50vnd5v724s5bnhnilnml03is7ssamd"; - }; aarch64-linux = { url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-570.0.0-linux-arm.tar.gz"; sha256 = "085ykvz0y6madak8aak4bh0qyafqyiflmck0nkcb4xv6kmw6s3fa"; diff --git a/pkgs/by-name/go/google-cloud-sdk/update.sh b/pkgs/by-name/go/google-cloud-sdk/update.sh index e8f3caf832f8..aea218cc1f87 100755 --- a/pkgs/by-name/go/google-cloud-sdk/update.sh +++ b/pkgs/by-name/go/google-cloud-sdk/update.sh @@ -30,9 +30,6 @@ EOF echo -n " x86_64-linux =" genMainSrc "linux" "x86_64" - echo -n " x86_64-darwin =" - genMainSrc "darwin" "x86_64" - echo -n " aarch64-linux =" genMainSrc "linux" "arm" diff --git a/pkgs/by-name/go/goose-cli/librusty_v8.nix b/pkgs/by-name/go/goose-cli/librusty_v8.nix index 3ace8f706ca8..0baf70969fb7 100644 --- a/pkgs/by-name/go/goose-cli/librusty_v8.nix +++ b/pkgs/by-name/go/goose-cli/librusty_v8.nix @@ -6,7 +6,6 @@ fetchLibrustyV8 { shas = { x86_64-linux = "sha256-chV1PAx40UH3Ute5k3lLrgfhih39Rm3KqE+mTna6ysE="; aarch64-linux = "sha256-4IivYskhUSsMLZY97+g23UtUYh4p5jk7CzhMbMyqXyY="; - x86_64-darwin = "sha256-1jUuC+z7saQfPYILNyRJanD4+zOOhXU2ac/LFoytwho="; aarch64-darwin = "sha256-yHa1eydVCrfYGgrZANbzgmmf25p7ui1VMas2A7BhG6k="; }; } diff --git a/pkgs/by-name/go/gopeed/package.nix b/pkgs/by-name/go/gopeed/package.nix index 527cf0124410..25c743f62e52 100644 --- a/pkgs/by-name/go/gopeed/package.nix +++ b/pkgs/by-name/go/gopeed/package.nix @@ -21,7 +21,7 @@ let metaCommon = { description = "Modern download manager"; homepage = "https://github.com/GopeedLab/gopeed"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = [ ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/go/goreman/package.nix b/pkgs/by-name/go/goreman/package.nix index c490c7480a78..3100f4df50c3 100644 --- a/pkgs/by-name/go/goreman/package.nix +++ b/pkgs/by-name/go/goreman/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "goreman"; - version = "0.3.16"; + version = "0.3.19"; src = fetchFromGitHub { owner = "mattn"; repo = "goreman"; tag = "v${finalAttrs.version}"; - hash = "sha256-hOFnLxHsrauOrsbJYKNrwFFT5yYX/rdZUVjscBIGDLo="; + hash = "sha256-WVgMJ/9HTwNY7M0hXW7ag8vyQkIrUg+n0e7RX3LQ6a4="; }; - vendorHash = "sha256-Udm0xdrW8Aky26oxUhdbpsNTWziZxkM0G1ZRKLwyl1Q="; + vendorHash = "sha256-KaqihJ5lu65EQQZGZ6Ym1Q/7jbN6zBdZ2AFovTpQ9S8="; ldflags = [ "-s" diff --git a/pkgs/by-name/go/gosec/package.nix b/pkgs/by-name/go/gosec/package.nix index 296ed052b101..6aeb24a0b7ba 100644 --- a/pkgs/by-name/go/gosec/package.nix +++ b/pkgs/by-name/go/gosec/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "gosec"; - version = "2.27.1"; + version = "2.28.0"; src = fetchFromGitHub { owner = "securego"; repo = "gosec"; rev = "v${finalAttrs.version}"; - hash = "sha256-k4zroP/kqOJe8xdbOSC26cfHGqUoXlJY66MP5s/Saq0="; + hash = "sha256-kj6G8aDTLgAXOzlZGgHPiDGjpczDSwYog5G7Cw0/VNE="; }; - vendorHash = "sha256-lkaIDS7jrRIXxIvE2/EfM3tTP0cAb58AnzCsrBO955A="; + vendorHash = "sha256-jd6nUvuWKygyKxyGCesQQj5OyYp+SD51ZDFXbyaJckc="; subPackages = [ "cmd/gosec" diff --git a/pkgs/by-name/gp/gpg-mdp/package.nix b/pkgs/by-name/gp/gpg-mdp/package.nix index 522cbc8852df..e62916a04459 100644 --- a/pkgs/by-name/gp/gpg-mdp/package.nix +++ b/pkgs/by-name/gp/gpg-mdp/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://tamentis.com/projects/mdp/"; changelog = "https://github.com/tamentis/mdp/releases/tag/v${finalAttrs.version}"; - license = [ lib.licenses.isc ]; + license = lib.licenses.isc; description = "Manage your passwords with GnuPG and a text editor"; }; diff --git a/pkgs/by-name/gp/gptcommit/package.nix b/pkgs/by-name/gp/gptcommit/package.nix index 9a923674f43b..dfcf46a392f1 100644 --- a/pkgs/by-name/gp/gptcommit/package.nix +++ b/pkgs/by-name/gp/gptcommit/package.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Git prepare-commit-msg hook for authoring commit messages with GPT-3"; mainProgram = "gptcommit"; homepage = "https://github.com/zurawiki/gptcommit"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ happysalada ]; platforms = with lib.platforms; all; }; diff --git a/pkgs/by-name/gp/gptscript/package.nix b/pkgs/by-name/gp/gptscript/package.nix index 50f7936a9211..4a992d5fbdee 100644 --- a/pkgs/by-name/gp/gptscript/package.nix +++ b/pkgs/by-name/gp/gptscript/package.nix @@ -29,7 +29,7 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/gptscript-ai/gptscript"; changelog = "https://github.com/gptscript-ai/gptscript/releases/tag/v${finalAttrs.version}"; description = "Build AI assistants that interact with your systems"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ jamiemagee ]; mainProgram = "gptscript"; }; diff --git a/pkgs/by-name/gr/grafana-alloy/package.nix b/pkgs/by-name/gr/grafana-alloy/package.nix index 7a802ca30581..95e24d8005b3 100644 --- a/pkgs/by-name/gr/grafana-alloy/package.nix +++ b/pkgs/by-name/gr/grafana-alloy/package.nix @@ -15,23 +15,23 @@ }: let - beylaVersion = "v3.9.5"; + beylaVersion = "v3.9.8"; in buildGoModule (finalAttrs: { pname = "grafana-alloy"; - version = "1.16.0"; + version = "1.17.1"; src = fetchFromGitHub { owner = "grafana"; repo = "alloy"; tag = "v${finalAttrs.version}"; - hash = "sha256-q5R2noxBZ3OPyZqmB+bx3iJKWFxC2WIprcgh9RwjLzk="; + hash = "sha256-4HjOerOe+v8GkKgID/oBm5Rt7nQiHjucAQkSYGY5zZs="; }; npmDeps = fetchNpmDeps { src = "${finalAttrs.src}/internal/web/ui"; - hash = "sha256-vResNUT4auDsK9ngnJYfMUUOYr/ikPhrvakqCjGq2Q8="; + hash = "sha256-eGyKXsZzyDovsMY2U1uAOn22nyRTYGJT+kEh61857Ls="; }; frontend = buildNpmPackage { @@ -65,7 +65,7 @@ buildGoModule (finalAttrs: { modRoot = "collector"; proxyVendor = true; - vendorHash = "sha256-uTIdurwLfxh27fb1CPCHbHmENk3S6VYNBaGT/5yh3Sc="; + vendorHash = "sha256-C6qVdSfTwmjseCjXKn5f9Q9mn3EBg31CQlLk5QY4YRY="; subPackages = [ "." ]; diff --git a/pkgs/by-name/gr/grafana/package.nix b/pkgs/by-name/gr/grafana/package.nix index 478bec0247dc..2fdf5e419e2d 100644 --- a/pkgs/by-name/gr/grafana/package.nix +++ b/pkgs/by-name/gr/grafana/package.nix @@ -167,7 +167,6 @@ buildGoModule (finalAttrs: { ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-linux" "aarch64-darwin" "riscv64-linux" diff --git a/pkgs/by-name/gr/grafx2/package.nix b/pkgs/by-name/gr/grafx2/package.nix index 9574fd771c43..a7505811a3f9 100644 --- a/pkgs/by-name/gr/grafx2/package.nix +++ b/pkgs/by-name/gr/grafx2/package.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { The program is mostly developed on Haiku, Linux and Windows, but is also portable on many other platforms. ''; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "grafx2-sdl"; maintainers = [ ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/gr/gram/package.nix b/pkgs/by-name/gr/gram/package.nix index 894b90cddfc5..2f860f540a62 100644 --- a/pkgs/by-name/gr/gram/package.nix +++ b/pkgs/by-name/gr/gram/package.nix @@ -80,6 +80,9 @@ rustPlatform.buildRustPackage (finalAttrs: { fontconfig libxcb libxkbcommon + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + git ]; cargoBuildFlags = [ diff --git a/pkgs/by-name/gr/graph-cli/package.nix b/pkgs/by-name/gr/graph-cli/package.nix index 720ec87b7a87..d9d046488eb7 100644 --- a/pkgs/by-name/gr/graph-cli/package.nix +++ b/pkgs/by-name/gr/graph-cli/package.nix @@ -41,7 +41,7 @@ python3Packages.buildPythonApplication (finalAttrs: { meta = { description = "CLI to create graphs from CSV files"; homepage = "https://github.com/mcastorina/graph-cli/"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ leungbk ]; mainProgram = "graph"; }; diff --git a/pkgs/by-name/gr/graphicsmagick/package.nix b/pkgs/by-name/gr/graphicsmagick/package.nix index ef76fb84d481..4c9ab79b4938 100644 --- a/pkgs/by-name/gr/graphicsmagick/package.nix +++ b/pkgs/by-name/gr/graphicsmagick/package.nix @@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: { including important formats like DPX, GIF, JPEG, JPEG-2000, JXL, PNG, PDF, PNM, TIFF, and WebP. ''; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ ambossmann ]; mainProgram = "gm"; platforms = lib.platforms.all; diff --git a/pkgs/by-name/gr/graphite-cli/package.nix b/pkgs/by-name/gr/graphite-cli/package.nix index af2cc83f569d..242a2b4c91c8 100644 --- a/pkgs/by-name/gr/graphite-cli/package.nix +++ b/pkgs/by-name/gr/graphite-cli/package.nix @@ -16,7 +16,6 @@ let suffix = selectSystem { x86_64-linux = "linux-x64"; aarch64-linux = "linux-arm64"; - x86_64-darwin = "darwin-x64"; aarch64-darwin = "darwin-arm64"; }; @@ -33,7 +32,6 @@ let platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; @@ -64,7 +62,6 @@ let hash = selectSystem { x86_64-linux = "sha256-YnG3iw35ZEyGbB9vGdcnj0qkvUfyLuaIEB5l09hkRck="; aarch64-linux = "sha256-Z4yY26hXf8++TX5tJcqufsAULTn9oUL90d9tDZj5d/k="; - x86_64-darwin = "sha256-oV0tanuk2dzB62uChni9CJtSw3eFECQi3aMBc+ZV7Do="; aarch64-darwin = "sha256-6eogi8fMOD5IgRyEdPRxdDa17WytB1JwTpKRzyyhQ2Q="; }; }; diff --git a/pkgs/by-name/gr/greenx/package.nix b/pkgs/by-name/gr/greenx/package.nix index fb360c6728b8..16c1f586823d 100644 --- a/pkgs/by-name/gr/greenx/package.nix +++ b/pkgs/by-name/gr/greenx/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Library for Green’s function based electronic structure theory calculations"; - license = [ lib.licenses.asl20 ]; + license = lib.licenses.asl20; homepage = "https://github.com/nomad-coe/greenX"; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.sheepforce ]; diff --git a/pkgs/by-name/gr/greybird/package.nix b/pkgs/by-name/gr/greybird/package.nix index 29bd35504195..f79e3ea6f623 100644 --- a/pkgs/by-name/gr/greybird/package.nix +++ b/pkgs/by-name/gr/greybird/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Grey and blue theme from the Shimmer Project for GTK-based environments"; homepage = "https://github.com/shimmerproject/Greybird"; - license = [ lib.licenses.gpl2Plus ]; # or alternatively: cc-by-nc-sa-30 or later + license = lib.licenses.gpl2Plus; # or alternatively: cc-by-nc-sa-30 or later platforms = lib.platforms.linux; maintainers = [ lib.maintainers.romildo ]; }; diff --git a/pkgs/by-name/gr/gridtracker2/package.nix b/pkgs/by-name/gr/gridtracker2/package.nix index 29e695afb3f9..bd45ad2b1ed2 100644 --- a/pkgs/by-name/gr/gridtracker2/package.nix +++ b/pkgs/by-name/gr/gridtracker2/package.nix @@ -11,13 +11,13 @@ }: buildNpmPackage (finalAttrs: { pname = "gridtracker2"; - version = "2.260705.2"; + version = "2.260714.0"; src = fetchFromGitLab { owner = "gridtracker.org"; repo = "gridtracker2"; tag = "v${finalAttrs.version}"; - hash = "sha256-LYBzoxLCJqbGI8j9nBDFfo9PPTiVDpbT6hM4TJEab1s="; + hash = "sha256-ZY+p86wgjzVNALBt6+Gn68sZ6tNcsq5wo1QykZccPT0="; }; npmDepsHash = "sha256-5h3bswjVf/8JHhwHRFTUfydN7XXtWbxNHTZ0mLL7RT8="; diff --git a/pkgs/by-name/gr/grobi/package.nix b/pkgs/by-name/gr/grobi/package.nix index ff198cf8db35..553b08f25e73 100644 --- a/pkgs/by-name/gr/grobi/package.nix +++ b/pkgs/by-name/gr/grobi/package.nix @@ -29,7 +29,7 @@ buildGoModule (finalAttrs: { meta = { homepage = "https://github.com/fd0/grobi"; description = "Automatically configure monitors/outputs for Xorg via RANDR"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; platforms = lib.platforms.linux; mainProgram = "grobi"; }; diff --git a/pkgs/by-name/gr/grok-build/package.nix b/pkgs/by-name/gr/grok-build/package.nix index 41384599d35e..8237c9a09f71 100644 --- a/pkgs/by-name/gr/grok-build/package.nix +++ b/pkgs/by-name/gr/grok-build/package.nix @@ -17,7 +17,6 @@ let platform = { x86_64-linux = "linux-x86_64"; aarch64-linux = "linux-aarch64"; - x86_64-darwin = "macos-x86_64"; aarch64-darwin = "macos-aarch64"; }; @@ -29,7 +28,6 @@ let { x86_64-linux = "sha256-Tgc407VVDzyEK8CuafRogVxjKcAIoRDQwnppTcNAETU="; aarch64-linux = "sha256-7a4g6SoKM/7ewao0iPPjgI2MTKISj8jzE/vYGOPpX18="; - x86_64-darwin = "sha256-8xDJT3lft4OY97M4cxF00Uq6IpqJWJXlyHlpr78/ypU="; aarch64-darwin = "sha256-Kpe6Z1vZkqqbmB4ug3dkYNlPRptRDAuO/ii1DSNtdnw="; } .${system}; diff --git a/pkgs/by-name/gr/grok-build/update.sh b/pkgs/by-name/gr/grok-build/update.sh index 371f2853e8ad..5d7553dc2603 100755 --- a/pkgs/by-name/gr/grok-build/update.sh +++ b/pkgs/by-name/gr/grok-build/update.sh @@ -16,7 +16,7 @@ fi update-source-version grok-build "${version}" || true -for system in "aarch64-darwin macos-aarch64" "aarch64-linux linux-aarch64" "x86_64-darwin macos-x86_64" "x86_64-linux linux-x86_64"; do +for system in "aarch64-darwin macos-aarch64" "aarch64-linux linux-aarch64" "x86_64-linux linux-x86_64"; do # shellcheck disable=SC2086 set -- ${system} diff --git a/pkgs/by-name/gr/grpc-client-cli/package.nix b/pkgs/by-name/gr/grpc-client-cli/package.nix index 42f0ce06eff5..71a31fea8340 100644 --- a/pkgs/by-name/gr/grpc-client-cli/package.nix +++ b/pkgs/by-name/gr/grpc-client-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "grpc-client-cli"; - version = "1.24.5"; + version = "1.24.6"; src = fetchFromGitHub { owner = "vadimi"; repo = "grpc-client-cli"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-oN6+INV1psGa0nV5vPuNl9arnXaIU+pipwacHi7rHVY="; + sha256 = "sha256-5T5Ks98nOQmK3wexnSEZ5q1J9JNGorXpkLGWG5ie6Y4="; }; - vendorHash = "sha256-hE+iwPP9hlj/taVKKY+On8RCRIUynZnvVXnAn2y5sxA="; + vendorHash = "sha256-lwat8cp+Tr2KeUc5S2yNZtd3Jadxug0eQKLSsDZlT54="; meta = { description = "Generic gRPC command line client"; diff --git a/pkgs/by-name/gr/grype/package.nix b/pkgs/by-name/gr/grype/package.nix index a55a869ba160..2fd707cefe94 100644 --- a/pkgs/by-name/gr/grype/package.nix +++ b/pkgs/by-name/gr/grype/package.nix @@ -136,7 +136,7 @@ buildGoModule (finalAttrs: { As a vulnerability scanner grype is able to scan the contents of a container image or filesystem to find known vulnerabilities. ''; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab jk diff --git a/pkgs/by-name/gs/gswatcher/package.nix b/pkgs/by-name/gs/gswatcher/package.nix index bafe4c812f8c..539633bde6d4 100644 --- a/pkgs/by-name/gs/gswatcher/package.nix +++ b/pkgs/by-name/gs/gswatcher/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Simple game server monitor and administrative tool"; homepage = "https://github.com/lxndr/gswatcher"; - license = with lib.licenses; [ agpl3Plus ]; + license = lib.licenses.agpl3Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ pluiedev ]; }; diff --git a/pkgs/by-name/gt/gt/package.nix b/pkgs/by-name/gt/gt/package.nix index fd62a2b45d99..1eb3dbf13f10 100644 --- a/pkgs/by-name/gt/gt/package.nix +++ b/pkgs/by-name/gt/gt/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Linux command line tool for setting up USB gadgets using configfs"; homepage = "https://github.com/linux-usb-gadgets/gt"; mainProgram = "gt"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = [ ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/gt/gtk-session-lock/package.nix b/pkgs/by-name/gt/gtk-session-lock/package.nix index f84b82e5bf28..35640bc2cc2e 100644 --- a/pkgs/by-name/gt/gtk-session-lock/package.nix +++ b/pkgs/by-name/gt/gtk-session-lock/package.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { # The author stated "GTK Session Lock is licensed under the GNU General # Public License version 3.0 or any later version approved by me (Cu3PO42)." # Since we don't know if the author will approve later versions, we mark gpl3Only - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ aleksana ]; platforms = lib.platforms.unix; badPlatforms = lib.platforms.darwin; diff --git a/pkgs/by-name/gt/gtk4/package.nix b/pkgs/by-name/gt/gtk4/package.nix index 9b7807508a35..c92464ba6e3d 100644 --- a/pkgs/by-name/gt/gtk4/package.nix +++ b/pkgs/by-name/gt/gtk4/package.nix @@ -60,6 +60,7 @@ compileSchemas ? stdenv.hostPlatform.emulatorAvailable buildPackages, cups, libexecinfo, + llvmPackages, broadwaySupport ? true, testers, darwinMinVersionHook, @@ -130,6 +131,10 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals vulkanSupport [ shaderc # for glslc ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # TODO: Remove when NixOS/nixpkgs#536365 reaches master. + llvmPackages.lld + ] ++ finalAttrs.setupHooks; buildInputs = [ @@ -221,6 +226,10 @@ stdenv.mkDerivation (finalAttrs: { } // lib.optionalAttrs stdenv.hostPlatform.isMusl { NIX_LDFLAGS = "-lexecinfo"; + } + // lib.optionalAttrs stdenv.hostPlatform.isDarwin { + # TODO: Remove when NixOS/nixpkgs#536365 reaches master. + NIX_CFLAGS_LINK = "--ld-path=${lib.getExe' llvmPackages.lld "ld64.lld"}"; }; postPatch = '' diff --git a/pkgs/by-name/gu/gui-for-singbox/package.nix b/pkgs/by-name/gu/gui-for-singbox/package.nix index 11b2ef7cf184..8245518cc16e 100644 --- a/pkgs/by-name/gu/gui-for-singbox/package.nix +++ b/pkgs/by-name/gu/gui-for-singbox/package.nix @@ -32,7 +32,7 @@ let metaCommon = { homepage = "https://github.com/GUI-for-Cores/GUI.for.SingBox"; hydraPlatforms = [ ]; # https://gui-for-cores.github.io/guide/#note - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ vollate ]; }; diff --git a/pkgs/by-name/gu/guilt/package.nix b/pkgs/by-name/gu/guilt/package.nix index 53d4e1249f9d..d3c0688368fd 100644 --- a/pkgs/by-name/gu/guilt/package.nix +++ b/pkgs/by-name/gu/guilt/package.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://github.com/jeffpc/guilt"; maintainers = with lib.maintainers; [ javimerino ]; - license = [ lib.licenses.gpl2 ]; + license = lib.licenses.gpl2; platforms = lib.platforms.all; mainProgram = "guilt"; }; diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix index 595bb7bef992..50191ac86634 100644 --- a/pkgs/by-name/h2/h2o/package.nix +++ b/pkgs/by-name/h2/h2o/package.nix @@ -20,18 +20,20 @@ ruby, withUring ? stdenv.hostPlatform.isLinux, liburing, + withZstandard ? true, + zstd, nixosTests, }: stdenv.mkDerivation (finalAttrs: { pname = "h2o"; - version = "2.3.0-rolling-2026-06-25"; + version = "2.3.0-rolling-2026-06-29"; src = fetchFromGitHub { owner = "h2o"; repo = "h2o"; - rev = "58a9a054300a09235df52954101a49573762e0fc"; - hash = "sha256-TofY3JzWM4XNiMqna5KnmtBJETndJ/YY0sFY/0X99GA="; + rev = "edd7a120bfc4af11ac0cbebce2a43cc1f93f9af1"; + hash = "sha256-WQy+v4zpwzgbMxT43+Nd33+YPynyZIwqzVTaknqjCmE="; }; outputs = [ @@ -53,7 +55,8 @@ stdenv.mkDerivation (finalAttrs: { bison ruby ] - ++ lib.optional withUring liburing; + ++ lib.optional withUring liburing + ++ lib.optional withZstandard zstd; buildInputs = [ brotli @@ -64,11 +67,13 @@ stdenv.mkDerivation (finalAttrs: { zlib wslay ] - ++ lib.optional withBrotli brotli; + ++ lib.optional withBrotli brotli + ++ lib.optional withZstandard zstd; cmakeFlags = [ "-DWITH_BROTLI=${if withBrotli then "ON" else "OFF"}" "-DWITH_MRUBY=${if withMruby then "ON" else "OFF"}" + "-DWITH_ZSTD=${if withZstandard then "ON" else "OFF"}" ]; postInstall = '' diff --git a/pkgs/by-name/ha/hacksguard/package.nix b/pkgs/by-name/ha/hacksguard/package.nix index 72f93cb69085..06b11fa8d32e 100644 --- a/pkgs/by-name/ha/hacksguard/package.nix +++ b/pkgs/by-name/ha/hacksguard/package.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "hacksguard"; - version = "0.1"; + version = "0.3"; __structuredAttrs = true; @@ -17,10 +17,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "Rhacknarok"; repo = "hacksguard"; tag = finalAttrs.version; - hash = "sha256-kS8VF1zD4VV9rSLz4euvNwtOUFWLeW2isAjgjw/iay0="; + hash = "sha256-3HD6FFZBJ7x5uDy0UEwQVaxpuNt4O2wmJgMspeFF6iQ="; }; - cargoHash = "sha256-7Wt2cFKwWT82P2uxOy/lGEWZcCUSu0BNr9JdgRLwBnw="; + cargoHash = "sha256-LLAPbXz8QAEUGs+37ZIFVNW1WfCVQbROfI7wQFaiy3E="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ha/halfempty/package.nix b/pkgs/by-name/ha/halfempty/package.nix index f0550d84e6f9..b8307f554b38 100644 --- a/pkgs/by-name/ha/halfempty/package.nix +++ b/pkgs/by-name/ha/halfempty/package.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "halfempty"; homepage = "https://github.com/googleprojectzero/halfempty/"; maintainers = with lib.maintainers; [ fpletz ]; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/ha/hamrs/package.nix b/pkgs/by-name/ha/hamrs/package.nix index f5efef779242..197c41291142 100644 --- a/pkgs/by-name/ha/hamrs/package.nix +++ b/pkgs/by-name/ha/hamrs/package.nix @@ -21,7 +21,6 @@ let "x86_64-linux" "i686-linux" "aarch64-darwin" - "x86_64-darwin" ]; mainProgram = "hamrs"; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; diff --git a/pkgs/by-name/ha/handbrake/package.nix b/pkgs/by-name/ha/handbrake/package.nix index edc886281aca..fadb57ec8242 100644 --- a/pkgs/by-name/ha/handbrake/package.nix +++ b/pkgs/by-name/ha/handbrake/package.nix @@ -88,23 +88,18 @@ }: let - version = "1.11.1"; + version = "1.11.2"; src = applyPatches { src = fetchFromGitHub { owner = "HandBrake"; repo = "HandBrake"; # uses version commit for logic in version.txt - rev = "4ce99a885cde39b3511016efdb5124726819defb"; - hash = "sha256-oWXNiRK0wbmINnjM3GrOIawcSULTuy3yANfgW8li9F0="; + rev = "9eb6c936803e8b071035b1a77662cb0db58441ea"; + hash = "sha256-f4kBFeW1yVFLlXGAimWsZx+9PKlgR6xrXUZG+CBh28A="; }; patches = [ - # Only needed so the subsequent patch applies - (fetchpatch2 { - url = "https://github.com/HandBrake/HandBrake/commit/c8e16778a330881af36fa32004f887bd73874d15.patch"; - hash = "sha256-i3/X9opDzsZIO7bjLHHZltuQH93uENRF0t7FP7DDdBM="; - }) # Update x265 submodule to v4.2, drop in next release (fetchpatch2 { url = "https://github.com/HandBrake/HandBrake/commit/432514bf839e7280511e4a7afc35fb4868ef4d0b.patch"; @@ -116,6 +111,14 @@ let ]; hash = "sha256-xwIY1pO9mKbrQFjQCENuvntIoiZTHeUVg8axrl3zxxo="; }) + # Update ffmpeg to v8.1.2, drop if backported + (fetchpatch2 { + url = "https://github.com/HandBrake/HandBrake/commit/02b704c5cf2e73d227fbb5be151501b232b0e5f2.patch?full_index=1"; + excludes = [ + "contrib/ffmpeg/module.defs" + ]; + hash = "sha256-fSfLXH+aRwVv9BrDT1oNBHD2VUbAnN3jVu3CJeoaAKg="; + }) ]; }; @@ -150,6 +153,7 @@ let "${src}/contrib/ffmpeg/A22-fix-d3d11-static-pool-size-error.patch" "${src}/contrib/ffmpeg/A23-movenc-set-the-chapters-track-language-to-the-same-a.patch" "${src}/contrib/ffmpeg/A24-movenc-use-version-2-audio-descriptor-for-2-channels.patch" + "${src}/contrib/ffmpeg/A26-avformat-movenc-fix-mov_create_dvd_sub_decoder_speci.patch" ]; }); @@ -173,12 +177,12 @@ let }); svt-av1-hb = svt-av1.overrideAttrs (old: rec { - version = "4.0.1"; + version = "4.1.0"; src = fetchFromGitLab { owner = "AOMediaCodec"; repo = "SVT-AV1"; - rev = "v${version}"; - hash = "sha256-7krVkLZxgolqPTkuyKAx07BekAPacftcGZ44lQTQFZQ="; + tag = "v${version}"; + hash = "sha256-NPJG1SsRlG9kGtUwdJa/uP6DAtF09nCctzeorrvjAhQ="; }; postPatch = (old.postPatch or "") + '' pushd .. diff --git a/pkgs/by-name/ha/handy/package.nix b/pkgs/by-name/ha/handy/package.nix index edb67c0a0dbe..1870494bec50 100644 --- a/pkgs/by-name/ha/handy/package.nix +++ b/pkgs/by-name/ha/handy/package.nix @@ -281,6 +281,5 @@ rustPlatform.buildRustPackage (finalAttrs: { philocalyst ]; platforms = with lib.platforms; linux ++ darwin; - badPlatforms = [ "x86_64-darwin" ]; # We weren't able to get hashes here }; }) diff --git a/pkgs/by-name/ha/haproxy/package.nix b/pkgs/by-name/ha/haproxy/package.nix index 77945c05c7d6..ac08bb4307e0 100644 --- a/pkgs/by-name/ha/haproxy/package.nix +++ b/pkgs/by-name/ha/haproxy/package.nix @@ -33,11 +33,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "haproxy"; - version = "3.4.1"; + version = "3.4.2"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz"; - hash = "sha256-LmLEzk/XfTvHzxflhkMWY0VEVqB4t8hGW48BJbW8Ivg="; + hash = "sha256-sTMNuw1ua8SnLEcIpqnlhVec0RVt/ldjwmMFEFvBKQc="; }; buildInputs = [ diff --git a/pkgs/by-name/ha/harminv/package.nix b/pkgs/by-name/ha/harminv/package.nix index c60ee2b20dff..663bff3c62b5 100644 --- a/pkgs/by-name/ha/harminv/package.nix +++ b/pkgs/by-name/ha/harminv/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Harmonic inversion algorithm of Mandelshtam: decompose signal into sum of decaying sinusoids"; homepage = "https://github.com/NanoComp/harminv"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ sheepforce markuskowa diff --git a/pkgs/by-name/ha/harmonoid/package.nix b/pkgs/by-name/ha/harmonoid/package.nix index be44011022dd..9a78f84bcded 100644 --- a/pkgs/by-name/ha/harmonoid/package.nix +++ b/pkgs/by-name/ha/harmonoid/package.nix @@ -19,20 +19,18 @@ let version = "0.3.22"; url_base = "https://github.com/alexmercerind2/harmonoid-releases/releases/download/v${version}"; url = - rec { + { x86_64-linux = "${url_base}/harmonoid-linux-x86_64.tar.gz"; aarch64-linux = "${url_base}/harmonoid-linux-aarch64.tar.gz"; - x86_64-darwin = "${url_base}/harmonoid-macos-universal.dmg"; - aarch64-darwin = x86_64-darwin; + aarch64-darwin = "${url_base}/harmonoid-macos-universal.dmg"; } .${stdenv.hostPlatform.system} or (throw "${stdenv.hostPlatform.system} is an unsupported platform"); hash = - rec { + { x86_64-linux = "sha256-+fEx30uu0rZiORrtE00xG2piJzpFbfxSZw3OjrhLJyg="; aarch64-linux = "sha256-jXN5i+LudsODNZUzb5SXClqgQxYzanrbZCqB8X0pJRQ="; - x86_64-darwin = "sha256-YYMKrb7ZilfEztL2JTxSdeoDd8xQMrHFtN9N9fmsm3w="; - aarch64-darwin = x86_64-darwin; + aarch64-darwin = "sha256-YYMKrb7ZilfEztL2JTxSdeoDd8xQMrHFtN9N9fmsm3w="; } .${stdenv.hostPlatform.system}; in @@ -95,7 +93,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; license = { diff --git a/pkgs/by-name/ha/harmonoid/update.sh b/pkgs/by-name/ha/harmonoid/update.sh index 3b60cd92159c..b1879fc4425d 100755 --- a/pkgs/by-name/ha/harmonoid/update.sh +++ b/pkgs/by-name/ha/harmonoid/update.sh @@ -17,4 +17,4 @@ macos_hash=$(nix-hash --to-sri --type sha256 "$macos_hash") update-source-version harmonoid "$version" "$linux64_hash" --system=x86_64-linux --ignore-same-version update-source-version harmonoid "$version" "$linux_aarch_hash" --system=aarch64-linux --ignore-same-version -update-source-version harmonoid "$version" "$macos_hash" --system=x86_64-darwin --ignore-same-version +update-source-version harmonoid "$version" "$macos_hash" --system=aarch64-darwin --ignore-same-version diff --git a/pkgs/by-name/ha/hasciicam/package.nix b/pkgs/by-name/ha/hasciicam/package.nix index ed85132e622f..5a62995bd69c 100644 --- a/pkgs/by-name/ha/hasciicam/package.nix +++ b/pkgs/by-name/ha/hasciicam/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hasciicam"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "dyne"; repo = "hasciicam"; tag = "v${finalAttrs.version}"; - hash = "sha256-agwNuIxO+o4HHkjd3TikYuVNgO0vlDPikcZoLDVLCUc="; + hash = "sha256-Zh/yJJHWcD79J2HvUD5h4itg4jlDvpVb4cSwMsB1QOg="; }; __structuredAttrs = true; diff --git a/pkgs/by-name/ha/hashlink/package.nix b/pkgs/by-name/ha/hashlink/package.nix index 27f7118cd6c2..a116f0677d4d 100644 --- a/pkgs/by-name/ha/hashlink/package.nix +++ b/pkgs/by-name/ha/hashlink/package.nix @@ -71,7 +71,6 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; platforms = [ "x86_64-linux" - "x86_64-darwin" ]; maintainers = with lib.maintainers; [ iblech diff --git a/pkgs/by-name/ha/havn/package.nix b/pkgs/by-name/ha/havn/package.nix index 731ac2e94f52..9b80f6bfde08 100644 --- a/pkgs/by-name/ha/havn/package.nix +++ b/pkgs/by-name/ha/havn/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "havn"; - version = "0.3.7"; + version = "0.3.8"; src = fetchFromGitHub { owner = "mrjackwills"; repo = "havn"; tag = "v${finalAttrs.version}"; - hash = "sha256-9xMrzRfnUA8GG+u255oBhdUWL7NACVtj50QwZuMM4yg="; + hash = "sha256-7VRYZK9QzKmhK4LPFRzf6QwgMwAC9aa6/+Fu/4SLQoo="; }; - cargoHash = "sha256-Fu+AU46AY/96uwKqDQcQ9inp2VZAZnq0YxR8N6wcQ2M="; + cargoHash = "sha256-pGfuKfjU/J52GgX8VmnNi9LLRfhQJagVzADn1bkUSvI="; checkFlags = [ # Skip tests that require network access diff --git a/pkgs/by-name/ha/hax11/package.nix b/pkgs/by-name/ha/hax11/package.nix index b3abacbe9fb4..33b586be1186 100644 --- a/pkgs/by-name/ha/hax11/package.nix +++ b/pkgs/by-name/ha/hax11/package.nix @@ -47,7 +47,7 @@ multiStdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/CyberShadow/hax11"; description = "Hackbrary to Hook and Augment X11 protocol calls"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ cybershadow ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/he/headplane-agent/package.nix b/pkgs/by-name/he/headplane-agent/package.nix index d7e795a62a99..583c4941847d 100644 --- a/pkgs/by-name/he/headplane-agent/package.nix +++ b/pkgs/by-name/he/headplane-agent/package.nix @@ -1,22 +1,15 @@ { buildGoModule, - fetchFromGitHub, + headplane, lib, }: buildGoModule (finalAttrs: { pname = "headplane-agent"; __structuredAttrs = true; - # Note, if you are upgrading this, you should upgrade headplane at the same time - version = "0.6.3"; + inherit (headplane) version src; - src = fetchFromGitHub { - owner = "tale"; - repo = "headplane"; - tag = "v${finalAttrs.version}"; - hash = "sha256-zvJUTKRIlHyPMq80teVXBSb7K9Zz44Kuuj2PPi6qIOw="; - }; + vendorHash = headplane.goVendorHash; - vendorHash = "sha256-MvrqKMD+A+qBZmzQv+T9920U5uJop+pjfJpZdm2ZqEA="; subPackages = [ "cmd/hp_agent" ]; ldflags = [ diff --git a/pkgs/by-name/he/headplane/package.nix b/pkgs/by-name/he/headplane/package.nix index 61201296d950..4e844e82b10b 100644 --- a/pkgs/by-name/he/headplane/package.nix +++ b/pkgs/by-name/he/headplane/package.nix @@ -3,32 +3,31 @@ fetchFromGitHub, fetchPnpmDeps, git, - headplane-agent, lib, makeWrapper, nixosTests, - nodejs_22, + nodejs_24, pnpm_10, pnpmConfigHook, stdenv, }: let pname = "headplane"; - # Note, if you are upgrading this, you should upgrade headplane-agent at the same time - version = "0.6.3"; - pnpmDepsHash = "sha256-CsmffCo9Se/4oiOqbcuhjPMuGmR2GL+YfcyWgzBTAh8="; + version = "0.7.0"; + goVendorHash = "sha256-MvrqKMD+A+qBZmzQv+T9920U5uJop+pjfJpZdm2ZqEA="; + pnpmDepsHash = "sha256-OBerkCnB/QL5HGYp2kehzFYEIKSuqpBt0dTFHIypc00="; src = fetchFromGitHub { owner = "tale"; repo = "headplane"; tag = "v${version}"; - hash = "sha256-zvJUTKRIlHyPMq80teVXBSb7K9Zz44Kuuj2PPi6qIOw="; + hash = "sha256-UMAGsrG2xfpgWlsDhf4aWJKoOrUbruucDNOhCJcYmQQ="; }; headplaneSshWasm = buildGoModule { pname = "headplane-ssh-wasm"; inherit version src; subPackages = [ "cmd/hp_ssh" ]; - vendorHash = "sha256-MvrqKMD+A+qBZmzQv+T9920U5uJop+pjfJpZdm2ZqEA="; + vendorHash = goVendorHash; env.CGO_ENABLED = 0; doCheck = false; buildPhase = '' @@ -73,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ git makeWrapper - nodejs_22 + nodejs_24 pnpm_10 pnpmConfigHook ]; @@ -82,14 +81,14 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version src; pnpm = pnpm_10; hash = pnpmDepsHash; - fetcherVersion = 3; + fetcherVersion = 4; }; buildPhase = '' runHook preBuild - cp ${headplaneSshWasm}/hp_ssh.wasm app/hp_ssh.wasm - cp ${headplaneSshWasm}/wasm_exec.js app/wasm_exec.js - pnpm --offline build + cp ${headplaneSshWasm}/hp_ssh.wasm public/hp_ssh.wasm + cp ${headplaneSshWasm}/wasm_exec.js public/wasm_exec.js + pnpm build runHook postBuild ''; @@ -97,18 +96,15 @@ stdenv.mkDerivation (finalAttrs: { runHook preInstall mkdir -p $out/{bin,share/headplane} cp -r build $out/share/headplane/ - cp -r node_modules $out/share/headplane/ cp -r drizzle $out/share/headplane/ - substituteInPlace $out/share/headplane/build/server/index.js \ - --replace "$PWD" "../.." - makeWrapper ${lib.getExe nodejs_22} $out/bin/headplane \ + makeWrapper ${lib.getExe nodejs_24} $out/bin/headplane \ --chdir $out/share/headplane \ --add-flags $out/share/headplane/build/server/index.js runHook postInstall ''; passthru = { - agent = headplane-agent; + inherit goVendorHash; tests = { inherit (nixosTests) headplane; }; }; diff --git a/pkgs/by-name/he/hebbot/package.nix b/pkgs/by-name/he/hebbot/package.nix index bb2469185630..fe4cc079fd7f 100644 --- a/pkgs/by-name/he/hebbot/package.nix +++ b/pkgs/by-name/he/hebbot/package.nix @@ -52,7 +52,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Matrix bot which can generate \"This Week in X\" like blog posts "; homepage = "https://github.com/haecker-felix/hebbot"; changelog = "https://github.com/haecker-felix/hebbot/releases/tag/v2.1"; - license = with lib.licenses; [ agpl3Only ]; + license = lib.licenses.agpl3Only; mainProgram = "hebbot"; maintainers = with lib.maintainers; [ a-kenji ]; }; diff --git a/pkgs/by-name/he/hecate/package.nix b/pkgs/by-name/he/hecate/package.nix index 00ff0afaccea..d4c37415ed26 100644 --- a/pkgs/by-name/he/hecate/package.nix +++ b/pkgs/by-name/he/hecate/package.nix @@ -26,7 +26,7 @@ buildGoModule (finalAttrs: { inherit (finalAttrs.src.meta) homepage; description = "Terminal hex editor"; longDescription = "The Hex Editor From Hell!"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ ramkromberg ]; mainProgram = "hecate"; }; diff --git a/pkgs/by-name/he/heh/package.nix b/pkgs/by-name/he/heh/package.nix index a2d9475ab0ec..64e141311d02 100644 --- a/pkgs/by-name/he/heh/package.nix +++ b/pkgs/by-name/he/heh/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { description = "Cross-platform terminal UI used for modifying file data in hex or ASCII"; homepage = "https://github.com/ndd7xv/heh"; changelog = "https://github.com/ndd7xv/heh/releases/tag/${src.rev}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ piturnah ]; mainProgram = "heh"; }; diff --git a/pkgs/by-name/he/herdr/package.nix b/pkgs/by-name/he/herdr/package.nix index 103b51823232..854ac3a19e22 100644 --- a/pkgs/by-name/he/herdr/package.nix +++ b/pkgs/by-name/he/herdr/package.nix @@ -4,6 +4,7 @@ rustPlatform, fetchFromGitHub, zig_0_15, + installShellFiles, cctools, xcbuild, versionCheckHook, @@ -11,7 +12,7 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "herdr"; - version = "0.7.3"; + version = "0.7.4"; __structuredAttrs = true; @@ -19,10 +20,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "ogulcancelik"; repo = "herdr"; tag = "v${finalAttrs.version}"; - hash = "sha256-Q2yvMs/N6oAF8xnRIrMxEOOV6Aj8aAXQzuvcaux2enA="; + hash = "sha256-dBOQYLFitJ+E3XNz44Ag3CIrBxFj16CmVPp7qil0ssg="; }; - cargoHash = "sha256-DRjcIJXWGxiA9c7xIiQoWU9az2EFjXsnFKu5sC933eE="; + cargoHash = "sha256-XHzZy2tKLbMQy4POmXowUcGf77ZPunG/oQ3P2wOoVls="; zigDeps = zig_0_15.fetchDeps { inherit (finalAttrs) pname version; @@ -33,6 +34,7 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ zig_0_15.hook + installShellFiles ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools @@ -53,6 +55,13 @@ rustPlatform.buildRustPackage (finalAttrs: { chmod -R u+w "$ZIG_GLOBAL_CACHE_DIR/p" ''; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd herdr \ + --bash <("$out/bin/herdr" completion bash) \ + --fish <("$out/bin/herdr" completion fish) \ + --zsh <("$out/bin/herdr" completion zsh) + ''; + nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/hf/hfinger/package.nix b/pkgs/by-name/hf/hfinger/package.nix index 92989dc1325f..585b0416a84d 100644 --- a/pkgs/by-name/hf/hfinger/package.nix +++ b/pkgs/by-name/hf/hfinger/package.nix @@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { mainProgram = "hfinger"; homepage = "https://github.com/CERT-Polska/hfinger"; changelog = "https://github.com/CERT-Polska/hfinger/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/hi/high-tide/package.nix b/pkgs/by-name/hi/high-tide/package.nix index 1916aaca9438..91ceebb4eefb 100644 --- a/pkgs/by-name/hi/high-tide/package.nix +++ b/pkgs/by-name/hi/high-tide/package.nix @@ -73,7 +73,7 @@ python313Packages.buildPythonApplication (finalAttrs: { meta = { description = "Libadwaita TIDAL client for Linux"; homepage = "https://github.com/Nokse22/high-tide"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; mainProgram = "high-tide"; maintainers = with lib.maintainers; [ drafolin diff --git a/pkgs/by-name/hi/hivemind/package.nix b/pkgs/by-name/hi/hivemind/package.nix index 6fd8813dc659..1b0d4315fc2f 100644 --- a/pkgs/by-name/hi/hivemind/package.nix +++ b/pkgs/by-name/hi/hivemind/package.nix @@ -25,7 +25,7 @@ buildGoModule (finalAttrs: { meta = { homepage = "https://github.com/DarthSim/"; description = "Process manager for Procfile-based applications"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.sveitser ]; mainProgram = "hivemind"; }; diff --git a/pkgs/by-name/hk/hk/package.nix b/pkgs/by-name/hk/hk/package.nix index abe884cfe875..b8ed92271a0d 100644 --- a/pkgs/by-name/hk/hk/package.nix +++ b/pkgs/by-name/hk/hk/package.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "hk"; - version = "1.50.0"; + version = "1.51.0"; __structuredAttrs = true; @@ -22,10 +22,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "jdx"; repo = "hk"; tag = "v${finalAttrs.version}"; - hash = "sha256-1sty3JUxiT4UDPmoqR6vql9bQcoSR+xfq3dQzT6u6rY="; + hash = "sha256-kCmujjvh2CACLrzqFal1CFc7RMzECBYsQ4W3ZnJGRV0="; }; - cargoHash = "sha256-oUgAzO7kWVlbw1ZvcjqIdV78tvXQYlV5bwvOSucQvWE="; + cargoHash = "sha256-hICexfvE0swz+g/9r/vR/sG2DUAK5Fj0lDTrkuWujok="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ho/home-assistant-matter-hub/package.nix b/pkgs/by-name/ho/home-assistant-matter-hub/package.nix index c5e6f7188d8c..b6feefcde22d 100644 --- a/pkgs/by-name/ho/home-assistant-matter-hub/package.nix +++ b/pkgs/by-name/ho/home-assistant-matter-hub/package.nix @@ -14,13 +14,13 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "home-assistant-matter-hub"; - version = "2.0.48"; + version = "2.0.49"; src = fetchFromGitHub { owner = "RiDDiX"; repo = "home-assistant-matter-hub"; tag = "v${finalAttrs.version}"; - hash = "sha256-0M1ZSqNyLQECaO0cj4MpDGN5x8wVZeJczMViW5d9IXQ="; + hash = "sha256-AbXm70mxpqIefVyoapdYc8NC+XUTAdfRDhorMP446JI="; }; # The bundled cli.js imports transitive dependencies (e.g. @noble/curves) @@ -38,7 +38,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ; inherit pnpm; fetcherVersion = 4; - hash = "sha256-Bfg2c6gYTUv1rsBGriXUiftlOwGCzPdbdYgW9qhFSLw="; + hash = "sha256-PESk5TexRfwD/4upUA7npGQobhFwgm87oqVS1LqzbRg="; }; __structuredAttrs = true; diff --git a/pkgs/by-name/ho/hoppscotch/package.nix b/pkgs/by-name/ho/hoppscotch/package.nix index e45ed21adc28..ddbfdba315b7 100644 --- a/pkgs/by-name/ho/hoppscotch/package.nix +++ b/pkgs/by-name/ho/hoppscotch/package.nix @@ -17,10 +17,6 @@ let url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_aarch64.dmg"; hash = "sha256-RnLMpXkDAk89T5ogNiVz8zMMdLtXTlAg5nu+sjyczEk="; }; - x86_64-darwin = { - url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_x64.dmg"; - hash = "sha256-dBjwElYc3+TpAbho/8p946VtEDlCVDsfCSidQUKVC/U="; - }; x86_64-linux = { url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_linux_x64.AppImage"; hash = "sha256-irPI613Y1l0j5F+Nzm9v/JXsiJY35D8dQpmMcPMYvmU="; @@ -46,7 +42,6 @@ let mainProgram = "hoppscotch"; platforms = [ "aarch64-darwin" - "x86_64-darwin" "x86_64-linux" ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; diff --git a/pkgs/by-name/ho/hoppscotch/update.sh b/pkgs/by-name/ho/hoppscotch/update.sh index dd18d1942cad..ce3a73ceb62c 100755 --- a/pkgs/by-name/ho/hoppscotch/update.sh +++ b/pkgs/by-name/ho/hoppscotch/update.sh @@ -17,7 +17,6 @@ update-source-version hoppscotch $latestVersion || true for system in \ x86_64-linux \ - x86_64-darwin \ aarch64-darwin; do hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix-instantiate --eval -E "with import $BASEDIR {}; hoppscotch.src.url" --system "$system" | tr -d '"'))) (cd $BASEDIR && update-source-version hoppscotch $latestVersion $hash --system=$system --ignore-same-version) diff --git a/pkgs/by-name/ho/hotdoc/package.nix b/pkgs/by-name/ho/hotdoc/package.nix index 47862db4d978..26576ee89438 100644 --- a/pkgs/by-name/ho/hotdoc/package.nix +++ b/pkgs/by-name/ho/hotdoc/package.nix @@ -115,7 +115,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Tastiest API documentation system"; homepage = "https://hotdoc.github.io/"; - license = [ lib.licenses.lgpl21Plus ]; + license = lib.licenses.lgpl21Plus; maintainers = [ ]; }; } diff --git a/pkgs/by-name/ho/hover/package.nix b/pkgs/by-name/ho/hover/package.nix index 90de28ebf09e..b2718923a68d 100644 --- a/pkgs/by-name/ho/hover/package.nix +++ b/pkgs/by-name/ho/hover/package.nix @@ -48,7 +48,7 @@ let meta = { description = "Build tool to run Flutter applications on desktop"; homepage = "https://github.com/go-flutter-desktop/hover"; - license = [ lib.licenses.bsd3 ]; + license = lib.licenses.bsd3; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.ericdallo ]; }; diff --git a/pkgs/by-name/ho/howl/package.nix b/pkgs/by-name/ho/howl/package.nix index 7f04a9497a48..6c4cd032ace6 100644 --- a/pkgs/by-name/ho/howl/package.nix +++ b/pkgs/by-name/ho/howl/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ euxane ]; mainProgram = "howl"; - # LuaJIT and Howl builds fail for x86_64-darwin and aarch64-linux respectively + # Howl builds fail for aarch64-linux platforms = [ "i686-linux" "x86_64-linux" diff --git a/pkgs/by-name/ht/htmltest/package.nix b/pkgs/by-name/ht/htmltest/package.nix index ff0d289a345e..968a21ddb2bb 100644 --- a/pkgs/by-name/ht/htmltest/package.nix +++ b/pkgs/by-name/ht/htmltest/package.nix @@ -34,7 +34,7 @@ buildGoModule (finalAttrs: { links, images, scripts references work, your alt tags are filled in, etc. ''; homepage = "https://github.com/wjdp/htmltest"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/ht/httpdump/package.nix b/pkgs/by-name/ht/httpdump/package.nix index 352e4d14425c..9285923c7f7e 100644 --- a/pkgs/by-name/ht/httpdump/package.nix +++ b/pkgs/by-name/ht/httpdump/package.nix @@ -29,7 +29,7 @@ buildGoModule { description = "Parse and display HTTP traffic from network device or pcap file"; mainProgram = "httpdump"; homepage = "https://github.com/hsiafan/httpdump"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/hu/hubstaff/package.nix b/pkgs/by-name/hu/hubstaff/package.nix index d1a490cc76c9..d4f97a31b95a 100644 --- a/pkgs/by-name/hu/hubstaff/package.nix +++ b/pkgs/by-name/hu/hubstaff/package.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation { name = "netsoft-com.netsoft.hubstaff"; desktopName = "Hubstaff"; exec = "HubstaffClient"; - icon = "hubstaff"; + icon = "hubstaff-color"; comment = "Time tracking software"; categories = [ "Office" @@ -119,6 +119,13 @@ stdenv.mkDerivation { # Why is this needed? SEGV otherwise. ln -s $opt/data/resources $opt/x86_64/resources + + # Link icons to the standard directory + for dir in $opt/data/resources/hicolor/[0-9]*x[0-9]*; do + size=$(basename "$dir") + mkdir -p $out/share/icons/hicolor/$size/apps + ln -s $dir/apps/hubstaff-color.png $out/share/icons/hicolor/$size/apps/hubstaff-color.png + done runHook postInstall ''; diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix index 30119aa33239..671d3614c1cb 100644 --- a/pkgs/by-name/hu/hugo/package.nix +++ b/pkgs/by-name/hu/hugo/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "hugo"; - version = "0.163.3"; + version = "0.164.0"; src = fetchFromGitHub { owner = "gohugoio"; repo = "hugo"; tag = "v${finalAttrs.version}"; - hash = "sha256-o8MoGrdOXBN/HkcuRsHyyyFLvPvNo3PI0oWBlO6Xfpw="; + hash = "sha256-hpxz5zOggqqYVTUkgwpkWcOa7sdGaWrRJUnXjJx59cA="; }; - vendorHash = "sha256-Bn+RA+EHd3gAKL4N/ibydX7yWNKOSYnIl2pfecfOu1k="; + vendorHash = "sha256-35VeZOtnwgYVuabzJ3+FjvhtoJGZcVRo+TWPTBAWVC4="; checkFlags = let diff --git a/pkgs/by-name/hu/humility/package.nix b/pkgs/by-name/hu/humility/package.nix index 93a032cc52a4..2dfa7dd81007 100644 --- a/pkgs/by-name/hu/humility/package.nix +++ b/pkgs/by-name/hu/humility/package.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage { description = "Debugger for Hubris"; mainProgram = "humility"; homepage = "https://github.com/oxidecomputer/humility"; - license = with lib.licenses; [ mpl20 ]; + license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ therishidesai ]; }; } diff --git a/pkgs/by-name/hu/hunspell/dictionaries.nix b/pkgs/by-name/hu/hunspell/dictionaries.nix index 94eee9bece0f..9ca7e0e7a303 100644 --- a/pkgs/by-name/hu/hunspell/dictionaries.nix +++ b/pkgs/by-name/hu/hunspell/dictionaries.nix @@ -884,7 +884,7 @@ rec { meta = { description = "Hunspell dictionary for Russian, updated version as used in Mozilla products"; homepage = "https://github.com/Goudron/ru-spelling-dictionary"; - license = [ lib.licenses.mpl20 ]; + license = lib.licenses.mpl20; }; }; @@ -896,7 +896,7 @@ rec { dictFileName = "cs_CZ"; shortDescription = "Czech (Czechia)"; readmeFile = "README_cs.txt"; - license = with lib.licenses; [ gpl2 ]; + license = lib.licenses.gpl2; }; # SLOVAK @@ -988,7 +988,7 @@ rec { dictFileName = "he_IL"; shortDescription = "Hebrew (Israel)"; readmeFile = "README_he_IL.txt"; - license = with lib.licenses; [ agpl3Plus ]; + license = lib.licenses.agpl3Plus; }; # THAI @@ -1008,7 +1008,7 @@ rec { meta = { description = "Hunspell dictionary for Central Thai (Thailand)"; homepage = "https://github.com/SyafiqHadzir/Hunspell-TH"; - license = with lib.licenses; [ gpl3 ]; + license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ toastal ]; # looking for a native speaker platforms = lib.platforms.all; }; @@ -1053,7 +1053,7 @@ rec { sourceRoot = "no"; readmeFile = "README_hyph_NO.txt"; shortDescription = "Norwegian Bokmål (Norway)"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; }; nn_NO = nn-no; @@ -1063,7 +1063,7 @@ rec { sourceRoot = "no"; readmeFile = "README_hyph_NO.txt"; shortDescription = "Norwegian Nynorsk (Norway)"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; }; # TOKI PONA @@ -1121,7 +1121,7 @@ rec { dictFileName = "pt_BR"; shortDescription = "Portuguese (Brazil)"; readmeFile = "README_pt_BR.txt"; - license = with lib.licenses; [ lgpl3 ]; + license = lib.licenses.lgpl3; }; pt_PT = pt-pt; @@ -1194,7 +1194,7 @@ rec { meta = { description = "Hunspell dictionary for ${shortDescription} from rospell"; homepage = "https://sourceforge.net/projects/rospell/"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ Andy3153 ]; }; }; diff --git a/pkgs/by-name/hy/hydra-cli/package.nix b/pkgs/by-name/hy/hydra-cli/package.nix index 549b5eec7d49..8464c3962d9b 100644 --- a/pkgs/by-name/hy/hydra-cli/package.nix +++ b/pkgs/by-name/hy/hydra-cli/package.nix @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Client for the Hydra CI"; mainProgram = "hydra-cli"; homepage = "https://github.com/nlewo/hydra-cli"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ lewo aleksana diff --git a/pkgs/by-name/hy/hydralauncher/package.nix b/pkgs/by-name/hy/hydralauncher/package.nix index 4a851918421a..6a4348de37f5 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 = "4.0.4"; + version = "4.0.5"; src = fetchurl { url = "https://github.com/hydralauncher/hydra/releases/download/v${version}/hydralauncher-${version}.AppImage"; - hash = "sha256-0ORi6JAhws3HgApmwv7sgC9gJE/KcKtKxgz3CKD6BSw="; + hash = "sha256-9TAsBiSJ9ZjGoKuHDbPibu/ZDBM9kdk9BlY5zKysVQ4="; }; appimageContents = appimageTools.extractType2 { inherit pname src version; }; diff --git a/pkgs/by-name/hy/hyperscan/package.nix b/pkgs/by-name/hy/hyperscan/package.nix index 41fe9c8ac965..d32212804412 100644 --- a/pkgs/by-name/hy/hyperscan/package.nix +++ b/pkgs/by-name/hy/hyperscan/package.nix @@ -129,7 +129,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ avnik ]; platforms = [ "x86_64-linux" - "x86_64-darwin" ]; license = lib.licenses.bsd3; }; diff --git a/pkgs/by-name/ib/ibm-plex/fonts.nix b/pkgs/by-name/ib/ibm-plex/fonts.nix index cda27fb6be87..9a5dd7b1748c 100644 --- a/pkgs/by-name/ib/ibm-plex/fonts.nix +++ b/pkgs/by-name/ib/ibm-plex/fonts.nix @@ -6,10 +6,10 @@ version = "1.1.0"; }; mono = { - hash = "sha256-OwUmrPfEehLDz0fl2ChYLK8FQM2p0G1+EMrGsYEq+6g="; + hash = "sha256-GK9KStu5KQ5g5+IUwJq4L+a5gOwzsNXH80OOIbyvOnM="; name = "IBM Plex Mono"; - url = "https://github.com/IBM/plex/releases/download/@ibm/plex-mono@1.1.0/ibm-plex-mono.zip"; - version = "1.1.0"; + url = "https://github.com/IBM/plex/releases/download/%40ibm/plex-mono%402.5.0/ibm-plex-mono.zip"; + version = "2.5.0"; }; sans = { hash = "sha256-mK+8GGl2ugF2+fS6yd3p5NWPHHcKEJWiShDS3lihOlI="; diff --git a/pkgs/by-name/ib/ibm-plex/package.nix b/pkgs/by-name/ib/ibm-plex/package.nix index b87f6cabff55..8f3f7bbcf445 100644 --- a/pkgs/by-name/ib/ibm-plex/package.nix +++ b/pkgs/by-name/ib/ibm-plex/package.nix @@ -62,7 +62,7 @@ in assert lib.assertMsg (unknownFamilies == [ ]) "Unknown font(s): ${toString unknownFamilies}"; symlinkJoin { pname = "ibm-plex"; - version = "0-unstable-2026-02-12"; + version = "0-unstable-2026-05-26"; paths = lib.attrValues fontDerivations; passthru = fontDerivations // { updateScript = ./update.py; diff --git a/pkgs/by-name/ib/ibmcloud-cli/package.nix b/pkgs/by-name/ib/ibmcloud-cli/package.nix index 8042e9afd4a0..ae09b5cb8e96 100644 --- a/pkgs/by-name/ib/ibmcloud-cli/package.nix +++ b/pkgs/by-name/ib/ibmcloud-cli/package.nix @@ -21,13 +21,7 @@ let "s390x" else throw "Unsupported arch: ${stdenv.hostPlatform.system}"; - platform = - if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then - "macos_arm64" - else if stdenv.hostPlatform.isDarwin then - "macos" - else - "linux_${arch}"; + platform = if stdenv.hostPlatform.isDarwin then "macos_arm64" else "linux_${arch}"; in stdenv.mkDerivation (finalAttrs: { pname = "ibmcloud-cli"; @@ -37,7 +31,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://download.clis.cloud.ibm.com/ibm-cloud-cli/${finalAttrs.version}/binaries/IBM_Cloud_CLI_${finalAttrs.version}_${platform}.tgz"; hash = { - "x86_64-darwin" = "sha256-/sekaJxa8+inOBsHucyPE3yWM+Z+64jArGwCht8Corc="; "aarch64-darwin" = "sha256-JrTFbufKjX9uUwUcfxCDjqbZx6drgSmqn0F/xtce/mE="; "x86_64-linux" = "sha256-Zu6XFQeD9Dlny6cex7X6P428MiQftwn9RR4QL3H/0AU="; "aarch64-linux" = "sha256-pfHhAszhbbLKkJnwP94dCaDZNFTLr+2tnO3aHxOch+U="; diff --git a/pkgs/by-name/ib/ibmcloud-cli/update.sh b/pkgs/by-name/ib/ibmcloud-cli/update.sh index 26f1525a3202..2d340e8d12ee 100755 --- a/pkgs/by-name/ib/ibmcloud-cli/update.sh +++ b/pkgs/by-name/ib/ibmcloud-cli/update.sh @@ -19,7 +19,6 @@ for system in \ i686-linux \ powerpc64le-linux \ s390x-linux \ - x86_64-darwin \ aarch64-darwin; do tmp=$(mktemp -d) curl -fsSL -o $tmp/ibmcloud-cli $(nix-instantiate --eval -E "with import ./. {}; ibmcloud-cli.src.url" --system "$system" | tr -d '"') diff --git a/pkgs/by-name/ib/ibtool/package.nix b/pkgs/by-name/ib/ibtool/package.nix index 7729742bf4c5..9d87e11e4fe4 100644 --- a/pkgs/by-name/ib/ibtool/package.nix +++ b/pkgs/by-name/ib/ibtool/package.nix @@ -31,7 +31,7 @@ python3Packages.buildPythonApplication (finalAttrs: { meta = { description = "Apple's ibtool reimplementation"; homepage = "https://github.com/viraptor/ibtool"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; mainProgram = "ibtool"; maintainers = [ lib.maintainers.viraptor ]; }; diff --git a/pkgs/by-name/ic/icesprog/package.nix b/pkgs/by-name/ic/icesprog/package.nix index a453534f7820..ed02168f6275 100644 --- a/pkgs/by-name/ic/icesprog/package.nix +++ b/pkgs/by-name/ic/icesprog/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "iCESugar FPGA flash utility"; mainProgram = "icesprog"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ RossComputerGuy ]; homepage = "https://github.com/wuxx/icesugar"; }; diff --git a/pkgs/by-name/id/ideviceinstaller/package.nix b/pkgs/by-name/id/ideviceinstaller/package.nix index 37bb21b9a909..42939866de7c 100644 --- a/pkgs/by-name/id/ideviceinstaller/package.nix +++ b/pkgs/by-name/id/ideviceinstaller/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, autoreconfHook, pkg-config, + gitUpdater, usbmuxd, libimobiledevice, libzip, @@ -11,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ideviceinstaller"; - version = "1.1.1+date=2023-04-30"; + version = "1.2.0"; src = fetchFromGitHub { owner = "libimobiledevice"; repo = "ideviceinstaller"; - rev = "71ec5eaa30d2780c2614b6b227a2229ea3aeb1e9"; - hash = "sha256-YsQwAlt71vouYJzXl0P7b3fG/MfcwI947GtvN4g3/gM="; + tag = finalAttrs.version; + hash = "sha256-V4zJ85wF3jjBlWOY+oxo6veNeiSHVAUBipmokzhRgaI="; }; nativeBuildInputs = [ @@ -40,6 +41,8 @@ stdenv.mkDerivation (finalAttrs: { export RELEASE_VERSION=${finalAttrs.version} ''; + passthru.updateScript = gitUpdater { }; + meta = { homepage = "https://github.com/libimobiledevice/ideviceinstaller"; description = "List/modify installed apps of iOS devices"; diff --git a/pkgs/by-name/if/ifwifi/package.nix b/pkgs/by-name/if/ifwifi/package.nix index dd5cba23547a..f1413bb283e7 100644 --- a/pkgs/by-name/if/ifwifi/package.nix +++ b/pkgs/by-name/if/ifwifi/package.nix @@ -50,7 +50,7 @@ rustPlatform.buildRustPackage (finalAttrs: { project that gave me almost everything I wanted to create this tool. ''; homepage = "https://github.com/araujobsd/ifwifi"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = [ ]; # networkmanager doesn't work on darwin # even though the `wifiscanner` crate would work diff --git a/pkgs/by-name/ii/iir1/package.nix b/pkgs/by-name/ii/iir1/package.nix index 2eb083070b3a..fb523df04a70 100644 --- a/pkgs/by-name/ii/iir1/package.nix +++ b/pkgs/by-name/ii/iir1/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { description = "DSP IIR realtime filter library written in C++"; downloadPage = "https://github.com/berndporr/iir1"; changelog = "https://github.com/berndporr/iir1/releases/tag/${finalAttrs.src.rev}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/ik/ikill/package.nix b/pkgs/by-name/ik/ikill/package.nix index 9c656b996fb8..1e19b3f531b9 100644 --- a/pkgs/by-name/ik/ikill/package.nix +++ b/pkgs/by-name/ik/ikill/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Interactively kill running processes"; homepage = "https://github.com/pombadev/ikill"; maintainers = with lib.maintainers; [ zendo ]; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; platforms = lib.platforms.linux; mainProgram = "ikill"; }; diff --git a/pkgs/by-name/il/iloader/package.nix b/pkgs/by-name/il/iloader/package.nix index 6d6b87d5ad00..2caf94bfb38e 100644 --- a/pkgs/by-name/il/iloader/package.nix +++ b/pkgs/by-name/il/iloader/package.nix @@ -123,7 +123,6 @@ rustPlatform.buildRustPackage (finalAttrs: { "aarch64-linux" "x86_64-linux" "aarch64-darwin" - "x86_64-darwin" ]; }; }) diff --git a/pkgs/by-name/im/imagineer/package.nix b/pkgs/by-name/im/imagineer/package.nix index 24e108b02ff0..3114786491e2 100644 --- a/pkgs/by-name/im/imagineer/package.nix +++ b/pkgs/by-name/im/imagineer/package.nix @@ -51,7 +51,5 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; maintainers = [ lib.maintainers.progrm_jarvis ]; mainProgram = "ig"; - # The last successful Darwin Hydra build was in 2024 - broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; }) diff --git a/pkgs/by-name/im/imapdedup/package.nix b/pkgs/by-name/im/imapdedup/package.nix index b275569cb47d..8b620e6b1656 100644 --- a/pkgs/by-name/im/imapdedup/package.nix +++ b/pkgs/by-name/im/imapdedup/package.nix @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication (finalAttrs: { description = "Duplicate email message remover"; homepage = "https://github.com/quentinsf/IMAPdedup"; maintainers = with lib.maintainers; [ sigmanificient ]; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; mainProgram = "imapdedup"; }; }) diff --git a/pkgs/by-name/im/imhex/package.nix b/pkgs/by-name/im/imhex/package.nix index 0ce61eea2f86..bc7fc486fa8c 100644 --- a/pkgs/by-name/im/imhex/package.nix +++ b/pkgs/by-name/im/imhex/package.nix @@ -144,7 +144,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Hex Editor for Reverse Engineers, Programmers and people who value their retinas when working at 3 AM"; homepage = "https://github.com/WerWolv/ImHex"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ kashw2 cafkafk diff --git a/pkgs/by-name/im/immersed/package.nix b/pkgs/by-name/im/immersed/package.nix index 38ed8ab5fd60..dd97389eea7d 100644 --- a/pkgs/by-name/im/immersed/package.nix +++ b/pkgs/by-name/im/immersed/package.nix @@ -9,7 +9,7 @@ let pname = "immersed"; version = "11.0.0"; - sources = lib.mapAttrs (_: fetchurl) rec { + sources = lib.mapAttrs (_: fetchurl) { x86_64-linux = { url = "https://web.archive.org/web/20260306043741/https://static.immersed.com/dl/Immersed-x86_64.AppImage"; hash = "sha256-GbckZ/WK+7/PFQvTfUwwePtufPKVwIwSPh+Bo/cG7ko="; @@ -18,11 +18,10 @@ let url = "https://web.archive.org/web/20260306043741/https://static.immersed.com/dl/Immersed-aarch64.AppImage"; hash = "sha256-3BokV30y6QRjE94K7JQ6iIuQw1t+h3BKZY+nEFGTVHI="; }; - x86_64-darwin = { + aarch64-darwin = { url = "https://web.archive.org/web/20260306043741/https://static.immersed.com/dl/Immersed.dmg"; hash = "sha256-L5nrkchXD1NIQCknYHVhBWbVJVkkHvKaDjuk9qiY340="; }; - aarch64-darwin = x86_64-darwin; }; src = sources.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); diff --git a/pkgs/by-name/im/immich-kiosk/package.nix b/pkgs/by-name/im/immich-kiosk/package.nix index 113ce904c923..0ca88bb23802 100644 --- a/pkgs/by-name/im/immich-kiosk/package.nix +++ b/pkgs/by-name/im/immich-kiosk/package.nix @@ -10,28 +10,28 @@ buildGoModule rec { pname = "immich-kiosk"; - version = "0.39.3"; + version = "0.41.0"; src = fetchFromGitHub { owner = "damongolding"; repo = "immich-kiosk"; tag = "v${version}"; - hash = "sha256-kdTEvH8MqL3oXe0QZlPTVpeByLpqAdNfPGfu5f2G6g0="; + hash = "sha256-mr0cxHdekpzfKfJ2IKpm79vTu5qnSl8q2c8eWose7tg="; }; postPatch = '' # Delete vendor directory to regenerate it consistently across platforms rm -rf vendor # immich-kiosk bumps go at a faster cadence than nixpkgs - sed 's/^go 1\.26\.\d+$/go 1.26/' go.mod + sed -i -E 's/^go 1\.26\.[0-9]+$/go 1.26/' go.mod ''; - vendorHash = "sha256-y6Xl00G+mkhRKVGwMS0WCXZhQqqGGX5qY8PhMxtw7z8="; + vendorHash = "sha256-5mMU73/XvHfvT8VaseSymZjDalvHj/KR6cTz1nvXHPQ="; proxyVendor = true; npmDeps = fetchNpmDeps { inherit src; sourceRoot = "${src.name}/frontend"; - hash = "sha256-lNON0/lxix2aczC0+m7Er5Te1+4fsSoLkk6Z2pYzQYQ="; + hash = "sha256-1m0JvPZDYjd2cNy9atENRS3/GHWzLnPISwGnJbSZwAo="; }; # Frontend is in a subdirectory npmRoot = "frontend"; diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix index c0e2725eaa57..674172bd4291 100644 --- a/pkgs/by-name/im/immich/package.nix +++ b/pkgs/by-name/im/immich/package.nix @@ -115,13 +115,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "immich"; - version = "3.0.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "immich-app"; repo = "immich"; tag = "v${finalAttrs.version}"; - hash = "sha256-DLDzICjhvIErVm15CLoLnd8WwQl+lcalXhz2xmWposA="; + hash = "sha256-20MxwDCU9+SyZDx7PkLSfbW+mTGxGqITQRl7EgzkmkA="; }; pnpmDeps = fetchPnpmDeps { @@ -137,6 +137,8 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeBuildInputs = [ + binaryen + extism-js nodejs pkg-config pnpmConfigHook @@ -174,7 +176,7 @@ stdenv.mkDerivation (finalAttrs: { # If exiftool-vendored.pl isn't found, exiftool is searched for on the PATH rm node_modules/.pnpm/node_modules/exiftool-vendored.pl - pnpm --filter immich... build + pnpm --filter immich... --filter immich-web... --filter @immich/plugin-core... build runHook postBuild ''; @@ -196,9 +198,9 @@ stdenv.mkDerivation (finalAttrs: { -o -name '*.target.mk' \ \) -exec rm -r {} + - mkdir -p "$packageOut/build/plugins" - ln -s '${finalAttrs.plugin-core}' "$packageOut/build/plugins/immich-plugin-core" - ln -s '${finalAttrs.web}' "$packageOut/build/www" + mkdir -p "$packageOut/build/plugins/immich-plugin-core" + cp -r packages/plugin-core/{dist,manifest.json} "$packageOut/build/plugins/immich-plugin-core/" + cp -r web/build "$packageOut/build/www" ln -s '${geodata}' "$packageOut/build/geodata" echo '${builtins.toJSON buildLock}' > "$packageOut/build/build-lock.json" @@ -222,65 +224,6 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - plugin-core = stdenv.mkDerivation { - pname = "immich-plugin-core"; - inherit (finalAttrs) version src pnpmDeps; - - nativeBuildInputs = [ - binaryen - extism-js - nodejs - pnpmConfigHook - pnpm - ]; - - buildPhase = '' - runHook preBuild - - pnpm --filter @immich/plugin-core... build - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - cd packages/plugin-core - mkdir $out - cp -r dist manifest.json $out - - runHook postInstall - ''; - }; - - web = stdenv.mkDerivation { - pname = "immich-web"; - inherit (finalAttrs) version src pnpmDeps; - - nativeBuildInputs = [ - nodejs - pnpmConfigHook - pnpm - ]; - - buildPhase = '' - runHook preBuild - - pnpm --filter immich-web... build - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - cd web - cp -r build $out - - runHook postInstall - ''; - }; - passthru = { tests = { inherit (nixosTests) immich immich-vectorchord-reindex; diff --git a/pkgs/by-name/in/incus/lts.nix b/pkgs/by-name/in/incus/lts.nix index 2b0318ca1a25..07d2b749ca21 100644 --- a/pkgs/by-name/in/incus/lts.nix +++ b/pkgs/by-name/in/incus/lts.nix @@ -1,155 +1,8 @@ import ./generic.nix { - hash = "sha256-7s2gc+78O8jKypVe1itaUrsLPa2mLjNgUUrR/cv7ITA="; - version = "7.0.0"; - vendorHash = "sha256-6irMB3hpWcxDuMQBxWXnhMLAOwTAl63JX6JJZMQXf5E="; + hash = "sha256-Ivj0vWKuhgb4VvyxcuB+CXsJ02zwo65rqxD5/cLUmSk="; + version = "7.0.1"; + vendorHash = "sha256-F3LhWVjckU0ypgOppHztjR6hDB6enHxoDmRWcSDfwQE="; lts = true; - patches = fetchpatch2: [ - (fetchpatch2 { - name = "doc-devices-disk_Fix-broken-link.patch"; - url = "https://github.com/lxc/incus/commit/faa636b70c05a5cca0346492a0586d5747e4b117.patch?full_index=1"; - hash = "sha256-UsfzSeLJq0B9xDmd124ITzFBJzg2w1xXNK6TavQ5iMs="; - }) - (fetchpatch2 { - name = "incusd-instance-qemu_Fix-version-detection-for-qemu-kvm.patch"; - url = "https://github.com/lxc/incus/commit/a5f50d36eaa41580f2233b05936bd29fe1b15100.patch?full_index=1"; - hash = "sha256-Qwu2oljB7COZB2m3W/9Y5wCCZyxvLj4ZUHcNqtoDGzk="; - }) - (fetchpatch2 { - name = "incusd_Re-introduce-core-scheduling-detection.patch"; - url = "https://github.com/lxc/incus/commit/1e6ce18e8cd92b5b3eb4346e7bd27fd4a7d1fb9b.patch?full_index=1"; - hash = "sha256-RLy8bcod55g8vtXxChte4oalApw7d/gZg8No6BUZQS0="; - }) - (fetchpatch2 { - name = "incusd-instance-lxc_Fix-swap=false-failure.patch"; - url = "https://github.com/lxc/incus/commit/5f2cdf7545c5398290dc507313de9ee547fe803f.patch?full_index=1"; - hash = "sha256-Ux6mm8Y4q68fj//hG7k+bXMjqhGDOxGNm64De1pwcYY="; - }) - (fetchpatch2 { - name = "incusd-forknet_Persist-DHCPv6-client-DUID-across-restarts.patch"; - url = "https://github.com/lxc/incus/commit/47377e345930e77d3fbce29d037fc7dbd6823dcf.patch?full_index=1"; - hash = "sha256-CWaNaDYuBBLahxkqnM0FQZraVkvBSbrx1+8dcB8Vfbg="; - }) - (fetchpatch2 { - name = "incusd-forknet_Include-FQDN-in-DHCPv6-INFO-requests.patch"; - url = "https://github.com/lxc/incus/commit/d7f1c9d75ca33eb2ddb0bf10cec934fd6e352089.patch?full_index=1"; - hash = "sha256-3zyADLiPUuiGLwdeISj5lUk3tkAayQGaRI+/yBHrvuM="; - }) - (fetchpatch2 { - name = "incusd-forknet_Properly-renew-stateful-DHCPv6.patch"; - url = "https://github.com/lxc/incus/commit/3b127758c17752302b3f4bf907f42e926ab664e4.patch?full_index=1"; - hash = "sha256-+dcdeZwuyTWH7yfPEDqKOax/lS1Yqvwn9ooqJxKD3jA="; - }) - (fetchpatch2 { - name = "incusd-forknet_Add-jitter-to-DHCPv6-renewal.patch"; - url = "https://github.com/lxc/incus/commit/2b24a260b6177c033047f270286933563f05a999.patch?full_index=1"; - hash = "sha256-grMspYyqn4Zl1Kn+hFeUfeIevdwszJc0x2YDC2JILKw="; - }) - (fetchpatch2 { - name = "incusd-device-nic_bridged_Fix-swapped-IPv4-IPv6-DNS-record.patch"; - url = "https://github.com/lxc/incus/commit/33ffcf71745e138dd4f3546839115c293e6be083.patch?full_index=1"; - hash = "sha256-E8Plz9qdoTt3id9I5jbZYMKQt+kUrKmXmtMJ6IXlRJg="; - }) - (fetchpatch2 { - name = "doc-authorization_Fix-reference-to-old-manager-relation.patch"; - url = "https://github.com/lxc/incus/commit/c65ac0f4e6e94859b8565bce41bbf1595f4a8085.patch?full_index=1"; - hash = "sha256-6wEz3uxWauIibBkH+OdB7+VsFySmugt6wk61qMayzYo="; - }) - (fetchpatch2 { - name = "incusd-network-acl_Fix-issue-with-instances-in-different-project-than-ACL.patch"; - url = "https://github.com/lxc/incus/commit/2a3584b6fccf152be42cf5614e54241bdb13e671.patch?full_index=1"; - hash = "sha256-CXE5Bowk3ZPup6oVDEJb9ucsJoXhXu/kU7gGCghhtjQ="; - }) - (fetchpatch2 { - name = "incusd-projects_Fix-targeting-on-project-delete.patch"; - url = "https://github.com/lxc/incus/commit/3a104e4dc24897f0d6543136bb1043fcd4a33632.patch?full_index=1"; - hash = "sha256-kTFkJqbjzdq5jvNxKw8YMPR04WRj4t5IS6ymoGyXDXE="; - }) - (fetchpatch2 { - name = "test-network_acl_Add-test-for-ACL-used-by-instance-in-different-project.patch"; - url = "https://github.com/lxc/incus/commit/41878729f06e9c31df9d4fac20fb8c384608577c.patch?full_index=1"; - hash = "sha256-YR2Akus4vp3vNvHEmsJUh/3gbEf3R/cFUOVvt9u/wEU="; - }) - (fetchpatch2 { - name = "incusd-instance-qemu_Remove-deprecated-QEMU-flag.patch"; - url = "https://github.com/lxc/incus/commit/c1f18c78fc6bc4850df20574bdcc541e5eefc4ac.patch?full_index=1"; - hash = "sha256-kbn4Yd/G23FCFA0Ch0+d81HUxCbcoiOzHfZ0MW+VlzE="; - }) - (fetchpatch2 { - name = "incusd-cluster_Re-order-evacuations-to-happen-earlier-on-shutdown.patch"; - url = "https://github.com/lxc/incus/commit/5b29ecc164ef28239d2e2a874a7c871a2e419083.patch?full_index=1"; - hash = "sha256-jpyJYjiZvRw/aOGsykEx8uotRBF7p1q5O08PVhyQtvk="; - }) - (fetchpatch2 { - name = "incusd-storage_Fix-unsafe-access-to-backup-data.patch"; - url = "https://github.com/lxc/incus/commit/d71c5053a4c8318e6eb07337a7a4a07a6608ef73.patch?full_index=1"; - hash = "sha256-/mH0/KmX9sG8HZTcdk8MT+QZtNqZa934wcHptvdVtXM="; - }) - (fetchpatch2 { - name = "incusd-storage_Guard-nil-ExpiresAt-in-CreateCustomVolumeFromBackup.patch"; - url = "https://github.com/lxc/incus/commit/ab6b7dff0c770044875d9d26a6254a7075b4d00b.patch?full_index=1"; - hash = "sha256-d7VUetQzUTBq3GLYM1JKy2KDbBxOW5Lg7Di1/JPNzSE="; - }) - (fetchpatch2 { - name = "incusd-storage_Guard-nil-fields-in-createDependentVolumesFromBackup.patch"; - url = "https://github.com/lxc/incus/commit/98e64f0a6fcfdc9676eea0246418d490c53297bf.patch?full_index=1"; - hash = "sha256-+lB7eHsGZ/dW7aL4/wIWD4AF6t7s4QYfAld1bQOw2tQ="; - }) - (fetchpatch2 { - name = "incusd-storage-s3_Confine-multipart-uploads-with-os.Root.patch"; - url = "https://github.com/lxc/incus/commit/a6012422b45c86f3b1956788cff5d75c604ad838.patch?full_index=1"; - hash = "sha256-u3NLKE8Rh8i6HMbJ0KNhH7gbuwIpJ1SPqiyVoiuw9Sc="; - }) - (fetchpatch2 { - name = "incusd-instances_Check-source-instance-access-on-copy.patch"; - url = "https://github.com/lxc/incus/commit/1e3ffc53a10950e55de62ac1e0d612be597b84eb.patch?full_index=1"; - hash = "sha256-1foxIu1rWcK1QbpmAPoQ46Tl1mrPvoctPnDhKRTWbd0="; - }) - (fetchpatch2 { - name = "incusd-storage_Check-source-volume-access-on-copy.patch"; - url = "https://github.com/lxc/incus/commit/2e01078366e2653712719dec82318e51c6d21b28.patch?full_index=1"; - hash = "sha256-FP9v/8V0ZFLgy1tODKLJlw5f/6qJ8AMP/yme2YhYSaA="; - }) - (fetchpatch2 { - name = "incusd-images_Validate-fingerprint-on-direct-download.patch"; - url = "https://github.com/lxc/incus/commit/46d6ef232186df5535c49ca9f3597cab381f9b86.patch?full_index=1"; - hash = "sha256-R8gsvdmb7KVC6W1vFH1CojzhrGNgNiFOOTYbCrDAajg="; - }) - (fetchpatch2 { - name = "shared-validate_Reject-compression-algorithm-arguments.patch"; - url = "https://github.com/lxc/incus/commit/873a032a461df6b09b7586435b592873863a4e88.patch?full_index=1"; - hash = "sha256-QvxGxwHvswUZFst71zA12ZdxNIErl1LkaNyQdcPiglI="; - }) - (fetchpatch2 { - name = "incusd-instance_Confine-template-access-to-instance-root.patch"; - url = "https://github.com/lxc/incus/commit/cbefa31ae0da8fd96361178aed3a3c631e098fef.patch?full_index=1"; - hash = "sha256-ZOHqnlIG6LyIUO6WP76SZJKTeqoiw9qj2YByGxqGP+E="; - }) - (fetchpatch2 { - name = "incusd-instance_Enforce-project-restrictions-on-snapshot-restore.patch"; - url = "https://github.com/lxc/incus/commit/3fe3bc99891940fcd3e758d49f65a853104fcd6b.patch?full_index=1"; - hash = "sha256-j+lTbDaUjnZRY0lmaOSH4oKNAeIe5GXTwd1oM50it+Y="; - }) - (fetchpatch2 { - name = "incusd-exec_Reject-exec-output-symlink.patch"; - url = "https://github.com/lxc/incus/commit/e109655d642c7cb7c9039b7c06323000407f76dd.patch?full_index=1"; - hash = "sha256-v/H12n8u+aqm9+ZxrarBxQEQSMN1gpX13oyummGWXl8="; - }) - (fetchpatch2 { - name = "incusd_Reject-rootfs-symlink-for-instances.patch"; - url = "https://github.com/lxc/incus/commit/7e58425ca7ffeb21bb116869e71a0d002dae9e72.patch?full_index=1"; - hash = "sha256-MU+Khx+DhYQWUVs71D05PnJGamrhRXxsahtdXZeSfvU="; - }) - (fetchpatch2 { - name = "shared-logger_Add-WarnOnError-helper.patch"; - url = "https://github.com/lxc/incus/commit/1bc4d3feb8cd3bd005b7406c0d44ad3ea59400bf.patch?full_index=1"; - hash = "sha256-ima4IGl0CyL30yZVdQ2pmp9SukIzrdBftGkO/GUPB3g="; - }) - (fetchpatch2 { - name = "incus-0001-incusd-daemon_images-Add-missing-import.patch"; - url = "https://raw.githubusercontent.com/zabbly/incus/a7fd42d2f5115c4e6893b23e64209db511fff828/patches/incus-0001-incusd-daemon_images-Add-missing-import.patch"; - hash = "sha256-xtuuASy9bck+BgXbea9goNhrMV8Yme9cmFp4WNrkIdI="; - }) - ]; nixUpdateExtraArgs = [ "--version-regex=^v(7\\.0\\.[0-9]+)$" "--override-filename=pkgs/by-name/in/incus/lts.nix" diff --git a/pkgs/by-name/in/input-remapper/package.nix b/pkgs/by-name/in/input-remapper/package.nix index 3b7a60156f8e..03c5738a0f08 100644 --- a/pkgs/by-name/in/input-remapper/package.nix +++ b/pkgs/by-name/in/input-remapper/package.nix @@ -32,24 +32,25 @@ let in (python3Packages.buildPythonApplication rec { pname = "input-remapper"; - version = "2.2.0"; - format = "setuptools"; + version = "2.2.1"; + pyproject = true; src = fetchFromGitHub { owner = "sezanzeb"; repo = "input-remapper"; tag = version; - hash = "sha256-MZO40Y8ym/lwHB8PETdtByAJb/UMMM6pRAAgAYao8UI="; + hash = "sha256-CFg/AvmZseU1f9bWI4CtYp9blvAhCgGzVWE8csVDbyE="; }; postPatch = '' # fix FHS paths - substituteInPlace inputremapper/configs/data.py \ - --replace-fail "/usr/share" "$out/usr/share" + substituteInPlace inputremapper/installation_info.py \ + --replace-fail 'DATA_DIR = "/usr/share/input-remapper"' \ + "DATA_DIR = \"$out/usr/share/input-remapper\"" '' + lib.optionalString withDebugLogLevel '' # if debugging - substituteInPlace inputremapper/logger.py \ + substituteInPlace inputremapper/logging/logger.py \ --replace-fail "logger.setLevel(logging.INFO)" "logger.setLevel(logging.DEBUG)" ''; @@ -63,15 +64,17 @@ in ] ++ maybeXmodmap; + build-system = with python3Packages; [ setuptools ]; + dependencies = with python3Packages; [ - setuptools # needs pkg_resources - pygobject3 + dasbus evdev - pkgconfig - pydantic - pydbus gtksourceview4 + packaging psutil + pycairo + pydantic + pygobject3 ]; # buildPythonApplication maps nativeCheckInputs to nativeInstallCheckInputs. @@ -98,6 +101,7 @@ in install -m644 -D -t $out/share/applications/ data/*.desktop install -m644 -D -t $out/share/polkit-1/actions/ data/input-remapper.policy + install -m644 -D data/69-input-remapper-forwarded.rules $out/etc/udev/rules.d/69-input-remapper-forwarded.rules install -m644 -D data/99-input-remapper.rules $out/etc/udev/rules.d/99-input-remapper.rules install -m644 -D data/input-remapper.service $out/lib/systemd/system/input-remapper.service install -m644 -D data/input-remapper.policy $out/share/polkit-1/actions/input-remapper.policy @@ -179,7 +183,8 @@ in # discussion postPatch = prev.postPatch or "" + '' # set revision for --version output - echo "COMMIT_HASH = '${final.src.rev}'" > inputremapper/commit_hash.py + substituteInPlace inputremapper/installation_info.py \ + --replace-fail 'COMMIT_HASH = "unknown"' 'COMMIT_HASH = "${final.src.rev}"' ''; } ) diff --git a/pkgs/by-name/in/inql/package.nix b/pkgs/by-name/in/inql/package.nix index eeee417289da..1e0114e58d65 100644 --- a/pkgs/by-name/in/inql/package.nix +++ b/pkgs/by-name/in/inql/package.nix @@ -41,7 +41,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { mainProgram = "inql"; homepage = "https://github.com/doyensec/inql"; changelog = "https://github.com/doyensec/inql/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/in/insomnia/package.nix b/pkgs/by-name/in/insomnia/package.nix index 002582e024f1..1292d46639cc 100644 --- a/pkgs/by-name/in/insomnia/package.nix +++ b/pkgs/by-name/in/insomnia/package.nix @@ -16,10 +16,6 @@ let url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.dmg"; hash = "sha256-sPl7KXC8Z13LFZvxuKg02iDbtrCxn//Yrr8AOOf3VD4="; }; - x86_64-darwin = { - url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.dmg"; - hash = "sha256-sPl7KXC8Z13LFZvxuKg02iDbtrCxn//Yrr8AOOf3VD4="; - }; x86_64-linux = { url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.AppImage"; hash = "sha256-PlcKBQnkmgU/SsLRKX7ohrGHm7B4hK9FMkplwlbFolI="; @@ -36,7 +32,6 @@ let platforms = [ "aarch64-darwin" "x86_64-linux" - "x86_64-darwin" ]; maintainers = with lib.maintainers; [ markus1189 diff --git a/pkgs/by-name/in/internalallthethings/package.nix b/pkgs/by-name/in/internalallthethings/package.nix index 2a0ea15a2d81..8bac7efd957b 100644 --- a/pkgs/by-name/in/internalallthethings/package.nix +++ b/pkgs/by-name/in/internalallthethings/package.nix @@ -48,7 +48,7 @@ stdenvNoCC.mkDerivation { meta = { homepage = "https://github.com/swisskyrepo/InternalAllTheThings"; description = "Active Directory and Internal Pentest Cheatsheets"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ felbinger ]; platforms = mkdocs.meta.platforms; sourceProvenance = with lib.sourceTypes; [ fromSource ]; diff --git a/pkgs/by-name/in/invidious-router/package.nix b/pkgs/by-name/in/invidious-router/package.nix index 970efb5a1724..3aba1da93f59 100644 --- a/pkgs/by-name/in/invidious-router/package.nix +++ b/pkgs/by-name/in/invidious-router/package.nix @@ -27,7 +27,7 @@ buildGoModule { meta = { homepage = "https://gitlab.com/gaincoder/invidious-router"; description = "Go application that routes requests to different Invidious instances based on their health status and (optional) response time"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ sils ]; mainProgram = "invidious-router"; }; diff --git a/pkgs/by-name/io/ioc-scan/package.nix b/pkgs/by-name/io/ioc-scan/package.nix index 49efb35b8aad..f05ef0c01569 100644 --- a/pkgs/by-name/io/ioc-scan/package.nix +++ b/pkgs/by-name/io/ioc-scan/package.nix @@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { description = "Tool to search a filesystem for indicators of compromise (IoC)"; homepage = "https://github.com/cisagov/ioc-scanner"; changelog = "https://github.com/cisagov/ioc-scanner/releases/tag/${finalAttrs.src.tag}"; - license = with lib.licenses; [ cc0 ]; + license = lib.licenses.cc0; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/io/ioquake3/package.nix b/pkgs/by-name/io/ioquake3/package.nix index 59fcc1e7a882..d10726ced535 100644 --- a/pkgs/by-name/io/ioquake3/package.nix +++ b/pkgs/by-name/io/ioquake3/package.nix @@ -20,6 +20,7 @@ mumble, unstableGitUpdater, bc, + buildPackages, }: stdenv.mkDerivation (finalAttrs: { @@ -33,6 +34,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-OszPRlS5NTvajDZhtGw2wa275O8YodkIgiBz3POouYs="; }; + makeFlags = [ + "ARCH=${stdenv.hostPlatform.parsed.cpu.name}" + "NO_STRIP=1" + ]; + nativeBuildInputs = [ copyDesktopItems makeBinaryWrapper @@ -55,6 +61,8 @@ stdenv.mkDerivation (finalAttrs: { mumble ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + enableParallelBuilding = true; preConfigure = '' diff --git a/pkgs/by-name/io/iosevka/package.nix b/pkgs/by-name/io/iosevka/package.nix index 1312abf903dc..326dc45ad92a 100644 --- a/pkgs/by-name/io/iosevka/package.nix +++ b/pkgs/by-name/io/iosevka/package.nix @@ -6,6 +6,7 @@ cctools, go-toml, ttfautohint-nox, + nodejs_latest, # Custom font set options. # See https://typeof.net/Iosevka/customizer # Can be a raw TOML string, or a Nix attrset. @@ -68,6 +69,7 @@ buildNpmPackage rec { }; npmDepsHash = "sha256-tlBxO9K0itXO6Mac4jcygZ6+9kj1gTdmu+rtbL2qdcE="; + nodejs = nodejs_latest; nativeBuildInputs = [ go-toml diff --git a/pkgs/by-name/io/iozone/package.nix b/pkgs/by-name/io/iozone/package.nix index d0a31d286279..3285519e5a18 100644 --- a/pkgs/by-name/io/iozone/package.nix +++ b/pkgs/by-name/io/iozone/package.nix @@ -69,7 +69,6 @@ stdenv.mkDerivation rec { platforms = [ "i686-linux" "x86_64-linux" - "x86_64-darwin" "aarch64-linux" ]; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/ip/ipatool/package.nix b/pkgs/by-name/ip/ipatool/package.nix index 25cfe240f238..7ea5aa5d8e93 100644 --- a/pkgs/by-name/ip/ipatool/package.nix +++ b/pkgs/by-name/ip/ipatool/package.nix @@ -5,6 +5,7 @@ nix-update-script, testers, ipatool, + writableTmpDirAsHomeHook, }: buildGoModule (finalAttrs: { @@ -18,7 +19,13 @@ buildGoModule (finalAttrs: { hash = "sha256-ZGy7Oxpjb5ONe//ImAN3bQwl+G9udvaf9V7heLq625c="; }; - vendorHash = "sha256-3H7ct0FIvOabXp8ShpRWltdMhyPRyuUAAxtLQTvgzF8="; + vendorHash = "sha256-PZDlJIIW+teFu6XuaTLB5eHHSeVJMUVAuq/StvyIVlc="; + + # Fixes "import lookup disabled by -mod=vendor" for onepassword-sdk-go on macOS + proxyVendor = true; + + # Fixes "unable to open output file '/homeless-shelter/.cache/clang/ModuleCache/" on macOS + nativeBuildInputs = [ writableTmpDirAsHomeHook ]; ldflags = [ "-s" diff --git a/pkgs/by-name/ip/ipinfo/package.nix b/pkgs/by-name/ip/ipinfo/package.nix index c536cd9ac917..9e21184c787b 100644 --- a/pkgs/by-name/ip/ipinfo/package.nix +++ b/pkgs/by-name/ip/ipinfo/package.nix @@ -24,7 +24,7 @@ buildGoModule rec { description = "Command Line Interface for the IPinfo API"; homepage = "https://github.com/ipinfo/cli"; changelog = "https://github.com/ipinfo/cli/releases/tag/ipinfo-${version}"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/ir/iruby/Gemfile b/pkgs/by-name/ir/iruby/Gemfile index 3998b5c6e99a..4a466e235bbb 100644 --- a/pkgs/by-name/ir/iruby/Gemfile +++ b/pkgs/by-name/ir/iruby/Gemfile @@ -1,2 +1,2 @@ source 'https://rubygems.org' -gem 'iruby', "0.8.2" +gem 'iruby', "0.8.3" diff --git a/pkgs/by-name/ir/iruby/Gemfile.lock b/pkgs/by-name/ir/iruby/Gemfile.lock index 972a50ba6bf4..4c8a24f9b13d 100644 --- a/pkgs/by-name/ir/iruby/Gemfile.lock +++ b/pkgs/by-name/ir/iruby/Gemfile.lock @@ -1,35 +1,54 @@ GEM remote: https://rubygems.org/ specs: + cgi (0.5.2) data_uri (0.1.0) - ffi (1.15.5) + date (3.5.1) + erb (4.0.4.1) + cgi (>= 0.3.3) + ffi (1.17.4) ffi-rzmq (2.0.7) ffi-rzmq-core (>= 1.0.7) ffi-rzmq-core (1.0.7) ffi - io-console (0.6.0) - irb (1.7.4) - reline (>= 0.3.6) - iruby (0.8.2) + io-console (0.8.2) + irb (1.18.0) + pp (>= 0.6.0) + prism (>= 1.3.0) + rdoc (>= 4.0.0) + reline (>= 0.4.2) + iruby (0.8.3) data_uri (~> 0.1) ffi-rzmq irb logger mime-types (>= 3.3.1) - multi_json (~> 1.11) logger (1.7.0) - mime-types (3.5.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2023.0808) - multi_json (1.15.0) - reline (0.3.8) + mime-types (3.7.0) + logger + mime-types-data (~> 3.2025, >= 3.2025.0507) + mime-types-data (3.2026.0414) + pp (0.6.4) + prettyprint + prettyprint (0.2.0) + prism (1.9.0) + psych (5.4.0) + date + stringio + rdoc (7.2.0) + erb + psych (>= 4.0.0) + tsort + reline (0.6.3) io-console (~> 0.5) + stringio (3.2.0) + tsort (0.2.0) PLATFORMS ruby DEPENDENCIES - iruby (= 0.8.2) + iruby (= 0.8.3) BUNDLED WITH - 2.6.9 + 2.3.9 diff --git a/pkgs/by-name/ir/iruby/gemset.nix b/pkgs/by-name/ir/iruby/gemset.nix index 0b875d6e8a6f..6bc68cee3f16 100644 --- a/pkgs/by-name/ir/iruby/gemset.nix +++ b/pkgs/by-name/ir/iruby/gemset.nix @@ -1,4 +1,14 @@ { + cgi = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1fzqwshg1xzbdm97havskfp6wifsgbjii00dzba0y6bih4lk1jk1"; + type = "gem"; + }; + version = "0.5.2"; + }; data_uri = { groups = [ "default" ]; platforms = [ ]; @@ -9,15 +19,36 @@ }; version = "0.1.0"; }; + date = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1h0db8r2v5llxdbzkzyllkfniqw9gm092qn7cbaib73v9lw0c3bm"; + type = "gem"; + }; + version = "3.5.1"; + }; + erb = { + dependencies = [ "cgi" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "097f4xvjq5k0m0i9mjwpl8vmqrl1wpbllc624f6fqk5s484sgqj7"; + type = "gem"; + }; + version = "4.0.4.1"; + }; ffi = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; + sha256 = "1kqasqvy8d7r09ri4n6bkdwbk63j7afd9ilsw34nzlgh0qp69ldw"; type = "gem"; }; - version = "1.15.5"; + version = "1.17.4"; }; ffi-rzmq = { dependencies = [ "ffi-rzmq-core" ]; @@ -46,21 +77,26 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0dikardh14c72gd9ypwh8dim41wvqmzfzf35mincaj5yals9m7ff"; + sha256 = "1k0lk3pwadm2myvpg893n8jshmrf2sigrd4ki15lymy7gixaxqyn"; type = "gem"; }; - version = "0.6.0"; + version = "0.8.2"; }; irb = { - dependencies = [ "reline" ]; + dependencies = [ + "pp" + "prism" + "rdoc" + "reline" + ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "158ca10kj3qqnql5g8f1g2arsnhgdl79mg74manpf8ldkwjjn3n8"; + sha256 = "1qs8a9vprg7s8krgq4s0pygr91hclqqyz98ik15p0m1sf2h5956y"; type = "gem"; }; - version = "1.7.4"; + version = "1.18.0"; }; iruby = { dependencies = [ @@ -69,16 +105,15 @@ "irb" "logger" "mime-types" - "multi_json" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "11lb7flkqpaff303g6lj9vzdw9zc0s2qmz36a6i4x4qj559bz30n"; + sha256 = "13qdw2ykzn6yjs4biiyvy1dr5j5v3kb1q7r98ds0kvg22rbs1s56"; type = "gem"; }; - version = "0.8.2"; + version = "0.8.3"; }; logger = { groups = [ "default" ]; @@ -91,35 +126,88 @@ version = "1.7.0"; }; mime-types = { - dependencies = [ "mime-types-data" ]; + dependencies = [ + "logger" + "mime-types-data" + ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0q8d881k1b3rbsfcdi3fx0b5vpdr5wcrhn88r2d9j7zjdkxp5mw5"; + sha256 = "0mjyxl7c0xzyqdqa8r45hqg7jcw2prp3hkp39mdf223g4hfgdsyw"; type = "gem"; }; - version = "3.5.1"; + version = "3.7.0"; }; mime-types-data = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "17zdim7kzrh5j8c97vjqp4xp78wbyz7smdp4hi5iyzk0s9imdn5a"; + sha256 = "1k28j6ww8rf43r5i8278jvm2cq3pnzsvqm7yqpb4p93kadjlq726"; type = "gem"; }; - version = "3.2023.0808"; + version = "3.2026.0414"; }; - multi_json = { + pp = { + dependencies = [ "prettyprint" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; + sha256 = "0w5mha75hs8gdj75g8vl0sxpyp8rzvwq8a4jcmi4ah8cf370zjyz"; type = "gem"; }; - version = "1.15.0"; + version = "0.6.4"; + }; + prettyprint = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "14zicq3plqi217w6xahv7b8f7aj5kpxv1j1w98344ix9h5ay3j9b"; + type = "gem"; + }; + version = "0.2.0"; + }; + prism = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "11ggfikcs1lv17nhmhqyyp6z8nq5pkfcj6a904047hljkxm0qlvv"; + type = "gem"; + }; + version = "1.9.0"; + }; + psych = { + dependencies = [ + "date" + "stringio" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1dx5bc3s1mb1i53np4cdkypg7ccygnvagr3hglyndbqilrljvxql"; + type = "gem"; + }; + version = "5.4.0"; + }; + rdoc = { + dependencies = [ + "erb" + "psych" + "tsort" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "14iiyb4yi1chdzrynrk74xbhmikml3ixgdayjma3p700singfl46"; + type = "gem"; + }; + version = "7.2.0"; }; reline = { dependencies = [ "io-console" ]; @@ -127,9 +215,29 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0lv1nv7z63n4qmsm3h5h273m7daxngkcq8ynkk9j8lmn7jji98lb"; + sha256 = "0d8q5c4nh2g9pp758kizh8sfrvngynrjlm0i1zn3cnsnfd4v160i"; type = "gem"; }; - version = "0.3.8"; + version = "0.6.3"; + }; + stringio = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1q92y9627yisykyscv0bdsrrgyaajc2qr56dwlzx7ysgigjv4z63"; + type = "gem"; + }; + version = "3.2.0"; + }; + tsort = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "17q8h020dw73wjmql50lqw5ddsngg67jfw8ncjv476l5ys9sfl4n"; + type = "gem"; + }; + version = "0.2.0"; }; } diff --git a/pkgs/by-name/ir/iruby/package.nix b/pkgs/by-name/ir/iruby/package.nix index 9054540ab378..b69da51d9eb8 100644 --- a/pkgs/by-name/ir/iruby/package.nix +++ b/pkgs/by-name/ir/iruby/package.nix @@ -7,7 +7,7 @@ # nix run --impure --expr 'with import {}; jupyter-console.withSingleKernel iruby.definition' # Jupyter notebook: -# nix run --impure --expr 'with import {}; jupyter.override { definitions.iruby = iruby.definition; }' +# nix shell --impure --expr 'with import {}; [ (jupyter.override { definitions.iruby = iruby.definition; }) ]' -c jupyter-notebook let self = bundlerApp { diff --git a/pkgs/by-name/is/isabelle/package.nix b/pkgs/by-name/is/isabelle/package.nix index a971e357825d..1a5f04256fab 100644 --- a/pkgs/by-name/is/isabelle/package.nix +++ b/pkgs/by-name/is/isabelle/package.nix @@ -356,7 +356,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/is/iso-flags/package.nix b/pkgs/by-name/is/iso-flags/package.nix index d66e64f1ca16..679cb5edf42e 100644 --- a/pkgs/by-name/is/iso-flags/package.nix +++ b/pkgs/by-name/is/iso-flags/package.nix @@ -45,7 +45,7 @@ stdenvNoCC.mkDerivation { meta = { homepage = "https://github.com/joielechong/iso-country-flags-svg-collection"; description = "248 country flag SVG & PNG icons with different icon styles"; - license = [ lib.licenses.publicDomain ]; + license = lib.licenses.publicDomain; platforms = lib.platforms.linux; # the output assets should work anywhere, but unsure about the tools to build them... maintainers = [ lib.maintainers.mkg20001 ]; }; diff --git a/pkgs/by-name/is/istioctl/package.nix b/pkgs/by-name/is/istioctl/package.nix index 78605d13c195..6f6c8618c5d1 100644 --- a/pkgs/by-name/is/istioctl/package.nix +++ b/pkgs/by-name/is/istioctl/package.nix @@ -7,15 +7,15 @@ buildGoModule (finalAttrs: { pname = "istioctl"; - version = "1.30.2"; + version = "1.30.3"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = finalAttrs.version; - hash = "sha256-Ejt6MjBmkWnYWHp9TiWYO6e1VV/+TN6cVZXYK3+B5Fc="; + hash = "sha256-9HIDkNpLwwGN80NIweQ6DowKR0x26E0LkMuzl3qsGNs="; }; - vendorHash = "sha256-cHW8FSYuZpl1GuWKsJLnAxCMOLvuaRwN1oL+xjwYspI="; + vendorHash = "sha256-19ziol7/8UOw78kW5epqzrR6GO0k+CwQGkq1l7XKMaw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/it/ite-backlight/package.nix b/pkgs/by-name/it/ite-backlight/package.nix index ca2b9ad8b246..65b8a1fb9ec4 100644 --- a/pkgs/by-name/it/ite-backlight/package.nix +++ b/pkgs/by-name/it/ite-backlight/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { This project aims to provide a set of simple utilities for controlling ITE 8291 keyboard backlight controllers. ''; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; homepage = "https://github.com/hexagonal-sun/ite-backlight"; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ hexagonal-sun ]; diff --git a/pkgs/by-name/it/iterm2/package.nix b/pkgs/by-name/it/iterm2/package.nix index 330cb67f2afb..346b13595625 100644 --- a/pkgs/by-name/it/iterm2/package.nix +++ b/pkgs/by-name/it/iterm2/package.nix @@ -52,7 +52,6 @@ stdenvNoCC.mkDerivation rec { emaiax ]; platforms = [ - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; diff --git a/pkgs/by-name/iv/iverilog/package.nix b/pkgs/by-name/iv/iverilog/package.nix index c32744a4d55d..d5cf8f12a57e 100644 --- a/pkgs/by-name/iv/iverilog/package.nix +++ b/pkgs/by-name/iv/iverilog/package.nix @@ -93,10 +93,5 @@ stdenv.mkDerivation (finalAttrs: { ]; maintainers = with lib.maintainers; [ thoughtpolice ]; platforms = lib.platforms.all; - badPlatforms = [ - # Several tests fail with: - # ==> Failed - running iverilog. - "x86_64-darwin" - ]; }; }) diff --git a/pkgs/by-name/ja/jackass/package.nix b/pkgs/by-name/ja/jackass/package.nix index 99bba6cbcca1..50e820a7235c 100644 --- a/pkgs/by-name/ja/jackass/package.nix +++ b/pkgs/by-name/ja/jackass/package.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { PowerUser64 l1npengtul ]; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/ja/jackett/package.nix b/pkgs/by-name/ja/jackett/package.nix index 1bf8590d5df0..db8409117d56 100644 --- a/pkgs/by-name/ja/jackett/package.nix +++ b/pkgs/by-name/ja/jackett/package.nix @@ -39,8 +39,6 @@ buildDotnetModule (finalAttrs: { runtimeDeps = [ openssl ]; # mono is not available on aarch64-darwin - #x86_64-darwin is failed with - #System.Net.Sockets.SocketException (13): Permission denied doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ mono ]; testProjectFile = "src/Jackett.Test/Jackett.Test.csproj"; diff --git a/pkgs/by-name/ja/jai/package.nix b/pkgs/by-name/ja/jai/package.nix index 2849b1e6c65d..80eb1815a571 100644 --- a/pkgs/by-name/ja/jai/package.nix +++ b/pkgs/by-name/ja/jai/package.nix @@ -32,7 +32,6 @@ let maintainers = with lib.maintainers; [ samestep ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/ja/jasper/package.nix b/pkgs/by-name/ja/jasper/package.nix index 62f51d330e8a..eafddf6b27f5 100644 --- a/pkgs/by-name/ja/jasper/package.nix +++ b/pkgs/by-name/ja/jasper/package.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { was chosen primarily due to the availability of C development environments for most computing platforms when JasPer was first developed, circa 1999. ''; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "jasper"; maintainers = [ ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/jd/jdiskreport/package.nix b/pkgs/by-name/jd/jdiskreport/package.nix index 5c89565d2a7e..c1766867a0ab 100644 --- a/pkgs/by-name/jd/jdiskreport/package.nix +++ b/pkgs/by-name/jd/jdiskreport/package.nix @@ -63,7 +63,6 @@ stdenv.mkDerivation rec { license = lib.licenses.unfreeRedistributable; # TODO freedist, libs under BSD-3 platforms = [ "x86_64-linux" - "x86_64-darwin" ]; maintainers = with lib.maintainers; [ kylesferrazza ]; mainProgram = "jdiskreport"; diff --git a/pkgs/by-name/je/jellyfin-desktop/package.nix b/pkgs/by-name/je/jellyfin-desktop/package.nix index 4a2c0f1251aa..3d571881d290 100644 --- a/pkgs/by-name/je/jellyfin-desktop/package.nix +++ b/pkgs/by-name/je/jellyfin-desktop/package.nix @@ -86,7 +86,6 @@ stdenv.mkDerivation (finalAttrs: { "aarch64-linux" "x86_64-linux" "aarch64-darwin" - "x86_64-darwin" ]; maintainers = with lib.maintainers; [ jojosch diff --git a/pkgs/by-name/je/jellyfin-tui/package.nix b/pkgs/by-name/je/jellyfin-tui/package.nix index b1fe48e44087..ffbaf54fb7aa 100644 --- a/pkgs/by-name/je/jellyfin-tui/package.nix +++ b/pkgs/by-name/je/jellyfin-tui/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "jellyfin-tui"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "dhonus"; repo = "jellyfin-tui"; tag = "v${finalAttrs.version}"; - hash = "sha256-su2zybyRc5Tyi7F+xX/YsWxqz8vLJdX3mAccqKqkRgo="; + hash = "sha256-ZdcAPN+APEnkQbPdLpcQd/fdQnEP6peQ+xdZI5sskSM="; }; - cargoHash = "sha256-euTJMkTPAnPJCAGUWkmcME1w6nOBq0GSUTDFEhE5nIc="; + cargoHash = "sha256-mri4PhYcUTWWKLl39sDhLUsFQFGLUAvDlhKNcj9gTFU="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/by-name/je/jetbrains-toolbox/package.nix b/pkgs/by-name/je/jetbrains-toolbox/package.nix index 13f6daa12ee5..3399a8f136a2 100644 --- a/pkgs/by-name/je/jetbrains-toolbox/package.nix +++ b/pkgs/by-name/je/jetbrains-toolbox/package.nix @@ -10,7 +10,7 @@ let pname = "jetbrains-toolbox"; - version = "3.6.1.85592"; + version = "3.6.2.85969"; updateScript = ./update.sh; @@ -27,7 +27,6 @@ let "aarch64-linux" "aarch64-darwin" "x86_64-linux" - "x86_64-darwin" ]; mainProgram = "jetbrains-toolbox"; }; @@ -58,10 +57,9 @@ let aarch64 = "-arm64"; }; hash = selectSystem { - x86_64-linux = "sha256-GhrN3oGdNqE4cYJmSAeRATk2yS6AVF6z+/VIb7ttoJc="; - aarch64-linux = "sha256-vI0niFirdAnYKF7+1+ACD31i86PgpPXUfKPkHttusRo="; - x86_64-darwin = "sha256-E58+mSFTptDE0Vb2xpfFgDOQrAB9LHi1pR+Hd7TlSYQ="; - aarch64-darwin = "sha256-islydrfr1j2OlC3wyzGss+NlzjcyrMydYSv6fjFf4D0="; + x86_64-linux = "sha256-2XvsZ5WrdmDGTigKWJCUJB2VkHj+Z3M8QClp6YoIIRw="; + aarch64-linux = "sha256-/8j7vJGTCvj57I1kqUCyBSDoJA8Tr0MUaomhb0Um7vA="; + aarch64-darwin = "sha256-esf/AfRDGoWV05KWb7CfJBRQvkcs3bG5/IldcTuNZOA="; }; in selectKernel { diff --git a/pkgs/by-name/ji/jimtcl/package.nix b/pkgs/by-name/ji/jimtcl/package.nix index 73e0d6e568a6..e551e07e3308 100644 --- a/pkgs/by-name/ji/jimtcl/package.nix +++ b/pkgs/by-name/ji/jimtcl/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "jimtcl"; - version = "0.82"; + version = "0.84"; src = fetchFromGitHub { owner = "msteveb"; repo = "jimtcl"; rev = finalAttrs.version; - sha256 = "sha256-CDjjrxpoTbLESAbCiCjQ8+E/oJP87gDv9SedQOzH3QY="; + sha256 = "sha256-MvsC82PMmh7PP1sXNwZRNDNFU7r5LWRA6YqvuvZ9yZE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/jn/jnv/package.nix b/pkgs/by-name/jn/jnv/package.nix index 8d3603432001..96bc793e1172 100644 --- a/pkgs/by-name/jn/jnv/package.nix +++ b/pkgs/by-name/jn/jnv/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Interactive JSON filter using jq"; mainProgram = "jnv"; homepage = "https://github.com/ynqa/jnv"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ nealfennimore nshalman diff --git a/pkgs/by-name/jo/jocalsend/package.nix b/pkgs/by-name/jo/jocalsend/package.nix index ad86d22c6a19..6597f1be5bb7 100644 --- a/pkgs/by-name/jo/jocalsend/package.nix +++ b/pkgs/by-name/jo/jocalsend/package.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://git.kittencollective.com/nebkor/joecalsend"; description = "Rust terminal client for Localsend"; changelog = "https://git.kittencollective.com/nebkor/joecalsend/releases/tag/${finalAttrs.src.tag}"; - license = with lib.licenses; [ unfreeRedistributable ]; + license = lib.licenses.unfreeRedistributable; maintainers = with lib.maintainers; [ Cameo007 ]; mainProgram = "jocalsend"; }; diff --git a/pkgs/by-name/jo/john/package.nix b/pkgs/by-name/jo/john/package.nix index 7378febe2b92..0a95f2b97525 100644 --- a/pkgs/by-name/jo/john/package.nix +++ b/pkgs/by-name/jo/john/package.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation { pname = "john"; - version = "1.9.0-Jumbo-1-unstable-2026-06-07"; + version = "1.9.0-Jumbo-1-unstable-2026-07-07"; src = fetchFromGitHub { owner = "openwall"; repo = "john"; - rev = "309326510e585c7a1340dab2e475c2ebfa6295aa"; - hash = "sha256-9bk5Icnm7PgQdSVrAKWHaKN0POctVKbofR7Aa9T2fXE="; + rev = "b544069b36ac166fb0a2fb19d0dc144ca72da6bb"; + hash = "sha256-dSdezI0+WSufYVLNChNJQ04VzuKczbfBLrI/5smR1fA="; }; patches = lib.optionals withOpenCL [ diff --git a/pkgs/by-name/jp/jpmml-evaluator/package.nix b/pkgs/by-name/jp/jpmml-evaluator/package.nix new file mode 100644 index 000000000000..3ca614f03a80 --- /dev/null +++ b/pkgs/by-name/jp/jpmml-evaluator/package.nix @@ -0,0 +1,56 @@ +{ + lib, + maven, + fetchFromGitHub, + makeBinaryWrapper, + jre_headless, + nix-update-script, +}: + +let + pname = "jpmml-evaluator"; + version = "1.7.7"; +in +maven.buildMavenPackage { + inherit pname version; + strictDeps = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "jpmml"; + repo = "jpmml-evaluator"; + tag = version; + hash = "sha256-DtI/cHmiKVH0IAp3mWJr2sDDjAzM5d9/cBx4KJm74WM="; + }; + + mvnHash = "sha256-PBkRDMPF/btYROGs4bl71wl2em05N6T2Klf1qFZLHDI="; + + nativeBuildInputs = [ + makeBinaryWrapper + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/java $out/bin + cp pmml-evaluator-example/target/pmml-evaluator-example-executable-*.jar $out/share/java/jpmml-evaluator.jar + + makeBinaryWrapper ${jre_headless}/bin/java $out/bin/jpmml-evaluator \ + --add-flags "-jar $out/share/java/jpmml-evaluator.jar" + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Java Evaluator API for PMML"; + homepage = "https://github.com/jpmml/jpmml-evaluator"; + changelog = "https://github.com/jpmml/jpmml-evaluator/releases/tag/${version}"; + license = lib.licenses.agpl3Only; + maintainers = [ lib.maintainers.b-rodrigues ]; + mainProgram = "jpmml-evaluator"; + platforms = lib.platforms.all; + sourceProvenance = with lib.sourceTypes; [ fromSource ]; + }; +} diff --git a/pkgs/by-name/js/jsign/package.nix b/pkgs/by-name/js/jsign/package.nix index 2dfbd3b1a734..f12100177111 100644 --- a/pkgs/by-name/js/jsign/package.nix +++ b/pkgs/by-name/js/jsign/package.nix @@ -18,13 +18,13 @@ maven.buildMavenPackage rec { pname = "jsign"; # For build from non-release, increment version by one and add -SNAPSHOT # e.g. 7.3-SNAPSHOT - version = "7.4"; + version = "7.5"; src = fetchFromGitHub { owner = "ebourg"; repo = "jsign"; tag = version; - hash = "sha256-r19w9k6Iuk6AQGC3l2yu6Ocn740BtE7DjtFLXUdhdw8="; + hash = "sha256-Eg23jy5K4F8pL0qqt7Ut/9NOXR9UfnQD7S7qtX9vAjk="; }; mvnHash = "sha256-zxlwb2id8yAw/yxTjD6jyAkPJx9IazrPQYGacQGLEK8="; diff --git a/pkgs/by-name/ju/jugglinglab/package.nix b/pkgs/by-name/ju/jugglinglab/package.nix index b27ef7717856..1841aefd1dcb 100644 --- a/pkgs/by-name/ju/jugglinglab/package.nix +++ b/pkgs/by-name/ju/jugglinglab/package.nix @@ -13,7 +13,6 @@ let { "x86_64-linux" = "linux-x86-64"; "aarch64-linux" = "linux-aarch64"; - "x86_64-darwin" = "darwin-x86-64"; "aarch64-darwin" = "darwin-aarch64"; } .${stdenv.system} or null; diff --git a/pkgs/by-name/ju/julec/package.nix b/pkgs/by-name/ju/julec/package.nix index bad43ba7d257..1204eb46cc68 100644 --- a/pkgs/by-name/ju/julec/package.nix +++ b/pkgs/by-name/ju/julec/package.nix @@ -116,7 +116,6 @@ clangStdenv.mkDerivation (finalAttrs: { "x86_64-linux" "aarch64-linux" "i686-linux" - "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "julec"; diff --git a/pkgs/by-name/ju/julia-mono/package.nix b/pkgs/by-name/ju/julia-mono/package.nix index 4a1757da4311..607b56df83ec 100644 --- a/pkgs/by-name/ju/julia-mono/package.nix +++ b/pkgs/by-name/ju/julia-mono/package.nix @@ -7,12 +7,12 @@ stdenvNoCC.mkDerivation rec { pname = "JuliaMono-ttf"; - version = "0.062"; + version = "0.63"; src = fetchzip { url = "https://github.com/cormullion/juliamono/releases/download/v${version}/JuliaMono-ttf.tar.gz"; stripRoot = false; - hash = "sha256-f9hjo3B4q2WBl0j86fHny8bYUqldYSC0pP4uoWOI8Zk="; + hash = "sha256-e1tQPtSnDeFhODCT+qtJd3IuGzUHW9VMZP85Nff9SSk="; }; nativeBuildInputs = [ installFonts ]; diff --git a/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix b/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix index c5bd601b5317..cd7e05c817dd 100644 --- a/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix +++ b/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://git.sr.ht/~hadronized/kak-tree-sitter"; description = "Server that interfaces tree-sitter with kakoune"; mainProgram = "kak-tree-sitter"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ lelgenio ]; }; }) diff --git a/pkgs/by-name/ka/kalamine/package.nix b/pkgs/by-name/ka/kalamine/package.nix index faca12ca4c63..5963e2cd1375 100644 --- a/pkgs/by-name/ka/kalamine/package.nix +++ b/pkgs/by-name/ka/kalamine/package.nix @@ -1,26 +1,30 @@ { lib, - python3, + python3Packages, fetchFromGitHub, + versionCheckHook, + writableTmpDirAsHomeHook, }: -python3.pkgs.buildPythonApplication (finalAttrs: { +python3Packages.buildPythonApplication (finalAttrs: { pname = "kalamine"; version = "0.40"; pyproject = true; + __structuredAttrs = true; + src = fetchFromGitHub { owner = "OneDeadKey"; repo = "kalamine"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-9R8N5p+VNuiqTl3a0SSmJEVg3Ol76nROf43GsdOdJL8="; }; - nativeBuildInputs = [ - python3.pkgs.hatchling + build-system = [ + python3Packages.hatchling ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3Packages; [ click livereload lxml @@ -31,6 +35,19 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pythonImportsCheck = [ "kalamine" ]; + # https://github.com/OneDeadKey/kalamine/blob/a9724bf6e93a34c740f9349b8811b2e51cc62c41/Makefile#L39 + preCheck = '' + python -m kalamine.cli build layouts/*.toml + ''; + + nativeCheckInputs = [ + python3Packages.pytestCheckHook + versionCheckHook + writableTmpDirAsHomeHook + ]; + versionCheckProgramArg = "version"; + versionCheckKeepEnvironment = [ "HOME" ]; + meta = { description = "Keyboard Layout Maker"; homepage = "https://github.com/OneDeadKey/kalamine/"; diff --git a/pkgs/by-name/ka/kanarenshu/package.nix b/pkgs/by-name/ka/kanarenshu/package.nix index 27b39c78ed7c..e8e848d5f344 100644 --- a/pkgs/by-name/ka/kanarenshu/package.nix +++ b/pkgs/by-name/ka/kanarenshu/package.nix @@ -7,14 +7,14 @@ buildGoModule (finalAttrs: { pname = "kanarenshu"; - version = "0.1.1"; + version = "0.1.4"; __structuredAttrs = true; src = fetchFromGitHub { owner = "nuixyz"; repo = "kanarenshu"; tag = "v${finalAttrs.version}"; - hash = "sha256-ea3wDS5AsXXFvhff3RoYj1HTcVrUq3Cd4Vjz80R2seI="; + hash = "sha256-ROpZXGvleciJf+B3KVSIcsSES9+mtdLhcPFtGBpEmqY="; }; vendorHash = "sha256-ES9+l6aDY8Y38yi4ufw2bpBPCW58L2oSlfXzh1TWGRE="; diff --git a/pkgs/by-name/ka/kanji-stroke-order-font/package.nix b/pkgs/by-name/ka/kanji-stroke-order-font/package.nix index e33bac6c9e31..3f88eee860ec 100644 --- a/pkgs/by-name/ka/kanji-stroke-order-font/package.nix +++ b/pkgs/by-name/ka/kanji-stroke-order-font/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { description = "Font containing stroke order diagrams for over 6500 kanji, 180 kana and other characters"; homepage = "https://www.kanji.uk/"; - license = [ lib.licenses.bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ ptrhlm stephen-huan diff --git a/pkgs/by-name/ka/kapow/package.nix b/pkgs/by-name/ka/kapow/package.nix index 6e6405a9106a..9790db08bf28 100644 --- a/pkgs/by-name/ka/kapow/package.nix +++ b/pkgs/by-name/ka/kapow/package.nix @@ -1,34 +1,36 @@ { lib, stdenv, + cmake, fetchFromGitHub, - libsForQt5, + qt6, }: stdenv.mkDerivation (finalAttrs: { pname = "kapow"; - version = "1.5.10"; + version = "1.7.0"; src = fetchFromGitHub { owner = "gottcode"; repo = "kapow"; rev = "v${finalAttrs.version}"; - sha256 = "1fz9fb4w21ax8hjs6dwfn2410ig4lqvzdlijq0jcj3jbgxd4i1gw"; + hash = "sha256-IWkvAXDcWodrV23/wv3GEQXWdNcaIZDsU3LUtxsD+cA="; }; nativeBuildInputs = [ - libsForQt5.qmake - libsForQt5.qttools - libsForQt5.wrapQtAppsHook + cmake + qt6.qmake + qt6.qttools + qt6.wrapQtAppsHook ]; - buildInputs = [ libsForQt5.qtbase ]; + buildInputs = [ qt6.qtbase ]; meta = { description = "Punch clock to track time spent on projects"; mainProgram = "kapow"; homepage = "https://gottcode.org/kapow/"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ tbutter ]; platforms = lib.platforms.linux; license = lib.licenses.gpl3Plus; }; diff --git a/pkgs/by-name/ka/karate/package.nix b/pkgs/by-name/ka/karate/package.nix index 9fc9eaa9186d..f1e87419b209 100644 --- a/pkgs/by-name/ka/karate/package.nix +++ b/pkgs/by-name/ka/karate/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "karate"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { url = "https://github.com/karatelabs/karate/releases/download/v${version}/karate-${version}.jar"; - sha256 = "sha256-ImFhqjBMYXREOZ+0j0IIARmtNQpCf71m2nUxZQusKKo="; + sha256 = "sha256-XrDmWpl1aforNvsnJU4V4TUUoCTU+7D8NTgTrJHjmOE="; }; dontUnpack = true; diff --git a/pkgs/by-name/ka/kassert/package.nix b/pkgs/by-name/ka/kassert/package.nix index dd796b047373..9ffdccde0198 100644 --- a/pkgs/by-name/ka/kassert/package.nix +++ b/pkgs/by-name/ka/kassert/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://kamping-site.github.io/kassert/"; downloadPage = "https://github.com/kamping-site/kassert"; changelog = "https://github.com/kamping-site/kasser/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ qbisi ]; }; diff --git a/pkgs/by-name/ka/kazumi/package.nix b/pkgs/by-name/ka/kazumi/package.nix index 382a297f1865..dd288a2724bd 100644 --- a/pkgs/by-name/ka/kazumi/package.nix +++ b/pkgs/by-name/ka/kazumi/package.nix @@ -18,13 +18,13 @@ }: let - version = "2.1.8"; + version = "2.2.0"; src = fetchFromGitHub { owner = "Predidit"; repo = "Kazumi"; tag = version; - hash = "sha256-g6Z2DTZVhLD9M1jJAyJexi4lYd7Y3XUci2mjvJWxvkU="; + hash = "sha256-xAXhESIGk3St2TgqLtUl6je7DlS4j4vD338T5t99OAE="; }; in flutter.buildFlutterApplication { diff --git a/pkgs/by-name/ka/kazumi/pubspec.lock.json b/pkgs/by-name/ka/kazumi/pubspec.lock.json index 166f9d6a1c28..ccd5c300e2fe 100644 --- a/pkgs/by-name/ka/kazumi/pubspec.lock.json +++ b/pkgs/by-name/ka/kazumi/pubspec.lock.json @@ -146,11 +146,11 @@ "dependency": "transitive", "description": { "name": "auto_injector", - "sha256": "1fc2624898e92485122eb2b1698dd42511d7ff6574f84a3a8606fc4549a1e8f8", + "sha256": "81815294ad9a512e294d97819bdbeccc7f93f18daeceac321e0c046a6f25eeb1", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.2.0" }, "boolean_selector": { "dependency": "transitive", @@ -524,7 +524,7 @@ "version": "1.3.3" }, "ffi": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "ffi", "sha256": "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45", @@ -729,11 +729,11 @@ "dependency": "direct main", "description": { "name": "flutter_modular", - "sha256": "33a63d9fe61429d12b3dfa04795ed890f17d179d3d38e988ba7969651fcd5586", + "sha256": "04b924a79e17ec897aa40886a46f27954ee0194e4601a006bdba3cb2be65e180", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.4.1" + "version": "7.1.0" }, "flutter_native_splash": { "dependency": "direct dev", @@ -1017,6 +1017,16 @@ "source": "hosted", "version": "1.0.5" }, + "iregexp": { + "dependency": "transitive", + "description": { + "name": "iregexp", + "sha256": "c79119931b7ae9c0b6327adaa4495811813fcae7e6236ac68c15f45ca857d38b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, "isolate_channel": { "dependency": "transitive", "description": { @@ -1067,6 +1077,16 @@ "source": "hosted", "version": "4.12.0" }, + "json_path": { + "dependency": "direct main", + "description": { + "name": "json_path", + "sha256": "99cef94ca7b604ad85b9442bc8852e55396f559c08c0ab961d10b90b730c326f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.0" + }, "leak_tracker": { "dependency": "transitive", "description": { @@ -1147,6 +1167,16 @@ "source": "hosted", "version": "0.13.0" }, + "maybe_just_nothing": { + "dependency": "transitive", + "description": { + "name": "maybe_just_nothing", + "sha256": "57af3cacbbe57d5889a4479983755b76551db3c8862aa6335f57f50657945054", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.0" + }, "media_kit": { "dependency": "direct main", "description": { @@ -1296,16 +1326,6 @@ "source": "hosted", "version": "2.7.7" }, - "modular_core": { - "dependency": "transitive", - "description": { - "name": "modular_core", - "sha256": "1db0420a0dfb8a2c6dca846e7cbaa4ffeb778e247916dbcb27fb25aa566e5436", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.4.1" - }, "msix": { "dependency": "direct dev", "description": { @@ -1477,7 +1497,7 @@ "version": "2.2.1" }, "path_provider_platform_interface": { - "dependency": "transitive", + "dependency": "direct dev", "description": { "name": "path_provider_platform_interface", "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334", @@ -1527,7 +1547,7 @@ "version": "3.1.6" }, "plugin_platform_interface": { - "dependency": "transitive", + "dependency": "direct dev", "description": { "name": "plugin_platform_interface", "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02", @@ -1557,7 +1577,7 @@ "version": "6.5.0" }, "provider": { - "dependency": "direct main", + "dependency": "transitive", "description": { "name": "provider", "sha256": "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272", @@ -1606,15 +1626,15 @@ "source": "hosted", "version": "0.6.0" }, - "result_dart": { + "rfc_6901": { "dependency": "transitive", "description": { - "name": "result_dart", - "sha256": "80096f0928e276c024e53cf1bb2aaffd5a94623dac8fdfa5cb3529e82b51eb3c", + "name": "rfc_6901", + "sha256": "6a43b1858dca2febaf93e15639aa6b0c49ccdfd7647775f15a499f872b018154", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.0" + "version": "0.2.1" }, "rxdart": { "dependency": "transitive", @@ -2314,7 +2334,7 @@ "version": "0.4.0" }, "win32": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "win32", "sha256": "d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e", @@ -2396,6 +2416,6 @@ }, "sdks": { "dart": ">=3.11.0 <4.0.0", - "flutter": ">=3.44.4" + "flutter": ">=3.44.5" } } diff --git a/pkgs/by-name/kd/kdigger/package.nix b/pkgs/by-name/kd/kdigger/package.nix index 32f3d9e98857..3d4473fde6db 100644 --- a/pkgs/by-name/kd/kdigger/package.nix +++ b/pkgs/by-name/kd/kdigger/package.nix @@ -74,7 +74,6 @@ buildGoModule (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" ]; }; }) diff --git a/pkgs/by-name/ke/keeweb/package.nix b/pkgs/by-name/ke/keeweb/package.nix index 50229cc3c924..e83b9b6863fa 100644 --- a/pkgs/by-name/ke/keeweb/package.nix +++ b/pkgs/by-name/ke/keeweb/package.nix @@ -36,10 +36,6 @@ let url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.linux.x64.deb"; hash = "sha256-/U+vn5TLIU9/J6cRFjuAdyGzlwC04mp4L2X2ETp+ZSE="; }; - x86_64-darwin = fetchurl { - url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.mac.x64.dmg"; - hash = "sha256-+ZFGrrw0tZ7F6lb/3iBIyGD+tp1puVhkPv10hfp6ATU="; - }; aarch64-darwin = fetchurl { url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.mac.arm64.dmg"; hash = "sha256-bkhwsWYLkec16vMOfXUce7jfrmI9W2xHiZvU1asebK4="; diff --git a/pkgs/by-name/ke/keyboard-layout-editor/package.nix b/pkgs/by-name/ke/keyboard-layout-editor/package.nix index 3c59c1790a13..a504ee36ba37 100644 --- a/pkgs/by-name/ke/keyboard-layout-editor/package.nix +++ b/pkgs/by-name/ke/keyboard-layout-editor/package.nix @@ -78,7 +78,6 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/ke/keycloak-config-cli/package.nix b/pkgs/by-name/ke/keycloak-config-cli/package.nix index df21c7e3715f..f599bfab35b2 100644 --- a/pkgs/by-name/ke/keycloak-config-cli/package.nix +++ b/pkgs/by-name/ke/keycloak-config-cli/package.nix @@ -5,25 +5,33 @@ jre_headless, makeWrapper, nix-update-script, + versionCheckHook, }: -maven.buildMavenPackage rec { +maven.buildMavenPackage (finalAttrs: { pname = "keycloak-config-cli"; - version = "6.4.0"; + version = "6.5.1"; src = fetchFromGitHub { owner = "adorsys"; repo = "keycloak-config-cli"; - tag = "v${version}"; - hash = "sha256-Vg56Dz9U0eAJw+7u90MSZWmMIZttWYGXAwsXZsEfTj8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-dSeLn9YaT0k6Mg8cxmoDoEtvjrzkyETvI4dt+q/Wj3A="; }; - mvnHash = "sha256-tdh8hRqGXI3zuwy55dC3La9dm2naqeCEZT4qcw37iDI="; + mvnHash = "sha256-Ff9ra9ruPJ8PA0bmC8uU8PiNqjtJoR4U04veZAqZ3sM="; - # Tests use MockServer which needs to bind to a local port - __darwinAllowLocalNetworking = true; + # JavaScriptEvaluatorTest needs GraalVM's Truffle engine, which fails to + # initialize on the sandbox JDK (org.graalvm.polyglot.Engine$ImplHolder). + doCheck = false; + + strictDeps = true; + __structuredAttrs = true; nativeBuildInputs = [ makeWrapper ]; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + installPhase = '' runHook preInstall install -Dm444 target/keycloak-config-cli.jar $out/share/keycloak-config-cli/keycloak-config-cli.jar @@ -36,6 +44,7 @@ maven.buildMavenPackage rec { meta = { homepage = "https://github.com/adorsys/keycloak-config-cli"; + changelog = "https://github.com/adorsys/keycloak-config-cli/releases/tag/v${finalAttrs.version}"; description = "Import YAML/JSON-formatted configuration files into Keycloak"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ @@ -46,4 +55,4 @@ maven.buildMavenPackage rec { mainProgram = "keycloak-config-cli"; platforms = jre_headless.meta.platforms; }; -} +}) diff --git a/pkgs/by-name/ke/keycloak/all-plugins.nix b/pkgs/by-name/ke/keycloak/all-plugins.nix index 5e36541557b5..ca02212b69dc 100644 --- a/pkgs/by-name/ke/keycloak/all-plugins.nix +++ b/pkgs/by-name/ke/keycloak/all-plugins.nix @@ -1,15 +1,18 @@ { + lib, + config, callPackage, fetchMavenArtifact, junixsocket-common, junixsocket-native-common, }: { + apple-identity-provider-keycloak = callPackage ./apple-identity-provider-keycloak { }; keycloak-2fa-sms-authenticator = callPackage ./keycloak-2fa-sms-authenticator { }; keycloak-discord = callPackage ./keycloak-discord { }; keycloak-enforce-mfa-authenticator = callPackage ./keycloak-enforce-mfa-authenticator { }; + keycloak-home-idp-discovery = callPackage ./keycloak-home-idp-discovery { }; keycloak-magic-link = callPackage ./keycloak-magic-link { }; - keycloak-metrics-spi = callPackage ./keycloak-metrics-spi { }; keycloak-orgs = callPackage ./keycloak-orgs { }; keycloak-remember-me-authenticator = callPackage ./keycloak-remember-me-authenticator { }; keycloak-restrict-client-auth = callPackage ./keycloak-restrict-client-auth { }; @@ -40,3 +43,6 @@ hash = "sha256-xHxzBxriSd/OU8gEcDG00VRkJYPYJDfAfPh/FkQe+zg="; }).passthru.jar; } +// lib.optionalAttrs config.allowAliases { + keycloak-metrics-spi = throw "keycloak.plugins.keycloak-metrics-spi has been removed in favor of Keycloak's native metrics."; # Added 2026-07-14 +} diff --git a/pkgs/by-name/ke/keycloak/apple-identity-provider-keycloak/default.nix b/pkgs/by-name/ke/keycloak/apple-identity-provider-keycloak/default.nix new file mode 100644 index 000000000000..7bda6aa7651c --- /dev/null +++ b/pkgs/by-name/ke/keycloak/apple-identity-provider-keycloak/default.nix @@ -0,0 +1,54 @@ +{ + lib, + stdenv, + fetchFromGitHub, + gradle_8, + nix-update-script, +}: +let + gradle = gradle_8; +in +stdenv.mkDerivation (finalAttrs: { + pname = "apple-identity-provider-keycloak"; + version = "1.17.0"; + + src = fetchFromGitHub { + owner = "klausbetz"; + repo = "apple-identity-provider-keycloak"; + tag = finalAttrs.version; + hash = "sha256-0/uHQwgyHwy+5ynRHs0ot0iIBVUckEs65YxkWLQNgbY="; + }; + + nativeBuildInputs = [ gradle ]; + + mitmCache = gradle.fetchDeps { + pkg = finalAttrs.finalPackage; + data = ./deps.json; + }; + + __darwinAllowLocalNetworking = true; + + strictDeps = true; + __structuredAttrs = true; + + installPhase = '' + runHook preInstall + install -Dm444 -t "$out" build/libs/apple-identity-provider-${finalAttrs.version}.jar + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/klausbetz/apple-identity-provider-keycloak"; + changelog = "https://github.com/klausbetz/apple-identity-provider-keycloak/releases/tag/${finalAttrs.version}"; + description = "Keycloak identity provider extension for Sign in with Apple"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ anish ]; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryBytecode # mitm cache + ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/ke/keycloak/apple-identity-provider-keycloak/deps.json b/pkgs/by-name/ke/keycloak/apple-identity-provider-keycloak/deps.json new file mode 100644 index 000000000000..b8c6df951b03 --- /dev/null +++ b/pkgs/by-name/ke/keycloak/apple-identity-provider-keycloak/deps.json @@ -0,0 +1,1335 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://repo.maven.apache.org/maven2": { + "com/apicatalog#titanium-json-ld/1.3.3": { + "jar": "sha256-d53h2I8XNIbw6p8bS3d5lwrCGnrUmyoDcPX5m23+9yw=", + "pom": "sha256-VM++dai2e/vf/1mf+be016mun7h1GQHKu9f1+OTbxL0=" + }, + "com/fasterxml#classmate/1.7.0": { + "jar": "sha256-y4aPIxxczrideV6gDm4bepO49Kwc4di+dt3jIt/0oEY=", + "pom": "sha256-ZHEa3vDskvH2zap7LqwGsuVmekppkez7i/rEZoHVuTE=" + }, + "com/fasterxml#oss-parent/56": { + "pom": "sha256-/UkfeIV0JBBtLj1gW815m1PTGlZc3IaEY8p+h120WlA=" + }, + "com/fasterxml#oss-parent/65": { + "pom": "sha256-2wuaUmqeMDxjuptYSWicYfs4kkf6cjEFS5DgvwC0MR4=" + }, + "com/fasterxml#oss-parent/69": { + "pom": "sha256-OFbVhKqhyOM86UxnJE9x9vcFOKJZ/+jngXYbn6qth18=" + }, + "com/fasterxml/jackson#jackson-base/2.19.0": { + "pom": "sha256-Noz4ykJkRni737F6sUfJC8QyWaWZUJfD8cT7au9Mdcg=" + }, + "com/fasterxml/jackson#jackson-base/2.19.2": { + "pom": "sha256-/779Z5U5lKd12QJsscFvkrqB0cHBMX7oorma4AnSYUM=" + }, + "com/fasterxml/jackson#jackson-bom/2.16.1": { + "pom": "sha256-adi/myp9QsnPHXCtgr5C9qxv14iRim4ddXkuzcwRegs=" + }, + "com/fasterxml/jackson#jackson-bom/2.19.0": { + "pom": "sha256-sR/LPvM6wH5oDObYXxfELWoz2waG+6z68OQ0j8Y5cbI=" + }, + "com/fasterxml/jackson#jackson-bom/2.19.2": { + "pom": "sha256-IgBr5w/QGAmemcbCesCYIyDzoPPCzgU8VXA1eaXuowM=" + }, + "com/fasterxml/jackson#jackson-parent/2.16": { + "pom": "sha256-i/YUKBIUiiq/aFCycvCvTD2P8RIe1gTEAvPzjJ5lRqs=" + }, + "com/fasterxml/jackson#jackson-parent/2.19": { + "pom": "sha256-bNk0tNFdfz7hONl7I8y4Biqd5CJX7YelVs7k1NvvWxo=" + }, + "com/fasterxml/jackson#jackson-parent/2.19.3": { + "pom": "sha256-I9GGyNjNBgFdAixxDHFUI9Zg1J4pc7FYcLApzCYBhoI=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.19.2": { + "jar": "sha256-5RZ0OjFtz4PFcv/Jy26MXowTSIDIxRVbAvezTpxdw88=", + "module": "sha256-MZtf0wd2wFk8yNxajX4ITkuQcJpDUGQYQqu9WfyByBU=", + "pom": "sha256-SVAWGuCtZsaze8Ku0S0hxleeF3ltv86Yixm40MIjpck=" + }, + "com/fasterxml/jackson/core#jackson-core/2.19.2": { + "jar": "sha256-qnfq8pKTqGjEc3IZT3xSh9d9k3CwTqJdP//B5JBLWIA=", + "module": "sha256-Ua8uZ3g6XXJETeajB8jj7ZMAklbNJ+ghkVVZohZcCUI=", + "pom": "sha256-gfatIwlG88U9gYwZ/l7hEcH6MxuRXEvajQGC5rT/1lA=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.19.2": { + "jar": "sha256-ChvU6bDWcOYy1A7oxiWtN2IzUC8DwvWIm66pXQJbR6c=", + "module": "sha256-xgFVg0SRj0CDS7bVg4EepsiDvwaigXmkx04voYswbGg=", + "pom": "sha256-2KebdQK2m/JQaEwZCpiCOJImaG1dlikGdW2BzVskO4I=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-cbor/2.19.0": { + "module": "sha256-qLWWRYzQPkdOAwOUJpAQeKzOtwMSau5jaUo0HpbWXoo=", + "pom": "sha256-p8eH3uN+tGj3MxtELbwPFUDxQnRveVmBu7YkgRY56K8=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-cbor/2.19.2": { + "jar": "sha256-RQ268UVD98LoE4cKousG/Nu3kxbYCzDMT32oMfNYLPM=", + "module": "sha256-tEgT9KJg3WOlW7Xcc9OsavHi+RwzrD8FfebYE6EiXeA=", + "pom": "sha256-o4vv9jT/C41ZaXIiP2tD7UtWatoxSBB5rwj9Hxn/mLs=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.19.2": { + "jar": "sha256-gKIT59mYJEkiq3vPCTjqA+t4aOiOLQWoQHxiKMiFo34=", + "module": "sha256-bpyu0tDwqryZNnVPNzN+Dxc2MdahWxjE2QRpVtZ1U24=", + "pom": "sha256-1UeZ1Ba/pn91wvGU3IgKE1dPvVXmQCqH45NImPebgM4=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-binary/2.19.0": { + "pom": "sha256-D8yK4bXILDgeQPw9uULCgMHMSECz5sDekmOu9v4D0Zg=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-binary/2.19.2": { + "pom": "sha256-z8A2j768TpMUNzf2pDHWjpLPPDXMlFmLo1U+1wYYEQk=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.19.2": { + "pom": "sha256-F5LLcfGWGg/nXi21/CckZovisBQX8LzHOee1AOIoFAE=" + }, + "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/datatype#jackson-datatype-jsr310/2.19.2": { + "jar": "sha256-lwn0Pg+lYlYz7mbbbAePsejHygIJJpa6lep4Xb8PpqE=", + "module": "sha256-HNFClAh9xmpIvf8+t1CZyHsK0paspR6AgMuc3yCRF6E=", + "pom": "sha256-sa5Nojzw/imhXWUC4XcpfAssYp3Nlpy2RFfVVLZacS8=" + }, + "com/fasterxml/jackson/jakarta/rs#jackson-jakarta-rs-base/2.19.2": { + "jar": "sha256-F/5iz/a/euqvdBNgCa9cS0mVSIxTe7bpKPcO2s7I4LA=", + "module": "sha256-1+OmfyY5twuE4/7bwZqTZKfMClnh7rl5lihDoARyjKg=", + "pom": "sha256-cuutsSEGvT1wp4JQT6g1ZL/R7oZHn5ZWPYMrnWt96rs=" + }, + "com/fasterxml/jackson/jakarta/rs#jackson-jakarta-rs-providers/2.19.2": { + "pom": "sha256-B2S/Gps0yugUzz8hO2oCKSBV4P0dxXOuixNfE/xre2M=" + }, + "com/fasterxml/jackson/jakarta/rs#jackson-jakarta-rs-yaml-provider/2.19.2": { + "jar": "sha256-zWNZeK73fG8NxbLTOhKhOo8HDmOjSVt9bCxrJRIwoSA=", + "module": "sha256-LLWfJRGJTBuWIQyhhK8LGvrXD+4HLMIfSo2OmEQe9wo=", + "pom": "sha256-JEYduYSE7ns8yTkLEKZyXfXp8JfN0XXnlwdnHCAmRcU=" + }, + "com/fasterxml/jackson/module#jackson-module-jakarta-xmlbind-annotations/2.19.2": { + "jar": "sha256-u69EflB7FOb/s/dVxLHmD1I5nHPzM4BfNK+6Z+8XWSs=", + "module": "sha256-HhkceCnIbeQvm7s6uph3Gdgcs49aDZdx5nQFHka3EDI=", + "pom": "sha256-mRKux2ADWIe3cb5/imHAWPOSt6WClRANzzqay8nAKec=" + }, + "com/fasterxml/jackson/module#jackson-modules-base/2.19.2": { + "pom": "sha256-V6S5QhVKz4VVeikvO4O3cnMAfjxwJak5UDScL9GoYVo=" + }, + "com/fasterxml/jackson/module#jackson-modules-java8/2.19.2": { + "pom": "sha256-o8wywUW5Yr45UE+FNsrGISTry1rVAy2TC8ck/flOgqQ=" + }, + "com/github/ben-manes/caffeine#caffeine/3.1.8": { + "jar": "sha256-fdFfnfG+I4/6o2fOb1VnN6iAMd5ClNrRju9XxHTd8dM=", + "module": "sha256-SazUz4G+Hk6GgFTw00/PXHdWCEWVBzB86HjNuk/dTYQ=", + "pom": "sha256-Rj9PiWOKroLGVLPyhC6NA/eg1IGUxCYEbdnJXOBjJu4=" + }, + "com/github/jai-imageio#jai-imageio-core/1.4.0": { + "jar": "sha256-itPGjp7/+xCsh/+LxYmt9ksEpynFGUwHnv0GQ2B/1yo=", + "pom": "sha256-Ac0LjPRGoe4kVuyeg8Q11gRH0G6fVJBMTm/sCPfO8qw=" + }, + "com/github/ua-parser#uap-java/1.6.1": { + "jar": "sha256-/z4eudgH34vBl5UN5dVV0YkqfO7Q/f91s+sqp4u+UcU=", + "pom": "sha256-ZnXK/DBSoJQXycUnGv5owrSrpuu8ya8FUfh10k6r6ck=" + }, + "com/google/api/grpc#proto-google-common-protos/2.29.0": { + "jar": "sha256-7px1HwaxEukrN/deT3OhfQPvLDMCxujZhq28xyG2PLA=", + "pom": "sha256-buHqFliOzsn79BLXrRulV7xFbOCXUg3uXkzQiuYcJ4Q=" + }, + "com/google/code/gson#gson-parent/2.11.0": { + "pom": "sha256-issfO3Km8CaRasBzW62aqwKT1Sftt7NlMn3vE6k2e3o=" + }, + "com/google/code/gson#gson/2.11.0": { + "jar": "sha256-V5KNblpu3rKr03cKj5W6RNzkXzsjt6ncKzCcWBVSp4s=", + "pom": "sha256-wOVHvqmYiI5uJcWIapDnYicryItSdTQ90sBd7Wyi42A=" + }, + "com/google/errorprone#error_prone_annotations/2.30.0": { + "jar": "sha256-FE86771uJ9rsVdN1OyxrE8Gv2vDPBIFs21ZFiO2S8b0=", + "pom": "sha256-9xOEnCOzSVPoVFZdzoqnlcrgwUFmEbcgwhRhMix5X4Y=" + }, + "com/google/errorprone#error_prone_parent/2.30.0": { + "pom": "sha256-Xog0zMDl7Qxy8wbCULUY5q0Q0HWpt7kQz2lcuh7gKi0=" + }, + "com/google/guava#failureaccess/1.0.1": { + "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", + "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk=" + }, + "com/google/guava#failureaccess/1.0.2": { + "jar": "sha256-io+Bz5s1nj9t+mkaHndphcBh7y8iPJssgHU+G0WOgGQ=", + "pom": "sha256-GevG9L207bs9B7bumU+Ea1TvKVWCqbVjRxn/qfMdA7I=" + }, + "com/google/guava#guava-parent/26.0-android": { + "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" + }, + "com/google/guava#guava-parent/32.1.2-jre": { + "pom": "sha256-iOnLAHM1q1/bMUpuPJh3NOwjCMmgY/90fHRpGJ0Kkr8=" + }, + "com/google/guava#guava-parent/32.1.3-android": { + "pom": "sha256-QfwmRk+6irC1W0AmdrRTaeCqqbqOClpd7IBFKQisl+E=" + }, + "com/google/guava#guava-parent/33.3.1-android": { + "pom": "sha256-bhGYbqclC1H4RxV+Lck38yowaATfzgAHpegd25uVxXk=" + }, + "com/google/guava#guava/32.1.2-jre": { + "module": "sha256-5Azwhc7QWrGPnJTnx7wZfhzbaVvJOa/DRKskwUFNbH4=", + "pom": "sha256-PyCFltceCDmyU6SQr0mjbvf9tFG+kKQqsd+els/TFmA=" + }, + "com/google/guava#guava/32.1.3-android": { + "module": "sha256-+Kh873LA6AJ6b648vfAHKiQc5tjnYPlucIe3QqZgWmE=", + "pom": "sha256-SfgFUBXoaHd0z9iTm9aDx08J1rJLzA/CaEC82XoIhms=" + }, + "com/google/guava#guava/32.1.3-jre": { + "jar": "sha256-bU4rWhGKq2Lm5eKdGFoCJO7YLIXECsPTPPBKJww7N0Q=" + }, + "com/google/guava#guava/33.3.1-android": { + "module": "sha256-aXFhTd7uAD5U0racawyUzopbXrqYDRZFXIHfkImnrLc=", + "pom": "sha256-xyjbbycFyj6mo88s8SYNvv86RSQkmhsbkA7c/p1yFC8=" + }, + "com/google/guava#guava/33.3.1-jre": { + "jar": "sha256-S/Dixa+ORSXJbo/eF6T3MH+X+EePEcTI41oOMpiuTpA=" + }, + "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { + "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", + "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" + }, + "com/google/j2objc#j2objc-annotations/2.8": { + "jar": "sha256-8CqV+hpele2z7YWf0Pt99wnRIaNSkO/4t03OKrf01u0=", + "pom": "sha256-N/h3mLGDhRE8kYv6nhJ2/lBzXvj6hJtYAMUZ1U2/Efg=" + }, + "com/google/j2objc#j2objc-annotations/3.0.0": { + "jar": "sha256-iCQVc0Z93KRP/U10qgTCu/0Rv3wX4MNCyUyd56cKfGQ=", + "pom": "sha256-I7PQOeForYndEUaY5t1744P0osV3uId9gsc6ZRXnShc=" + }, + "com/google/protobuf#protobuf-bom/3.25.1": { + "pom": "sha256-Q3hpcMGst8EZyWH1PqhWpLwL9r8M7/qwrSqE8mLPFlQ=" + }, + "com/google/protobuf#protobuf-java/3.25.1": { + "jar": "sha256-SKjlihqPgu/xQaejiNON/nfXpI1eV8kGbuN/GRR+IN8=", + "pom": "sha256-P/SnjWBeHWmR5RXFUDcmy0gEK4dOpVSkvIqHrp+Rv5U=" + }, + "com/google/protobuf#protobuf-parent/3.25.1": { + "pom": "sha256-zRvoNznwNkYrEptlN1n6hov61D+5U5xefR3irD2F3Oo=" + }, + "com/google/zxing#core/3.4.0": { + "jar": "sha256-ZQBIBqZpI0xpj74HVSWBADdfsB/pO1OEVfOQNxPUpQ0=", + "pom": "sha256-CzqlUO6bM9qDUwx7POCYVDQyNZew+ZXZrqEkbfeweDI=" + }, + "com/google/zxing#javase/3.4.0": { + "jar": "sha256-eu73RqVE7/zZ5JkhTZ8xXmnDqDXnyBq/twO+efhZptc=", + "pom": "sha256-zAE4wjA1fmStdZpAwONiuog3yf1PSr5kw1uz/VKhCno=" + }, + "com/google/zxing#zxing-parent/3.4.0": { + "pom": "sha256-6hqNZZr4nC3dRyfettWvEkddEsi4Rd/J11AT0I/xE+8=" + }, + "com/googlecode/owasp-java-html-sanitizer#java10-shim/20260101.1": { + "jar": "sha256-nCC++8cAOvTe45cP0fnQHyUtK+mDUjVQkDhBn8to2h0=", + "pom": "sha256-AkJQ+u/aQWrhRxG64pkHes+SfHIy5JG4SlIjUNebpck=" + }, + "com/googlecode/owasp-java-html-sanitizer#java8-shim/20260101.1": { + "jar": "sha256-tdWxCv0qsYmb2ahZ0de1m0nkONqxinyV2FrHHBMpkyo=", + "pom": "sha256-1DL8KSVzoBYOU/IZAupmBMuST25eGW3J4G+Q5z25uSk=" + }, + "com/googlecode/owasp-java-html-sanitizer#owasp-java-html-sanitizer/20260101.1": { + "jar": "sha256-8xPx1q6Emhj1Ei2++BJtw3nshs7y3PgZK0eBcMfq8VU=", + "pom": "sha256-LzARwOiu+gAb+dsZ+Mx+ts7bcvnoA/7wKGLvWlVa71s=" + }, + "com/googlecode/owasp-java-html-sanitizer#parent/20260101.1": { + "pom": "sha256-nk08oMDaG75sAV7RenMI6GNFrx2/BGBtZ9hx5CI7vMc=" + }, + "com/sun/activation#all/2.0.1": { + "pom": "sha256-ZI1dYrYVP0LxkM7S1ucMHmRCVQyc/rZvvuCWHGYWssw=" + }, + "com/sun/activation#jakarta.activation/2.0.1": { + "jar": "sha256-ueJLfdbgdJVWLqllMb4xMMltuk144d/Yitu96/QzKHE=", + "pom": "sha256-igaFktsI5oUyBP8LYlowFDjjw26l8a5lur/tIIUCeBo=" + }, + "com/webauthn4j#webauthn4j-core/0.29.3.RELEASE": { + "jar": "sha256-KwcixSJzMd6gy6hVyM06C0wu+d1SKN3HP7g9wV4ado4=", + "module": "sha256-LvUJKU66sFQfwNJLBbuUReNtMbveczzXFFsUtKujeYg=", + "pom": "sha256-mRqiEmv00c88ly/MiIKgb0F2Q17FlC1CT2+Ou6GGp2A=" + }, + "commons-codec#commons-codec/1.11": { + "jar": "sha256-5ZnVMY6Xqkj0ITaikn5t+k6Igd/w5sjjEJ3bv/Ude30=", + "pom": "sha256-wecUDR3qj981KLwePFRErAtUEpcxH0X5gGwhPsPumhA=" + }, + "io/grpc#grpc-api/1.65.0": { + "pom": "sha256-JD7d8N/78ktOlxt4m6NO0zUb0X85Y3k8JaiNJv98dDk=" + }, + "io/grpc#grpc-api/1.69.1": { + "jar": "sha256-qNPW3McfOrYT1miEIoK0iL3ZPT6ZoO9dyn7ub6c0woM=", + "pom": "sha256-vq8uR11cRdBjTU0yS/hNsqjWqSkilx5vfcJ+hRxCkH8=" + }, + "io/grpc#grpc-context/1.69.1": { + "jar": "sha256-Re+VuMFYqLW906y2e55oLvJUFLsUj0iOyEdDirZHFdQ=", + "pom": "sha256-beKbzqslob0L4R7qhGjQ4/HAxHbQpTMhW0/eHIKEtXA=" + }, + "io/grpc#grpc-core/1.69.1": { + "jar": "sha256-UTUsra7L+aSkqkLZP28fxyjx/QGwUWgDg+0J5WMf+9A=", + "pom": "sha256-loCY9KhFG7zT17iMaoq1t6dO+A397npgUvNS//eDssU=" + }, + "io/grpc#grpc-netty/1.65.0": { + "jar": "sha256-zukwf1gJhY/XtLwR1Sxqz/jamJ3yiCItDGir7Qm6SI0=", + "pom": "sha256-4WrvLiECuNN5SvCh9eEZmQFohMkR1LFeBJBmcp+u3gs=" + }, + "io/grpc#grpc-protobuf-lite/1.65.0": { + "jar": "sha256-lEZ52Y6pLvVkx+zOMKtpJRLcL/rllvTpqJQRMq+TcOg=", + "pom": "sha256-OslNjEdH7PHig5nrPaapmCJg/eAOV5Y/C6PQ3YdqFbg=" + }, + "io/grpc#grpc-protobuf/1.65.0": { + "jar": "sha256-r2l19WnK5PBaY2/cFXXi7ufMIJmrvFCvSKrGhJA0hD0=", + "pom": "sha256-3M03CJmNVXPgzZAWE0iNloomfnpXVTrrT32Hwh5dF4I=" + }, + "io/grpc#grpc-stub/1.65.0": { + "jar": "sha256-oZ+kxWQ060tyDt7JrdOJqKRCe/kYGMP0dwVxIS5b7iQ=", + "pom": "sha256-lzgLq7iK4WhKL8aUCfgkXn/507Myla47K6WuwOpWdXg=" + }, + "io/grpc#grpc-util/1.65.0": { + "jar": "sha256-aVtu9QQdECm9RyQHyMvdI11S+zJ0DZq8l64GDKggRxo=", + "pom": "sha256-iBzI5CKWjAreK+XJmBLu/82qMein8Sf9cquJgQgpgGE=" + }, + "io/netty#netty-bom/4.1.121.Final": { + "pom": "sha256-E24RjGngF0Wbor28weVaD9w2dD1X8oqOoWKpjR/LtjM=" + }, + "io/netty#netty-bom/4.1.125.Final": { + "pom": "sha256-xKF8K1VcdW41xsJQz1dSjD0uyGAeReAOHEXTofHPAhY=" + }, + "io/netty#netty-bom/4.1.128.Final": { + "pom": "sha256-6EgBU0x4auPRUcKkhzZyrehbCxxlKXM1Y8134bo5XIQ=" + }, + "io/netty#netty-buffer/4.1.128.Final": { + "jar": "sha256-Jb77ayA7SS6tMqUOc3SiUFBKS4vMYru4lZLv3zP+Pp4=", + "pom": "sha256-kTgt1XW9T7AyzRhJTMh+BD4YIIM8NXOsMkcVD5aQgPc=" + }, + "io/netty#netty-codec-dns/4.1.128.Final": { + "jar": "sha256-u5qW8kV+IacKftui8LiOvF8GyohR9iFTzMacDp3I4gg=", + "pom": "sha256-WxwtwXjziq/oavyyerkx/QGdK272ox0Z0/DKKTrMayY=" + }, + "io/netty#netty-codec-haproxy/4.1.128.Final": { + "jar": "sha256-82SM6nywJ+8KfTCuXEzfVWCVTKfhVkwjvU0B4uZu4vw=", + "pom": "sha256-0S/Naoyzjg701bI69Q+QBz0PBI7cBPK4nRJGVn+3FEE=" + }, + "io/netty#netty-codec-http/4.1.128.Final": { + "jar": "sha256-dkxClm3MnfhUE+IOCn+X08toIhl3L7jcoybgovDl9fM=", + "pom": "sha256-IWZQVqRQE/BIOYpXmYA+1Zj4yBjUWsSABlIyG4hYzKc=" + }, + "io/netty#netty-codec-http2/4.1.128.Final": { + "jar": "sha256-Rnm13lVq5UWHM/hEZX2RLeIf25aXJLbL1bGUKqCUyeY=", + "pom": "sha256-/MSa+wuxBCjX6LOlvmUApo2Hfh9sj3syhGNTq5is2KU=" + }, + "io/netty#netty-codec-socks/4.1.128.Final": { + "jar": "sha256-gxboFZNUQSqv8A+Ozmjqwfd6GXB9H1nav1BFfLdS7Os=", + "pom": "sha256-WQy4n/NyKrKoPIa1M/NlEkRWvjKSg3whUEd3Sgb48nM=" + }, + "io/netty#netty-codec/4.1.128.Final": { + "jar": "sha256-0qrYGYggsdCFb6k/4KxvGTW9lQpIqyuF5bStvfxfp7Q=", + "pom": "sha256-Wjb0rUE+qslHS9wKtZBKZMfplniQDofNQPjqb/TVAWo=" + }, + "io/netty#netty-common/4.1.128.Final": { + "jar": "sha256-V12BA0KyQA+vgIW4/AveCUMtr26LknxNyyRvDuWz6Y8=", + "pom": "sha256-8VBjPV5LdwT/Wqdf4jXBXcqNwn+Sei32qMMGwmHhPTo=" + }, + "io/netty#netty-handler-proxy/4.1.128.Final": { + "jar": "sha256-gIQ08tqZP7DzJ2Y6qO8wdWx+6UsWQiE4jsY/7UqfaqY=", + "pom": "sha256-IxkMAx2zJZnCAzvie+9NrCzY2AgdUZ0H9+EjBQG3ic0=" + }, + "io/netty#netty-handler/4.1.128.Final": { + "jar": "sha256-2eP9m4OcsgcDD/04XVs8CH2/dGpkMFbbVE8WMYVzl18=", + "pom": "sha256-Us8llYniP11RyEQGwResnM9zVXf3ozmDomKHwiJzd0w=" + }, + "io/netty#netty-parent/4.1.128.Final": { + "pom": "sha256-MP+WtQDff6aHKn4uvjY57xc84HQ+FiUX+w50qiC77nQ=" + }, + "io/netty#netty-resolver-dns/4.1.128.Final": { + "jar": "sha256-JxwndI/K5eaL7nSvgaFQ0cQLTCE9g23LFYQ8CQpFLEo=", + "pom": "sha256-4Plrh2cPdoEbY9rr2Uv3hf4QbqykPe90SCWcmUYUzJE=" + }, + "io/netty#netty-resolver/4.1.128.Final": { + "jar": "sha256-OsK48KAP7HhaBkgXL7uLrGqOj1Tn1aqVh5Dl3nBQS2s=", + "pom": "sha256-Ksv4nHRODB31ls68vwy+qbr0JtFbFu81VXSpeMcxhBU=" + }, + "io/netty#netty-transport-native-unix-common/4.1.128.Final": { + "jar": "sha256-hWPiIpFJ2UKYjUp6DsfAG5oF3vUq0oRGM94lxcCmhp8=", + "pom": "sha256-DYZVX0OzfMzjiI4UgkIJYa0KrRxil44dUZifKr3S3xo=" + }, + "io/netty#netty-transport/4.1.128.Final": { + "jar": "sha256-3JEHqukxy1z1lHGDU1j2i0y5VIyfsKn+Bqzyo9PUIvI=", + "pom": "sha256-7hczPyV6AU9abJ92wHCjpfn4tL2ZxInU1ErEkMPFJek=" + }, + "io/opentelemetry#opentelemetry-api-incubator/1.44.1-alpha": { + "jar": "sha256-jb9FHOWA+gJS7pynczH9IXEHEMqbc1oTWSQerTvo6+U=", + "module": "sha256-4xVFUKMLo5DGJMsWRkRzAzGPseeQ2ocO2UGb1TcBvzQ=", + "pom": "sha256-hcOLlNH3DV4pzm2VhFaKae4m3X3nMZcCFsp0FHuxNlI=" + }, + "io/opentelemetry#opentelemetry-api/1.44.1": { + "jar": "sha256-CX4ucci4yBP0oTF2uq+7uxJLElP1yf/9EQvCrddKzpM=", + "module": "sha256-RbSspNj7Vc4bw+hkVvSTGQhRnvRJIb9+zLskhezCVeg=", + "pom": "sha256-KS4M34NNybob7DZvStv+UzZx9DZ3mlfBgshKTLU/PKQ=" + }, + "io/opentelemetry#opentelemetry-context/1.44.1": { + "jar": "sha256-AGs/fDiANWqG8CxA7t66Ek8iai8UX+kEzBt97wCIurA=", + "module": "sha256-h8s/2z9n8MpQ+C211ma7biS2jngCKKCXZD6JuXFQZGA=", + "pom": "sha256-zODnGGvOKSWMYdP68YUjTedaN3g81Lz++gr15YzkCWU=" + }, + "io/opentelemetry#opentelemetry-exporter-common/1.44.1": { + "jar": "sha256-JZtlrcHolpgEtCMlKb1Sy6qr+GBJxATyW841iYAjaWs=", + "module": "sha256-yW92+ff4JJk+mdYynDqOkJULe+ASlBrbPoo0jtK9gJo=", + "pom": "sha256-zBc+te2QVHVmGNUJFoMV9UiNn+doBox0QYX/3fBwFVI=" + }, + "io/opentelemetry#opentelemetry-exporter-otlp-common/1.44.1": { + "jar": "sha256-WJOFzt6Ol0oJJ1PXuvvFr9JujqrZcOl1+1EQZVe9rkE=", + "module": "sha256-K1ONCNGjdLY5Pj6Ucmzad+9FwSIDvt+g3HpEBSG5tRU=", + "pom": "sha256-/n6L61GdAJnLCzn8YmfP8rXdEgpSF92tJtJbvVI+IDg=" + }, + "io/opentelemetry#opentelemetry-exporter-otlp/1.44.1": { + "jar": "sha256-k4T6qDHwgt0QyksJ6xkG+izdiooP2/ylbrtPtNbiBew=", + "module": "sha256-aK04rzhflHG9FcXFzvj3ZWLTSO55JVXtaAMt9AGWP6I=", + "pom": "sha256-xEkzR+8x4M1O7083/BT7LDLOoOZ+kY+c5UZbuZtpKp4=" + }, + "io/opentelemetry#opentelemetry-sdk-common/1.44.1": { + "jar": "sha256-N3D8R37g+rIeeWu1WfCpltOMdE86Fwho0bO4W2O4J9A=", + "module": "sha256-GJDjyaKYoES0Wvc0EfKQ7GN7RLKHJReJ9jbHrWMmbic=", + "pom": "sha256-lSuXrrc9sdi6OocSdRPbY15F9Dy3jFqJY10DCmoyG/E=" + }, + "io/opentelemetry#opentelemetry-sdk-extension-autoconfigure-spi/1.44.1": { + "jar": "sha256-80eK+W5PL1/WAoNSJVPeTOmcA2BqFuRg0HvG7uEvn5U=", + "module": "sha256-RR2LypYXHnQYdi+k56TE+NaVsft0p9/2VcEvR1l0ACY=", + "pom": "sha256-0VY919SNjat3nNL+nHsvMUuDezLjJlT2yvvfvzQCCkw=" + }, + "io/opentelemetry#opentelemetry-sdk-extension-autoconfigure/1.44.1": { + "jar": "sha256-IsMSy/77GmqKsJc/P//oLDJpCJgmSqW6eUH77TM/Rrc=", + "module": "sha256-8Pp/J/HrRfuGKXzUhTVHWdCdSD4toO5+CM3+rJg8S50=", + "pom": "sha256-d8LvW3ZBR/ugGutAqaLHbH5BoVoWB31LRfYqywraQsM=" + }, + "io/opentelemetry#opentelemetry-sdk-logs/1.44.1": { + "jar": "sha256-ukqXlm3tKSfcqubpG/ChcHhn5EzD3Srkx++CFL342vc=", + "module": "sha256-WqzBloLcDuNB5WKaKCnrrdgQ2FlKOddardqk2bSD/Bc=", + "pom": "sha256-ZfhfVBB+2/csorRqovDFeVBl4sdD6nAi2WyWJm6PJb0=" + }, + "io/opentelemetry#opentelemetry-sdk-metrics/1.44.1": { + "jar": "sha256-PAlmipbx6UQ9KJSuRWZ0yMOLIhwJbDkfyBYW2qZyv2g=", + "module": "sha256-6rYDVYnMHynQbSW4JEa6175P6OqXdHjg35UhMe4e1Vo=", + "pom": "sha256-0aP1lEWdRQUX5k6D+dqjIj5RxSfouDGYLpfsDd7OjN8=" + }, + "io/opentelemetry#opentelemetry-sdk-trace/1.44.1": { + "jar": "sha256-/wE6uUVWfcy13eY496NmUZ3vvS0TjfE3CTboR+9gjIc=", + "module": "sha256-GbZ9F2m+2icA2wziDS5OMg+dGMHX3DW2iy2rq2e99M4=", + "pom": "sha256-Yhr6Z+8S2iKViUfNm8JR0vbCfSgzMOu+XKJv6fjscpo=" + }, + "io/opentelemetry#opentelemetry-sdk/1.44.1": { + "jar": "sha256-fGTzMOwZeh64gFm5fck3b9uYNmlQJ8lqDLTnTvkXzr4=", + "module": "sha256-l4xnOlg7C4VWdDijcn/JJ/uxB8zdniLEV27NQ1O8bto=", + "pom": "sha256-mSRNwYlhphYEI96Ks0Gg1cd5VcUrFHoFzLxxz75qrXU=" + }, + "io/opentelemetry/instrumentation#opentelemetry-instrumentation-annotations-support/2.10.0-alpha": { + "jar": "sha256-+M7F7I2nF9sluK0wctA0PmNvW1uHv/2T2wks+/2/SAI=", + "module": "sha256-SX5VTcazi7yAtwUGYkv4ZHL7gPsSRhBUX/wVCtyVQPM=", + "pom": "sha256-8NVbPyHN3//YXrGy4nd1BuIhLmQEB381sh/GlUJ+/4A=" + }, + "io/opentelemetry/instrumentation#opentelemetry-instrumentation-annotations/2.10.0": { + "jar": "sha256-kGuirHRxCeRUC9hyN2P8HQxRYAuf6iA7oidqQpWb9tM=", + "module": "sha256-W6mFKXlR/zMxayDtgRXkPLgnZc7N74ijq0y9i88sOuY=", + "pom": "sha256-6QM+fjTF3BegyTlR1hFKejiSr6JyVICuptsHYcgK4n0=" + }, + "io/opentelemetry/instrumentation#opentelemetry-instrumentation-api-incubator/2.10.0-alpha": { + "jar": "sha256-5q0LzuRnSZPxX9ZyACCQ97EI/+lf59otiCmJy+txmkw=", + "module": "sha256-4KjCBqOkKfT0rs73Fs6KntB0IMLRA51EPsvy88qeYDE=", + "pom": "sha256-NqfREgpfdEiRf0BB7HRejvP6aahhCNgmsY3ejoxyskI=" + }, + "io/opentelemetry/instrumentation#opentelemetry-instrumentation-api/2.10.0": { + "jar": "sha256-qxU1wp+S/Py3Vf35aQTTFxYcauJ9U4Xr6oyOOU0p5vY=", + "module": "sha256-1J2QILHe9JzH4Vp9AvoAIGLSd2/RZdyJ8SpL/hCXdGE=", + "pom": "sha256-KHIpdPydxrwV+ETuAhYEkhpVtI1aalZdmb7GQkuZ+D0=" + }, + "io/opentelemetry/instrumentation#opentelemetry-jdbc/2.10.0-alpha": { + "jar": "sha256-nO9Jvc7m0ndyWZUAQXQ2XXT7MV1zdDVbd00j1zvP8Hc=", + "module": "sha256-S643TODrEX09xYI5IBRQQf2wPLRz+TuEmrmODGsGuB8=", + "pom": "sha256-hchv5iiuk9gYQXQ5oVUtVUj4kMcfTS8KUsBvgq8gDLE=" + }, + "io/opentelemetry/instrumentation#opentelemetry-runtime-telemetry-java17/2.10.0-alpha": { + "jar": "sha256-eIoK0DsirJr24w+rkQNHCAd0Glqx8lrsAP1HQMSQ8cM=", + "module": "sha256-xqxvXJOqGGKNmG7KMw9YcLUPBQ4Wy5u8jt2Af0eoqSc=", + "pom": "sha256-1/247cE3DrnctSvBVqFlNRxYdeZZNYhWfzv39MrOues=" + }, + "io/opentelemetry/instrumentation#opentelemetry-runtime-telemetry-java8/2.10.0-alpha": { + "jar": "sha256-FlgPr5BTL2AXlnesGISpZjrecEf5UEqGcUbQrssyYyY=", + "module": "sha256-NoAo0AwQf6M46e3eyYXb284JzyAwkPpxldArDT4U/eM=", + "pom": "sha256-1S1lVTYZ50/4xiD9J4wPspBZChhRyVFrumhtKX4nadM=" + }, + "io/opentelemetry/semconv#opentelemetry-semconv-incubating/1.29.0-alpha": { + "jar": "sha256-KNFmd+YnvROgJJe63cUjX/86TcmJO25xDaXX7n+OkRs=", + "module": "sha256-UQnQAW3PUDYkHNqJFISYO+QYwmqPq4c3a6XprAIyxyo=", + "pom": "sha256-bGXZkzdvLC9hRrir8BYts2lbnWXteUOYnr1O5nlUHec=" + }, + "io/opentelemetry/semconv#opentelemetry-semconv/1.28.0-alpha": { + "module": "sha256-a+M8eGFUBbP+AKl/Kq/heNGT8/GXgbsMnS1BDKtMs/0=", + "pom": "sha256-WxMz4G1KPsra2LV6BJfZU4gLCL4fTBlKHR5ql2yE5VQ=" + }, + "io/opentelemetry/semconv#opentelemetry-semconv/1.29.0-alpha": { + "jar": "sha256-qV8a7X4/ZDU+xiXG3vcqDKrwa2xTlw9Xj91RPa/Zlf0=", + "module": "sha256-uCvms5s/HXFPu90Te+mLagSeocjD/bPSRP+4YlGYOmg=", + "pom": "sha256-ritWG/POdHQlww2QMVMJt1fV/Qn/GVykQE5XSadm8hs=" + }, + "io/perfmark#perfmark-api/0.27.0": { + "jar": "sha256-x7R4UD7FJOVd8ZtCTUbSfIporrgBZk+t1PBptx9S0PY=", + "module": "sha256-n2xOamK43v0UFzrNt9spPQhjU7Ikkj7vYpP1gWGJPMo=", + "pom": "sha256-IsF1wsGCNmdjDITnMiV2f1lwSS2ObL/7gaZXXbpHLSY=" + }, + "io/quarkus#quarkus-arc-parent/3.27.1": { + "pom": "sha256-r+Hy3BjQ0h4WmNEdMfWvqvH/y2qGBuP/rVWHUOiCzJg=" + }, + "io/quarkus#quarkus-arc/3.27.1": { + "jar": "sha256-S+KuUy1yMtViIe5+Dl7vDOROCwLFYTlh7f2q+vAl4Uk=", + "pom": "sha256-sj5Fn2K/Q4n4CDLsu+S0sndYsatMZjWr9Gc/BIFpC7Q=" + }, + "io/quarkus#quarkus-bom/3.27.1": { + "pom": "sha256-ic2cgol50N/WCG53Rw+dv2CpvFwC4+I6S4hh6to26vE=" + }, + "io/quarkus#quarkus-bootstrap-bom-test/3.27.1": { + "pom": "sha256-SuT+6+5SQplL2pTWVuM7oOwm8cl0KD5ivRMAKoDNofA=" + }, + "io/quarkus#quarkus-bootstrap-bom/3.27.1": { + "pom": "sha256-41TAMHxEga56DfKpfTy/f7E9z1gzQmNvXGHPlHdzhx0=" + }, + "io/quarkus#quarkus-bootstrap-parent/3.27.1": { + "pom": "sha256-PnAy4WfoK+CG+M/d6cWX4fxMEspy3UgyBuVKwe07Kpk=" + }, + "io/quarkus#quarkus-bootstrap-runner/3.27.1": { + "jar": "sha256-bkZqKVQOOCGzCHFNhS42nk4pksXmJFu8k/N5aDUf7cc=", + "pom": "sha256-LVBxXS6bD71Herqo/X5otezJf5mQ5GWSpdKH5p9nypg=" + }, + "io/quarkus#quarkus-build-parent/3.27.1": { + "pom": "sha256-i/dMvx3yTW3Na0BPk5gIs5X4LwV9QBi7iN3XCH1QaYw=" + }, + "io/quarkus#quarkus-classloader-commons/3.27.1": { + "jar": "sha256-tvj6OuYXuPm0drE0RYEaF5DJVyEw4Iwdw+xUCvAN1Tg=", + "pom": "sha256-pVhBcPuOEnunyM58orVoFFiqWBi/diaFO5oXmvEDUQY=" + }, + "io/quarkus#quarkus-core-parent/3.27.1": { + "pom": "sha256-AqCmkFLzkc5pJgJXlnyZSC+GVVtphw9TtG94ArzQC6A=" + }, + "io/quarkus#quarkus-core/3.27.1": { + "jar": "sha256-vquzQtI6cQY61ffEsJhdX8lZPxkbmmF2dnGmwrPC1AA=", + "pom": "sha256-gMiPhJuvoaJk5c3GDSM03kaZuaep37xh8BKEAQcSwhU=" + }, + "io/quarkus#quarkus-credentials-parent/3.27.1": { + "pom": "sha256-5LqD5xw19ulq6raZ+0Lj9WEeAzAfx6KCRMq/2w1ajDE=" + }, + "io/quarkus#quarkus-credentials/3.27.1": { + "jar": "sha256-RV2rOiUQwoqxAneuY1Ja8mRqSxBaYxnoQadVlOXWvQw=", + "pom": "sha256-Ta/o/0o264J9wgLgnpva8Kw75UG/x5RhjPNWP+4nqSo=" + }, + "io/quarkus#quarkus-development-mode-spi/3.27.1": { + "jar": "sha256-KYQeqIU8rGPKoDdP70flt4fnLiPLn2kfPcwLaTyaAV0=", + "pom": "sha256-08R9mFvm97gLRlOmVcXSpaWCaE6LmdqOrU6DBXhLSjc=" + }, + "io/quarkus#quarkus-extensions-parent/3.27.1": { + "pom": "sha256-AL/j47l8ooM2I4PqlAqQ6GMJ9wDu0r2nPKa/7sFMNAY=" + }, + "io/quarkus#quarkus-fs-util/1.1.0": { + "jar": "sha256-UVeS4sJh5wS1wFK+If2qnMQ6pf2FiN9Tzy7dBx/Z7iY=", + "pom": "sha256-b3vzqQRLngi5QKZ4aONBjJrTtaUw4L92iMJpTR4jYK4=" + }, + "io/quarkus#quarkus-grpc-common-parent/3.27.1": { + "pom": "sha256-ATBpJ84MCd1dbs9n8I9+6+TChHoOSoGfd1lEqyMHF1c=" + }, + "io/quarkus#quarkus-grpc-common/3.27.1": { + "jar": "sha256-tBgyjQj4Dkntr2ElV4n+OSWfdpyBlf4tYc3MCPLQpF8=", + "pom": "sha256-t7qidlYUCqTpKQg6m5jbwxWtTdquIMw7jqNghRxGs6U=" + }, + "io/quarkus#quarkus-ide-launcher/3.27.1": { + "jar": "sha256-WGzMWDNhLILgmNcD8f69E8OJKXsizxw79rui7m2XQCc=", + "pom": "sha256-sZonPJXUOMg93h052ulF3mOyienRjJezqgAZLifFgUo=" + }, + "io/quarkus#quarkus-mutiny-parent/3.27.1": { + "pom": "sha256-4fDk629gp9colHbBpBYXbC29Yg6pparY9rN2p7gM8t0=" + }, + "io/quarkus#quarkus-mutiny/3.27.1": { + "jar": "sha256-Wa9V7q4wnBRjRtw0opZAWdEw8YDyDtca8fqbXknreEc=", + "pom": "sha256-OBw67j40/cj4cwshiLbXJfkWTzU9oJVYKoIQOFa8R80=" + }, + "io/quarkus#quarkus-netty-parent/3.27.1": { + "pom": "sha256-ZJ3QhMKK1c0ybVhKcD7O8MZoqpEMHh2lPZ1yFNzJ+kI=" + }, + "io/quarkus#quarkus-netty/3.27.1": { + "jar": "sha256-eOuqYoIrJk0n1WsHH8W/Wej1FRn0gqzMGjsKkOasxXY=", + "pom": "sha256-aoNgfiRQ3/ySdDIQz2KHsfVVkykRiXvlfEEjCjdk7n8=" + }, + "io/quarkus#quarkus-opentelemetry-parent/3.27.1": { + "pom": "sha256-FDRhOYZblfU3H78qu7Kaeg/hrhC1qMRdKZcBJtRjEZc=" + }, + "io/quarkus#quarkus-opentelemetry/3.27.1": { + "jar": "sha256-TccC56imxwSa79eSZsM1j3D1z8bpAFHXx+Epz1VzUTQ=", + "pom": "sha256-EhcHh+DF3S6/FtlXeQ95eImZSedMBG6AzFwr7kWbC6A=" + }, + "io/quarkus#quarkus-parent/3.27.1": { + "pom": "sha256-aQJC4vk6U1kcqebmETu9x6BuaHcVI2gxVlcHeD09rFE=" + }, + "io/quarkus#quarkus-project/3.27.1": { + "pom": "sha256-XZ2SuvTsWMF+8kyCuC/Mu1otcV17P6qV8QfrAOVx2fM=" + }, + "io/quarkus#quarkus-security-parent/3.27.1": { + "pom": "sha256-/rbLSu0vEByzvOoa89+gLoHfQEXM5A3VCDTsrDaJBa0=" + }, + "io/quarkus#quarkus-security-runtime-spi/3.27.1": { + "jar": "sha256-bahwghgxPVoHqybwm3ARXMf8fan17WviCwQTMHwOTUA=", + "pom": "sha256-eDWfYKR6nRue9h/VFOQ6ZSG2nymsfLTcAgtl8kZDbdw=" + }, + "io/quarkus#quarkus-smallrye-context-propagation-parent/3.27.1": { + "pom": "sha256-bIPmNx+8faZa7GzEk2xgi8hTudJMpcX/7Ku48hBIPSg=" + }, + "io/quarkus#quarkus-smallrye-context-propagation/3.27.1": { + "jar": "sha256-78RAqAHk8YcLVRxj/87yT2O7TFxtbwHxiP71ddCagv8=", + "pom": "sha256-DbWuY2oMAdOI/oXi6Aeh4S/B4NqGAN4nJyMpgy2BYFI=" + }, + "io/quarkus#quarkus-tls-registry-parent/3.27.1": { + "pom": "sha256-8PmG4m64Xu7/YDJ7nslzA5pVlNibbXk+sw5Hw2Nujtk=" + }, + "io/quarkus#quarkus-tls-registry-spi/3.27.1": { + "jar": "sha256-AcDTssFYrwsKZRRLj82akg84+LV/9sgTe16NikVOEJY=", + "pom": "sha256-4P0BVMC8mvJ5gr3wZHnPhXLK6VxXdJjCFk372ylkqJI=" + }, + "io/quarkus#quarkus-tls-registry/3.27.1": { + "jar": "sha256-RM8NWfK1aDU9s8xAa9cnF0n4wZ6X3Q1glm8oQ1yfXAQ=", + "pom": "sha256-joJAcS7zcwoLie7o/XmPCWjTEoTKrgxbhP9KOXzyqYU=" + }, + "io/quarkus#quarkus-vertx-latebound-mdc-provider/3.27.1": { + "jar": "sha256-lYG3JcmSE5QU5w0yddTBFteOr5+76NkmbmZCVU48vIw=", + "pom": "sha256-7cHLybq1IlWyKODz37U17bnkeEsfA/F2Lk8lCxeeC0E=" + }, + "io/quarkus#quarkus-vertx-parent/3.27.1": { + "pom": "sha256-vraDDs16B9havTqUhKmBYMyiKwfiHzafHBOs4Rv7Moo=" + }, + "io/quarkus#quarkus-vertx/3.27.1": { + "jar": "sha256-MXhCvYIKlsoVWeVjPJ/qUGWGOqm4ShZWJa4QzOe+7gU=", + "pom": "sha256-ipj01ZM9buhM4iYAkvVTmhJ69Zb9LEp5Sp0HjQTSI1s=" + }, + "io/quarkus#quarkus-virtual-threads-parent/3.27.1": { + "pom": "sha256-tbV3LVxACcbKSif/FSPxnuwREInFliWTb4eEaEaKCHI=" + }, + "io/quarkus#quarkus-virtual-threads/3.27.1": { + "jar": "sha256-nFsg/8wBVE6o9Zafk3VrlvcYff/hm9B3n474OMhzchM=", + "pom": "sha256-D7dc1AZNuhnkns7sSQC8mkY24aMtdC5K8cYIgkFMUS8=" + }, + "io/quarkus#quarkus-websockets-next-parent/3.27.1": { + "pom": "sha256-M7QoaUhK3FVN1LL+C9A8eKOK82nHtWM59AJGJylvtHw=" + }, + "io/quarkus#quarkus-websockets-next-spi/3.27.1": { + "jar": "sha256-ieUFqGTfVK/smA2Sx4GoPUCUWHvlHOBqXUr5RouJYQ8=", + "pom": "sha256-ir5mMbxgTbc5CKl+VT8xEbQG0j0YFg7lvuzmSpgc+2I=" + }, + "io/quarkus/arc#arc-parent/3.27.1": { + "pom": "sha256-RLsMrAX3FOcOWQ7t39YS7AJo0clPMLgp0JS+KGobLf4=" + }, + "io/quarkus/arc#arc/3.27.1": { + "jar": "sha256-QNVht1tRjvE3aBA7Ees//i6lII4z2xERvQSr+wsE0Zg=", + "pom": "sha256-QvLyd1g/azcc1ZtnTZBMI3NC5ksaXcKtHcdwpOVGMsc=" + }, + "io/quarkus/platform#quarkus-bom/3.27.1": { + "pom": "sha256-HSMAeLG5ZadDG4+U+JqlQfsxKs//zlAppjKh9RbXoIU=" + }, + "io/quarkus/security#quarkus-security/2.2.1": { + "jar": "sha256-tQIPb8xQbS23HBesaFTMOpB4wLc5UpGASNHyy7Sn2Pg=", + "pom": "sha256-61QM6rzfhW8vhd1hzXDVDrIYSPb6mMFcSR/5ngWVZ+o=" + }, + "io/reactivex/rxjava3#rxjava/3.1.10": { + "jar": "sha256-6fJW+egFVy3V/UWxQNs2DX3ERNDDgwSbLT1+vwXYSqs=", + "module": "sha256-rwV/vBEyR6Pp/cYOWU+dh2xPW8oZy4sb2myBGP9ixpU=", + "pom": "sha256-EeldzI+ywwumAH/f9GxW+HF2/lwwLFGEQThZEk1Tq60=" + }, + "io/setl#rdf-urdna/1.1": { + "jar": "sha256-xXoq5VG9MB+E+vEBAlHZZRCkDisA2IPobN0tDfpvAa4=", + "pom": "sha256-A9Ntu7P+61HJhioDg6G/JMnvI/3MM+IaPi3iAxE/OF0=" + }, + "io/smallrye#smallrye-build-parent/41": { + "pom": "sha256-cMa/huHu5E1o5zmJYoghjLU6mtI+GNJHp5FBXKdyfGU=" + }, + "io/smallrye#smallrye-build-parent/42": { + "pom": "sha256-FBJFawNFSQ+NC00L5SnQSh1Y0Z1a2FvzHDdAwT+Q1t4=" + }, + "io/smallrye#smallrye-build-parent/45": { + "pom": "sha256-1vPL5JFUM6LZ9bmsEjjul17d+7En3yDbdpRpCKBMXys=" + }, + "io/smallrye#smallrye-build-parent/46": { + "pom": "sha256-FP8daINJaqcRP89+Fv5Whyr1hL2g2G16nreXQkW4zFE=" + }, + "io/smallrye#smallrye-build-parent/47": { + "pom": "sha256-1xrwHMwBPiiKiVx5tegErdaADy3r6NWXUSAaYsqt5Bk=" + }, + "io/smallrye#smallrye-context-propagation-api/2.2.1": { + "jar": "sha256-oTFH8wXUh5B0wHOt/YYdBwdieLGPH4AQrNgf2KIfXLk=", + "pom": "sha256-Xv/VEJ3oz9ZYvhkePAgHx9ri8OOcFIZslJzY0JxalWk=" + }, + "io/smallrye#smallrye-context-propagation-parent/2.2.1": { + "pom": "sha256-5unin/Ow22Q+mTxqico0Edh7FxMlbOd/3yTn6hcIxps=" + }, + "io/smallrye#smallrye-context-propagation-storage/2.2.1": { + "jar": "sha256-OzR7tXyOyT7SN1rnjySQj6C1QaEQ3oCv22PzJaXIpwU=", + "pom": "sha256-Z5IMHn2OUknNWtW2siSG10hnnAYml6unH7a8YHPrRxg=" + }, + "io/smallrye#smallrye-context-propagation/2.2.1": { + "jar": "sha256-kfolPYvZA2cvMLm80DqX8DpzSZ9aftH9PQPQT1NIVJo=", + "pom": "sha256-THy3aKr/jqdJXTUy9VVqP9wjaRas02QbF3745PJs2OY=" + }, + "io/smallrye#smallrye-fault-tolerance-implementation-parent/6.9.3": { + "pom": "sha256-ZVqovQk90r2ER3clp+IuJFvrUzHhXUpuX9W4rhH66p8=" + }, + "io/smallrye#smallrye-fault-tolerance-parent/6.9.3": { + "pom": "sha256-r/x2bbL5uacuQnzsKg0tZn0Lq5CohWTmPxv62is8yGA=" + }, + "io/smallrye#smallrye-fault-tolerance-vertx/6.9.3": { + "jar": "sha256-QQh8osz5wPJY3zY59uT5WbeRFZbQ8XXulCeNWbxIhKA=", + "pom": "sha256-hhpJklfkS8MRa9DJANGSPAzHh8JI3RzG7YMm/4EvCXk=" + }, + "io/smallrye#smallrye-parent/41": { + "pom": "sha256-ioaQNk3oDebPDRAahYPpMb6E4Ej6OHw5i79upl8lrQw=" + }, + "io/smallrye#smallrye-parent/42": { + "pom": "sha256-EGQjW60r3LUZiEslMIbPyqQ0Ft20fExszkIVadt5ooU=" + }, + "io/smallrye#smallrye-parent/46": { + "pom": "sha256-SwaHf4gDT1Nv8tl97y0zlQq2ROCZFWOb6lOPasl+je4=" + }, + "io/smallrye#smallrye-parent/47": { + "pom": "sha256-5kq1jZ4QolJiHzARt1x+dbNHmlvOiBoiuO+msH4EhDI=" + }, + "io/smallrye/certs#smallrye-certificate-generator-parent/0.9.2": { + "pom": "sha256-8aCsVJaI1GhDzzDhM3F6Gck17ytxXVemI6lfpzyjG2c=" + }, + "io/smallrye/certs#smallrye-private-key-pem-parser/0.9.2": { + "jar": "sha256-S6mOku0gNZPYfjhKHgn6lsGMkBc6YXD+pxzyOhycUoY=", + "pom": "sha256-xGmWD+xR7AjjvWN3l2QsRK3yIAFI0x6DJCLmU6XN/o8=" + }, + "io/smallrye/common#smallrye-common-annotation/2.13.9": { + "jar": "sha256-rT7/FbRvv4G7yVMVFEZAd0veeBfC51mBIwof4563Qpo=", + "pom": "sha256-SFvgX+ekxY65Ejs7GOv0QO5jwAHwaG65RJoQ9cRz6ek=" + }, + "io/smallrye/common#smallrye-common-bom/2.12.0": { + "pom": "sha256-KO214eRveaA0DEcf1MV3AV7+xXqcDC7wP+lNsuMh+vA=" + }, + "io/smallrye/common#smallrye-common-bom/2.13.7": { + "pom": "sha256-ONZLzK+YWJ7WHBXQo4w7Z6WQytJS/Hef5SZgk++Da7w=" + }, + "io/smallrye/common#smallrye-common-bom/2.13.9": { + "pom": "sha256-0HBc+5T145lqWx69/t6T9JGe86VS9nwcccsf0gbleRQ=" + }, + "io/smallrye/common#smallrye-common-bom/2.2.0": { + "pom": "sha256-qLCcNrWIuSXIMKhUV+75cVVOQk4H6wu+1GnGruoLiAk=" + }, + "io/smallrye/common#smallrye-common-bom/2.4.0": { + "pom": "sha256-puGY/JfU0KDHsxCSPhkTTjS6+jHmpG6CcmYDwLxeYow=" + }, + "io/smallrye/common#smallrye-common-classloader/2.13.7": { + "jar": "sha256-UauhPN7KCsXFLwPBgM+ovgm3BSYVM/9wKIxt8BpFeds=", + "pom": "sha256-PgSr+3GjSeEcYi8sYv5Ac2Nx7buorTcgLwf9JbnJN4k=" + }, + "io/smallrye/common#smallrye-common-constraint/2.13.9": { + "jar": "sha256-x11vzsuGdIAQbtFmB/A5MHiIOMT9lZ0R4FqRbl6uOgE=", + "pom": "sha256-atuj2SyHn4RCf3M5FqHGSvF4xjirIUVBd/kYMXPj0EI=" + }, + "io/smallrye/common#smallrye-common-cpu/2.12.0": { + "jar": "sha256-nR3X1CNMWNiRmNd3+hxretVTNm9fY1S4HNwjIE73cJA=", + "pom": "sha256-++jCL2Z7E7lT9AFC5AWZmMBunYdM9jxZweAlErHvBoQ=" + }, + "io/smallrye/common#smallrye-common-cpu/2.2.0": { + "pom": "sha256-0mGDziGlS1zTx9LyEZ18DDFLgs5OLXWsXHze+sQBK4M=" + }, + "io/smallrye/common#smallrye-common-expression/2.13.7": { + "jar": "sha256-QF4QVDL9FaTbTTzx+Q9bIRfSEohb4p4D5haG5NkZQPQ=", + "pom": "sha256-NEoEFG5anaEB6JLhnh4ThyxQvRAkKxudJX3/zkBXQa4=" + }, + "io/smallrye/common#smallrye-common-expression/2.2.0": { + "pom": "sha256-1uROh7ttspfOvjlga2s3qaLbDTShf2sLmZxAWDsNL1o=" + }, + "io/smallrye/common#smallrye-common-expression/2.4.0": { + "pom": "sha256-wBzAQOvkRjOSkKdFwFvU4nykStE1TbF/g9VpXEMeErk=" + }, + "io/smallrye/common#smallrye-common-function/2.12.0": { + "pom": "sha256-dYYLzV8fA29BYMyMqrNw55t2iend1Q0hDHey8gtBpDg=" + }, + "io/smallrye/common#smallrye-common-function/2.13.7": { + "jar": "sha256-xj4w9o6RJSiMT8DXcrpWHnKSjStsKiJYHM1GbfRaFz8=", + "pom": "sha256-8s3BlLdddMAJQzF6Kquv0cpz5w6XmX3qw5NZHRaq7N4=" + }, + "io/smallrye/common#smallrye-common-io/2.13.9": { + "jar": "sha256-YTJRL6HDLqY7nw2stfuF9dQY8ltwh9iNtu0pRWCoiOs=", + "pom": "sha256-qmB8FWWNw3VPNWFw0ChKzMv/Zrk3NxxXiVwVdoCN8EE=" + }, + "io/smallrye/common#smallrye-common-net/2.2.0": { + "pom": "sha256-Jamu9WCWh9aY0pXM6SMr+10GTXH80kb/I90yHXGFhas=" + }, + "io/smallrye/common#smallrye-common-net/2.4.0": { + "jar": "sha256-wwPBS2+Nz+u7O/IwwcKU5MP5kOBgtKLHDo/86jyabe4=", + "pom": "sha256-oLeuxpBtgIykODX1QIJb9Dr0HkNX3Me6dcvHfuWnqLM=" + }, + "io/smallrye/common#smallrye-common-os/2.13.9": { + "jar": "sha256-jeGEbKBnSimc1sN/ZpFM5yVpAZtXBiZ6o5Y85o/YezY=", + "pom": "sha256-/VEGxFrO4x3T4EHrCDwmAhplmKAwLqy2hnrGWOsiU0E=" + }, + "io/smallrye/common#smallrye-common-parent/2.12.0": { + "pom": "sha256-Lgu9gF58//pkt4GMZmEetxMSC/EiijO5MUeaFhw3VCs=" + }, + "io/smallrye/common#smallrye-common-parent/2.13.7": { + "pom": "sha256-HekbICMWPsNipJy1t+4sfdx0n5xJUZuvx9W4RnqWMxQ=" + }, + "io/smallrye/common#smallrye-common-parent/2.13.9": { + "pom": "sha256-98YjrNoF1DADFDNl04nV4UY8i1KmDv2uTvKzD2TSBfc=" + }, + "io/smallrye/common#smallrye-common-parent/2.2.0": { + "pom": "sha256-JMv8O0a0/z97onRjG26HpkFt0rKzCLfu7JarZYHeBJc=" + }, + "io/smallrye/common#smallrye-common-parent/2.4.0": { + "pom": "sha256-snO2sOWvRzileVZ+dA4krJON7RD45EbT26GQ9xhkT+E=" + }, + "io/smallrye/common#smallrye-common-ref/2.2.0": { + "pom": "sha256-/Ix5ya3YlCcd7MU2ZM+mNevQV/XIZu7kqu9046VKC3o=" + }, + "io/smallrye/common#smallrye-common-ref/2.4.0": { + "jar": "sha256-uZAtmbUqRjzDhREF3d1Y1A9YBzUGSLmWrhYasUEjQnw=", + "pom": "sha256-wMVVPQElarUrmuLe57dismveONfMkHaddTWM8+Cpo4Y=" + }, + "io/smallrye/common#smallrye-common-vertx-context/2.13.9": { + "jar": "sha256-LwDDSoNFiipQVkJZNJnm4FxQlpTyMIcyr13ZFgrRBU0=", + "pom": "sha256-wCsRlq7H/o/kqsXkYgZXvgZXbiq55EjXZMw09N9Hh0w=" + }, + "io/smallrye/config#smallrye-config-common/3.13.4": { + "jar": "sha256-/T+28GCdLLldJhGZEhZfiQNhIDkv95yr4Lwkzbes2lE=", + "pom": "sha256-ri+qhPtc37XPeMq5BL7OtXC+zV6cZrno743VPOq7fL4=" + }, + "io/smallrye/config#smallrye-config-core/3.13.4": { + "jar": "sha256-sqxThIRLrnmLQMVwV/Ex63J1T7aDZvsJK9pdkT7ko1s=", + "pom": "sha256-WM2maEKhpej+6b1VbAsRFu2IOJlbvATOOpwTPiKQdrQ=" + }, + "io/smallrye/config#smallrye-config-parent/3.13.4": { + "pom": "sha256-O/t/MY3foMxv7MzAXEEYzA86wXVbDQRacvnfYb06AGc=" + }, + "io/smallrye/config#smallrye-config/3.13.4": { + "jar": "sha256-yo1vsLAg2HS3B/LEoT1kktYup//6lf4DwED1U/d5mPQ=", + "pom": "sha256-Ps7R2beSYvTpJIKLdp0T9bBzmDyR56XPLxpMBT66/Nw=" + }, + "io/smallrye/reactive#mutiny-bom/2.9.5": { + "pom": "sha256-fXWvERRq4a5zlsXsV2GOaue600OsxjqPJ6f26yd7yZA=" + }, + "io/smallrye/reactive#mutiny-project/2.9.5": { + "pom": "sha256-7d/eBJRqr5SzYVp4D+fNSxg9xAf9NB+fAD2zjxzYfqE=" + }, + "io/smallrye/reactive#mutiny-smallrye-context-propagation/2.9.5": { + "jar": "sha256-cxHvP49PQO/RuMKr/oecwoeojLahwz66bIGetDLLP+k=", + "pom": "sha256-f/QMyqIOqZ2jTbAKmH6RPRnICX2El3WtMeQxOMuMjZc=" + }, + "io/smallrye/reactive#mutiny/2.9.5": { + "jar": "sha256-fj0axgFs+xUm2OSav0i7cr91IwXmzX9WCfnT914EvZA=", + "pom": "sha256-cFbpIIxnrcli7KWljCsj7jk4tHMSHu6ZUbkMyaM0DQs=" + }, + "io/smallrye/reactive#smallrye-mutiny-vertx-bindings-projects/3.19.2": { + "pom": "sha256-CzmbH+pkPCpnDicjtlehqh10I7oKsj/FSS2Y86yyzow=" + }, + "io/smallrye/reactive#smallrye-mutiny-vertx-core/3.19.2": { + "jar": "sha256-qcfKgb1b20YNpCzEk9JWBJ3BVEKqKB7z+pZ66IrF5Dk=", + "pom": "sha256-PIT7fs/5TJOmACHVYXqDzKS2b4q7X8uS7WVKHDXi6RM=" + }, + "io/smallrye/reactive#smallrye-mutiny-vertx-runtime/3.19.2": { + "jar": "sha256-tje5sU0FQ20qNhx9uv/lLg7tZoBavJkhwb5Tj8uXX5U=", + "pom": "sha256-QiNzICjfVvzW8IWKpJ+gCp2HT8MzpjgsYaS5YKOQjRo=" + }, + "io/smallrye/reactive#vertx-mutiny-clients/3.19.2": { + "pom": "sha256-e9l/JtUJFNpDZVvmrytUYm/od6HyKd1uoCph+t69EEo=" + }, + "io/smallrye/reactive#vertx-mutiny-generator/3.19.2": { + "jar": "sha256-WVckM8inxyrm31HfR9Atpo1CyEnf9RMZ2CEOL+gf1lc=", + "pom": "sha256-JoZP6CzDJMcnyKZ0NJMSUPKBBDf/7Nf3KPMPS9KuLVc=" + }, + "io/smallrye/testing#smallrye-testing-bom/2.3.1": { + "pom": "sha256-PXfwZzfjRWwgi9zmKzccfsRYz2+9vJgWQIPkiFC4Mf4=" + }, + "io/smallrye/testing#smallrye-testing-parent/2.3.1": { + "pom": "sha256-vxksWNysCIzuwC3riPu+eC7iNx4N8hZh6lXPR4kZNdE=" + }, + "io/vertx#vertx-codegen/4.5.16": { + "jar": "sha256-wudmVKG/xxEBG9dDXEhWWGNdEsC06uxBNoSEmczCn1Q=", + "pom": "sha256-/cs+rzdQDBvFRtu1tV8ScKlGlkio6RfV+M1kyAfnLmM=" + }, + "io/vertx#vertx-core/4.5.21": { + "pom": "sha256-AIylD5wQ4cMOKU0Yv+2Y7/CGiZwLS/n32Ns3RUBKbz0=" + }, + "io/vertx#vertx-core/4.5.22": { + "jar": "sha256-bB9vFYrSFHY7EV7v7KFS5hl8UJeVN5bj4GCJpfxmx3Y=", + "pom": "sha256-wsD6yOTRZH8l6qULgpsrBnuZOuUgBZHbuQLdRdX3ij4=" + }, + "io/vertx#vertx-dependencies/4.5.16": { + "pom": "sha256-tMhz4Q689VFGlzc5mGbEQl5jxFF49oUIcjZfh+4CaDs=" + }, + "io/vertx#vertx-dependencies/4.5.21": { + "pom": "sha256-RoNO1Vlj5RBbGeXMUF8j3MIvQpoVPxfpCAxSrIJi34s=" + }, + "io/vertx#vertx-dependencies/4.5.22": { + "pom": "sha256-U+GlkteyIh9ohiOVtLbaA/DBgAt+tRusu12VKc2UIMw=" + }, + "io/vertx#vertx-ext-parent/42": { + "pom": "sha256-VPvxEeodETa2f+Y4RC3Eezw7ecBZgtdJbcMSpeYtyQc=" + }, + "io/vertx#vertx-ext/42": { + "pom": "sha256-MNosN+ZU8G39XLc2XbuXawmGgNc4PtcVnmP5Ysbvoro=" + }, + "io/vertx#vertx-grpc-aggregator/4.5.22": { + "pom": "sha256-R3D3MtyQl5KPEOsJIdjPXBovmTGzFQkGo6nWGWQeaRk=" + }, + "io/vertx#vertx-grpc-client/4.5.22": { + "jar": "sha256-nvyN30Badsh/HgJjO+lzUrrPHlk4FKDLJwdkRvMO6Zo=", + "pom": "sha256-Ih+tXAnSuv0wB3oRM3J7YkWbzlqROggkJ2TCznixp4o=" + }, + "io/vertx#vertx-grpc-common/4.5.22": { + "jar": "sha256-zUBB3ryzoL5+4opkYZcImYH2HeIX6q+VZ/O4B+oyqvI=", + "pom": "sha256-chScFwdbbWHREqzwqiRPwLtKHVYntJIvFJFO3p+6Nvc=" + }, + "io/vertx#vertx-grpc-parent/4.5.22": { + "pom": "sha256-xIu0mGuT2E7ar4505VDYd5KNFXrARSr5PkuBa4uUKSY=" + }, + "io/vertx#vertx-grpc-server/4.5.22": { + "jar": "sha256-GOFss0HeqpRDfvngfGW/qJQ1v279hws/Xso8bm6k+Vo=", + "pom": "sha256-0+m3LUk/WvdU8TdqUFaOvqfJqT2w8q4YwWdmfZYX8hw=" + }, + "io/vertx#vertx-grpc/4.5.22": { + "jar": "sha256-CABnjN9H+ajYOzq7Z3H0d4/Eyn3+qi2LsKkxuy0SOQ0=", + "pom": "sha256-nOrng6qgdfJsb+hMkh7f/pZ1CGtI8HeyustVaB6faYc=" + }, + "io/vertx#vertx-parent/22": { + "pom": "sha256-0RFbFBZdLwS0RoW7RJhQ3l9Yd3EGWjGJWK/Iwvv9hv0=" + }, + "jakarta/activation#jakarta.activation-api/2.1.1": { + "pom": "sha256-aTJZ+O/tqXSHm/MFz3HPELZUjYxvZ6ufNYyWrUfnygA=" + }, + "jakarta/activation#jakarta.activation-api/2.1.3": { + "jar": "sha256-AbF21xihaSY+eCkGkfxHmXcYa8xrMzSHMlCE1lhvRic=", + "pom": "sha256-slSZQMF7aGWjT2E1t3Iu2Mv+9tC2wNs3LDDwNGvIzVg=" + }, + "jakarta/annotation#jakarta.annotation-api/3.0.0": { + "jar": "sha256-sB9VVSKEz7FJQR5k6rynXpQtJtLheGsykUJQ5DMK+qI=", + "pom": "sha256-n8Zqhzdd+EQ6umvcwdT/B/EmVCWDeFpIKpJioZv+jq4=" + }, + "jakarta/el#jakarta.el-api/6.0.0": { + "jar": "sha256-8z0L7PLVUWcwulzJmntaKx9imGvwozcCSc3/mi8XFQc=", + "pom": "sha256-JsZmqRV0htvE3C6xnzuAhWDdvAukVyVNY/JcjascZtA=" + }, + "jakarta/enterprise#jakarta.enterprise.cdi-api/4.1.0": { + "jar": "sha256-xCyAjxeSUSmggA9hj+vgUNlm4YGkxzhMil56AoPWhpk=", + "pom": "sha256-1GTYSDGOBh0SNkQit1NHz8i8vSlEfbZIDTbx0CWAmFw=" + }, + "jakarta/enterprise#jakarta.enterprise.cdi-parent/4.1.0": { + "pom": "sha256-4WQl8r2D3YcdpwRKpRQBb74SBdpfsVTl2tFEtrNjgvE=" + }, + "jakarta/enterprise#jakarta.enterprise.lang-model/4.1.0": { + "jar": "sha256-u1b1cfYNKGKyOH1UaP6PVUD4CUcnKD7ZkfiQgnCAle4=", + "pom": "sha256-/2xEh5kCTGlLrItSt97jsfJkoicYpeKvTdTV+0LJiwI=" + }, + "jakarta/inject#jakarta.inject-api/2.0.1": { + "jar": "sha256-99yYBi/M8UEmq7dRtk+rEsMSVm6MvchINZi//OqTr3w=", + "pom": "sha256-5/1yMuljB6V1sklMk2fWjPQ+yYJEqs48zCPhdz/6b9o=" + }, + "jakarta/interceptor#jakarta.interceptor-api/2.2.0": { + "jar": "sha256-0kDXK03Tii5DHIBAeYEAEMuXkDZ4+l+Yf7dDSHiwQ5g=", + "pom": "sha256-jOOOxhmprbgI0qjQay+mLYmkNC5/Fu125+m7uzcypvg=" + }, + "jakarta/json#jakarta.json-api/2.1.3": { + "jar": "sha256-vJNBQoBeodeU8UQFY5ZaOGGiqft0FOzT/kTyZQBzRBQ=", + "pom": "sha256-QWpzlxOFoL5D+dqKR3qmT0gUrFIYfYjz4k8hW3+J394=" + }, + "jakarta/mail#jakarta.mail-api/2.1.1": { + "pom": "sha256-LApZ7RKeEs7aDkiIohPfsaBthZGa/OzAzBwKPUNqIqA=" + }, + "jakarta/mail#jakarta.mail-api/2.1.3": { + "jar": "sha256-gFG1jXX5gvmluWOzdlQm6CSypkhl7wrxcgXkVbmNsFw=", + "pom": "sha256-/r52PsEKgXMh7LFdqGyx+8mVx+NS4cET8P01fku1eYA=" + }, + "jakarta/transaction#jakarta.transaction-api/2.0.1": { + "jar": "sha256-UMCnx2DBOubAQqzxgrKPAEdBPblbRjb7iHm8/6tbqHU=", + "pom": "sha256-X+NJmBwVb7viY4jVmUn9rBa7jXh57mGzTEnHtc4PLyM=" + }, + "jakarta/validation#jakarta.validation-api/3.1.1": { + "jar": "sha256-Y84AFWOIw2XzrBvnH8+vEUaC/AxFICC1325+wjbhQqs=", + "pom": "sha256-qxnpAKv5Awo3+DI+Ws66WNQK+I47UqBYuOA95II1ync=" + }, + "jakarta/ws/rs#all/3.1.0": { + "pom": "sha256-1P3UF4DgZarNWsCZzQSQFxk3zFEi3CyO8biKh7PJQkw=" + }, + "jakarta/ws/rs#jakarta.ws.rs-api/3.1.0": { + "jar": "sha256-azs2KLi0rt2g0kwzVDNemFSX2O88UQuPMCjpINW4Zj0=", + "pom": "sha256-xpejA+n/wxlj6xwnW793pYOn1IKWWsTxuybckeWV/78=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api-parent/3.0.1": { + "pom": "sha256-nx+11KAun4/dYu876rlLj+p7gWQ3SMhvaKMfQPd0rVY=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api/3.0.1": { + "jar": "sha256-uPtL7j/1tcHvdxRNhBExYBjXu9Qfzx7eBkb3l4VGuGc=", + "pom": "sha256-onPayXQUEv2dzM6ZESmHBteJ5YLcs1GXB19v0qWw6+o=" + }, + "jakarta/xml/soap#jakarta.xml.soap-api/3.0.0": { + "jar": "sha256-MxJOmNcktp4Wc6YWdcIFtYw3JgX0JU1FWxKzc5ghmjc=", + "pom": "sha256-L2a6M+MGzpKyLnvPRW0S5klOepfRijqNS+rbt4Gdzdg=" + }, + "javax/annotation#javax.annotation-api/1.3.2": { + "jar": "sha256-4EulGVvNVV3JVlD3zGFNFR5LzVLSmhC4qiGX86uJq5s=", + "pom": "sha256-RqSiUcpAbnjkhT16K66DKChEpJkoUUOe6aHyNxbwa5c=" + }, + "net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" + }, + "org/apache#apache/18": { + "pom": "sha256-eDEwcoX9R1u8NrIK4454gvEcMVOx1ZMPhS1E7ajzPBc=" + }, + "org/apache#apache/21": { + "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" + }, + "org/apache/commons#commons-collections4/4.4": { + "jar": "sha256-Hfi5QwtcjtFD14FeQD4z71NxskAKrb6b2giDdi4IRtE=", + "pom": "sha256-JxvWc4Oa9G5zr/lX4pGNS/lvWsT2xs9NW+k/0fEnHE0=" + }, + "org/apache/commons#commons-parent/42": { + "pom": "sha256-zTE0lMZwtIPsJWlyrxaYszDlmPgHACNU63ZUefYEsJw=" + }, + "org/apache/commons#commons-parent/48": { + "pom": "sha256-Hh996TcKe3kB8Sjx2s0UIr504/R/lViw954EwGN8oLQ=" + }, + "org/apache/httpcomponents#httpclient/4.5.14": { + "jar": "sha256-yLx+HFGm1M5y9A0uu6vxxLaL/nbnMhBLBDgbSTR46dY=", + "pom": "sha256-8YNVr0z4CopO8E69dCpH6Qp+rwgMclsgldvE/F2977c=" + }, + "org/apache/httpcomponents#httpcomponents-client/4.5.14": { + "pom": "sha256-W60d5PEBRHZZ+J0ImGjMutZKaMxQPS1lQQtR9pBKoGE=" + }, + "org/apache/httpcomponents#httpcomponents-core/4.4.16": { + "pom": "sha256-8tdaLC1COtGFOb8hZW1W+IpAkZRKZi/K8VnVrig9t/c=" + }, + "org/apache/httpcomponents#httpcomponents-parent/11": { + "pom": "sha256-qQH4exFcVQcMfuQ+//Y+IOewLTCvJEOuKSvx9OUy06o=" + }, + "org/apache/httpcomponents#httpcore/4.4.16": { + "jar": "sha256-bJs90UKgncRo4jrTmq1vdaDyuFElEERp8CblKkdORk8=", + "pom": "sha256-PLrYSbNdrP5s7DGtraLGI8AmwyYRQbDSbux+OZxs1/o=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/checkerframework#checker-qual/3.43.0": { + "jar": "sha256-P7wumPBYVMPfFt+auqlVuRsVs+ysM2IyCO1kJGQO8PY=", + "module": "sha256-+BYzJyRauGJVMpSMcqkwVIzZfzTWw/6GD6auxaNNebQ=", + "pom": "sha256-kxO/U7Pv2KrKJm7qi5bjB5drZcCxZRDMbwIxn7rr7UM=" + }, + "org/crac#crac/1.5.0": { + "jar": "sha256-9EJuFkHI8PovAlpM18QMKFq68mWTDmcXrfyu8D0DSFA=", + "pom": "sha256-mW3NvEpNuqYmZ6d9nSoMlH7SeUpGuX5iG6nZpG4oxQ8=" + }, + "org/eclipse/angus#all/2.0.4": { + "pom": "sha256-/M1yMQnFQB6VNOZYBCnxNj/1yEa0sWkThqbx9zdcoQw=" + }, + "org/eclipse/angus#angus-activation-project/2.0.2": { + "pom": "sha256-r5GIoQy4qk61/+bTkfHuIVnx6kp/2JDuaYYj5vN52PY=" + }, + "org/eclipse/angus#angus-activation/2.0.2": { + "jar": "sha256-bdO8/8IrzoOwc3ag4uCU5JZKMZXUEY+0PjgO81Q2zB4=", + "pom": "sha256-deViGn3IWMmW7nDGtNiE2QHRh4Ns5sZxIMr5VH5vxXE=" + }, + "org/eclipse/angus#angus-mail/2.0.4": { + "jar": "sha256-hzAYZVhLrZFwZis+7vA1Cqr+pFIkg+OOVK6H3D3z6Vg=", + "pom": "sha256-hQ9aU/bgvIyFxRwmuDzkvVGEsbmC3zTRMfYIRO2T6zg=" + }, + "org/eclipse/ee4j#project/1.0.6": { + "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0=" + }, + "org/eclipse/ee4j#project/1.0.7": { + "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" + }, + "org/eclipse/ee4j#project/1.0.8": { + "pom": "sha256-DQx7blSjXq9sJG4QfrGox6yP8KC4TEibB6NXcTrfZ0s=" + }, + "org/eclipse/ee4j#project/1.0.9": { + "pom": "sha256-glN5k0oc8pJJ80ny0Yra95p7LLLb4jFRiXTh7nCUHBc=" + }, + "org/eclipse/microprofile#microprofile-parent/2.11": { + "pom": "sha256-Bh21mPB4vltnvh3qVKmYZPqaa6zH1AvPtWrArdpDdVc=" + }, + "org/eclipse/microprofile#microprofile-parent/2.8": { + "pom": "sha256-Jp6jTEQci09GlvduyeDGaE10K/13dicT+6ix5E2BI6k=" + }, + "org/eclipse/microprofile/config#microprofile-config-api/3.1": { + "jar": "sha256-3uJ3+B4e3+r9XkNYlEHs30NFAP5KMdA150uObY57/ZE=", + "pom": "sha256-GAJTRl9lUPjhlVSHJVZ5ZuUyS6NDkNGShL1V7tl+aWk=" + }, + "org/eclipse/microprofile/config#microprofile-config-parent/3.1": { + "pom": "sha256-ywzs7U528l0aYMvNPGfM9eOQKPYCTpM17fX6oPL2vhI=" + }, + "org/eclipse/microprofile/context-propagation#microprofile-context-propagation-api/1.3": { + "jar": "sha256-aczARIfod3nUlwqlDGc8w0qd8IDBwOjY6rLotG+CXPQ=", + "pom": "sha256-nvSA7RaoZ9Gux6gEH6/mDcPBdF0G68GN1d1o5sQ/qEQ=" + }, + "org/eclipse/microprofile/context-propagation#microprofile-context-propagation-parent/1.3": { + "pom": "sha256-tIsfWNtYIsWs6EQcbAymZoHUsETBbbXLDsrxMUtGeLQ=" + }, + "org/eclipse/microprofile/openapi#microprofile-openapi-api/4.0.2": { + "jar": "sha256-xvypkT1+y964AdXmyTWYghn2Sg64sX4jQ36g4B56EKk=", + "pom": "sha256-pHgztxGIuIUZs0nPLC2LTiaKn78OhbwsC0+D7VFpcwo=" + }, + "org/eclipse/microprofile/openapi#microprofile-openapi-parent/4.0.2": { + "pom": "sha256-xZ/HxL1loTq28ogYDbDT5M1n2+sINSNpqn4wu7dsKus=" + }, + "org/eclipse/parsson#parsson/1.1.6": { + "jar": "sha256-f4gAdNCe+vG3RDv9n5m1KZgTkuhFrZctu2kXNEuxOBU=", + "pom": "sha256-DZz9FQTUuOs3gmXoY4M5nPEJuYMtCQvI0OzOMiOIs9M=" + }, + "org/eclipse/parsson#project/1.1.6": { + "pom": "sha256-LuAauaenRjgO5vpjnCrxvJixnc/WCmWZZUu7uS/tftA=" + }, + "org/hibernate/validator#hibernate-validator/9.0.1.Final": { + "jar": "sha256-JfQBGPpMUPhSLQkNJdUtWjiVOwzNElCDXwUue9MWTOA=", + "pom": "sha256-5w3BopQp/dTgh1E+tk70V1IMrwpRqxFFw7ilN8hC6gw=" + }, + "org/infinispan#infinispan-bom/15.0.19.Final": { + "pom": "sha256-EORmwd1rdMnBh9B5ZpN25naQJrlCWTpKu10NQ9W4XY8=" + }, + "org/infinispan#infinispan-build-configuration-parent/15.0.19.Final": { + "pom": "sha256-3jSEoQYRh1Y+i9Jj4xFRWs3i/Ie4GgrxZJ5s/TCsjJA=" + }, + "org/infinispan#infinispan-commons-parent/15.0.19.Final": { + "pom": "sha256-luIdP8U1wVS//6cWlsrHprgsUGVAqM3CA3QXqIAc0OI=" + }, + "org/infinispan#infinispan-commons/15.0.19.Final": { + "jar": "sha256-lnV1+9JTNIcr1J2hIA8sizIwXh68z3EJUhk30PRo920=", + "pom": "sha256-sJb5V+rLRJc1umczXOCq+0OvTm2ZNvN3VHPw6sBOlRI=" + }, + "org/infinispan#infinispan-parent/15.0.19.Final": { + "pom": "sha256-jmzA2m9nq4OgTPxDgVmhqKYYpzrxGAMT894ueE5F2f4=" + }, + "org/infinispan/protostream#parent/5.0.14.Final": { + "pom": "sha256-dd31FbFXy5YxbUl5TptinotZ9s+rTRpOmXtXRerEpBE=" + }, + "org/infinispan/protostream#protostream-processor/5.0.14.Final": { + "jar": "sha256-7YnsbRu2iKEmyYr+OmguOw4JVVfWye1iaWvs2rTDX5M=", + "pom": "sha256-DfassHZwHm5xRbfsowFX6442zcQK0q2FGflf2ZlQYPU=" + }, + "org/infinispan/protostream#protostream-types/5.0.14.Final": { + "jar": "sha256-Ff7P3AVs+AMw2yTAUge1e5mpKsiXHx9wmEkfvRXfOd0=", + "pom": "sha256-uFRu3De9CldOIkryjf2NtLkAasbheD0zTxBMsmbQGpI=" + }, + "org/infinispan/protostream#protostream/5.0.14.Final": { + "jar": "sha256-dcDm6an7B8faP85awaUBIqjAqcg8wDnYjHjAfyf9MRg=", + "pom": "sha256-Qd4D8E1bo2CzRxCoAWjT3uZnuldNChSG8PO+/bZy6Rk=" + }, + "org/jboss#jboss-parent/18": { + "pom": "sha256-cHWFSAOI9dIE/KZTz7/KCIVx61HCW70VLoXwfhg3tuQ=" + }, + "org/jboss#jboss-parent/39": { + "pom": "sha256-BN/wdaAAlLYwYa9AfSgW2c3mZ5WsrjdqBUvf6Lox5mQ=" + }, + "org/jboss#jboss-parent/42": { + "pom": "sha256-5BJ27+NQkFTLpBl7PWNgxR3Ve8ZA3eSM832vqkWgnDs=" + }, + "org/jboss#jboss-parent/43": { + "pom": "sha256-PDredvuIOs25qKAzVdHfQGb/ucjHjwmyGenA/Co/Qxc=" + }, + "org/jboss#jboss-parent/44": { + "pom": "sha256-zsr9kUYWSkIoy76TFkCzmGAmwC2D+U7fFrZJNPe2rcc=" + }, + "org/jboss#jboss-parent/47": { + "pom": "sha256-B0S14LJQm3uhe4W1r1RoCOovH4Oydl/R2MMztyzQW+Y=" + }, + "org/jboss#jboss-parent/48": { + "pom": "sha256-CO+EDZkz+WMjFsnLGysaql2oZynZSE5ZdQnRh43iv5s=" + }, + "org/jboss#jboss-parent/49": { + "pom": "sha256-LomePziWPgSk3fGSpaQFY6cAnEjYVjBAaHTMwVzbBpg=" + }, + "org/jboss/logging#commons-logging-jboss-logging/1.0.0.Final": { + "jar": "sha256-8SF2Jj6iX054u0+ks20zWilzjd5qgSPhttqJplXRUP8=", + "pom": "sha256-WNsZt6ci9K+a5CHQh0xaCkpCt/0VqO0m2FmnM1du5cw=" + }, + "org/jboss/logging#jboss-logging/3.6.1.Final": { + "jar": "sha256-XgiksJLchbM38JEKdAVx2HIM+lZfq9iAqMr5SmV8pBY=", + "pom": "sha256-J82Iq45ZRrinqpJkTrNzLjW+KBQ5qwevcfiYRT7nVA0=" + }, + "org/jboss/logging#logging-parent/1.0.0.Final": { + "pom": "sha256-42K+6+hUVCL6KGhAVGvIRqaeyo7NY+VKMkywhPqvyNY=" + }, + "org/jboss/logging#logging-parent/1.0.3.Final": { + "pom": "sha256-mXLIlHSc2jVXZiF9Q97XAJse6ybgMBwwkUotslPdaFs=" + }, + "org/jboss/logmanager#jboss-logmanager/3.1.2.Final": { + "jar": "sha256-wefeaCpIcajk7vsmra8PzGPNCRNUPFCqa39G+l7BUf4=", + "pom": "sha256-W8Fhlm6f+EcDJamlXR0bT3zhyp9b6CsrfG90toW+mxI=" + }, + "org/jboss/shrinkwrap#shrinkwrap-bom/1.2.6": { + "pom": "sha256-HArIAaoxJb3l6IFrqHijJDJZw5bS845nbihSqcxVADY=" + }, + "org/jboss/slf4j#slf4j-jboss-logmanager/2.0.0.Final": { + "jar": "sha256-J3iFEEtyeiE+94S6sxSZ0jIhB03tKLBIJ+gJ0vVIlpM=", + "pom": "sha256-U01FZKb8jAJlTHQ3X9lK7G4rg5C1mlTHfyKC5EjpOFo=" + }, + "org/jboss/threads#jboss-threads/3.9.1": { + "jar": "sha256-068va5Qurmg/8t59/mhGf41XDLuo2zf+hYl3NJw78qo=", + "pom": "sha256-1c6ELJiUVKWGeA4ONoidMglfFdMneG72yIRJ+d743AI=" + }, + "org/jctools#jctools-core/4.0.5": { + "jar": "sha256-1l5fOLzQmE4m+HGHaH8fcN1SdAxNXgRvjRBOAatduV8=", + "pom": "sha256-ppiXuP8MIZi0uM19T5P95tQrjp2/yVVTWF4nWHsk4hE=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.10.2": { + "pom": "sha256-+vDGU45T3cBJmmNmTY52PCFlgLLhjnIsy98bQxpq/iY=" + }, + "org/junit#junit-bom/5.10.0": { + "module": "sha256-6z7mEnYIAQaUqJgFbnQH0RcpYAOrpfXbgB30MLmIf88=", + "pom": "sha256-4AbdiJT5/Ht1/DK7Ev5e2L5lZn1bRU+Z4uC4xbuNMLM=" + }, + "org/junit#junit-bom/5.10.2": { + "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", + "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" + }, + "org/junit#junit-bom/5.10.3": { + "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=", + "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw=" + }, + "org/junit#junit-bom/5.11.0": { + "module": "sha256-9+2+Z/IgQnCMQQq8VHQI5cR29An1ViNqEXkiEnSi7S0=", + "pom": "sha256-5nRZ1IgkJKxjdPQNscj0ouiJRrNAugcsgL6TKivkZE0=" + }, + "org/junit#junit-bom/5.11.3": { + "module": "sha256-S/D1PO6nx5D9+9JNujyeBM3FGGQnnuv8V6qkc+vKA4A=", + "pom": "sha256-8T3y5Mrx/rzlZ2Z+fDeBAaAzHVPRMk1uLf467Psfd3Q=" + }, + "org/junit#junit-bom/5.11.4": { + "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=", + "pom": "sha256-GdS3R7IEgFMltjNFUylvmGViJ3pKwcteWTpeTE9eQRU=" + }, + "org/junit#junit-bom/5.13.4": { + "module": "sha256-6Vkoj94bGwUNm8CC/HhniRKNpdKFMJFGj8pQQQS99AA=", + "pom": "sha256-16CKmbJQLwu2jNTh+YTwv2kySqogi9D3M2bAP8NUikI=" + }, + "org/junit#junit-bom/5.9.0": { + "module": "sha256-oFTq9QFrWLvN6GZgREp8DdPiyvhNKhrV/Ey1JZecGbk=", + "pom": "sha256-2D6H8Wds3kQZHuxc2mkEkjkvJpI7HkmBSMpznf7XUpU=" + }, + "org/junit#junit-bom/5.9.2": { + "module": "sha256-qxN7pajjLJsGa/kSahx23VYUtyS6XAsCVJdyten0zx8=", + "pom": "sha256-LtB9ZYRRMfUzaoZHbJpAVrWdC1i5gVqzZ5uw82819wU=" + }, + "org/junit/jupiter#junit-jupiter-api/5.9.0": { + "jar": "sha256-PjcLy7HoV/2l8LIDckEW0CsF54j6oeslGIFKzPnPtbE=", + "module": "sha256-n5LPF5V1xN9pgpRwTRDxLozHFdaC+yDtzYrbxB/H8PQ=", + "pom": "sha256-ap2MRpjcjGkE1qwfXRMBiqf4KESbxbjO94/BQxzgghc=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.9.0": { + "jar": "sha256-24bLszUnGfoKl4AO39CcIEY8fyq0oEaZJEQwvYlUWDs=", + "module": "sha256-sVnltbYmIiOP1v0oZPigEsHfbbK7JvEMqA4dIqzOLx0=", + "pom": "sha256-qLfR7QMvuStDJY140jmwGcX1g02swIT5l4PjTD7hLL8=" + }, + "org/junit/jupiter#junit-jupiter-params/5.9.0": { + "jar": "sha256-uM73mC3VPfhMlXpumsie3pZ88ubZNA70xReG4gVIxBs=", + "module": "sha256-QUkSewrR3JKJdqY4WIer3wpD9oNlRLK614OUh2kJenE=", + "pom": "sha256-DDOljPiR2vvGIfPG2cyCMnCDHrOxib3juIbMMDmQ/Ww=" + }, + "org/junit/jupiter#junit-jupiter/5.9.0": { + "jar": "sha256-LbLkqitegv78vxjQryDICVpD6UrZq50WvYdVfNqjl90=", + "module": "sha256-a1AJDfWdSZ4ycr41ULiBJdXJGojhzbSaEsLwi+p6hds=", + "pom": "sha256-Imsy40Pt4WvSls+36xXhmaFOQBxUJulUOsUDrM1E3JI=" + }, + "org/junit/platform#junit-platform-commons/1.9.0": { + "jar": "sha256-5YlLcQCUtMqvxigLiCmkOft2SQHqCuGNBu2AOIswm3o=", + "module": "sha256-SyAzP4ruVOgwRY2B0EXrjRfcBCTTEzKNtQmpzCSZsXo=", + "pom": "sha256-MJp9efG/577WChoXCKqovXGGHBKdIWhNaO305NnILCA=" + }, + "org/junit/platform#junit-platform-engine/1.9.0": { + "jar": "sha256-quxzX3REqfwFXiBlmN49gpwk6ceo7qbv3usZYgh/6BE=", + "module": "sha256-/3Xx1hE/RdWyXyUpUE3tiDmGoBLJtD0hrUI5jknXEGM=", + "pom": "sha256-G2rN+hUNaWYlIHYAAcaONlhl1o7xMNGZblK5SD7IYWE=" + }, + "org/keycloak#keycloak-common/26.5.0": { + "jar": "sha256-2PK11SgJzuZvI+s03v9MhAU8PZMa8DmLaoldGeeybWA=", + "pom": "sha256-4vFpvHt9yXBC2UzAi6lkXABKch6kJGM5qAY+mrI/+YY=" + }, + "org/keycloak#keycloak-config-api/26.5.0": { + "jar": "sha256-oRDkNFwYkuUix1MJzdB0Y+jvXyRB/lPN+4AfDl5Ae6U=", + "pom": "sha256-morv3k+SZkVsBR2iwFVm31DUtAhUunCvjMVDy2VAqWg=" + }, + "org/keycloak#keycloak-core/26.5.0": { + "jar": "sha256-1yA3b1qqEu/i24uRbLchwOK51yflDoVeI7cBXdaBwbY=", + "pom": "sha256-xmppjrEpuyQI0bTJjsw9wTi9PZN0Yn8v1XSwNtCHXqI=" + }, + "org/keycloak#keycloak-model-pom/26.5.0": { + "pom": "sha256-DM/HtbmHsna/rnG1Dce8ZWb4atZ/RzMmcqY8GWor7Sc=" + }, + "org/keycloak#keycloak-model-storage-private/26.5.0": { + "jar": "sha256-3Wk68aMVEo85/pqRReLyJKSRyMhltmTNtfB+/1qaz+g=", + "pom": "sha256-1sFZtmjRNs8kOeJj/empnp2PYJzrunHetaRUxYTzdJU=" + }, + "org/keycloak#keycloak-model-storage/26.5.0": { + "jar": "sha256-HZ05Oog0lfyvAjQwbndB3g2ziytXqb4DSWK8WwwfbwQ=", + "pom": "sha256-iTC+gd270T75QEHzHTUNpfSBJV+VnvACYEguTUsipio=" + }, + "org/keycloak#keycloak-parent/26.5.0": { + "pom": "sha256-uUAV2DPIwxPbc6dW2EvXFhSdrRdQtYA1Zq1t4Rovwjw=" + }, + "org/keycloak#keycloak-quarkus-parent/26.5.0": { + "pom": "sha256-Ho5I8IjxJHJFmET7rE1Hhtv79KcilbaJLPA+DL2Vwrw=" + }, + "org/keycloak#keycloak-server-spi-private/26.5.0": { + "jar": "sha256-gjQHk70/k84MOYF6Fof9uMuGoispAKdK+j0LKUV0zGc=", + "pom": "sha256-ebNAq+2oFRzpgm4mvRLCfacycX1LTSNOWAxIrAme/zo=" + }, + "org/keycloak#keycloak-server-spi/26.5.0": { + "jar": "sha256-TTuIUF2kSgU270lW3Efk8kut4UK8m2/BpjBCzzeEYLk=", + "pom": "sha256-mxto4VbiUf9d1KK5kUSF3VzEn8cCrMCPGhKDDVyJZXs=" + }, + "org/keycloak#keycloak-services/26.5.0": { + "jar": "sha256-klKTfqrMeC/ZoH4+HvWmng6Dxf5zml4zlEU4zpC3Qaw=", + "pom": "sha256-Qu6DIJIxfY/tWp5pG7/ytqxzuKZ7Gz3gAVgkjov2NQ0=" + }, + "org/mockito#mockito-bom/5.18.0": { + "pom": "sha256-BhfEyedxfwt421BQgYuxvvLYvEuzmDQiQfKwoaKruZg=" + }, + "org/opentest4j#opentest4j/1.2.0": { + "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", + "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" + }, + "org/ow2#ow2/1.5.1": { + "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" + }, + "org/ow2/asm#asm/9.8": { + "jar": "sha256-h26raoPa7K1cpn65/KuwY8l7WuuM8fynqYns3hdSIFE=", + "pom": "sha256-wTZ8O7OD12Gef3l+ON91E4hfLu8ErntZCPaCImV7W6o=" + }, + "org/reactivestreams#reactive-streams/1.0.4": { + "jar": "sha256-91yll3ibPaxY9hhXuawuEDSmj6Zy2zUFWo+0UJ4yXyg=", + "pom": "sha256-VLoj2HotQ4VAyZ74eUoIVvxXOiVrSYZ4KDw8Z+8Yrag=" + }, + "org/slf4j#slf4j-api/2.0.17": { + "jar": "sha256-e3UdlSBhlU1av+1xgcH2RdM2CRtnmJFZHWMynGIuuDI=", + "pom": "sha256-FQxAKH987NwhuTgMqsmOkoxPM8Aj22s0jfHFrJdwJr8=" + }, + "org/slf4j#slf4j-bom/2.0.17": { + "pom": "sha256-940ntkK0uIbrg5/BArXNn+fzDzdZn/5oGFvk4WCQMek=" + }, + "org/slf4j#slf4j-parent/2.0.17": { + "pom": "sha256-lc1x6FLf2ykSbli3uTnVfsKy5gJDkYUuC1Rd7ggrvzs=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "org/testcontainers#testcontainers-bom/1.21.3": { + "pom": "sha256-LOcXIm0dZ7Wx35cH7ZgCKjZqyJLZ5JbF8Bc/GreKCWU=" + }, + "org/twitter4j#twitter4j-core/4.1.2": { + "jar": "sha256-cmAigcBtl+ksY86EvZPQB2QvoL/4UvY98S/RI7mQsfI=", + "module": "sha256-AQDT1GTl6gAdKXq4e4JQsslz2b9a2VFnltfHvnVrOCY=", + "pom": "sha256-VhhBMpQ6873BFPIRc7ieacjMqlj2GBo/vR1g9xJro0Y=" + }, + "org/wildfly/common#wildfly-common/2.0.1": { + "jar": "sha256-+kpxDbeuPlmKX0FjnrVOn3sJ3l/Q9Y9WvWBw8h2VY3Q=", + "pom": "sha256-yWySJJfCjJxm7brae4odGYJJJr1B/h1LEMJ7psZsZfM=" + }, + "org/yaml#snakeyaml/2.0": { + "pom": "sha256-Q8dh+StUnIsI+5kggCU+SfCpg+VE7wZjwfT51o61JhY=" + }, + "org/yaml#snakeyaml/2.4": { + "jar": "sha256-73ea9dKand6MxwzgNB9cb3c14j7f+Whc6qnTU1m3u38=", + "pom": "sha256-4VSjIxzWzeaKq/J0/RiWTUmpwaX16e079HHprnvfCOY=" + } + } +} diff --git a/pkgs/by-name/ke/keycloak/keycloak-2fa-sms-authenticator/default.nix b/pkgs/by-name/ke/keycloak/keycloak-2fa-sms-authenticator/default.nix index e456b5f6a83a..20253474f3e0 100644 --- a/pkgs/by-name/ke/keycloak/keycloak-2fa-sms-authenticator/default.nix +++ b/pkgs/by-name/ke/keycloak/keycloak-2fa-sms-authenticator/default.nix @@ -19,7 +19,6 @@ maven.buildMavenPackage rec { let mvnHashes = { "aarch64-darwin" = "sha256-eRlu24SYe+PBOTKoAQPd5MoM7VUxHZx4/uiW6mV2PZI="; - "x86_64-darwin" = "sha256-p+XpCjXiEPMJnXIrbD2Qse/csZfv8YZ6h+sNZitCyro="; "aarch64-linux" = "sha256-4P9qM3X99dEy3ssr1+vp65QUJikRfE4EoK6LOta9IFs="; "x86_64-linux" = "sha256-wxgEHC1xJahyoizozvRfRZAWTjrYmYNM42yk+ZRke5A="; }; diff --git a/pkgs/by-name/ke/keycloak/keycloak-enforce-mfa-authenticator/default.nix b/pkgs/by-name/ke/keycloak/keycloak-enforce-mfa-authenticator/default.nix index 5a2f0bb9afa7..cbbc5e58a903 100644 --- a/pkgs/by-name/ke/keycloak/keycloak-enforce-mfa-authenticator/default.nix +++ b/pkgs/by-name/ke/keycloak/keycloak-enforce-mfa-authenticator/default.nix @@ -19,7 +19,6 @@ maven.buildMavenPackage rec { let mvnHashes = { "aarch64-darwin" = "sha256-eRlu24SYe+PBOTKoAQPd5MoM7VUxHZx4/uiW6mV2PZI="; - "x86_64-darwin" = "sha256-p+XpCjXiEPMJnXIrbD2Qse/csZfv8YZ6h+sNZitCyro="; "aarch64-linux" = "sha256-4P9qM3X99dEy3ssr1+vp65QUJikRfE4EoK6LOta9IFs="; "x86_64-linux" = "sha256-wxgEHC1xJahyoizozvRfRZAWTjrYmYNM42yk+ZRke5A="; }; diff --git a/pkgs/by-name/ke/keycloak/keycloak-home-idp-discovery/default.nix b/pkgs/by-name/ke/keycloak/keycloak-home-idp-discovery/default.nix new file mode 100644 index 000000000000..7cd29ceaaeaf --- /dev/null +++ b/pkgs/by-name/ke/keycloak/keycloak-home-idp-discovery/default.nix @@ -0,0 +1,41 @@ +{ + lib, + fetchFromGitHub, + maven, + nix-update-script, +}: +maven.buildMavenPackage (finalAttrs: { + pname = "keycloak-home-idp-discovery"; + version = "26.2.1"; + + src = fetchFromGitHub { + owner = "sventorben"; + repo = "keycloak-home-idp-discovery"; + tag = "v${finalAttrs.version}"; + hash = "sha256-4zZVDl50LOYv6OeBsBevxM9u3PNQPrn4ZxSNTa8dN7M="; + }; + + mvnHash = "sha256-+Urd07v2mYQjPCGAP4OnJr/dE/lmLrq8M7RAEdhyX3Y="; + + # e2e tests need docker (testcontainers/selenium) + mvnParameters = "-DskipTests"; + + strictDeps = true; + __structuredAttrs = true; + + installPhase = '' + runHook preInstall + install -Dm444 -t "$out" target/keycloak-home-idp-discovery.jar + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/sventorben/keycloak-home-idp-discovery"; + changelog = "https://github.com/sventorben/keycloak-home-idp-discovery/releases/tag/v${finalAttrs.version}"; + description = "Keycloak authenticator to redirect users to their home identity provider by email domain"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ anish ]; + }; +}) diff --git a/pkgs/by-name/ke/keycloak/keycloak-metrics-spi/default.nix b/pkgs/by-name/ke/keycloak/keycloak-metrics-spi/default.nix deleted file mode 100644 index 7ae12fc8023a..000000000000 --- a/pkgs/by-name/ke/keycloak/keycloak-metrics-spi/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - maven, - lib, - stdenv, - fetchFromGitHub, -}: -maven.buildMavenPackage rec { - pname = "keycloak-metrics-spi"; - version = "7.0.0"; - - src = fetchFromGitHub { - owner = "aerogear"; - repo = "keycloak-metrics-spi"; - tag = version; - hash = "sha256-C6ueYhSMVMGpjHF5QQj9jfaS9sGTZ3wKZq2xmNgTmAg="; - }; - - mvnHash = - let - mvnHashes = { - "aarch64-darwin" = "sha256-L+LVJGBVhkaWOdXpHep9f2s7hLr3enf5POm8U+Y7I1w="; - "x86_64-darwin" = "sha256-G/e0mgAGP+6zvX3b0EuI95bdLT7Bzwh1GgcAfxzsIhE="; - "aarch64-linux" = "sha256-Nrs+gqRYPKXWRr0COAsKmOrNaza2fxhEAJ5x896tKvA="; - "x86_64-linux" = "sha256-oHMkzXHR4mETH6VsxhFuap3AcjvTXytNkKlLY/mzT3g="; - }; - in - mvnHashes.${stdenv.hostPlatform.system} - or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - installPhase = '' - runHook preInstall - install -Dm444 -t "$out" target/keycloak-metrics-spi-*.jar - runHook postInstall - ''; - - meta = { - homepage = "https://github.com/aerogear/keycloak-metrics-spi"; - description = "Keycloak Service Provider that adds a metrics endpoint"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ - benley - anish - ]; - }; -} diff --git a/pkgs/by-name/ke/keycloak/package.nix b/pkgs/by-name/ke/keycloak/package.nix index 921923d1c323..bd7675168fe5 100644 --- a/pkgs/by-name/ke/keycloak/package.nix +++ b/pkgs/by-name/ke/keycloak/package.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "keycloak"; - version = "26.6.4"; + version = "26.7.0"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${finalAttrs.version}/keycloak-${finalAttrs.version}.zip"; - hash = "sha256-rb3Wdzc3g8jMvUffOfMfJ4Uw9HJomznXzLtPOrHoWU8="; + hash = "sha256-QfPCgwUZYwiCWZgL8DVlVAYE3AoZnDHn99j+f/oo0Hs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ke/keyfinder-cli/package.nix b/pkgs/by-name/ke/keyfinder-cli/package.nix index 55f600863587..884874fed958 100644 --- a/pkgs/by-name/ke/keyfinder-cli/package.nix +++ b/pkgs/by-name/ke/keyfinder-cli/package.nix @@ -5,29 +5,32 @@ ffmpeg, libkeyfinder, fftw, + cmake, + pkg-config, }: stdenv.mkDerivation (finalAttrs: { pname = "keyfinder-cli"; - version = "1.1.2"; + version = "1.2.0"; src = fetchFromGitHub { repo = "keyfinder-cli"; owner = "EvanPurkhiser"; rev = "v${finalAttrs.version}"; - hash = "sha256-9/+wzPTaQ5PfPiqTZ5EuHdswXJgfgnvAul/FeeDbbJA="; + hash = "sha256-WdZ5jiq5bfwiq1RK4XDRhqh2gAukq3hLCA56K/f+84g="; }; + nativeBuildInputs = [ + cmake + pkg-config + ]; + buildInputs = [ ffmpeg libkeyfinder fftw ]; - makeFlags = [ "PREFIX=$(out)" ]; - - enableParallelBuilding = true; - meta = { inherit (finalAttrs.src.meta) homepage; description = "Musical key detection for digital audio (command-line tool)"; diff --git a/pkgs/by-name/ke/keymapp/package.nix b/pkgs/by-name/ke/keymapp/package.nix index 0b9c11e485df..ca95ba677ca6 100644 --- a/pkgs/by-name/ke/keymapp/package.nix +++ b/pkgs/by-name/ke/keymapp/package.nix @@ -21,7 +21,6 @@ let url = "https://oryx.nyc3.cdn.digitaloceanspaces.com/keymapp/keymapp-${version}.dmg"; hash = "sha256-H6xRau7pWuSF5Aa6lblwi/Lg5KxC+HM3rtUMjX+hEE8="; }; - x86_64-darwin = aarch64-darwin; aarch64-linux = { url = "https://oryx.nyc3.cdn.digitaloceanspaces.com/keymapp/keymapp-${version}.tar.gz"; hash = "sha256-qHvHCDzWRhuhDg2kuU8kmikQDXElQtVEmPAelHz4aPo="; diff --git a/pkgs/by-name/ki/kikit/default.nix b/pkgs/by-name/ki/kikit/default.nix index 9e9e61ca60d3..62d0935c8336 100644 --- a/pkgs/by-name/ki/kikit/default.nix +++ b/pkgs/by-name/ki/kikit/default.nix @@ -4,6 +4,7 @@ lib, bats, fetchFromGitHub, + fetchpatch, python, buildPythonApplication, callPackage, @@ -47,6 +48,14 @@ buildPythonApplication (finalAttrs: { ''; }; + patches = [ + (fetchpatch { + name = "fix-stencil-arc-numpy2.patch"; + url = "https://github.com/yaqwsx/KiKit/commit/036ca08fc380dd2c5b8b3ba2adc4215f4114e975.patch?full_index=1"; + hash = "sha256-AmvH822nAubqVhl1PEKvE0Ij/K0NrBsSvnMUJXgxmfI="; + }) + ]; + build-system = [ setuptools ]; diff --git a/pkgs/by-name/ki/kikit/solidpython/default.nix b/pkgs/by-name/ki/kikit/solidpython/default.nix index 7003d6a590ce..7f02e5c00228 100644 --- a/pkgs/by-name/ki/kikit/solidpython/default.nix +++ b/pkgs/by-name/ki/kikit/solidpython/default.nix @@ -7,7 +7,7 @@ poetry-core, prettytable, ply, - setuptools, + setuptools_80, euclid3, }: buildPythonPackage (finalAttrs: { @@ -28,7 +28,8 @@ buildPythonPackage (finalAttrs: { propagatedBuildInputs = [ ply - setuptools + # Pinned to v80 due to pkg_resources removal, see https://github.com/SolidCode/SolidPython/issues/216 + setuptools_80 euclid3 prettytable diff --git a/pkgs/by-name/ki/kilo/package.nix b/pkgs/by-name/ki/kilo/package.nix index 15dd55fab2e2..b49d470751de 100644 --- a/pkgs/by-name/ki/kilo/package.nix +++ b/pkgs/by-name/ki/kilo/package.nix @@ -190,11 +190,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { "aarch64-linux" "x86_64-linux" "aarch64-darwin" - "x86_64-darwin" - ]; - badPlatforms = [ - # Broken due to Bun requiring AVX when run via Rosetta 2 on Apple Silicon. - "x86_64-darwin" ]; }; }) diff --git a/pkgs/by-name/ki/kiro-cli/package.nix b/pkgs/by-name/ki/kiro-cli/package.nix index 46b9a508e063..3e41ce545e9c 100644 --- a/pkgs/by-name/ki/kiro-cli/package.nix +++ b/pkgs/by-name/ki/kiro-cli/package.nix @@ -14,26 +14,22 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "kiro-cli"; - version = "2.10.0"; + version = "2.13.0"; src = - let - darwinDmg = fetchurl { - url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/Kiro%20CLI.dmg"; - hash = "sha256-NDeyXQO9NBsK3xqAEcO1gGn9ta+ZVQ1GNwZ4hbGUe3Q="; - }; - in { x86_64-linux = fetchurl { url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/kirocli-x86_64-linux.tar.gz"; - hash = "sha256-cJl6CyYCzbLpB6m+W9Tx7enaPzijgjOBjdmG6CPMM8k="; + hash = "sha256-8qEnlNv8lQK3SCjYJ/AdfWB/RELpjLI0VQ7n4vKA7DI="; }; aarch64-linux = fetchurl { url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/kirocli-aarch64-linux.tar.gz"; - hash = "sha256-39hKSRi1l5ruSqObViksJkufiCOvLTaIkQzT3sNQFQQ="; + hash = "sha256-uKR5ZxuijDgfIJ4DmDVhN5XGHDyOyiRkLcTie2iuzZU="; + }; + aarch64-darwin = fetchurl { + url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/Kiro%20CLI.dmg"; + hash = "sha256-GAK8+adzrEc1kXtHVCNC1aU09C86D9mroSQv7dXvbfo="; }; - x86_64-darwin = darwinDmg; - aarch64-darwin = darwinDmg; } .${system} or (throw "Unsupported system: ${system}"); @@ -98,7 +94,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/ki/kiro-cli/update.sh b/pkgs/by-name/ki/kiro-cli/update.sh index baff24e34e71..bedf83491dfc 100755 --- a/pkgs/by-name/ki/kiro-cli/update.sh +++ b/pkgs/by-name/ki/kiro-cli/update.sh @@ -63,7 +63,7 @@ echo "darwin hash: $darwin_hash" # Get current hashes from package.nix current_x86_hash=$(grep -A2 'x86_64-linux = fetchurl' "$PACKAGE_NIX" | grep -Po 'hash = "\K[^"]+') current_aarch64_hash=$(grep -A2 'aarch64-linux = fetchurl' "$PACKAGE_NIX" | grep -Po 'hash = "\K[^"]+') -current_darwin_hash=$(grep -A2 'darwinDmg = fetchurl' "$PACKAGE_NIX" | grep -Po 'hash = "\K[^"]+') +current_darwin_hash=$(grep -A2 'aarch64-darwin = fetchurl' "$PACKAGE_NIX" | grep -Po 'hash = "\K[^"]+') # Update version and hashes sed -i "s|version = \"$current_version\"|version = \"$latest_version\"|" "$PACKAGE_NIX" diff --git a/pkgs/by-name/ki/kiro/package.nix b/pkgs/by-name/ki/kiro/package.nix index 60d81bd99c69..1a866bbd3d06 100644 --- a/pkgs/by-name/ki/kiro/package.nix +++ b/pkgs/by-name/ki/kiro/package.nix @@ -58,7 +58,6 @@ in ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "kiro"; diff --git a/pkgs/by-name/ki/kiro/sources.json b/pkgs/by-name/ki/kiro/sources.json index 08221c497282..3bbebcea1ec8 100644 --- a/pkgs/by-name/ki/kiro/sources.json +++ b/pkgs/by-name/ki/kiro/sources.json @@ -3,10 +3,6 @@ "url": "https://prod.download.desktop.kiro.dev/releases/stable/linux-x64/signed/0.12.333/tar/kiro-ide-0.12.333-stable-linux-x64.tar.gz", "hash": "sha256-EEj0hz3fxPtesifXuFb0DQfFHaYgOQ1wgkaqcNMeX84=" }, - "x86_64-darwin": { - "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-x64/signed/0.12.333/kiro-ide-0.12.333-stable-darwin-x64.dmg", - "hash": "sha256-5oPK6JGrY+0+i/VnvRlSM/5XQJkq3pPsUB1IaoruJzw=" - }, "aarch64-darwin": { "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-arm64/signed/0.12.333/kiro-ide-0.12.333-stable-darwin-arm64.dmg", "hash": "sha256-Wu5dpXzth/TTly3k019ln/cHl3ZgtS8PenGTzwR5b6Y=" diff --git a/pkgs/by-name/ki/kiro/update.sh b/pkgs/by-name/ki/kiro/update.sh index 211dd624d020..07652514b9c2 100755 --- a/pkgs/by-name/ki/kiro/update.sh +++ b/pkgs/by-name/ki/kiro/update.sh @@ -12,7 +12,6 @@ SOURCES_JSON="${SCRIPT_DIR}/sources.json" # Platform configuration declare -A PLATFORM_URLS=( ["x86_64-linux"]="https://prod.download.desktop.kiro.dev/stable/metadata-linux-x64-stable.json" - ["x86_64-darwin"]="https://prod.download.desktop.kiro.dev/stable/metadata-dmg-darwin-x64-stable.json" ["aarch64-darwin"]="https://prod.download.desktop.kiro.dev/stable/metadata-dmg-darwin-arm64-stable.json" ) diff --git a/pkgs/by-name/ki/kiterunner/package.nix b/pkgs/by-name/ki/kiterunner/package.nix index c30a8e139085..1cb256d51c69 100644 --- a/pkgs/by-name/ki/kiterunner/package.nix +++ b/pkgs/by-name/ki/kiterunner/package.nix @@ -37,7 +37,7 @@ buildGoModule (finalAttrs: { and endpoints in modern applications. ''; homepage = "https://github.com/assetnote/kiterunner"; - license = with lib.licenses; [ agpl3Only ]; + license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/ki/kitty-img/package.nix b/pkgs/by-name/ki/kitty-img/package.nix index 96a6da300e1e..a7ede19a6bde 100644 --- a/pkgs/by-name/ki/kitty-img/package.nix +++ b/pkgs/by-name/ki/kitty-img/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Print images inline in kitty"; homepage = "https://git.sr.ht/~zethra/kitty-img"; changelog = "https://git.sr.ht/~zethra/kitty-img/refs/${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ gaykitty ]; mainProgram = "kitty-img"; }; diff --git a/pkgs/by-name/kl/klayout/package.nix b/pkgs/by-name/kl/klayout/package.nix index 6b842a645514..7e6ff18cc50b 100644 --- a/pkgs/by-name/kl/klayout/package.nix +++ b/pkgs/by-name/kl/klayout/package.nix @@ -124,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "High performance layout viewer and editor with support for GDS and OASIS"; mainProgram = "klayout"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; homepage = "https://www.klayout.de/"; changelog = "https://www.klayout.de/development.html#${finalAttrs.version}"; platforms = lib.platforms.linux ++ lib.platforms.darwin; diff --git a/pkgs/by-name/kn/knot-resolver_5/package.nix b/pkgs/by-name/kn/knot-resolver_5/package.nix index 1bc541bb9498..26dbd427f5a4 100644 --- a/pkgs/by-name/kn/knot-resolver_5/package.nix +++ b/pkgs/by-name/kn/knot-resolver_5/package.nix @@ -140,6 +140,7 @@ let rm -r "$out"/lib/sysusers.d/ # ATM more likely to harm than help ''; + __darwinAllowLocalNetworking = true; doInstallCheck = with stdenv; hostPlatform == buildPlatform; nativeInstallCheckInputs = [ cmocka diff --git a/pkgs/by-name/kn/knot-resolver_6/package.nix b/pkgs/by-name/kn/knot-resolver_6/package.nix index f8058a3ad70e..5223af3b2463 100644 --- a/pkgs/by-name/kn/knot-resolver_6/package.nix +++ b/pkgs/by-name/kn/knot-resolver_6/package.nix @@ -121,6 +121,7 @@ let rm -r "$out"/lib/sysusers.d/ # ATM more likely to harm than help ''; + __darwinAllowLocalNetworking = true; doInstallCheck = with stdenv; hostPlatform == buildPlatform; nativeInstallCheckInputs = [ which diff --git a/pkgs/by-name/kn/knowsmore/package.nix b/pkgs/by-name/kn/knowsmore/package.nix index 9c0f9ef1f627..77ea63f6ff98 100644 --- a/pkgs/by-name/kn/knowsmore/package.nix +++ b/pkgs/by-name/kn/knowsmore/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "knowsmore"; - version = "0.1.50"; + version = "0.1.51"; pyproject = true; src = fetchFromGitHub { owner = "helviojunior"; repo = "knowsmore"; tag = "v${finalAttrs.version}"; - hash = "sha256-D3WhlReBwQLU+U/389r5gR73+DNvFiVuSr6NQgG2oFY="; + hash = "sha256-GpFcRLPyWmkqyF4cpsm7uNv2U1TTJI0NoRV6IQQiQw4="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/ko/koodousfinder/package.nix b/pkgs/by-name/ko/koodousfinder/package.nix index 093e90987527..7e987f65c3dc 100644 --- a/pkgs/by-name/ko/koodousfinder/package.nix +++ b/pkgs/by-name/ko/koodousfinder/package.nix @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication { meta = { description = "Tool to allows users to search for and analyze Android apps"; homepage = "https://github.com/HuntDownProject/KoodousFinder"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/ko/kord/package.nix b/pkgs/by-name/ko/kord/package.nix index 0d0cec62fd1a..bff91f9bb568 100644 --- a/pkgs/by-name/ko/kord/package.nix +++ b/pkgs/by-name/ko/kord/package.nix @@ -55,6 +55,6 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Music theory binary and library for Rust"; homepage = "https://github.com/twitchax/kord"; maintainers = with lib.maintainers; [ kidsan ]; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; }; }) diff --git a/pkgs/by-name/kr/krapslog/package.nix b/pkgs/by-name/kr/krapslog/package.nix index c13ff620d55e..4dac61c7d625 100644 --- a/pkgs/by-name/kr/krapslog/package.nix +++ b/pkgs/by-name/kr/krapslog/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Visualize a log file with sparklines"; homepage = "https://github.com/acj/krapslog-rs"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ yanganto ]; mainProgram = "krapslog"; }; diff --git a/pkgs/by-name/ks/kshutdown/package.nix b/pkgs/by-name/ks/kshutdown/package.nix index f1956581dfc0..2fce0f755dbf 100644 --- a/pkgs/by-name/ks/kshutdown/package.nix +++ b/pkgs/by-name/ks/kshutdown/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://kshutdown.sourceforge.io/"; description = "Graphical shutdown utility for Linux and Windows"; mainProgram = "kshutdown"; - license = with lib.licenses; [ gpl3 ]; + license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ eymeric ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/ku/ku/package.nix b/pkgs/by-name/ku/ku/package.nix index ed4d43993cde..60d613cc5158 100644 --- a/pkgs/by-name/ku/ku/package.nix +++ b/pkgs/by-name/ku/ku/package.nix @@ -8,17 +8,17 @@ buildGo126Module (finalAttrs: { pname = "ku"; - version = "0.7.1"; + version = "0.8.2"; __structuredAttrs = true; src = fetchFromGitHub { owner = "bjarneo"; repo = "ku"; tag = "v${finalAttrs.version}"; - hash = "sha256-KaD2DUPkkCT5vG6nNOL/TGXUK6Q/KErZhhE2Zb/D78s="; + hash = "sha256-vUv4eKTCucJ/ol76z0Q3jOigYBSwM823ZxjvBFqv1yY="; }; - vendorHash = "sha256-0gLwvJSEMgCw23YG8rMzoI7ubo0I5nvguex2HBJE1dU="; + vendorHash = "sha256-x7O2/uKnIIFDr8WK0ej3FJiIGxN5Fq5Czqrv4OJ5A44="; ldflags = [ "-s" diff --git a/pkgs/by-name/ku/kubeaudit/package.nix b/pkgs/by-name/ku/kubeaudit/package.nix index f476f7ed6e87..c38a64f577f0 100644 --- a/pkgs/by-name/ku/kubeaudit/package.nix +++ b/pkgs/by-name/ku/kubeaudit/package.nix @@ -28,7 +28,7 @@ buildGoModule (finalAttrs: { description = "Audit tool for Kubernetes"; homepage = "https://github.com/Shopify/kubeaudit"; changelog = "https://github.com/Shopify/kubeaudit/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "kubeaudit"; }; diff --git a/pkgs/by-name/ku/kubeclarity/package.nix b/pkgs/by-name/ku/kubeclarity/package.nix index d39a9619315f..8121a6ee324e 100644 --- a/pkgs/by-name/ku/kubeclarity/package.nix +++ b/pkgs/by-name/ku/kubeclarity/package.nix @@ -56,7 +56,7 @@ buildGoModule (finalAttrs: { ''; homepage = "https://github.com/openclarity/kubeclarity"; changelog = "https://github.com/openclarity/kubeclarity/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/ku/kubectl-gadget/package.nix b/pkgs/by-name/ku/kubectl-gadget/package.nix index 07e90bcf2d78..7a54d490998c 100644 --- a/pkgs/by-name/ku/kubectl-gadget/package.nix +++ b/pkgs/by-name/ku/kubectl-gadget/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "kubectl-gadget"; - version = "0.54.0"; + version = "0.54.1"; src = fetchFromGitHub { owner = "inspektor-gadget"; repo = "inspektor-gadget"; tag = "v${finalAttrs.version}"; - hash = "sha256-T0UywAmNHk+tmE2eHnxHPpOulNAa+juEMqA2Bth044I="; + hash = "sha256-eG316yAUxW6w5kn53szdgcd3q4czkrLWgG953gNYPsg="; }; vendorHash = "sha256-35bloouMwEuaZOC7ygz3sOJqoJoldDD4XHeCdBxx56U="; diff --git a/pkgs/by-name/ku/kubernetes-polaris/package.nix b/pkgs/by-name/ku/kubernetes-polaris/package.nix index 2e6b3cf8e50e..5ab1d74f6189 100644 --- a/pkgs/by-name/ku/kubernetes-polaris/package.nix +++ b/pkgs/by-name/ku/kubernetes-polaris/package.nix @@ -49,7 +49,7 @@ buildGoModule (finalAttrs: { description = "Validate and remediate Kubernetes resources to ensure configuration best practices are followed"; mainProgram = "polaris"; homepage = "https://www.fairwinds.com/polaris"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ longer ]; }; }) diff --git a/pkgs/by-name/ku/kubernix/package.nix b/pkgs/by-name/ku/kubernix/package.nix index 991f5870f2d2..87b5d6deb4d7 100644 --- a/pkgs/by-name/ku/kubernix/package.nix +++ b/pkgs/by-name/ku/kubernix/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "kubernix"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "saschagrunert"; repo = "kubernix"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-CtY2HzDOtR//0aJhJtO4wrqUwvCkTLmemfNYyoYrl88="; + sha256 = "sha256-WHXhPa+U53Z8GTCpKYk2j4SnDxZX+E/rQUHUvOz7G6c="; }; - cargoHash = "sha256-+bEwLg/S2TBCZLbNrQfA+FsftW4bb0XbIXtXGj+FO2A="; + cargoHash = "sha256-NQ0d7kk6nw1D/a57+nlrfjAr4gVKVjPrH59dcbKcII0="; # Tests require network access doCheck = false; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Single dependency Kubernetes clusters for local testing, experimenting and development"; mainProgram = "kubernix"; homepage = "https://github.com/saschagrunert/kubernix"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ saschagrunert ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/ku/kubesec/package.nix b/pkgs/by-name/ku/kubesec/package.nix index 6ceb33e5ec66..bbfdb5fd052e 100644 --- a/pkgs/by-name/ku/kubesec/package.nix +++ b/pkgs/by-name/ku/kubesec/package.nix @@ -52,7 +52,7 @@ buildGoModule (finalAttrs: { mainProgram = "kubesec"; homepage = "https://github.com/controlplaneio/kubesec"; changelog = "https://github.com/controlplaneio/kubesec/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab jk diff --git a/pkgs/by-name/ku/kubie/package.nix b/pkgs/by-name/ku/kubie/package.nix index 988291d230e2..f3e27bb26eb2 100644 --- a/pkgs/by-name/ku/kubie/package.nix +++ b/pkgs/by-name/ku/kubie/package.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Shell independent context and namespace switcher for kubectl"; mainProgram = "kubie"; homepage = "https://github.com/kubie-org/kubie"; - license = with lib.licenses; [ zlib ]; + license = lib.licenses.zlib; maintainers = with lib.maintainers; [ illiusdope ]; }; }) diff --git a/pkgs/by-name/kx/kx-aspe-cli/package.nix b/pkgs/by-name/kx/kx-aspe-cli/package.nix index 54ff953c63d4..e7e9d5ac1f46 100644 --- a/pkgs/by-name/kx/kx-aspe-cli/package.nix +++ b/pkgs/by-name/kx/kx-aspe-cli/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Keyoxide profile generator CLI using ASPE"; mainProgram = "kx-aspe"; platforms = lib.platforms.linux; - license = [ lib.licenses.asl20 ]; + license = lib.licenses.asl20; maintainers = [ lib.maintainers.nobbz ]; }; }) diff --git a/pkgs/by-name/ky/kythe/package.nix b/pkgs/by-name/ky/kythe/package.nix index b9d536501b3a..47fba89db82b 100644 --- a/pkgs/by-name/ky/kythe/package.nix +++ b/pkgs/by-name/ky/kythe/package.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "0.0.75"; + version = "0.0.76"; pname = "kythe"; src = fetchurl { url = "https://github.com/kythe/kythe/releases/download/v${finalAttrs.version}/kythe-v${finalAttrs.version}.tar.gz"; - sha256 = "sha256-ZFZh3kt32UeqAl8AYbvrwjhqRVWtgyI/3k+Vb4/jAGo="; + sha256 = "sha256-7qQw91Y9uAXJnk0aQnymDXrvAc7HZpmGUpz+LCYpY1Y="; }; buildInputs = [ binutils ]; diff --git a/pkgs/by-name/la/labwc/package.nix b/pkgs/by-name/la/labwc/package.nix index b34cfffa956b..44de740f5c71 100644 --- a/pkgs/by-name/la/labwc/package.nix +++ b/pkgs/by-name/la/labwc/package.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/labwc/labwc"; description = "Wayland stacking compositor, inspired by Openbox"; changelog = "https://github.com/labwc/labwc/blob/master/NEWS.md"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "labwc"; maintainers = [ ]; inherit (wayland.meta) platforms; diff --git a/pkgs/by-name/la/labymod-launcher/package.nix b/pkgs/by-name/la/labymod-launcher/package.nix index 2fd80eaac300..f35e48a086ab 100644 --- a/pkgs/by-name/la/labymod-launcher/package.nix +++ b/pkgs/by-name/la/labymod-launcher/package.nix @@ -6,12 +6,12 @@ let pname = "labymod-launcher"; - version = "3.0.10"; + version = "3.0.11"; src = fetchurl { name = "labymod-launcher"; url = "https://releases.r2.labymod.net/launcher/linux/x64/LabyMod%20Launcher-${version}.AppImage"; - hash = "sha256-etrP2kfhaWVyTgRAsw8MeBy3ndScTkKi3ogXiaQZ2g0="; + hash = "sha256-piGk8nbOj4AUjw05y9Ux59JSPXBIB7VisDbVirriMoI="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/by-name/la/ladybird/package.nix b/pkgs/by-name/la/ladybird/package.nix index 5e8f45e08a92..f64b20b0cc17 100644 --- a/pkgs/by-name/la/ladybird/package.nix +++ b/pkgs/by-name/la/ladybird/package.nix @@ -216,7 +216,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "Ladybird"; diff --git a/pkgs/by-name/la/lapce/package.nix b/pkgs/by-name/la/lapce/package.nix index f94a88f9bbb5..c4d0d084ae36 100644 --- a/pkgs/by-name/la/lapce/package.nix +++ b/pkgs/by-name/la/lapce/package.nix @@ -107,7 +107,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Lightning-fast and Powerful Code Editor written in Rust"; homepage = "https://github.com/lapce/lapce"; changelog = "https://github.com/lapce/lapce/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; mainProgram = "lapce"; }; }) diff --git a/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix b/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix index 1ad982520822..b93fe9205ce9 100644 --- a/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix +++ b/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix @@ -13,20 +13,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "lasuite-docs-collaboration-server"; - version = "5.3.0"; + version = "5.4.1"; src = fetchFromGitHub { owner = "suitenumerique"; repo = "docs"; tag = "v${finalAttrs.version}"; - hash = "sha256-GQAhCwtcp/9rSk1B1/EWL2jnfd46w1vikEMJeucD1bA="; + hash = "sha256-Xomq2i1t1POgggcAR8FAWf+Lr0y6YOKGvANFOv/BH20="; }; sourceRoot = "${finalAttrs.src.name}/src/frontend"; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/src/frontend/yarn.lock"; - hash = "sha256-6uZF4op81QzYCAogvlcyZAkJsCqs72scyLKc1bc2QBU="; + hash = "sha256-r4uROroadFHALG8uHFPcvs8tCEdObx2rSVmxISxyyS8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/la/lasuite-docs-frontend/package.nix b/pkgs/by-name/la/lasuite-docs-frontend/package.nix index c14ae1a7986e..722711dd1bd4 100644 --- a/pkgs/by-name/la/lasuite-docs-frontend/package.nix +++ b/pkgs/by-name/la/lasuite-docs-frontend/package.nix @@ -12,20 +12,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "lasuite-docs-frontend"; - version = "5.3.0"; + version = "5.4.1"; src = fetchFromGitHub { owner = "suitenumerique"; repo = "docs"; tag = "v${finalAttrs.version}"; - hash = "sha256-GQAhCwtcp/9rSk1B1/EWL2jnfd46w1vikEMJeucD1bA="; + hash = "sha256-Xomq2i1t1POgggcAR8FAWf+Lr0y6YOKGvANFOv/BH20="; }; sourceRoot = "${finalAttrs.src.name}/src/frontend"; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/src/frontend/yarn.lock"; - hash = "sha256-6uZF4op81QzYCAogvlcyZAkJsCqs72scyLKc1bc2QBU="; + hash = "sha256-r4uROroadFHALG8uHFPcvs8tCEdObx2rSVmxISxyyS8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/la/lasuite-docs/package.nix b/pkgs/by-name/la/lasuite-docs/package.nix index 98f84e289624..6584ead2daa5 100644 --- a/pkgs/by-name/la/lasuite-docs/package.nix +++ b/pkgs/by-name/la/lasuite-docs/package.nix @@ -11,12 +11,12 @@ yarnConfigHook, }: let - version = "5.3.0"; + version = "5.4.1"; src = fetchFromGitHub { owner = "suitenumerique"; repo = "docs"; tag = "v${version}"; - hash = "sha256-GQAhCwtcp/9rSk1B1/EWL2jnfd46w1vikEMJeucD1bA="; + hash = "sha256-Xomq2i1t1POgggcAR8FAWf+Lr0y6YOKGvANFOv/BH20="; }; mail-templates = stdenv.mkDerivation { @@ -29,7 +29,7 @@ let offlineCache = fetchYarnDeps { yarnLock = "${src}/src/mail/yarn.lock"; - hash = "sha256-MYzADDcXHGieGkygmlbZQbYcS68NdKWyHYGgoSaqDO8="; + hash = "sha256-miA1ysqNSaBZSb2B2uqTx1rea9R5/AgRfuCPr5X0bx8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/la/lasuite-drive/frontend.nix b/pkgs/by-name/la/lasuite-drive/frontend.nix index 5ed9033ec82e..1387b44b7b62 100644 --- a/pkgs/by-name/la/lasuite-drive/frontend.nix +++ b/pkgs/by-name/la/lasuite-drive/frontend.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/src/frontend/yarn.lock"; - hash = "sha256-yUKJp6yUTxpvkaA+YuQC3r1t4LBvuYMv1xesLewbK/U="; + hash = "sha256-W0Sp8G7Lt9UMND8+ZLD8oxrNCgGpQph23AvQpynYWYI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/la/lasuite-drive/package.nix b/pkgs/by-name/la/lasuite-drive/package.nix index 61d77e62b6a8..24953084a2b8 100644 --- a/pkgs/by-name/la/lasuite-drive/package.nix +++ b/pkgs/by-name/la/lasuite-drive/package.nix @@ -7,13 +7,13 @@ nixosTests, }: let - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "suitenumerique"; repo = "drive"; tag = "v${version}"; - hash = "sha256-JoOHbwZR4salfLB9Gg7kfRMDcDA/Srn8qwUqLAZtsz8="; + hash = "sha256-y9lvGYTIxpuTA0mFDl616JxX+RF5+5Ea8k/NWlLjrZk="; }; meta = { @@ -94,6 +94,7 @@ python.pkgs.buildPythonApplication (finalAttrs: { sentry-sdk url-normalize whitenoise + zipstream-ng ] ++ celery.optional-dependencies.redis ++ django-storages.optional-dependencies.s3; diff --git a/pkgs/by-name/la/layerx/package.nix b/pkgs/by-name/la/layerx/package.nix index 42204ebc8f64..39bc78ea88dd 100644 --- a/pkgs/by-name/la/layerx/package.nix +++ b/pkgs/by-name/la/layerx/package.nix @@ -10,14 +10,14 @@ buildGoModule (finalAttrs: { pname = "layerx"; - version = "1.5.2"; + version = "1.5.3"; __structuredAttrs = true; src = fetchFromGitHub { owner = "deveshctl"; repo = "layerx"; tag = "v${finalAttrs.version}"; - hash = "sha256-2FttqXnc6o8EXbLBk7BpLS0Xf6ZozydD7a5gFspPQoo="; + hash = "sha256-HboWzfDiiVMwMXkrOyxUvZ+V4Hi11cEqODfWT7b5+dw="; }; vendorHash = "sha256-7wbyz6fKB3HMFhKJVIWrOIczLfqF4yInyszdh2Ky8WU="; diff --git a/pkgs/by-name/la/laze/package.nix b/pkgs/by-name/la/laze/package.nix index 0d2803e1ff8d..d673643ed58b 100644 --- a/pkgs/by-name/la/laze/package.nix +++ b/pkgs/by-name/la/laze/package.nix @@ -53,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: { mainProgram = "laze"; homepage = "https://github.com/kaspar030/laze"; changelog = "https://github.com/kaspar030/laze/blob/${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ dannixon ]; }; }) diff --git a/pkgs/by-name/la/lazygit/package.nix b/pkgs/by-name/la/lazygit/package.nix index a11eacfd6409..27bf48fb73a8 100644 --- a/pkgs/by-name/la/lazygit/package.nix +++ b/pkgs/by-name/la/lazygit/package.nix @@ -8,13 +8,13 @@ }: buildGoModule (finalAttrs: { pname = "lazygit"; - version = "0.63.0"; + version = "0.63.1"; src = fetchFromGitHub { owner = "jesseduffield"; repo = "lazygit"; tag = "v${finalAttrs.version}"; - hash = "sha256-WDGYS2W0FCIDoayafzUjcwTAW+v2jxfJo54kaM6ymCE="; + hash = "sha256-vcpd04DEHmtEJtOOYohxHUgNtQfiChErWmNiQle8pvc="; }; vendorHash = null; diff --git a/pkgs/by-name/la/lazyjournal/package.nix b/pkgs/by-name/la/lazyjournal/package.nix index 7a5b014e8ed7..cd613e21cbc5 100644 --- a/pkgs/by-name/la/lazyjournal/package.nix +++ b/pkgs/by-name/la/lazyjournal/package.nix @@ -34,7 +34,7 @@ buildGoModule { meta = { description = "TUI for journalctl, file system logs, as well as Docker and Podman containers"; homepage = "https://github.com/Lifailon/lazyjournal"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; platforms = with lib.platforms; unix ++ windows; maintainers = with lib.maintainers; [ pluiedev ]; mainProgram = "lazyjournal"; diff --git a/pkgs/by-name/la/lazyworktree/package.nix b/pkgs/by-name/la/lazyworktree/package.nix index a319756abbe7..0ddaca0b29a9 100644 --- a/pkgs/by-name/la/lazyworktree/package.nix +++ b/pkgs/by-name/la/lazyworktree/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "lazyworktree"; - version = "1.47.0"; + version = "1.48.0"; src = fetchFromGitHub { owner = "chmouel"; repo = "lazyworktree"; tag = "v${finalAttrs.version}"; - hash = "sha256-aiObEOw+osGRzvkSwo/aWbby8eb/jPiruxcGehafUvw="; + hash = "sha256-0Ldrul/T7QdmZiIiaCPkcojw75WZqKBLMSmKyLBUd3Y="; }; - vendorHash = "sha256-aQ0My2re9rCoU6EZ0VSyHYT1TMZEMAwnhmcqGBd95ks="; + vendorHash = "sha256-HCPS084sPctHAXgy0SK0EWVpn6K/UQYCu2LnGT0czAI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/lb/lbreakout2/package.nix b/pkgs/by-name/lb/lbreakout2/package.nix index 22f4500376a9..cc6aa9ccaf75 100644 --- a/pkgs/by-name/lb/lbreakout2/package.nix +++ b/pkgs/by-name/lb/lbreakout2/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "http://lgames.sourceforge.net/LBreakout2/"; description = "Breakout clone from the LGames series"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "lbreakout2"; maintainers = [ ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/lc/lcalc/package.nix b/pkgs/by-name/lc/lcalc/package.nix index 8ca3e7d23956..e29277b96f37 100644 --- a/pkgs/by-name/lc/lcalc/package.nix +++ b/pkgs/by-name/lc/lcalc/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.com/sagemath/lcalc"; description = "Program for calculating with L-functions"; mainProgram = "lcalc"; - license = with lib.licenses; [ gpl2 ]; + license = lib.licenses.gpl2; teams = [ lib.teams.sage ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/ld/ldapmonitor/package.nix b/pkgs/by-name/ld/ldapmonitor/package.nix index 051d50ff5c82..26556ceeffe9 100644 --- a/pkgs/by-name/ld/ldapmonitor/package.nix +++ b/pkgs/by-name/ld/ldapmonitor/package.nix @@ -37,7 +37,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { mainProgram = "ldapmonitor"; homepage = "https://github.com/p0dalirius/LDAPmonitor"; changelog = "https://github.com/p0dalirius/LDAPmonitor/releases/tag/${finalAttrs.version}"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/ld/ldc/bootstrap.nix b/pkgs/by-name/ld/ldc/bootstrap.nix index 734797cd5c2a..4c73b83d707b 100644 --- a/pkgs/by-name/ld/ldc/bootstrap.nix +++ b/pkgs/by-name/ld/ldc/bootstrap.nix @@ -72,7 +72,6 @@ stdenv.mkDerivation { maintainers = with lib.maintainers; [ lionello ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; diff --git a/pkgs/by-name/ld/ldc/package.nix b/pkgs/by-name/ld/ldc/package.nix index e57382a52b6a..e0bd2ad39ae2 100644 --- a/pkgs/by-name/ld/ldc/package.nix +++ b/pkgs/by-name/ld/ldc/package.nix @@ -177,7 +177,6 @@ stdenv.mkDerivation (finalAttrs: { "x86_64-linux" "i686-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/le/ledmon/package.nix b/pkgs/by-name/le/ledmon/package.nix index 9a69b171b3b0..d6eed318eeea 100644 --- a/pkgs/by-name/le/ledmon/package.nix +++ b/pkgs/by-name/le/ledmon/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/md-raid-utilities/ledmon"; description = "Enclosure LED Utilities"; platforms = lib.platforms.linux; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ sorki ]; }; }) diff --git a/pkgs/by-name/le/legends-of-equestria/package.nix b/pkgs/by-name/le/legends-of-equestria/package.nix index 4c1b58e89594..65539a30db33 100644 --- a/pkgs/by-name/le/legends-of-equestria/package.nix +++ b/pkgs/by-name/le/legends-of-equestria/package.nix @@ -52,10 +52,6 @@ let url = "https://mega.nz/file/QmBXXDiC#XoG19N2_uBIHVKDNId5mE4cod9q29iPkYOfGDgAX_Oo"; outputHash = "IdcowkU2k2grg133jTf3EOENATCCige64BMYXtFupRE="; }; - x86_64-darwin = { - url = "https://mega.nz/file/Uy4WzbCL#5tCRmmrizaIdilo2iYLSVkoSSNDleyQ8ZNYYT5hJsR4"; - outputHash = "D/2G7w89Z4JTP0TEjnlBKI7XCBx2LBurXZcEp0gW+JA="; - }; aarch64-darwin = { url = "https://mega.nz/file/xr4AHIrb#pD5wDIiYys2my4_59UWiYoqBpdyUQHf_CalPZe7hpME"; outputHash = "PpDUFnobznB5FHYSF+m9S3RcNIdi7eWyxxDHRdS+zlY="; diff --git a/pkgs/by-name/le/legends-of-equestria/update.sh b/pkgs/by-name/le/legends-of-equestria/update.sh index 1035b733a8da..b3ac969539e1 100755 --- a/pkgs/by-name/le/legends-of-equestria/update.sh +++ b/pkgs/by-name/le/legends-of-equestria/update.sh @@ -60,5 +60,4 @@ applyUpdate() { } applyUpdate x86_64-linux Linux -applyUpdate x86_64-darwin macOS applyUpdate aarch64-darwin "macOS arm64" diff --git a/pkgs/by-name/le/lemmy-help/package.nix b/pkgs/by-name/le/lemmy-help/package.nix index 88fcb34d5ddb..0336a0551d61 100644 --- a/pkgs/by-name/le/lemmy-help/package.nix +++ b/pkgs/by-name/le/lemmy-help/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; homepage = "https://github.com/numToStr/lemmy-help"; changelog = "https://github.com/numToStr/lemmy-help/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ ]; mainProgram = "lemmy-help"; }; diff --git a/pkgs/by-name/le/lens/package.nix b/pkgs/by-name/le/lens/package.nix index dd955dbe67de..8c06617539c8 100644 --- a/pkgs/by-name/le/lens/package.nix +++ b/pkgs/by-name/le/lens/package.nix @@ -15,10 +15,6 @@ let url = "https://api.k8slens.dev/binaries/Lens-${version}-latest.x86_64.AppImage"; hash = "sha512-P9PrtbGKaHNlzZsm10ovkYCBBfQpVWBgcVsYLETMwINP2bzrIIK5HVbkbcTEUsxK90L7MQmFwpAssojW0b9G5Q=="; }; - x86_64-darwin = { - url = "https://api.k8slens.dev/binaries/Lens-${version}-latest.dmg"; - hash = "sha512-I/i9s7O3jT+eNqqUu6B+rB+YbegKhAsZwHlc3mp2wNWW9YDilQbzKrhF9Fq2dSz2WKVZUscBtSGtXCuiPcFXzw=="; - }; aarch64-darwin = { url = "https://api.k8slens.dev/binaries/Lens-${version}-latest-arm64.dmg"; hash = "sha512-eCE3w7NlYrHiexCirH2wFN0nOO3qAt5acbldXbDMVIrG94tbgM8Y5ZO8/YIUN45XbotYtKW8/Nw+WsrTp6DPBg=="; diff --git a/pkgs/by-name/le/lens/update.sh b/pkgs/by-name/le/lens/update.sh index 12174d9799fc..ec0f3bd9d32f 100755 --- a/pkgs/by-name/le/lens/update.sh +++ b/pkgs/by-name/le/lens/update.sh @@ -28,10 +28,9 @@ appimage_hash=$(manifest_hash '.x86_64.AppImage' "$linux_manifest") dmg_hash=$(manifest_hash '-latest.dmg' "$mac_manifest") arm64_dmg_hash=$(manifest_hash '-arm64.dmg' "$mac_manifest") -# The three platforms share one version but have distinct hashes. --system picks +# The two platforms share one version but have distinct hashes. --system picks # which source (and therefore which hash) update-source-version rewrites; passing # the hash explicitly avoids a download. The version is written on the first call, # so the darwin calls need --ignore-same-version to not early-exit as "unchanged". update-source-version lens "$version" "$appimage_hash" --system=x86_64-linux -update-source-version lens "$version" "$dmg_hash" --system=x86_64-darwin --ignore-same-version update-source-version lens "$version" "$arm64_dmg_hash" --system=aarch64-darwin --ignore-same-version diff --git a/pkgs/by-name/le/leo3-bin/package.nix b/pkgs/by-name/le/leo3-bin/package.nix index dfdd5f0eb22d..718e2c281425 100644 --- a/pkgs/by-name/le/leo3-bin/package.nix +++ b/pkgs/by-name/le/leo3-bin/package.nix @@ -7,11 +7,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "leo3"; - version = "1.2"; + version = "1.7.18"; src = fetchurl { - url = "https://github.com/leoprover/Leo-III/releases/download/v${finalAttrs.version}/leo3.jar"; - sha256 = "1lgwxbr1rnk72rnvc8raq5i1q71ckhn998pwd9xk6zf27wlzijk7"; + url = "https://github.com/leoprover/Leo-III/releases/download/v${finalAttrs.version}/leo3-v${finalAttrs.version}.jar"; + sha256 = "sha256-HEUi8Krxv9u9Rq/2Gu0Tts86sseaAZq+pccJ4Q5MRr0="; }; dontUnpack = true; diff --git a/pkgs/by-name/le/lexy/package.nix b/pkgs/by-name/le/lexy/package.nix index 192651fb22f8..b3fb30eeafc9 100644 --- a/pkgs/by-name/le/lexy/package.nix +++ b/pkgs/by-name/le/lexy/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "lexy"; - version = "0.6.0"; + version = "0.6.3"; pyproject = true; src = fetchFromGitHub { owner = "antoniorodr"; repo = "lexy"; tag = "v${finalAttrs.version}"; - hash = "sha256-1Q7ntShhzE9OUrifIV9GjCp6BvUv1OmtH7SRLGYUhYU="; + hash = "sha256-OT+RaoIC+CxHHFdi3Hp405B/tWCTsPPrK8aDowKOUFc="; }; build-system = [ diff --git a/pkgs/by-name/li/libagar/package.nix b/pkgs/by-name/li/libagar/package.nix index 5994aa44a756..b8999c144cc8 100644 --- a/pkgs/by-name/li/libagar/package.nix +++ b/pkgs/by-name/li/libagar/package.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Cross-platform GUI toolkit"; homepage = "http://libagar.org/index.html"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ ramkromberg ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/li/libagar_test/package.nix b/pkgs/by-name/li/libagar_test/package.nix index 2fd663cdb654..210aee5180ae 100644 --- a/pkgs/by-name/li/libagar_test/package.nix +++ b/pkgs/by-name/li/libagar_test/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { description = "Tests for libagar"; mainProgram = "agartest"; homepage = "http://libagar.org/index.html"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ ramkromberg ]; platforms = lib.platforms.linux; broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); diff --git a/pkgs/by-name/li/libajantv2/package.nix b/pkgs/by-name/li/libajantv2/package.nix index aad9624acc98..a09fdff502df 100644 --- a/pkgs/by-name/li/libajantv2/package.nix +++ b/pkgs/by-name/li/libajantv2/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "AJA NTV2 Open Source Static Libs and Headers for building applications that only wish to statically link against"; homepage = "https://github.com/aja-video/libajantv2"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.lukegb ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/li/libamplsolver/package.nix b/pkgs/by-name/li/libamplsolver/package.nix index e836cc9a5741..e96a3604f7ec 100644 --- a/pkgs/by-name/li/libamplsolver/package.nix +++ b/pkgs/by-name/li/libamplsolver/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Library of routines that help solvers work with AMPL"; homepage = "https://ampl.com/netlib/ampl/"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ aanderse ]; # generates header at compile time diff --git a/pkgs/by-name/li/libbacktrace/package.nix b/pkgs/by-name/li/libbacktrace/package.nix index 8ae11fe8a786..0e4f30d052ba 100644 --- a/pkgs/by-name/li/libbacktrace/package.nix +++ b/pkgs/by-name/li/libbacktrace/package.nix @@ -57,6 +57,6 @@ stdenv.mkDerivation { description = "C library that may be linked into a C/C++ program to produce symbolic backtraces"; homepage = "https://github.com/ianlancetaylor/libbacktrace"; maintainers = with lib.maintainers; [ twey ]; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; }; } diff --git a/pkgs/by-name/li/libdatachannel/package.nix b/pkgs/by-name/li/libdatachannel/package.nix index f0f60aac75b3..b356fa9334c8 100644 --- a/pkgs/by-name/li/libdatachannel/package.nix +++ b/pkgs/by-name/li/libdatachannel/package.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "C/C++ WebRTC network library featuring Data Channels, Media Transport, and WebSockets"; homepage = "https://libdatachannel.org/"; - license = with lib.licenses; [ mpl20 ]; + license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ erdnaxe ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; diff --git a/pkgs/by-name/li/libedit/package.nix b/pkgs/by-name/li/libedit/package.nix index 11712e641d99..b74e107981a8 100644 --- a/pkgs/by-name/li/libedit/package.nix +++ b/pkgs/by-name/li/libedit/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { provides generic line editing, history, and tokenization functions, similar to those found in GNU Readline. ''; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ corngood ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/li/libeufin/package.nix b/pkgs/by-name/li/libeufin/package.nix index 07f0344163ea..e6bb25489684 100644 --- a/pkgs/by-name/li/libeufin/package.nix +++ b/pkgs/by-name/li/libeufin/package.nix @@ -34,9 +34,7 @@ stdenv.mkDerivation (finalAttrs: { ''; }; - patchPhase = '' - runHook prePatch - + postPatch = '' substituteInPlace Makefile \ --replace-fail "install: build install-nobuild-files" "install: install-nobuild-files" @@ -47,8 +45,6 @@ stdenv.mkDerivation (finalAttrs: { # Use gradle repo to download dependencies substituteInPlace build.gradle \ --replace-fail 'mavenCentral()' "gradlePluginPortal()" - - runHook postPatch ''; preConfigure = '' diff --git a/pkgs/by-name/li/libfrida-core/package.nix b/pkgs/by-name/li/libfrida-core/package.nix index df551379428b..7a0515460c24 100644 --- a/pkgs/by-name/li/libfrida-core/package.nix +++ b/pkgs/by-name/li/libfrida-core/package.nix @@ -35,10 +35,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { url = "https://github.com/frida/frida/releases/download/${finalAttrs.version}/frida-core-devkit-${finalAttrs.version}-linux-arm64.tar.xz"; hash = "sha256-ryGe+T9GP3CitQMZHwco0d5tNoyXQ9TUwRG2D5E+Hp0="; }; - x86_64-darwin = fetchurl { - url = "https://github.com/frida/frida/releases/download/${finalAttrs.version}/frida-core-devkit-${finalAttrs.version}-macos-x86_64.tar.xz"; - hash = "sha256-x76PBEkQ7j1nIHucxV/BCmmOfRhiJUiCXGQk/Iw7KTE="; - }; aarch64-darwin = fetchurl { url = "https://github.com/frida/frida/releases/download/${finalAttrs.version}/frida-core-devkit-${finalAttrs.version}-macos-arm64.tar.xz"; hash = "sha256-CmOkZ+/w/Vh6V5lJ8jzXU5ZLi0FWXXXIFgPLdb+nu88="; diff --git a/pkgs/by-name/li/libgcrypt/package.nix b/pkgs/by-name/li/libgcrypt/package.nix index 08fa5886de73..20f8cad0a141 100644 --- a/pkgs/by-name/li/libgcrypt/package.nix +++ b/pkgs/by-name/li/libgcrypt/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, gettext, libgpg-error, enableCapabilities ? false, @@ -24,6 +25,16 @@ stdenv.mkDerivation rec { hash = "sha256-fOM8JJIiGgQ2+WqFACFenz49y1/SanV81BXnqEO6vV4="; }; + patches = lib.optionals stdenv.hostPlatform.isRiscV64 [ + # Remove in next release + # https://github.com/gpg/libgcrypt/commit/3f684fc6ab3ac98320e245a06b3563ad37ec56f5 + # zvkned AES corrupts CBC/CFB/CTR/OCB/XTS output on VLEN>128 hardware + (fetchpatch { + url = "https://github.com/gpg/libgcrypt/commit/3f684fc6ab3ac98320e245a06b3563ad37ec56f5.patch"; + hash = "sha256-1LSrIwsN0n5IBRDZ+9MJTEjzY+/T6LQO6hX1ke8hSuc="; + }) + ]; + outputs = [ "bin" "lib" diff --git a/pkgs/by-name/li/libgdsii/package.nix b/pkgs/by-name/li/libgdsii/package.nix index d7c011932808..7484d4837a3e 100644 --- a/pkgs/by-name/li/libgdsii/package.nix +++ b/pkgs/by-name/li/libgdsii/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Library and command-line utility for reading GDSII geometry files"; mainProgram = "GDSIIConvert"; homepage = "https://github.com/HomerReid/libGDSII"; - license = [ lib.licenses.gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ sheepforce markuskowa diff --git a/pkgs/by-name/li/libjpeg-tools/package.nix b/pkgs/by-name/li/libjpeg-tools/package.nix index 02b166817efe..53082642fc2d 100644 --- a/pkgs/by-name/li/libjpeg-tools/package.nix +++ b/pkgs/by-name/li/libjpeg-tools/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "A complete implementation of 10918-1 (JPEG) coming from jpeg.org (the ISO group) with extensions for HDR, lossless and alpha channel coding standardized as ISO/IEC 18477 (JPEG XT)"; homepage = "https://github.com/thorfdbg/libjpeg"; - license = with lib.licenses; [ gpl3 ]; + license = lib.licenses.gpl3; changelog = "https://github.com/thorfdbg/libjpeg/README.history"; maintainers = with lib.maintainers; [ bcdarwin ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/li/libmbd/package.nix b/pkgs/by-name/li/libmbd/package.nix index bf8233412d77..8e44c7b05f9b 100644 --- a/pkgs/by-name/li/libmbd/package.nix +++ b/pkgs/by-name/li/libmbd/package.nix @@ -15,13 +15,13 @@ assert !lapack.isILP64; stdenv.mkDerivation (finalAttrs: { pname = "libMBD"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "libmbd"; repo = "libMBD"; rev = finalAttrs.version; - hash = "sha256-ra5nPH7wTlATHWM1QiMZ43P9q9wDfV9CUhm7T0nj3kk="; + hash = "sha256-pWwb7T9zJ6XOUAvKYqcbE/X5y9RFlfsLR2Nvq0Nq2dE="; }; preConfigure = '' diff --git a/pkgs/by-name/li/libmpdclient/package.nix b/pkgs/by-name/li/libmpdclient/package.nix index eb80534dbfe3..48ae8a2a6df4 100644 --- a/pkgs/by-name/li/libmpdclient/package.nix +++ b/pkgs/by-name/li/libmpdclient/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Client library for MPD (music player daemon)"; homepage = "https://www.musicpd.org/libs/libmpdclient/"; changelog = "https://raw.githubusercontent.com/MusicPlayerDaemon/libmpdclient/${finalAttrs.src.rev}/NEWS"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = [ ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/li/libmt32emu/package.nix b/pkgs/by-name/li/libmt32emu/package.nix index df69448aca61..85f3fbe184f4 100644 --- a/pkgs/by-name/li/libmt32emu/package.nix +++ b/pkgs/by-name/li/libmt32emu/package.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://munt.sourceforge.net/"; description = "Library to emulate Roland MT-32, CM-32L, CM-64 and LAPC-I devices"; - license = with lib.licenses; [ lgpl21Plus ]; + license = lib.licenses.lgpl21Plus; maintainers = with lib.maintainers; [ OPNA2608 ]; platforms = lib.platforms.unix; # Not tested on ReactOS yet :) }; diff --git a/pkgs/by-name/li/libnghttp2_asio/package.nix b/pkgs/by-name/li/libnghttp2_asio/package.nix index 152d8c0615f6..693716a7920d 100644 --- a/pkgs/by-name/li/libnghttp2_asio/package.nix +++ b/pkgs/by-name/li/libnghttp2_asio/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { OpenSSL. libnghttp2_asio provides both client and server APIs. ''; homepage = "https://github.com/nghttp2/nghttp2-asio"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ izorkin ]; }; } diff --git a/pkgs/by-name/li/libnvme/package.nix b/pkgs/by-name/li/libnvme/package.nix index f58a2d176c04..aaa5214ad200 100644 --- a/pkgs/by-name/li/libnvme/package.nix +++ b/pkgs/by-name/li/libnvme/package.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { description = "C Library for NVM Express on Linux"; homepage = "https://github.com/linux-nvme/libnvme"; maintainers = with lib.maintainers; [ vifino ]; - license = with lib.licenses; [ lgpl21Plus ]; + license = lib.licenses.lgpl21Plus; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/li/libopenshot-audio/package.nix b/pkgs/by-name/li/libopenshot-audio/package.nix index 7288bf804841..b8816e679f1c 100644 --- a/pkgs/by-name/li/libopenshot-audio/package.nix +++ b/pkgs/by-name/li/libopenshot-audio/package.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { high-quality editing and playback of audio, and is based on the amazing JUCE library. ''; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = [ ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/li/libopenshot/package.nix b/pkgs/by-name/li/libopenshot/package.nix index 4d9bdabc6166..1eec1eaf174e 100644 --- a/pkgs/by-name/li/libopenshot/package.nix +++ b/pkgs/by-name/li/libopenshot/package.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: { delivering high quality video editing, animation, and playback solutions to the world. API currently supports C++, Python, and Ruby. ''; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = [ ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/li/libphonenumber/package.nix b/pkgs/by-name/li/libphonenumber/package.nix index 77d745e6a573..1007318b608f 100644 --- a/pkgs/by-name/li/libphonenumber/package.nix +++ b/pkgs/by-name/li/libphonenumber/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libphonenumber"; - version = "9.0.34"; + version = "9.0.35"; src = fetchFromGitHub { owner = "google"; repo = "libphonenumber"; tag = "v${finalAttrs.version}"; - hash = "sha256-KWn58r2Dnh9DMwiESmrF/pN5LPuYe0G7z3TeM+Zp6ZA="; + hash = "sha256-bGbPTZJWdGTdnWQCK9yXqcqK0AkAOsmZ/rRR2a+IT7M="; }; patches = [ diff --git a/pkgs/by-name/li/libprojectm/package.nix b/pkgs/by-name/li/libprojectm/package.nix index ee3e8c451541..9c5414cc5e64 100644 --- a/pkgs/by-name/li/libprojectm/package.nix +++ b/pkgs/by-name/li/libprojectm/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libprojectm"; - version = "4.1.6"; + version = "4.1.7"; src = fetchFromGitHub { owner = "projectM-visualizer"; repo = "projectm"; tag = "v${finalAttrs.version}"; - hash = "sha256-IUVll+nRvIAOxrb16gWb9OpKzMRRuj28j/v+LvaLY5Y="; + hash = "sha256-g7a5Ce7dEfOBGn6wMgdwujkWSi+vLeayWHClvH5W1wY="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/li/libr3/package.nix b/pkgs/by-name/li/libr3/package.nix index 1145b48362d9..647b91eb1f83 100644 --- a/pkgs/by-name/li/libr3/package.nix +++ b/pkgs/by-name/li/libr3/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "High-performance path dispatching library"; homepage = "https://github.com/c9s/r3"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; }; }) diff --git a/pkgs/by-name/li/librespot/package.nix b/pkgs/by-name/li/librespot/package.nix index 24dd76fd0f1d..8c4a3e7f498f 100644 --- a/pkgs/by-name/li/librespot/package.nix +++ b/pkgs/by-name/li/librespot/package.nix @@ -73,7 +73,7 @@ rustPlatform.buildRustPackage (finalAttrs: { mainProgram = "librespot"; homepage = "https://github.com/librespot-org/librespot"; changelog = "https://github.com/librespot-org/librespot/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ bennofs ]; }; }) diff --git a/pkgs/by-name/li/libreswan/package.nix b/pkgs/by-name/li/libreswan/package.nix index 2295de6ae0d1..ae17e04d0078 100644 --- a/pkgs/by-name/li/libreswan/package.nix +++ b/pkgs/by-name/li/libreswan/package.nix @@ -51,11 +51,11 @@ in stdenv.mkDerivation rec { pname = "libreswan"; - version = "5.3.1"; + version = "5.3.2"; src = fetchurl { url = "https://download.libreswan.org/libreswan-${version}.tar.gz"; - hash = "sha256-4/DlHYtkK/aTpqjMbx5ip2TP9BgKAjvzx+QtQ6Yt/p4="; + hash = "sha256-+5GK+gu5K9BDDB2oYe+AaIZNJdchMN8MYweh+dp2EIg="; }; strictDeps = true; diff --git a/pkgs/by-name/li/libretro-shaders-slang/package.nix b/pkgs/by-name/li/libretro-shaders-slang/package.nix index 9894a9927121..c69961f1a1c7 100644 --- a/pkgs/by-name/li/libretro-shaders-slang/package.nix +++ b/pkgs/by-name/li/libretro-shaders-slang/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "libretro-shaders-slang"; - version = "0-unstable-2026-06-28"; + version = "0-unstable-2026-07-15"; src = fetchFromGitHub { owner = "libretro"; repo = "slang-shaders"; - rev = "b5108ca29a50796011fedf1435025673a17dba98"; - hash = "sha256-jJQnp3oWlaariLCAZ9tcn19xX8eCIGck7xwC3vMYqIg="; + rev = "3b0d6aa1d134a168478cd9c904a866d969f8882b"; + hash = "sha256-wSrKcrX5GcTXfaxxjyd7COAFsaZsed8pYtScqGo+LA8="; }; dontConfigure = true; diff --git a/pkgs/by-name/li/librevenge/package.nix b/pkgs/by-name/li/librevenge/package.nix index 3f023b20b60f..f95a20070669 100644 --- a/pkgs/by-name/li/librevenge/package.nix +++ b/pkgs/by-name/li/librevenge/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "librevenge"; - version = "0.0.5"; + version = "0.0.6"; src = fetchurl { url = "mirror://sourceforge/project/libwpd/librevenge/librevenge-${finalAttrs.version}/librevenge-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-EG0MRLtkCLE0i54EZWZvqDuBYXdmWiLNAX6IbBqu6zQ="; + sha256 = "sha256-GerPXOVdf+apkKRRQlic332gx7aHAXl/EzSCy0Txifo="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/li/librewolf-unwrapped/src.json b/pkgs/by-name/li/librewolf-unwrapped/src.json index ee4e908f7de4..bcc4927bcbc6 100644 --- a/pkgs/by-name/li/librewolf-unwrapped/src.json +++ b/pkgs/by-name/li/librewolf-unwrapped/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "152.0.5-1", + "packageVersion": "152.0.6-1", "source": { - "rev": "152.0.5-1", - "hash": "sha256-5f/JkPWOUlfxND9JrPJv9j7UZvfndxi5vLPWZNJwHzk=" + "rev": "152.0.6-1", + "hash": "sha256-O5s1t/ZZVYL/9ik4zyi/kKAQEbSERO6vD1NJzEUmnU4=" }, "firefox": { - "version": "152.0.5", - "hash": "sha512-bPLcfyimo0MPKGbfTKNQY8ut8jTIKjT6ZR4C2QnldB5QzZhv7xvZfUhrUSRMtjmysQNRRog0e/f5T9FtJkzE8g==" + "version": "152.0.6", + "hash": "sha512-xNh3g31wB/thHDjUnZtt07xMXJypALVOci4UDOfs0JJPabXO3H+MH+YC5+/h1xWbAZ3ieZnikjXNYxghuxPmsA==" } } diff --git a/pkgs/by-name/li/libsidplayfp/package.nix b/pkgs/by-name/li/libsidplayfp/package.nix index dab256cfe4ad..2699b6a91c1a 100644 --- a/pkgs/by-name/li/libsidplayfp/package.nix +++ b/pkgs/by-name/li/libsidplayfp/package.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://github.com/libsidplayfp/libsidplayfp"; changelog = "https://github.com/libsidplayfp/libsidplayfp/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ ramkromberg OPNA2608 diff --git a/pkgs/by-name/li/libspng/package.nix b/pkgs/by-name/li/libspng/package.nix index eb7b69bcbd27..24315abdb844 100644 --- a/pkgs/by-name/li/libspng/package.nix +++ b/pkgs/by-name/li/libspng/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Simple, modern libpng alternative"; homepage = "https://libspng.org/"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ humancalico ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/li/libssh2/package.nix b/pkgs/by-name/li/libssh2/package.nix index 1e987379f73c..7a48067d111d 100644 --- a/pkgs/by-name/li/libssh2/package.nix +++ b/pkgs/by-name/li/libssh2/package.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Client-side C library implementing the SSH2 protocol"; homepage = "https://www.libssh2.org"; platforms = lib.platforms.all; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ SuperSandro2000 ]; }; }) diff --git a/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix b/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix index 82626adf9740..36329fdabc7b 100644 --- a/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix +++ b/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix @@ -17,14 +17,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "libtorrent-rasterbar"; - version = "2.0.12"; + version = "2.0.13"; src = fetchFromGitHub { owner = "arvidn"; repo = "libtorrent"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-JbNOKzB830VQkZjC8ZAmzbu/7nkAgyD8cOr22uYbIGQ="; + hash = "sha256-0L7C3IY/XA+/vLJjZr47aFdYypevhMn1tzZNvDtOjbw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libversion/package.nix b/pkgs/by-name/li/libversion/package.nix index ba5c0d1ee3db..e9fe43fd2337 100644 --- a/pkgs/by-name/li/libversion/package.nix +++ b/pkgs/by-name/li/libversion/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Advanced version string comparison library"; homepage = "https://github.com/repology/libversion"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ ryantm ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/li/libvori/package.nix b/pkgs/by-name/li/libvori/package.nix index 42c00efae9f8..8cc74b367f03 100644 --- a/pkgs/by-name/li/libvori/package.nix +++ b/pkgs/by-name/li/libvori/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Library for Voronoi integration of electron densities"; homepage = "https://brehm-research.de/libvori.php"; - license = with lib.licenses; [ lgpl3Only ]; + license = lib.licenses.lgpl3Only; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.sheepforce ]; }; diff --git a/pkgs/by-name/li/libwhereami/package.nix b/pkgs/by-name/li/libwhereami/package.nix index e77179f3066d..6c03202f9e7e 100644 --- a/pkgs/by-name/li/libwhereami/package.nix +++ b/pkgs/by-name/li/libwhereami/package.nix @@ -50,7 +50,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "i686-linux" "x86_64-linux" - "x86_64-darwin" ]; # fails on aarch64 }; diff --git a/pkgs/by-name/li/libxmp/package.nix b/pkgs/by-name/li/libxmp/package.nix index f54013905da5..c170f837e902 100644 --- a/pkgs/by-name/li/libxmp/package.nix +++ b/pkgs/by-name/li/libxmp/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libxmp"; - version = "4.7.0"; + version = "4.7.1"; src = fetchFromGitHub { owner = "libxmp"; repo = "libxmp"; tag = "libxmp-${finalAttrs.version}"; - hash = "sha256-MatT8/tR8Gs3Q6WE+LOlbcZEiAxfO0Y89bo0c5reAUA="; + hash = "sha256-X+oIXTwlrLEl3n8gu5+LlNfIOBkZ02hiivrjTgVrqRk="; }; outputs = [ diff --git a/pkgs/by-name/li/libyang/package.nix b/pkgs/by-name/li/libyang/package.nix index 85ef0f7499e1..1838497f1208 100644 --- a/pkgs/by-name/li/libyang/package.nix +++ b/pkgs/by-name/li/libyang/package.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { sysrepo or FRRouting projects. ''; homepage = "https://github.com/CESNET/libyang"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ woffs ]; }; diff --git a/pkgs/by-name/li/libz/package.nix b/pkgs/by-name/li/libz/package.nix index 6e351e7bb43e..dfde91c55dfa 100644 --- a/pkgs/by-name/li/libz/package.nix +++ b/pkgs/by-name/li/libz/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://sortix.org/libz/"; description = "Clean fork of zlib"; - license = [ lib.licenses.zlib ]; + license = lib.licenses.zlib; maintainers = [ ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/li/libzim/package.nix b/pkgs/by-name/li/libzim/package.nix index 16e55e157f6a..acaaa36ff43a 100644 --- a/pkgs/by-name/li/libzim/package.nix +++ b/pkgs/by-name/li/libzim/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libzim"; - version = "9.8.0"; + version = "9.8.1"; src = fetchFromGitHub { owner = "openzim"; repo = "libzim"; tag = finalAttrs.version; - hash = "sha256-7AfhDpNuEGsb2ys4Lq+VEPI5sVZJ4Md0G6uLcuRKbtE="; + hash = "sha256-XgUB3Nrz7qTinf9Xp1k+R8b+AfzpMAFlFUV6mej7TDU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/lief/package.nix b/pkgs/by-name/li/lief/package.nix index d91399f0d52e..4b87c777fb79 100644 --- a/pkgs/by-name/li/lief/package.nix +++ b/pkgs/by-name/li/lief/package.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Library to Instrument Executable Formats"; homepage = "https://lief.quarkslab.com/"; - license = [ lib.licenses.asl20 ]; + license = lib.licenses.asl20; platforms = with lib.platforms; linux ++ darwin; maintainers = with lib.maintainers; [ lassulus diff --git a/pkgs/by-name/li/lightning/package.nix b/pkgs/by-name/li/lightning/package.nix index 086ac44f3d53..90646f340256 100644 --- a/pkgs/by-name/li/lightning/package.nix +++ b/pkgs/by-name/li/lightning/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { standardized RISC instruction set inspired by the MIPS and SPARC chips. ''; maintainers = [ ]; - license = with lib.licenses; [ lgpl3Plus ]; + license = lib.licenses.lgpl3Plus; platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; # failing tests }; diff --git a/pkgs/by-name/li/linear/package.nix b/pkgs/by-name/li/linear/package.nix index f8a2122dd09e..c7052fffb023 100644 --- a/pkgs/by-name/li/linear/package.nix +++ b/pkgs/by-name/li/linear/package.nix @@ -42,7 +42,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://linear.app/"; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ - iniw + wini pradyuman ]; platforms = lib.platforms.darwin; diff --git a/pkgs/by-name/li/linvstmanager/package.nix b/pkgs/by-name/li/linvstmanager/package.nix index 5358d1d975d7..e3ddcdd758c5 100644 --- a/pkgs/by-name/li/linvstmanager/package.nix +++ b/pkgs/by-name/li/linvstmanager/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Graphical companion application for various bridges like LinVst, etc"; mainProgram = "linvstmanager"; homepage = "https://github.com/Goli4thus/linvstmanager"; - license = with lib.licenses; [ gpl3 ]; + license = lib.licenses.gpl3; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ GabrielDougherty ]; }; diff --git a/pkgs/by-name/li/litmusctl/package.nix b/pkgs/by-name/li/litmusctl/package.nix index b752a5686ce2..81905c937951 100644 --- a/pkgs/by-name/li/litmusctl/package.nix +++ b/pkgs/by-name/li/litmusctl/package.nix @@ -9,7 +9,7 @@ buildGoModule (finalAttrs: { pname = "litmusctl"; - version = "1.26.0"; + version = "1.27.0"; nativeBuildInputs = [ installShellFiles @@ -23,7 +23,7 @@ buildGoModule (finalAttrs: { owner = "litmuschaos"; repo = "litmusctl"; rev = "${finalAttrs.version}"; - hash = "sha256-Zo21QH6uO1uKcLbuirLiIXS4qOI40zbamt1G9sL0IWg="; + hash = "sha256-jVbWgwW7qkGLY2T0SbK0Y/GItLj1BfLn1cloPyItpvI="; }; vendorHash = "sha256-Lkvc8dBr/nvKczx83/KXKLe5FskGpI/17GIrl2y/E1I="; diff --git a/pkgs/by-name/li/live555/package.nix b/pkgs/by-name/li/live555/package.nix index e1ba10303089..114959d2ae80 100644 --- a/pkgs/by-name/li/live555/package.nix +++ b/pkgs/by-name/li/live555/package.nix @@ -149,7 +149,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://www.live555.com/liveMedia/"; description = "Set of C++ libraries for multimedia streaming, using open standard protocols (RTP/RTCP, RTSP, SIP)"; changelog = "http://www.live555.com/liveMedia/public/changelog.txt"; - license = with lib.licenses; [ lgpl21Plus ]; + license = lib.licenses.lgpl21Plus; maintainers = [ ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/ll/lla/package.nix b/pkgs/by-name/ll/lla/package.nix index 9d8c38b2578c..094ab30f08a3 100644 --- a/pkgs/by-name/ll/lla/package.nix +++ b/pkgs/by-name/ll/lla/package.nix @@ -63,7 +63,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; homepage = "https://lla.chaqchase.com"; changelog = "https://github.com/chaqchase/lla/blob/refs/tags/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ pluiedev ]; platforms = lib.platforms.unix; mainProgram = "lla"; diff --git a/pkgs/by-name/lm/lmp/package.nix b/pkgs/by-name/lm/lmp/package.nix index 3fa1b52eefdf..883894c3b63c 100644 --- a/pkgs/by-name/lm/lmp/package.nix +++ b/pkgs/by-name/lm/lmp/package.nix @@ -20,7 +20,7 @@ buildGoModule (finalAttrs: { meta = { description = "Scanning and validation toolkit for the Log4J vulnerability"; homepage = "https://github.com/0xInfection/LogMePwn"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; mainProgram = "lmp"; }; diff --git a/pkgs/by-name/lo/localsend/package.nix b/pkgs/by-name/lo/localsend/package.nix index 0db8997810e4..e7337d1034a6 100644 --- a/pkgs/by-name/lo/localsend/package.nix +++ b/pkgs/by-name/lo/localsend/package.nix @@ -132,7 +132,6 @@ let mainProgram = "localsend"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = [ - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/lo/lokalise2-cli/package.nix b/pkgs/by-name/lo/lokalise2-cli/package.nix index 433f66a74cd6..c352b3c3e932 100644 --- a/pkgs/by-name/lo/lokalise2-cli/package.nix +++ b/pkgs/by-name/lo/lokalise2-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "lokalise2-cli"; - version = "3.1.4"; + version = "3.1.5"; src = fetchFromGitHub { owner = "lokalise"; repo = "lokalise-cli-2-go"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-weqYHKxu6HvdrFduzKtHtCVnJ0GVRGIPABLrsW4f0VA="; + sha256 = "sha256-vMredBTXwlpRK3Y90CRV00mdpJu6SoqfPNH1AMUOsPA="; }; - vendorHash = "sha256-thD8NtG9uVI4KwNQiNsVCUdyUcgAmnr+szsUQ2Ika1c="; + vendorHash = "sha256-NS4nKoZSJ8M/n18Y2vQb5MuKBBjS6SGRoKJi5B2J68g="; doCheck = false; diff --git a/pkgs/by-name/lo/loksh/package.nix b/pkgs/by-name/lo/loksh/package.nix index 44d02a14f928..771c3b88d54a 100644 --- a/pkgs/by-name/lo/loksh/package.nix +++ b/pkgs/by-name/lo/loksh/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { vulnerabilities and makes loksh a good fit for resource-constrained systems. ''; - license = with lib.licenses; [ publicDomain ]; + license = lib.licenses.publicDomain; maintainers = with lib.maintainers; [ cameronnemo ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/lo/losange/package.nix b/pkgs/by-name/lo/losange/package.nix index 6f50fabfc121..be9b2cee7f1a 100644 --- a/pkgs/by-name/lo/losange/package.nix +++ b/pkgs/by-name/lo/losange/package.nix @@ -21,7 +21,7 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "losange"; - version = "0.10.1"; + version = "0.10.2"; __structuredAttrs = true; strictDeps = true; @@ -30,10 +30,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "tymmesyde"; repo = "losange"; tag = "v${finalAttrs.version}"; - hash = "sha256-mr54/vnaopLwG9lhFiZJGgxWH/VaGitROVEeV7GSyHM="; + hash = "sha256-GRWDtua4QaJP6Te/EUXu0YmUJYdYbMrdNxj0WiE/B7w="; }; - cargoHash = "sha256-LJ8EpxEIN8wojSmQ+WVshYRxGFAC9sUk5tnh3I2J408="; + cargoHash = "sha256-e7ENEIEpnwdI50bQnlP9iV0vmsNOlfNaR0UJ6mHsi2g="; buildInputs = [ mpv diff --git a/pkgs/by-name/lp/lpairs2/package.nix b/pkgs/by-name/lp/lpairs2/package.nix index ce1248cd2e26..d2dc5c3851bb 100644 --- a/pkgs/by-name/lp/lpairs2/package.nix +++ b/pkgs/by-name/lp/lpairs2/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "http://lgames.sourceforge.net/LPairs/"; description = "Matching the pairs - a typical Memory Game"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "lpairs2"; maintainers = [ ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/ls/lsb-release/package.nix b/pkgs/by-name/ls/lsb-release/package.nix index 4e5f82c2c8ab..a0d17aae335d 100644 --- a/pkgs/by-name/ls/lsb-release/package.nix +++ b/pkgs/by-name/ls/lsb-release/package.nix @@ -23,7 +23,7 @@ replaceVarsWith { meta = { description = "Prints certain LSB (Linux Standard Base) and Distribution information"; mainProgram = "lsb_release"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/ls/lspmux/package.nix b/pkgs/by-name/ls/lspmux/package.nix index 5e3fce8ce39d..a539ba227f48 100644 --- a/pkgs/by-name/ls/lspmux/package.nix +++ b/pkgs/by-name/ls/lspmux/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Share one language server instance between multiple LSP clients to save resources"; mainProgram = "lspmux"; homepage = "https://codeberg.org/p2502/lspmux"; - license = with lib.licenses; [ eupl12 ]; + license = lib.licenses.eupl12; maintainers = with lib.maintainers; [ mrcjkb ]; }; }) diff --git a/pkgs/by-name/ls/lstk/package.nix b/pkgs/by-name/ls/lstk/package.nix index 8f1a9569cef2..ac93856533fa 100644 --- a/pkgs/by-name/ls/lstk/package.nix +++ b/pkgs/by-name/ls/lstk/package.nix @@ -7,7 +7,7 @@ }: buildGoModule (finalAttrs: { pname = "lstk"; - version = "0.15.0"; + version = "0.17.0"; __structuredAttrs = true; @@ -15,10 +15,10 @@ buildGoModule (finalAttrs: { owner = "localstack"; repo = "lstk"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-OqJhHJFSQ8tJDcFizXky40W5nedSroUVXGrXAWTHnlQ="; + sha256 = "sha256-btwXEUstvJ2z+ixVH5QeOVOhrE7AmLNESKVSTmEmNiU="; }; - vendorHash = "sha256-ZWezMbvUUwOoWMU+zHL4hHMKAncI/oCsWMaLt5qN+YM="; + vendorHash = "sha256-86yg2+SZ+pnCi0wTjfqyO68adVaDjT24SgCbPVgd1Ho="; excludedPackages = "test/integration"; diff --git a/pkgs/by-name/lt/ltris/package.nix b/pkgs/by-name/lt/ltris/package.nix index 15c2107a06ea..58abf38148b4 100644 --- a/pkgs/by-name/lt/ltris/package.nix +++ b/pkgs/by-name/lt/ltris/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://lgames.sourceforge.io/LTris/"; description = "Tetris clone from the LGames series"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; mainProgram = "ltris2"; maintainers = with lib.maintainers; [ marcin-serwin ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/lt/lttng-tools/package.nix b/pkgs/by-name/lt/lttng-tools/package.nix index ffe2ed82880b..e91b33e858fb 100644 --- a/pkgs/by-name/lt/lttng-tools/package.nix +++ b/pkgs/by-name/lt/lttng-tools/package.nix @@ -3,6 +3,7 @@ stdenv, fetchurl, pkg-config, + python3, babeltrace2, popt, libuuid, @@ -14,14 +15,21 @@ stdenv.mkDerivation rec { pname = "lttng-tools"; - version = "2.14.1"; + version = "2.15.1"; src = fetchurl { url = "https://lttng.org/files/lttng-tools/${pname}-${version}.tar.bz2"; - sha256 = "sha256-DmjrJ5I2IcS8Enz85AQi0oz35HP+32IprmwyulxbfG0="; + sha256 = "sha256-i21Lp64sA299r7tOKXF2d0EQePmp2WGy3HwboWJz6ek="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + python3 + ]; + + # Used by the test source generator during the build. + makeFlags = [ "PYTHON=${lib.getExe python3}" ]; + buildInputs = [ babeltrace2 popt diff --git a/pkgs/by-name/lu/lua-language-server/package.nix b/pkgs/by-name/lu/lua-language-server/package.nix index a87504ce7502..f5ab88f987bf 100644 --- a/pkgs/by-name/lu/lua-language-server/package.nix +++ b/pkgs/by-name/lu/lua-language-server/package.nix @@ -15,6 +15,8 @@ versionCheckHook, nix-update-script, + runCommand, + lua-language-server, }: stdenv.mkDerivation (finalAttrs: { @@ -128,7 +130,26 @@ stdenv.mkDerivation (finalAttrs: { ]; doInstallCheck = true; - passthru.updateScript = nix-update-script { }; + passthru = { + updateScript = nix-update-script { }; + + tests.smoke = runCommand "lua-language-server-smoke-test" { } '' + export XDG_CACHE_HOME=$(mktemp -d) + + INIT_REQUEST='{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"processId":null,"rootUri":"file:///tmp","workspaceFolders":[{"uri":"file:///tmp","name":"test"}],"capabilities":{}}}' + CONTENT_LENGTH=''${#INIT_REQUEST} + + RESPONSE=$( + { + printf "Content-Length: %d\r\n\r\n%s" "$CONTENT_LENGTH" "$INIT_REQUEST" + sleep 1 + } | timeout 3 ${lib.getExe lua-language-server} --stdio 2>&1 | head -c 1000 + ) || true + + echo "$RESPONSE" | grep -q '"capabilities"' + touch $out + ''; + }; meta = { description = "Language server that offers Lua language support"; diff --git a/pkgs/by-name/lu/luau-lsp/package.nix b/pkgs/by-name/lu/luau-lsp/package.nix index 0caaceacf2d0..0928dc206081 100644 --- a/pkgs/by-name/lu/luau-lsp/package.nix +++ b/pkgs/by-name/lu/luau-lsp/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "luau-lsp"; - version = "1.68.1"; + version = "1.69.0"; src = fetchFromGitHub { owner = "JohnnyMorganz"; repo = "luau-lsp"; tag = finalAttrs.version; - hash = "sha256-XxXAK/BaJcgel1vOATVbQVBxsxEYv9vr0w4JjmU64fM="; + hash = "sha256-fVmc/Ky1fbS4hnh2pOw1idaZFCq0KFHE2hTVQQmYmfM="; fetchSubmodules = true; }; @@ -57,10 +57,5 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ HeitorAugustoLN ]; mainProgram = "luau-lsp"; platforms = lib.platforms.all; - badPlatforms = [ - # Could not find a package configuration file provided by "Protobuf" - # It is unclear why this is only happening on x86_64-darwin - "x86_64-darwin" - ]; }; }) diff --git a/pkgs/by-name/lu/lumen/package.nix b/pkgs/by-name/lu/lumen/package.nix index af26fb66b206..71962b623652 100644 --- a/pkgs/by-name/lu/lumen/package.nix +++ b/pkgs/by-name/lu/lumen/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "lumen"; - version = "2.30.0"; + version = "2.31.0"; __structuredAttrs = true; @@ -19,10 +19,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "jnsahaj"; repo = "lumen"; tag = "v${finalAttrs.version}"; - hash = "sha256-EoxMYlWHmuprjjhvj3GyCxGDIcT/d+JMda9j75pqs+k="; + hash = "sha256-RoOCBwmBIOu17h0cB/t69lw1NWGl6chwAEgK4QixsPs="; }; - cargoHash = "sha256-qTFRfy+Wutee5SbaMaqcYjXgr6xZKYYBIuyVA7jAGiY="; + cargoHash = "sha256-RKSFbsqeR+m/VLs1qu6Ln4bZ9prYj5vUoemuLpSe5+M="; strictDeps = true; diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix index 7714186e91c0..461083089ac5 100644 --- a/pkgs/by-name/lu/lunar-client/package.nix +++ b/pkgs/by-name/lu/lunar-client/package.nix @@ -7,11 +7,11 @@ appimageTools.wrapType2 rec { pname = "lunarclient"; - version = "3.7.9"; + version = "3.7.11"; src = fetchurl { url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}-ow.AppImage"; - hash = "sha512-7rVPN/CmnaA91mnNQkuK4/pmPtHeLvsLeuzBlEBbRT2RrYtSxF3eEnHiFndlMzmRor8FWuFITz43QFPgFVMJpQ=="; + hash = "sha512-mKs/ZfTW+QrHQF86W7nutiGhVu/M5orbXyjPjlAjQDwusJ01A7eZzbXG9Le31QLqu4eX0mLl/SrzByYHiipYEQ=="; }; nativeBuildInputs = [ makeWrapper ]; @@ -34,7 +34,7 @@ appimageTools.wrapType2 rec { meta = { description = "Free Minecraft client with mods, cosmetics, and performance boost"; homepage = "https://www.lunarclient.com/"; - license = with lib.licenses; [ unfree ]; + license = lib.licenses.unfree; mainProgram = "lunarclient"; maintainers = with lib.maintainers; [ Technical27 diff --git a/pkgs/by-name/lu/lunar/package.nix b/pkgs/by-name/lu/lunar/package.nix index d14faf6a0b11..8e1647755a0c 100644 --- a/pkgs/by-name/lu/lunar/package.nix +++ b/pkgs/by-name/lu/lunar/package.nix @@ -40,7 +40,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { ]; maintainers = with lib.maintainers; [ delafthi ]; platforms = [ - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/lu/luwen/package.nix b/pkgs/by-name/lu/luwen/package.nix index 35dc01452d8d..f9a80ad2fa3c 100644 --- a/pkgs/by-name/lu/luwen/package.nix +++ b/pkgs/by-name/lu/luwen/package.nix @@ -26,6 +26,6 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Tenstorrent system interface tools"; homepage = "https://github.com/tenstorrent/luwen"; maintainers = with lib.maintainers; [ RossComputerGuy ]; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; }; }) diff --git a/pkgs/by-name/lv/lvtk/package.nix b/pkgs/by-name/lv/lvtk/package.nix index 7e0b9f8ff379..f84dd1bac181 100644 --- a/pkgs/by-name/lv/lvtk/package.nix +++ b/pkgs/by-name/lv/lvtk/package.nix @@ -51,7 +51,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ bot-wxt1221 ]; platforms = lib.platforms.unix; badPlatforms = [ - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/lx/lxgw-neoxihei/package.nix b/pkgs/by-name/lx/lxgw-neoxihei/package.nix index fb1543bace5d..02f90de7c175 100644 --- a/pkgs/by-name/lx/lxgw-neoxihei/package.nix +++ b/pkgs/by-name/lx/lxgw-neoxihei/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-neoxihei"; - version = "1.303"; + version = "1.304"; src = fetchurl { url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf"; - hash = "sha256-uksTXdA6UPJfaQxyqzjurDfMy7ecEzzSIpkCqG4DA3Y="; + hash = "sha256-WWXdmSKQhhxtYihQmNxcp/bGaZMHZf0R1dD9SRLYFuc="; }; dontUnpack = true; diff --git a/pkgs/by-name/lx/lxmf-rs/package.nix b/pkgs/by-name/lx/lxmf-rs/package.nix index 2105a1395f15..2549e3f9bbde 100644 --- a/pkgs/by-name/lx/lxmf-rs/package.nix +++ b/pkgs/by-name/lx/lxmf-rs/package.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "lxmf-rs"; - version = "0.5.1"; + version = "0.9.0"; __structuredAttrs = true; src = fetchFromGitHub { owner = "FreeTAKTeam"; repo = "LXMF-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-ztJHjapogSF1qzyCBsi6mu3ByLdVTBt8y2OVEFyohKk="; + hash = "sha256-RKe19Tv4IP837fJX5V0T3TeauwaBXuD176lD8W8BRpo="; }; - cargoHash = "sha256-g80lnqJ8VxGg0zHqHsQCvJO9AgXFE0ABysSr+XjXBAk="; + cargoHash = "sha256-BqiemIfYuqB+8qDvEXpRPtW2dW4ApcNsj3augivIMdc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/lz/lzsa/package.nix b/pkgs/by-name/lz/lzsa/package.nix index ef06433c7860..4b5312125ea0 100644 --- a/pkgs/by-name/lz/lzsa/package.nix +++ b/pkgs/by-name/lz/lzsa/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/emmanuel-marty/lzsa"; description = "Byte-aligned, efficient lossless packer that is optimized for fast decompression on 8-bit micros"; mainProgram = "lzsa"; - license = with lib.licenses; [ cc0 ]; + license = lib.licenses.cc0; maintainers = [ ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/ma/macchina/package.nix b/pkgs/by-name/ma/macchina/package.nix index 0e3b98afaf39..54d2cb46757f 100644 --- a/pkgs/by-name/ma/macchina/package.nix +++ b/pkgs/by-name/ma/macchina/package.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Fast, minimal and customizable system information fetcher"; homepage = "https://github.com/Macchina-CLI/macchina"; changelog = "https://github.com/Macchina-CLI/macchina/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ _414owen progrm_jarvis diff --git a/pkgs/by-name/ma/mactop/package.nix b/pkgs/by-name/ma/mactop/package.nix index e54d58aec534..7b0a15ee20c7 100644 --- a/pkgs/by-name/ma/mactop/package.nix +++ b/pkgs/by-name/ma/mactop/package.nix @@ -2,6 +2,7 @@ lib, buildGoModule, fetchFromGitHub, + llvmPackages, versionCheckHook, nix-update-script, }: @@ -21,6 +22,14 @@ buildGoModule rec { proxyVendor = true; + nativeBuildInputs = [ llvmPackages.lld ]; + + env = { + # Work around ld64's libc++ hardening issue. + # TODO: Remove once #536365 reaches this branch. + NIX_CFLAGS_LINK = "-fuse-ld=lld"; + }; + ldflags = [ "-s" "-w" diff --git a/pkgs/by-name/ma/mactracker/package.nix b/pkgs/by-name/ma/mactracker/package.nix index 6ed1c53b5007..f6b9a4a30bad 100644 --- a/pkgs/by-name/ma/mactracker/package.nix +++ b/pkgs/by-name/ma/mactracker/package.nix @@ -72,7 +72,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ DimitarNestorov ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" ]; }; }) diff --git a/pkgs/by-name/ma/mago/package.nix b/pkgs/by-name/ma/mago/package.nix index e826b30803c0..44cee926a131 100644 --- a/pkgs/by-name/ma/mago/package.nix +++ b/pkgs/by-name/ma/mago/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mago"; - version = "1.29.0"; + version = "1.43.0"; src = fetchFromGitHub { owner = "carthage-software"; repo = "mago"; tag = finalAttrs.version; - hash = "sha256-e/LKOQ+GAtdDye/poJdbX/98gDWle3NWIZ2zHwkGkcQ="; + hash = "sha256-AWnPhylz41E6d1M7PxVpH4EbyYeO9T6jlWVlzBqiOhQ="; forceFetchGit = true; # Does not download all files otherwise }; - cargoHash = "sha256-stjjP8VRHy5k9zMXWGikVNExXRFte0gVBEsbKmPY6U4="; + cargoHash = "sha256-f7HZTJ0ESx7QTKgBqd2FOH1nCeIzgODMM9Sb0tQpfdE="; env = { # Get openssl-sys to use pkg-config diff --git a/pkgs/by-name/ma/maigret/package.nix b/pkgs/by-name/ma/maigret/package.nix index 428650819675..2322b0d6fd76 100644 --- a/pkgs/by-name/ma/maigret/package.nix +++ b/pkgs/by-name/ma/maigret/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "maigret"; - version = "0.6.2"; + version = "0.6.3"; pyproject = true; src = fetchFromGitHub { owner = "soxoj"; repo = "maigret"; tag = "v${finalAttrs.version}"; - hash = "sha256-KgSf0lM8euahWRYT+acuoH6C+NN08IzkVGzytfnvHEg="; + hash = "sha256-iKWPIDxuwoNzyWZAiziWU2Q7VDFgGqAcxYjcw6L/5Ho="; }; pythonRelaxDeps = true; diff --git a/pkgs/by-name/ma/mailspring/mailcore2.nix b/pkgs/by-name/ma/mailspring/mailcore2.nix index aa5c4e4f5ba9..c3dccc1d0bc4 100644 --- a/pkgs/by-name/ma/mailspring/mailcore2.nix +++ b/pkgs/by-name/ma/mailspring/mailcore2.nix @@ -99,7 +99,6 @@ stdenv.mkDerivation { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/ma/mailspring/mailsync.nix b/pkgs/by-name/ma/mailspring/mailsync.nix index cd112e3b4740..6f77d031ec29 100644 --- a/pkgs/by-name/ma/mailspring/mailsync.nix +++ b/pkgs/by-name/ma/mailspring/mailsync.nix @@ -131,7 +131,6 @@ stdenv.mkDerivation { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/ma/mailspring/package.nix b/pkgs/by-name/ma/mailspring/package.nix index fecb9bd4c470..d084abef9230 100644 --- a/pkgs/by-name/ma/mailspring/package.nix +++ b/pkgs/by-name/ma/mailspring/package.nix @@ -56,7 +56,6 @@ let platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; @@ -154,7 +153,6 @@ buildNpmPackage (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/ma/maker-panel/package.nix b/pkgs/by-name/ma/maker-panel/package.nix index 8d6d830396e0..77e76344ed32 100644 --- a/pkgs/by-name/ma/maker-panel/package.nix +++ b/pkgs/by-name/ma/maker-panel/package.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Make mechanical PCBs by combining shapes together"; homepage = "https://github.com/twitchyliquid64/maker-panel"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ ]; }; }) diff --git a/pkgs/by-name/ma/mangayomi/package.nix b/pkgs/by-name/ma/mangayomi/package.nix index dd6f25130177..867070e8222e 100644 --- a/pkgs/by-name/ma/mangayomi/package.nix +++ b/pkgs/by-name/ma/mangayomi/package.nix @@ -27,7 +27,7 @@ let changelog = "https://github.com/kodjodevf/mangayomi/releases/tag/v${version}"; description = "Reading manga, novels, and watching animes"; homepage = "https://github.com/kodjodevf/mangayomi"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = [ ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/ma/mangojuice/package.nix b/pkgs/by-name/ma/mangojuice/package.nix index 2c664aa2506c..85baeb2c27be 100644 --- a/pkgs/by-name/ma/mangojuice/package.nix +++ b/pkgs/by-name/ma/mangojuice/package.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Convenient alternative to GOverlay for setting up MangoHud"; homepage = "https://github.com/radiolamp/mangojuice"; changelog = "https://github.com/radiolamp/mangojuice/releases/tag/${finalAttrs.version}"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ pluiedev diff --git a/pkgs/by-name/ma/mapserver/package.nix b/pkgs/by-name/ma/mapserver/package.nix index b075c21c6e20..1faa71910363 100644 --- a/pkgs/by-name/ma/mapserver/package.nix +++ b/pkgs/by-name/ma/mapserver/package.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mapserver"; - version = "8.6.4"; + version = "8.6.5"; src = fetchFromGitHub { owner = "MapServer"; repo = "MapServer"; rev = "rel-${lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version}"; - hash = "sha256-kqCP0QZ8gNqS54B8nL8M9Wr9WyMQnORCs42O1eiMtRw="; + hash = "sha256-HEQ+bBb6cXXqR+4Yw5H+3xwQMQvlv0LjlBRT0baFeZQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ma/marco/package.nix b/pkgs/by-name/ma/marco/package.nix index 296c681f6282..7e830bfa5c06 100644 --- a/pkgs/by-name/ma/marco/package.nix +++ b/pkgs/by-name/ma/marco/package.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "MATE default window manager"; homepage = "https://github.com/mate-desktop/marco"; - license = [ lib.licenses.gpl2Plus ]; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; diff --git a/pkgs/by-name/ma/mark/package.nix b/pkgs/by-name/ma/mark/package.nix index 9c0c9feb446d..8506cc5d33e7 100644 --- a/pkgs/by-name/ma/mark/package.nix +++ b/pkgs/by-name/ma/mark/package.nix @@ -8,16 +8,16 @@ # https://github.com/kovetskiy/mark/pull/581#issuecomment-2797872996 buildGoModule (finalAttrs: { pname = "mark"; - version = "16.5.0"; + version = "16.5.1"; src = fetchFromGitHub { owner = "kovetskiy"; repo = "mark"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-lgqS9SDI8UIkcucVdKyrPxIn7DIpQyRUknuy1nmoKM0="; + sha256 = "sha256-k1VDB/wV8zFtMr8KcgTsw1/+7/PElD62zn5UQ1IuJLU="; }; - vendorHash = "sha256-Tw6tk7ZF4H+5/AJCFfMFy2zB4OCQB9S3mFA4Ky49pz4="; + vendorHash = "sha256-dCELGpByfx4sEV6/bZ7O+xU5b15Ptbq+wPcbjMXzGZc="; ldflags = [ "-s" diff --git a/pkgs/by-name/ma/markdownlint-cli/package.nix b/pkgs/by-name/ma/markdownlint-cli/package.nix index 12d9eb3175d7..edaa8a8c37e8 100644 --- a/pkgs/by-name/ma/markdownlint-cli/package.nix +++ b/pkgs/by-name/ma/markdownlint-cli/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "markdownlint-cli"; - version = "0.49.0"; + version = "0.49.1"; src = fetchFromGitHub { owner = "igorshubovych"; repo = "markdownlint-cli"; rev = "v${version}"; - hash = "sha256-Se8Dw3pFGUiAMchbX4gH56aIMtvSg6wxGYecqRK1UAA="; + hash = "sha256-+zR/A7cp85ggX8MwidRzIPQ54Su4SyGOQtWy9c6fdk8="; }; - npmDepsHash = "sha256-CrffManYnidN0XgRmTBaBpu4skCMXubbfz91Q4sGh80="; + npmDepsHash = "sha256-UMaE1ZAha8D8v387YlVn47AEu6YwNop1yh80gd1Gwh4="; dontNpmBuild = true; diff --git a/pkgs/by-name/ma/marktext/package.nix b/pkgs/by-name/ma/marktext/package.nix index 6f3503763737..db7d839c5b44 100644 --- a/pkgs/by-name/ma/marktext/package.nix +++ b/pkgs/by-name/ma/marktext/package.nix @@ -173,7 +173,6 @@ stdenv.mkDerivation (finalAttrs: { bot-wxt1221 ]; badPlatforms = [ - "x86_64-darwin" "aarch64-darwin" ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/ma/martin/package.nix b/pkgs/by-name/ma/martin/package.nix index 7c1807168515..f957e7424d17 100644 --- a/pkgs/by-name/ma/martin/package.nix +++ b/pkgs/by-name/ma/martin/package.nix @@ -7,6 +7,7 @@ rustPlatform, pkg-config, curl, + libuv, libz, openssl, postgresql, @@ -16,21 +17,21 @@ let # check package.metadata.mln in https://github.com/maplibre/maplibre-native-rs/blob/main/Cargo.toml - mlnRelease = "core-9b6325a14e2cf1cc29ab28c1855ad376f1ba4903"; + mlnRelease = "core-fa8a9c8e3261ce64940127aecc1d52f540c21c57"; mlnHeaders = fetchurl { url = "https://github.com/maplibre/maplibre-native/releases/download/${mlnRelease}/maplibre-native-headers.tar.gz"; - hash = "sha256-VjVEc/+IZTBG9ixP/i7oeel+7gy3+DhSEOi2UDIqeLc="; + hash = "sha256-SqZaqePNbqBZoUgMJIsZf0zqKc8EAwInYNRciv/jX1A="; }; mlnLibrary = fetchurl ( let sources = { aarch64-linux = { url = "https://github.com/maplibre/maplibre-native/releases/download/${mlnRelease}/libmaplibre-native-core-amalgam-linux-arm64-vulkan.a"; - hash = "sha256-PHFNdzcG3+kngZmziMccCTnwBUbtsS2RAUNkTyNYXmc"; + hash = "sha256-iug/ZEIoM0LUczPkVbzVelILoc1uzsM519V2em7Va4U="; }; x86_64-linux = { url = "https://github.com/maplibre/maplibre-native/releases/download/${mlnRelease}/libmaplibre-native-core-amalgam-linux-x64-vulkan.a"; - hash = "sha256-T9H7NiXHv+hbMgOd5QetQzxjIX1Ufn6gNmBJJ/7Ha50="; + hash = "sha256-FoUFDoUw+eM/aaXMfO7iuoUrv8gUGVdBW1tiqxjYCbI="; }; }; in @@ -46,18 +47,18 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "martin"; - version = "1.10.1"; + version = "1.12.0"; src = fetchFromGitHub { owner = "maplibre"; repo = "martin"; tag = "martin-v${finalAttrs.version}"; - hash = "sha256-Zu3vkU7HQcSqzCL7n0uX4M+DxBDMC0Sii7esxM9AtpA="; + hash = "sha256-zCiyJw79KBrK/JqZFx93cPeCnS02/HrH+F1A6EBras0="; }; patches = [ ./dont-build-webui.patch ]; - cargoHash = "sha256-OPuUvm4ez5TZUWwJ6D6fqy++cCiVt7f1qP6OPdsOEDA="; + cargoHash = "sha256-1VSErzoJ0Xdzefaq++8lCGnJfh7LyQCsWmq1xSl4iqg="; webui = buildNpmPackage { pname = "martin-ui"; @@ -71,7 +72,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ln -sf ${finalAttrs.src}/demo/frontend/public/favicon.ico public/_/assets/favicon.ico ''; - npmDepsHash = "sha256-lX5FSWAQyy4Sa7OPnNyTYttjHiPuYxgrPsmZpwCnpO8="; + npmDepsHash = "sha256-4BNjrYMAB8VBwCD4bREWw2vXwE9FCdfOFHsRgYNdiBI="; buildPhase = '' runHook preBuild @@ -99,6 +100,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildInputs = [ curl + libuv libz openssl ]; diff --git a/pkgs/by-name/ma/mas/package.nix b/pkgs/by-name/ma/mas/package.nix index 1822215e189d..2b46f7eec175 100644 --- a/pkgs/by-name/ma/mas/package.nix +++ b/pkgs/by-name/ma/mas/package.nix @@ -9,33 +9,18 @@ versionCheckHook, zsh, }: + stdenvNoCC.mkDerivation (finalAttrs: { pname = "mas"; version = "7.0.0"; __structuredAttrs = true; - src = - let - # nix store prefetch-file https://github.com/mas-cli/mas/releases/download/v$VERSION/mas-$VERSION-$ARCH.pkg - sources = - { - x86_64-darwin = { - arch = "x86_64"; - hash = "sha256-m8od4ftuoZyeC517fIUkkCDJ7WWp1DTC70CJai8zlfk="; - }; - aarch64-darwin = { - arch = "arm64"; - hash = "sha256-vCGKhUyF2eHJVJapayYoe7ZgVrlWiLkPkdBPpi7SG3U="; - }; - } - .${stdenvNoCC.hostPlatform.system} - or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); - in - fetchurl { - url = "https://github.com/mas-cli/mas/releases/download/v${finalAttrs.version}/mas-${finalAttrs.version}-${sources.arch}.pkg"; - inherit (sources) hash; - }; + # nix store prefetch-file https://github.com/mas-cli/mas/releases/download/v$VERSION/mas-$VERSION-arm64.pkg + src = fetchurl { + url = "https://github.com/mas-cli/mas/releases/download/v${finalAttrs.version}/mas-${finalAttrs.version}-arm64.pkg"; + hash = "sha256-vCGKhUyF2eHJVJapayYoe7ZgVrlWiLkPkdBPpi7SG3U="; + }; nativeBuildInputs = [ installShellFiles @@ -76,6 +61,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; + passthru.updateScript = ./update.sh; + meta = { description = "Mac App Store command line interface"; homepage = "https://github.com/mas-cli/mas"; @@ -83,9 +70,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { mainProgram = "mas"; maintainers = with lib.maintainers; [ zachcoyle + tiferrei ]; platforms = [ - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/ma/mas/update.sh b/pkgs/by-name/ma/mas/update.sh new file mode 100755 index 000000000000..6ed1b5b71a3c --- /dev/null +++ b/pkgs/by-name/ma/mas/update.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq nurl gnused + +set -eu + +ROOT="$(dirname "$(readlink -f "$0")")" +NIX_DRV="$ROOT/package.nix" + +VERSION="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} https://api.github.com/repos/mas-cli/mas/releases/latest \ + | jq -r '.tag_name | ltrimstr("v")')" + +URL="https://github.com/mas-cli/mas/releases/download/v${VERSION}/mas-${VERSION}-arm64.pkg" +HASH=$(nurl --hash --expr \ + "(import { }).fetchurl { url = \"$URL\"; }") + +sed -i "s/version = \".*\"/version = \"$VERSION\"/" "$NIX_DRV" +sed -i "/arm64.pkg\";/{n; s|hash = \"sha256-.\{44\}\"|hash = \"$HASH\"|}" "$NIX_DRV" diff --git a/pkgs/by-name/ma/mastodon/package.nix b/pkgs/by-name/ma/mastodon/package.nix index f75a1fda6a4d..3a211fdc08b6 100644 --- a/pkgs/by-name/ma/mastodon/package.nix +++ b/pkgs/by-name/ma/mastodon/package.nix @@ -190,7 +190,6 @@ stdenv.mkDerivation rec { happy-river erictapen izorkin - ghuntley ]; }; } diff --git a/pkgs/by-name/ma/mate-calc/package.nix b/pkgs/by-name/ma/mate-calc/package.nix index 3488fd4ba96f..91f18026e381 100644 --- a/pkgs/by-name/ma/mate-calc/package.nix +++ b/pkgs/by-name/ma/mate-calc/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Calculator for the MATE desktop"; homepage = "https://mate-desktop.org"; - license = [ lib.licenses.gpl2Plus ]; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; teams = [ lib.teams.mate ]; }; diff --git a/pkgs/by-name/ma/mate-polkit/package.nix b/pkgs/by-name/ma/mate-polkit/package.nix index 49b7269fae3e..363842c17ebc 100644 --- a/pkgs/by-name/ma/mate-polkit/package.nix +++ b/pkgs/by-name/ma/mate-polkit/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Integrates polkit authentication for MATE desktop"; homepage = "https://mate-desktop.org"; - license = [ lib.licenses.gpl2Plus ]; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; diff --git a/pkgs/by-name/ma/mate-sensors-applet/package.nix b/pkgs/by-name/ma/mate-sensors-applet/package.nix index 536b3c3251fa..a8496deb4f96 100644 --- a/pkgs/by-name/ma/mate-sensors-applet/package.nix +++ b/pkgs/by-name/ma/mate-sensors-applet/package.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/mate-desktop/mate-sensors-applet"; description = "MATE panel applet for hardware sensors"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; teams = [ lib.teams.mate ]; }; diff --git a/pkgs/by-name/ma/mate-system-monitor/package.nix b/pkgs/by-name/ma/mate-system-monitor/package.nix index bc8715962c5e..06ece55fd14b 100644 --- a/pkgs/by-name/ma/mate-system-monitor/package.nix +++ b/pkgs/by-name/ma/mate-system-monitor/package.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { description = "System monitor for the MATE desktop"; mainProgram = "mate-system-monitor"; homepage = "https://mate-desktop.org"; - license = [ lib.licenses.gpl2Plus ]; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; diff --git a/pkgs/by-name/ma/mate-tweak/package.nix b/pkgs/by-name/ma/mate-tweak/package.nix index 63cc32afbd25..ee347085be71 100644 --- a/pkgs/by-name/ma/mate-tweak/package.nix +++ b/pkgs/by-name/ma/mate-tweak/package.nix @@ -85,7 +85,7 @@ python3Packages.buildPythonApplication rec { description = "Tweak tool for the MATE Desktop"; homepage = "https://github.com/ubuntu-mate/mate-tweak"; changelog = "https://github.com/ubuntu-mate/mate-tweak/releases/tag/${version}"; - license = [ lib.licenses.gpl2Plus ]; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; teams = [ lib.teams.mate ]; }; diff --git a/pkgs/by-name/ma/mate-user-share/package.nix b/pkgs/by-name/ma/mate-user-share/package.nix index f3e0b3846e5d..8a3acda40b02 100644 --- a/pkgs/by-name/ma/mate-user-share/package.nix +++ b/pkgs/by-name/ma/mate-user-share/package.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { description = "User level public file sharing for the MATE desktop"; mainProgram = "mate-file-share-properties"; homepage = "https://github.com/mate-desktop/mate-user-share"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; diff --git a/pkgs/by-name/ma/matrix-appservice-irc/package.nix b/pkgs/by-name/ma/matrix-appservice-irc/package.nix index 52e4d4b8d854..6dcf8c5c3366 100644 --- a/pkgs/by-name/ma/matrix-appservice-irc/package.nix +++ b/pkgs/by-name/ma/matrix-appservice-irc/package.nix @@ -5,7 +5,7 @@ fetchYarnDeps, fixup-yarn-lock, node-gyp-build, - nodejs-slim, + nodejs-slim_22, matrix-sdk-crypto-nodejs, nixosTests, nix-update-script, @@ -42,7 +42,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ fixup-yarn-lock - nodejs-slim + nodejs-slim_22 yarn node-gyp-build ]; diff --git a/pkgs/by-name/ma/matrix-authentication-service/package.nix b/pkgs/by-name/ma/matrix-authentication-service/package.nix index 38b359752e54..6c9cffa76f22 100644 --- a/pkgs/by-name/ma/matrix-authentication-service/package.nix +++ b/pkgs/by-name/ma/matrix-authentication-service/package.nix @@ -2,8 +2,9 @@ lib, rustPlatform, fetchFromGitHub, - fetchNpmDeps, - npmHooks, + fetchPnpmDeps, + pnpm, + pnpmConfigHook, nodejs, python3, pkg-config, @@ -19,30 +20,30 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "matrix-authentication-service"; - version = "1.17.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "element-hq"; repo = "matrix-authentication-service"; tag = "v${finalAttrs.version}"; - hash = "sha256-/3NgMZ0B+B0BHPBi/vuiCS6xi70wgNKCZH0hTpkWi+U="; + hash = "sha256-0fvGhBxwXhSzWvNhflreEFoCBycM10vMkMf4sj95vfY="; }; - cargoHash = "sha256-aZSnQmOwqo0OG3XXM5eups0cKNs80j/nAsZB5tnWUrY="; + cargoHash = "sha256-3V50qNvg24WZvQ9z7IZJAnPXHTibZ6o3EzUoinLU6Gw="; - npmDeps = fetchNpmDeps { - name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; - src = "${finalAttrs.src}/${finalAttrs.npmRoot}"; - hash = "sha256-FevzqirT/GyT8urQ79AtJi+q1zcwn73AyiJTf/B9cG0="; + pnpmDeps = fetchPnpmDeps { + inherit (finalAttrs) pname version src; + fetcherVersion = 4; + hash = "sha256-j2A2VCKQPfoyrNDtazu8hzUHpS130Ju/Cy3yfu9tC5I="; }; - npmRoot = "frontend"; - npmFlags = [ "--legacy-peer-deps" ]; + pnpmRoot = "frontend"; nativeBuildInputs = [ pkg-config open-policy-agent - npmHooks.npmConfigHook + pnpmConfigHook + pnpm nodejs (python3.withPackages (ps: [ ps.setuptools ])) # Used by gyp ] @@ -82,7 +83,7 @@ rustPlatform.buildRustPackage (finalAttrs: { in '' make -C policies - (cd "$npmRoot" && npm run build) + (cd "$pnpmRoot" && npm run build) # Fix aws-lc-sys cross-compilation export CC_${buildTargetUnderscore}=$CC_FOR_BUILD @@ -92,8 +93,8 @@ rustPlatform.buildRustPackage (finalAttrs: { # Adapted from https://github.com/element-hq/matrix-authentication-service/blob/v0.20.0/.github/workflows/build.yaml#L75-L84 postInstall = '' install -Dm444 -t "$out/share/$pname" "policies/policy.wasm" - install -Dm444 -t "$out/share/$pname" "$npmRoot/dist/manifest.json" - install -Dm444 -t "$out/share/$pname/assets" "$npmRoot/dist/"* + install -Dm444 -t "$out/share/$pname" "$pnpmRoot/dist/manifest.json" + install -Dm444 -t "$out/share/$pname/assets" "$pnpmRoot/dist/"* cp -r templates "$out/share/$pname/templates" cp -r translations "$out/share/$pname/translations" ''; diff --git a/pkgs/by-name/ma/matterbridge/package.nix b/pkgs/by-name/ma/matterbridge/package.nix index d847c02f3aa2..edad78b29a8e 100644 --- a/pkgs/by-name/ma/matterbridge/package.nix +++ b/pkgs/by-name/ma/matterbridge/package.nix @@ -22,7 +22,7 @@ buildGoModule { meta = { description = "Simple bridge between Mattermost, IRC, XMPP, Gitter, Slack, Discord, Telegram, Rocket.Chat, Hipchat(via xmpp), Matrix and Steam"; homepage = "https://github.com/42wim/matterbridge"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ ryantm ]; mainProgram = "matterbridge"; }; diff --git a/pkgs/by-name/ma/matterjs-server/package.nix b/pkgs/by-name/ma/matterjs-server/package.nix index a783efe28a6d..428e73568b38 100644 --- a/pkgs/by-name/ma/matterjs-server/package.nix +++ b/pkgs/by-name/ma/matterjs-server/package.nix @@ -12,7 +12,7 @@ buildNpmPackage (finalAttrs: { pname = "matterjs-server"; - version = "1.1.7"; + version = "1.2.5"; __structuredAttrs = true; strictDeps = true; @@ -20,10 +20,10 @@ buildNpmPackage (finalAttrs: { owner = "matter-js"; repo = "matterjs-server"; tag = "v${finalAttrs.version}"; - hash = "sha256-8b4bLDVHTFcOHj3h/VuIxwdHJBleibZe9gUQvUD+aPA="; + hash = "sha256-IXYq4Ppz61+8PeGUgmBcENkL3o6JFrJaIwFjr77uOhg="; }; - npmDepsHash = "sha256-wkxYJtHwwpP87PDuE2HWA/2GDEUWfcSN2sEvjWz27a8="; + npmDepsHash = "sha256-HrBtwT61RnHSuUCGH9I6vcigzpZdwp6HS5dc0v3EVnQ="; nativeBuildInputs = [ makeBinaryWrapper diff --git a/pkgs/by-name/ma/mautrix-telegram/0002-use-importlib-resources.patch b/pkgs/by-name/ma/mautrix-telegram/0002-use-importlib-resources.patch new file mode 100644 index 000000000000..bcacda11ca52 --- /dev/null +++ b/pkgs/by-name/ma/mautrix-telegram/0002-use-importlib-resources.patch @@ -0,0 +1,36 @@ +diff --git a/mautrix_telegram/web/public/__init__.py b/mautrix_telegram/web/public/__init__.py +index cde3735..d911779 100644 +--- a/mautrix_telegram/web/public/__init__.py ++++ b/mautrix_telegram/web/public/__init__.py +@@ -23,7 +23,7 @@ import time + + from aiohttp import web + from mako.template import Template +-import pkg_resources ++from importlib.resources import files + + from mautrix.types import UserID + from mautrix.util.signed_token import sign_token, verify_token +@@ -45,11 +45,11 @@ class PublicBridgeWebsite(AuthAPI): + self.secret_key = "".join(random.choices(string.ascii_lowercase + string.digits, k=64)) + + self.login = Template( +- pkg_resources.resource_string("mautrix_telegram", "web/public/login.html.mako") ++ files("mautrix_telegram").joinpath("web/public/login.html.mako").read_bytes() + ) + + self.mx_login = Template( +- pkg_resources.resource_string("mautrix_telegram", "web/public/matrix-login.html.mako") ++ files("mautrix_telegram").joinpath("web/public/matrix-login.html.mako").read_bytes() + ) + + self.app = web.Application(loop=loop) +@@ -58,7 +58,7 @@ class PublicBridgeWebsite(AuthAPI): + self.app.router.add_route("GET", "/matrix-login", self.get_matrix_login) + self.app.router.add_route("POST", "/matrix-login", self.post_matrix_login) + self.app.router.add_static( +- "/", pkg_resources.resource_filename("mautrix_telegram", "web/public/") ++ "/", str(files("mautrix_telegram").joinpath("web/public/")) + ) + + def make_token(self, mxid: str, endpoint: str = "/login", expires_in: int = 900) -> str: diff --git a/pkgs/by-name/ma/mautrix-telegram/package.nix b/pkgs/by-name/ma/mautrix-telegram/package.nix index 4a80fc9c9b36..2f6546a74b33 100644 --- a/pkgs/by-name/ma/mautrix-telegram/package.nix +++ b/pkgs/by-name/ma/mautrix-telegram/package.nix @@ -3,24 +3,43 @@ fetchPypi, fetchFromGitHub, python3, + openssl, withE2BE ? true, }: let - tulir-telethon = python3.pkgs.telethon.overrideAttrs ( - finalAttrs: previousAttrs: { - version = "1.99.0a6"; - pname = "tulir_telethon"; - src = fetchFromGitHub { - owner = "tulir"; - repo = "Telethon"; - tag = "v${finalAttrs.version}"; - hash = "sha256-ulnA+xKbZDOTzXYmF9oBWNBNhgxSiF+mKx1ijoCyo/w="; - }; - dontUsePytestCheck = true; - } - ); + # tulir-telethon is a fork of telethon used only by mautrix-telegram. It is + # built standalone rather than via telethon.overrideAttrs so it does not + # inherit telethon's `disabled = pythonAtLeast "3.14"` (which exists only + # because telethon's *tests* fail on 3.14). This fork skips the test suite. + # + # Kept as a local let binding rather than a top-level package: the upstream + # Python version is EOL (being rewritten in Go), so splitting it out would + # only add maintenance surface for code that will soon be replaced. + tulir-telethon = python3.pkgs.buildPythonPackage { + pname = "tulir_telethon"; + version = "1.99.0a6"; + pyproject = true; + src = fetchFromGitHub { + owner = "tulir"; + repo = "Telethon"; + tag = "v1.99.0a6"; + hash = "sha256-ulnA+xKbZDOTzXYmF9oBWNBNhgxSiF+mKx1ijoCyo/w="; + }; + postPatch = '' + substituteInPlace telethon/crypto/libssl.py --replace-fail \ + "ctypes.util.find_library('ssl')" "'${lib.getLib openssl}/lib/libssl.so'" + ''; + build-system = [ + python3.pkgs.setuptools + ]; + dependencies = with python3.pkgs; [ + pyaes + rsa + ]; + dontUsePytestCheck = true; + }; in python3.pkgs.buildPythonApplication (finalAttrs: { pname = "mautrix-telegram"; @@ -36,7 +55,10 @@ python3.pkgs.buildPythonApplication (finalAttrs: { build-system = with python3.pkgs; [ setuptools ]; - patches = [ ./0001-Re-add-entrypoint.patch ]; + patches = [ + ./0001-Re-add-entrypoint.patch + ./0002-use-importlib-resources.patch + ]; pythonRelaxDeps = [ "mautrix" diff --git a/pkgs/by-name/mc/mcap-cli/package.nix b/pkgs/by-name/mc/mcap-cli/package.nix index 65fcd91a4a4b..96aa8e76e35e 100644 --- a/pkgs/by-name/mc/mcap-cli/package.nix +++ b/pkgs/by-name/mc/mcap-cli/package.nix @@ -77,7 +77,7 @@ buildGoModule { meta = { description = "MCAP CLI tool to inspect and fix MCAP files"; homepage = "https://github.com/foxglove/mcap"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ therishidesai ]; diff --git a/pkgs/by-name/mc/mcp-grafana/package.nix b/pkgs/by-name/mc/mcp-grafana/package.nix index dfbce63aae9d..09e2c6a48648 100644 --- a/pkgs/by-name/mc/mcp-grafana/package.nix +++ b/pkgs/by-name/mc/mcp-grafana/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "mcp-grafana"; - version = "0.17.1"; + version = "0.17.2"; src = fetchFromGitHub { owner = "grafana"; repo = "mcp-grafana"; tag = "v${finalAttrs.version}"; - hash = "sha256-nuG17gscAzGzxehlR+UkVo6NyGM0swiKXSx0N95ffvU="; + hash = "sha256-8cImJIND4S3ISkfNBCdP05AgNuAJNKOCtI9o47MR7tw="; }; vendorHash = "sha256-SovR9UxTqN397oczKgJqlJ9iOFnCrZGqPWhhfcjSNPg="; diff --git a/pkgs/by-name/mc/mcp-server-fetch/package.nix b/pkgs/by-name/mc/mcp-server-fetch/package.nix index e086399f3b6d..d4575f05da2e 100644 --- a/pkgs/by-name/mc/mcp-server-fetch/package.nix +++ b/pkgs/by-name/mc/mcp-server-fetch/package.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "mcp-server-fetch"; - version = "2026.7.4"; + version = "2026.7.10"; pyproject = true; src = fetchFromGitHub { diff --git a/pkgs/by-name/mc/mcp-server-git/package.nix b/pkgs/by-name/mc/mcp-server-git/package.nix index c4e17c4d543b..98140ce96260 100644 --- a/pkgs/by-name/mc/mcp-server-git/package.nix +++ b/pkgs/by-name/mc/mcp-server-git/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "mcp-server-git"; - version = "2026.7.4"; + version = "2026.7.10"; pyproject = true; src = fetchFromGitHub { owner = "modelcontextprotocol"; repo = "servers"; tag = finalAttrs.version; - hash = "sha256-rBdJoTC1wOEMbAAeSccFqaHL7lacf2SFfxZ/pp2Lx90="; + hash = "sha256-ORihWA8Xx7WAPo2+vRPpYNF9CGfc1sjmW+NfUKBGzxs="; }; sourceRoot = "${finalAttrs.src.name}/src/git/"; diff --git a/pkgs/by-name/mc/mcp-server-time/package.nix b/pkgs/by-name/mc/mcp-server-time/package.nix index 3b2b41b224a4..33e53dc6bac0 100644 --- a/pkgs/by-name/mc/mcp-server-time/package.nix +++ b/pkgs/by-name/mc/mcp-server-time/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "mcp-server-time"; - version = "2026.7.4"; + version = "2026.7.10"; pyproject = true; src = fetchFromGitHub { owner = "modelcontextprotocol"; repo = "servers"; tag = finalAttrs.version; - hash = "sha256-rBdJoTC1wOEMbAAeSccFqaHL7lacf2SFfxZ/pp2Lx90="; + hash = "sha256-ORihWA8Xx7WAPo2+vRPpYNF9CGfc1sjmW+NfUKBGzxs="; }; sourceRoot = "${finalAttrs.src.name}/src/time/"; diff --git a/pkgs/by-name/md/md4c/package.nix b/pkgs/by-name/md/md4c/package.nix index 32fad6ff5a2a..5447b89d4fb5 100644 --- a/pkgs/by-name/md/md4c/package.nix +++ b/pkgs/by-name/md/md4c/package.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { - Permissive license: MD4C is available under the MIT license. ''; changelog = "https://github.com/mity/md4c/blob/${finalAttrs.src.rev}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ ]; mainProgram = "md2html"; platforms = lib.platforms.all; diff --git a/pkgs/by-name/md/mdbook-bib/package.nix b/pkgs/by-name/md/mdbook-bib/package.nix index 8f6955dbba22..4c6816a923ee 100644 --- a/pkgs/by-name/md/mdbook-bib/package.nix +++ b/pkgs/by-name/md/mdbook-bib/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mdbook-bib"; - version = "0.5.2"; + version = "0.5.3"; __structuredAttrs = true; src = fetchFromGitHub { owner = "francisco-perez-sorrosal"; repo = "mdbook-bib"; tag = "v${finalAttrs.version}"; - hash = "sha256-xgGJYnOYUuxHs2sXzYKSZd0jLm/x/PoPsNHQcWpXkn8="; + hash = "sha256-IhGwVnUYjnwZmZJkt1Z9yFlNcJ2EObnqFHmmfJNco/M="; }; - cargoHash = "sha256-QyP+Mw/95NvjaAkr5eoeC49nLXCE9/TMPIWahJayqBQ="; + cargoHash = "sha256-A1rOfXZP4rFtLX3pmLwB99FBws1wMotKnMPfqnYW9m0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/md/mdbook-open-on-gh/package.nix b/pkgs/by-name/md/mdbook-open-on-gh/package.nix index d922a63a13b8..841918c42094 100644 --- a/pkgs/by-name/md/mdbook-open-on-gh/package.nix +++ b/pkgs/by-name/md/mdbook-open-on-gh/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "mdbook preprocessor to add a open-on-github link on every page"; mainProgram = "mdbook-open-on-gh"; homepage = "https://github.com/badboy/mdbook-open-on-gh"; - license = [ lib.licenses.mpl20 ]; + license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ matthiasbeyer ]; }; }) diff --git a/pkgs/by-name/md/mdbook/package.nix b/pkgs/by-name/md/mdbook/package.nix index fa23ac200d96..cceebdbc719a 100644 --- a/pkgs/by-name/md/mdbook/package.nix +++ b/pkgs/by-name/md/mdbook/package.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { mainProgram = "mdbook"; homepage = "https://github.com/rust-lang/mdBook"; changelog = "https://github.com/rust-lang/mdBook/blob/v${version}/CHANGELOG.md"; - license = [ lib.licenses.mpl20 ]; + license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ Frostman matthiasbeyer diff --git a/pkgs/by-name/md/mdsh/package.nix b/pkgs/by-name/md/mdsh/package.nix index e5bb0805e79e..297a02e2d957 100644 --- a/pkgs/by-name/md/mdsh/package.nix +++ b/pkgs/by-name/md/mdsh/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Markdown shell pre-processor"; homepage = "https://github.com/zimbatm/mdsh"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ zimbatm ]; mainProgram = "mdsh"; }; diff --git a/pkgs/by-name/me/mediawiki/package.nix b/pkgs/by-name/me/mediawiki/package.nix index 137a750715aa..0b8a4444421c 100644 --- a/pkgs/by-name/me/mediawiki/package.nix +++ b/pkgs/by-name/me/mediawiki/package.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation rec { pname = "mediawiki"; - version = "1.45.3"; + version = "1.45.4"; src = fetchurl { url = "https://releases.wikimedia.org/mediawiki/${lib.versions.majorMinor version}/mediawiki-${version}.tar.gz"; - hash = "sha256-XqjB8yHJ+Nuk0aweTsoYJ/sTUZ1KIZDiOfUUMgWKQmk="; + hash = "sha256-y3yCRGjrWlEacvCOYpHQncivEuCg/9wlMu4/drsMrXw="; }; postPatch = '' diff --git a/pkgs/by-name/me/meetingbar/package.nix b/pkgs/by-name/me/meetingbar/package.nix index 1038adb66296..c8b656d24b24 100644 --- a/pkgs/by-name/me/meetingbar/package.nix +++ b/pkgs/by-name/me/meetingbar/package.nix @@ -37,7 +37,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ delafthi ]; platforms = [ - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/me/meilisearch/package.nix b/pkgs/by-name/me/meilisearch/package.nix index 6f4876cfbf5b..e257bfba31b3 100644 --- a/pkgs/by-name/me/meilisearch/package.nix +++ b/pkgs/by-name/me/meilisearch/package.nix @@ -50,7 +50,6 @@ rustPlatform.buildRustPackage (finalAttrs: { "aarch64-linux" "aarch64-darwin" "x86_64-linux" - "x86_64-darwin" ]; }; }) diff --git a/pkgs/by-name/me/melonds/package.nix b/pkgs/by-name/me/melonds/package.nix index 4403f9ff44eb..7e1f67e99c3b 100644 --- a/pkgs/by-name/me/melonds/package.nix +++ b/pkgs/by-name/me/melonds/package.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: { - (WIP) GBA slot add-ons - and more are planned! ''; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; mainProgram = "melonDS"; maintainers = with lib.maintainers; [ artemist diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix index 086cd2759348..e20edd45e41e 100644 --- a/pkgs/by-name/me/mergiraf/package.nix +++ b/pkgs/by-name/me/mergiraf/package.nix @@ -6,23 +6,27 @@ # native check inputs git, + jujutsu, versionCheckHook, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "mergiraf"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromCodeberg { owner = "mergiraf"; repo = "mergiraf"; tag = "v${finalAttrs.version}"; - hash = "sha256-Tqz1gNg2XIYO/dFETajF3XUs3A1+mY82U4pz+mMb/ws="; + hash = "sha256-PfGiPH7CU8z+Flj3X04XnRdWcv5K+hTZMfvHpM52Fic="; }; - cargoHash = "sha256-8Geu6Cd83hTnd53/ZTKq1YIEMIX4oIgwzSS6h8RNaP8="; + cargoHash = "sha256-1MDjaaH2PcvQz0DKSTADRB+8YEUWP1GN2edHk4EDVGA="; - nativeCheckInputs = [ git ]; + nativeCheckInputs = [ + git + jujutsu + ]; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/me/meshlab/package.nix b/pkgs/by-name/me/meshlab/package.nix index ed277bf0733b..104fbc3a03d2 100644 --- a/pkgs/by-name/me/meshlab/package.nix +++ b/pkgs/by-name/me/meshlab/package.nix @@ -76,12 +76,7 @@ stdenv.mkDerivation (finalAttrs: { bzip2 muparser eigen - # MeshLab renders through Qt's xcb platform, which creates a GLX context, - # and calls glewInit() against it. The default EGL-enabled glew is built - # EGL-only (no GLX dispatch table), so glewInit can't read GL_VERSION and - # the app fails to launch with "GLEW initialization failed: Missing GL - # version". See https://github.com/NixOS/nixpkgs/issues/531470 - (glew.override { enableEGL = false; }) + glew gmp levmar qhull diff --git a/pkgs/by-name/me/messer-slim/package.nix b/pkgs/by-name/me/messer-slim/package.nix index 93f74a7820e9..84ab01605fae 100644 --- a/pkgs/by-name/me/messer-slim/package.nix +++ b/pkgs/by-name/me/messer-slim/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Evolutionary simulation framework"; homepage = "https://messerlab.org/slim/"; - license = with lib.licenses; [ gpl3 ]; + license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ bzizou ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/me/meteor/package.nix b/pkgs/by-name/me/meteor/package.nix index 59f7148ad3f8..499113461bd7 100644 --- a/pkgs/by-name/me/meteor/package.nix +++ b/pkgs/by-name/me/meteor/package.nix @@ -20,10 +20,6 @@ let url = "https://static.meteor.com/packages-bootstrap/${version}/meteor-bootstrap-os.linux.x86_64.tar.gz"; hash = "sha256-tzzRN9UAH7+BM3fs76U5H20vD0LGMpdrMDDiJtchgEg="; }; - x86_64-darwin = fetchurl { - url = "https://static.meteor.com/packages-bootstrap/${version}/meteor-bootstrap-os.osx.x86_64.tar.gz"; - hash = "sha256-Z9Had9hscEjxHch19KCYUTqN4OikYLfz1tqEpyxw2Y8="; - }; aarch64-darwin = fetchurl { url = "https://static.meteor.com/packages-bootstrap/${version}/meteor-bootstrap-os.osx.arm64.tar.gz"; hash = "sha256-AT7njZTgf/WTHlvLEbF3dXKNoqyqHy8KloBQ4gsbPuM="; diff --git a/pkgs/by-name/mg/mgba/package.nix b/pkgs/by-name/mg/mgba/package.nix index 100ef2405845..651badb289a7 100644 --- a/pkgs/by-name/mg/mgba/package.nix +++ b/pkgs/by-name/mg/mgba/package.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: { not support. ''; changelog = "https://raw.githubusercontent.com/mgba-emu/mgba/${finalAttrs.src.rev}/CHANGES"; - license = with lib.licenses; [ mpl20 ]; + license = lib.licenses.mpl20; mainProgram = "mgba"; maintainers = with lib.maintainers; [ Gliczy ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/mi/microfetch/package.nix b/pkgs/by-name/mi/microfetch/package.nix index 6ecf01979deb..6ce77db31bfe 100644 --- a/pkgs/by-name/mi/microfetch/package.nix +++ b/pkgs/by-name/mi/microfetch/package.nix @@ -9,25 +9,21 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "microfetch"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "NotAShelf"; repo = "microfetch"; tag = "${finalAttrs.version}"; - hash = "sha256-akJ44+X1POnV1dZnWq66X5vWokp9TGgJ5/Ey6kh/icA="; + hash = "sha256-Hi9U1WqCCoXnZx8ZgT5+fT2grTdNPC73fTAn0l9kzkg="; }; - cargoHash = "sha256-mVS1fv/FI3rDoNm2D7ToiqZJZuySggK2zW2KbbxtpuQ="; + cargoHash = "sha256-7tN5E95uEJBUT1OMAnjkXnbSZjO23KWi8Vc3Cic9nek="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ mold ]; passthru.updateScript = nix-update-script { }; - # For whatever reason the cargo test build in the checkphase attempts to use dynamic libraries. - # Could be wrong, but rectifying this is probably more of an investment than it's worth. - doCheck = false; - meta = { description = "Microscopic fetch script in Rust, for NixOS systems"; homepage = "https://github.com/NotAShelf/microfetch"; @@ -37,6 +33,6 @@ rustPlatform.buildRustPackage (finalAttrs: { NotAShelf ]; mainProgram = "microfetch"; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ [ "aarch64-darwin" ]; }; }) diff --git a/pkgs/by-name/mi/micropython/package.nix b/pkgs/by-name/mi/micropython/package.nix index bb7745fd2849..38df77b5a981 100644 --- a/pkgs/by-name/mi/micropython/package.nix +++ b/pkgs/by-name/mi/micropython/package.nix @@ -67,7 +67,6 @@ stdenv.mkDerivation rec { "armv6l-linux" = "Linux"; "riscv64-linux" = "Linux"; "powerpc64le-linux" = "Linux"; - "x86_64-darwin" = "Darwin"; "aarch64-darwin" = "Darwin"; } .${stdenv.hostPlatform.system} or stdenv.hostPlatform.parsed.kernel.name diff --git a/pkgs/by-name/mi/mill/package.nix b/pkgs/by-name/mi/mill/package.nix index 3f95a76c87fd..47155656b736 100644 --- a/pkgs/by-name/mi/mill/package.nix +++ b/pkgs/by-name/mi/mill/package.nix @@ -16,7 +16,6 @@ let suffixMap = { aarch64-darwin = "native-mac-aarch64"; - x86_64-darwin = "native-mac-amd64"; aarch64-linux = "native-linux-aarch64"; x86_64-linux = "native-linux-amd64"; }; @@ -33,7 +32,6 @@ stdenvNoCC.mkDerivation rec { sha256 = { aarch64-darwin = "sha256-UiooqMbxceUepk4uJV8ZSL1o4VLeTZgWs3URQFXFmQs="; - x86_64-darwin = "sha256-EvIH0GHrdFtE5m6WqHAu7XDJn/8rElpmSxLrdCx5CKY="; aarch64-linux = "sha256-Az/NCaFVrKANJvgIHx9QlW/fPyFVc4XiJ6BZr4ahfxk="; x86_64-linux = "sha256-YhygFs8+ffOgoOSpggrYQ+xS19q8koYbN9UnozlLTPY="; } @@ -118,7 +116,6 @@ stdenvNoCC.mkDerivation rec { "x86_64-linux" "aarch64-linux" "aarch64-darwin" - "x86_64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; diff --git a/pkgs/by-name/mi/mimeo/package.nix b/pkgs/by-name/mi/mimeo/package.nix index 5edbcdaab098..4ac69cb3519a 100644 --- a/pkgs/by-name/mi/mimeo/package.nix +++ b/pkgs/by-name/mi/mimeo/package.nix @@ -39,7 +39,7 @@ python3Packages.buildPythonApplication { meta = { description = "Open files by MIME-type or file name using regular expressions"; homepage = "https://xyne.dev/projects/mimeo/"; - license = [ lib.licenses.gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = [ lib.maintainers.rycee ]; platforms = lib.platforms.unix; mainProgram = "mimeo"; diff --git a/pkgs/by-name/mi/mimikatz/package.nix b/pkgs/by-name/mi/mimikatz/package.nix index 665ea7f82975..320ff1c76db9 100644 --- a/pkgs/by-name/mi/mimikatz/package.nix +++ b/pkgs/by-name/mi/mimikatz/package.nix @@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/gentilkiwi/mimikatz"; description = "Little tool to play with Windows security"; - license = with lib.licenses; [ cc-by-40 ]; + license = lib.licenses.cc-by-40; maintainers = [ ]; platforms = lib.platforms.all; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/mi/mimir/package.nix b/pkgs/by-name/mi/mimir/package.nix index c20fd10fea90..f06783ebd4c5 100644 --- a/pkgs/by-name/mi/mimir/package.nix +++ b/pkgs/by-name/mi/mimir/package.nix @@ -7,13 +7,13 @@ }: buildGoModule (finalAttrs: { pname = "mimir"; - version = "3.1.2"; + version = "3.1.3"; src = fetchFromGitHub { rev = "mimir-${finalAttrs.version}"; owner = "grafana"; repo = "mimir"; - hash = "sha256-8GvpmCanVlsObH1mwPA/TsHzNp3f0hzF7fURIDHy/DU="; + hash = "sha256-OXzYV42v9coPPp1zbITDOepmccioF+rBfRMoVUZaTeY="; }; vendorHash = null; @@ -67,7 +67,6 @@ buildGoModule (finalAttrs: { maintainers = with lib.maintainers; [ happysalada bryanhonof - adamcstephens ]; }; }) diff --git a/pkgs/by-name/mi/minecraft-server/derivation.nix b/pkgs/by-name/mi/minecraft-server/derivation.nix index 4192dff1ccf6..a93d2eb05302 100644 --- a/pkgs/by-name/mi/minecraft-server/derivation.nix +++ b/pkgs/by-name/mi/minecraft-server/derivation.nix @@ -36,7 +36,11 @@ stdenv.mkDerivation { passthru = { tests = { inherit (nixosTests) minecraft-server; }; - updateScript = ./update.py; + updateScript = { + command = [ ./update.py ]; + + supportedFeatures = [ "commit" ]; + }; }; meta = { @@ -48,6 +52,7 @@ stdenv.mkDerivation { maintainers = with lib.maintainers; [ thoughtpolice tomberek + wrench-exile-legacy costrouc ]; mainProgram = "minecraft-server"; diff --git a/pkgs/by-name/mi/minecraft-server/update.py b/pkgs/by-name/mi/minecraft-server/update.py index f272c8b71a84..de4c9339c576 100755 --- a/pkgs/by-name/mi/minecraft-server/update.py +++ b/pkgs/by-name/mi/minecraft-server/update.py @@ -110,6 +110,32 @@ def group_major_releases(releases: List[Version]) -> Dict[str, List[Version]]: return groups +def slugify(version: str) -> str: + return version.replace(".", "-") + + +def get_changelog_url(version: str) -> Optional[str]: + """ + Attempt to resolve the Minecraft changelog article URL. + Returns the URL if it exists, otherwise None. + """ + url = f"https://www.minecraft.net/en-us/article/minecraft-java-edition-{slugify(version)}" + + # our request is denied without a human user-agent + headers = { + "User-Agent": "Mozilla/5.0 (X11; Linux x86_64; rv:140.0) Gecko/20100101 Firefox/140.0" + } + + try: + response = requests.head(url, headers=headers, timeout=3) + if response.status_code == 200: + return url + except requests.RequestException as e: + pass + + return None + + def get_latest_major_releases(releases: List[Version]) -> Dict[str, Version]: """ Return a dictionary containing the latest version for each major release. @@ -118,8 +144,12 @@ def get_latest_major_releases(releases: List[Version]) -> Dict[str, Version]: """ return { major_release: max( - (release for release in releases if get_major_release(release.id) == major_release), - key=lambda x: tuple(map(int, x.id.split('.'))), + ( + release + for release in releases + if get_major_release(release.id) == major_release + ), + key=lambda x: tuple(map(int, x.id.split("."))), ) for major_release in group_major_releases(releases) } @@ -153,7 +183,101 @@ def generate() -> Dict[str, Dict[str, str]]: return servers +def get_latest(servers: Dict[str, Dict[str, str]]) -> str | None: + return max( + (v.get("version") for v in servers.values()), + key=lambda x: tuple(map(int, x.split("."))) if x is not None else (), + ) + + +def generate_commit( + previous_servers: Dict[str, Dict[str, str]], + servers: Dict[str, Dict[str, str]], + versions_file: Path, +) -> List[Dict[str, str | list[str]]]: + actions = [] + commit_body_lines = [] + + old_latest = get_latest(previous_servers) + new_latest = get_latest(servers) + + for major_version, server in servers.items(): + version = server.get("version") + previous_server = previous_servers.get(major_version) + + if version is None: + continue + + attribute = f"minecraftServers.vanilla-{slugify(major_version)}" + + if not previous_server: + # this version didn't exist before + # check if its now the latest version + if version == new_latest: + action = f"{old_latest} -> {new_latest}" + attribute = "minecraft-server" + else: + action = f"init {version}" + + else: + previous_version = previous_server.get("version") + if previous_version == version: + continue + + action = f"{previous_version} -> {version}" + + actions.append(action) + + commit_body_lines.append(f"{attribute}: {action}") + + changelog_url = get_changelog_url(version) + if changelog_url: + commit_body_lines.append(f"Release notes: {changelog_url}") + + if not commit_body_lines: + return [] + + if len(actions) == 1: + commit_message = commit_body_lines[0] + + # the body should only be the release notes to avoid repeatition + # if the release notes don't exist this will be blank + commit_body = "\n".join(commit_body_lines[1:]).strip() + else: + detailed_message = f"minecraft-server: {', '.join(actions)}" + + commit_message = ( + detailed_message + if len(detailed_message) <= 72 + else "minecraft-server: update multiple versions" + ) + + commit_body = "\n".join(commit_body_lines).strip() + + commit_json = { + "attrPath": "minecraftServers.vanilla", + "files": [str(versions_file)], + "commitMessage": commit_message, + } + + if commit_body: + commit_json["commitBody"] = commit_body + + return [commit_json] + + if __name__ == "__main__": - with open(Path(__file__).parent / "versions.json", "w") as file: - json.dump(generate(), file, indent=2) + versions_file = Path(__file__).parent / "versions.json" + + with open(versions_file, "r") as file: + previous_servers = json.load(file) + + servers = generate() + + commit_json = generate_commit(previous_servers, servers, versions_file) + + with open(versions_file, "w") as file: + json.dump(servers, file, indent=2) file.write("\n") + + print(json.dumps(commit_json)) diff --git a/pkgs/by-name/mi/minecraft-server/versions.json b/pkgs/by-name/mi/minecraft-server/versions.json index ac403058dc95..192cef5383f4 100644 --- a/pkgs/by-name/mi/minecraft-server/versions.json +++ b/pkgs/by-name/mi/minecraft-server/versions.json @@ -1,4 +1,10 @@ { + "26.2": { + "sha1": "823e2250d24b3ddac457a60c92a6a941943fcd6a", + "url": "https://piston-data.mojang.com/v1/objects/823e2250d24b3ddac457a60c92a6a941943fcd6a/server.jar", + "version": "26.2", + "javaVersion": 25 + }, "26.1": { "sha1": "97ccd4c0ed3f81bbb7bfacddd1090b0c56f9bc51", "url": "https://piston-data.mojang.com/v1/objects/97ccd4c0ed3f81bbb7bfacddd1090b0c56f9bc51/server.jar", diff --git a/pkgs/by-name/mi/minijinja/package.nix b/pkgs/by-name/mi/minijinja/package.nix index 9c03a3de2a9d..346726ba5716 100644 --- a/pkgs/by-name/mi/minijinja/package.nix +++ b/pkgs/by-name/mi/minijinja/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Command Line Utility to render MiniJinja/Jinja2 templates"; homepage = "https://github.com/mitsuhiko/minijinja"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ psibi ]; changelog = "https://github.com/mitsuhiko/minijinja/blob/${finalAttrs.version}/CHANGELOG.md"; mainProgram = "minijinja-cli"; diff --git a/pkgs/by-name/mi/minikube/package.nix b/pkgs/by-name/mi/minikube/package.nix index 9fc1a2e0a432..1594840e771a 100644 --- a/pkgs/by-name/mi/minikube/package.nix +++ b/pkgs/by-name/mi/minikube/package.nix @@ -71,7 +71,11 @@ buildGoModule (finalAttrs: { installBin out/minikube - wrapProgram $out/bin/minikube --set MINIKUBE_WANTUPDATENOTIFICATION false + wrapProgram $out/bin/minikube --set MINIKUBE_WANTUPDATENOTIFICATION false \ + --prefix PATH : ${lib.makeBinPath (lib.optionals stdenv.hostPlatform.isLinux [ libvirt ])} \ + --prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath (lib.optionals stdenv.hostPlatform.isLinux [ libvirt ]) + } ln -sv $out/bin/minikube $out/bin/kubectl for shell in bash zsh fish; do diff --git a/pkgs/by-name/mi/miniserve/package.nix b/pkgs/by-name/mi/miniserve/package.nix index 56bb57953d04..895e3cc33cee 100644 --- a/pkgs/by-name/mi/miniserve/package.nix +++ b/pkgs/by-name/mi/miniserve/package.nix @@ -66,7 +66,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "CLI tool to serve files and directories over HTTP"; homepage = "https://github.com/svenstaro/miniserve"; changelog = "https://github.com/svenstaro/miniserve/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ defelo ]; diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json index c761bc6d5cf4..6e1c8d36235e 100644 --- a/pkgs/by-name/mi/mirrord/manifest.json +++ b/pkgs/by-name/mi/mirrord/manifest.json @@ -12,10 +12,6 @@ "aarch64-darwin": { "url": "https://github.com/metalbear-co/mirrord/releases/download/3.229.0/mirrord_mac_universal", "hash": "sha256-o71hF5s3dwNPgubbJrO1/Vjfau3kTVZAjDYahuDpevc=" - }, - "x86_64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.229.0/mirrord_mac_universal", - "hash": "sha256-o71hF5s3dwNPgubbJrO1/Vjfau3kTVZAjDYahuDpevc=" } } } diff --git a/pkgs/by-name/mi/mirrord/update.py b/pkgs/by-name/mi/mirrord/update.py index 5756363cfc7c..580aafb451c2 100755 --- a/pkgs/by-name/mi/mirrord/update.py +++ b/pkgs/by-name/mi/mirrord/update.py @@ -12,7 +12,6 @@ platforms = { "x86_64-linux": "linux_x86_64", "aarch64-linux": "linux_aarch64", "aarch64-darwin": "mac_universal", - "x86_64-darwin": "mac_universal", } if __name__ == "__main__": diff --git a/pkgs/by-name/mi/mirth/package.nix b/pkgs/by-name/mi/mirth/package.nix index 4aa8dfd1eab4..031fb321fd92 100644 --- a/pkgs/by-name/mi/mirth/package.nix +++ b/pkgs/by-name/mi/mirth/package.nix @@ -107,7 +107,6 @@ stdenv.mkDerivation { "aarch64-windows" "i686-linux" "i686-windows" - "x86_64-darwin" "x86_64-linux" "x86_64-windows" ]; diff --git a/pkgs/by-name/mi/misc-gitology/package.nix b/pkgs/by-name/mi/misc-gitology/package.nix index 2b6c9f735544..df4c21bfb68b 100644 --- a/pkgs/by-name/mi/misc-gitology/package.nix +++ b/pkgs/by-name/mi/misc-gitology/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { meta = { description = "Assortment of scripts around Git"; homepage = "https://github.com/da-x/misc-gitology"; - license = [ lib.licenses.bsd2 ]; + license = lib.licenses.bsd2; maintainers = [ lib.maintainers._9999years ]; }; diff --git a/pkgs/by-name/mi/mistral-rs/package.nix b/pkgs/by-name/mi/mistral-rs/package.nix index 33a343496199..b7799c0aa1a6 100644 --- a/pkgs/by-name/mi/mistral-rs/package.nix +++ b/pkgs/by-name/mi/mistral-rs/package.nix @@ -34,6 +34,7 @@ let inherit (stdenv) hostPlatform; + rustc = rustPlatform.callPackage ({ rustc }: rustc) { }; accelIsValid = builtins.elem acceleration [ null @@ -94,6 +95,26 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail \ "lto = true" \ "lto = false" + + '' + # LLVM 21 cannot select the VPDPBUSD intrinsic because its argument types are incorrect. + # Fixed by https://github.com/rust-lang/llvm-project/commit/94e2c19f86a699d7a19ff0f4130b696699189c8d. + + lib.optionalString (hostPlatform.isx86_64 && lib.versionOlder rustc.llvm.version "22") '' + substituteInPlace "$cargoDepsCopy/source-git-0/candle-core-0.11.0/src/quantized/mod.rs" \ + --replace-fail \ + '#[cfg(target_arch = "x86_64")]' \ + '#[cfg(any())]' \ + --replace-fail \ + '#[cfg(not(any(target_arch = "aarch64", target_arch = "x86_64")))]' \ + '#[cfg(not(target_arch = "aarch64"))]' + + substituteInPlace "$cargoDepsCopy/source-git-0/candle-core-0.11.0/src/quantized/repack.rs" \ + --replace-fail \ + '#[cfg(target_arch = "x86_64")]' \ + '#[cfg(any())]' \ + --replace-fail \ + '#[cfg(not(any(target_arch = "aarch64", target_arch = "x86_64")))]' \ + '#[cfg(not(target_arch = "aarch64"))]' '' # Prevent build scripts from attempting to clone cutlass (which would fail in the sandbox anyway). # Instead, we provide cutlass in buildInputs. diff --git a/pkgs/by-name/mi/mixxc/package.nix b/pkgs/by-name/mi/mixxc/package.nix index 7e302d0369f8..d84b7b683227 100644 --- a/pkgs/by-name/mi/mixxc/package.nix +++ b/pkgs/by-name/mi/mixxc/package.nix @@ -59,7 +59,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Minimalistic and customizable volume mixer"; homepage = "https://github.com/Elvyria/mixxc"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ daru-san ]; mainProgram = "mixxc"; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/mk/mkl/package.nix b/pkgs/by-name/mk/mkl/package.nix index f9e1dda4e7ab..c2df26331271 100644 --- a/pkgs/by-name/mk/mkl/package.nix +++ b/pkgs/by-name/mk/mkl/package.nix @@ -210,7 +210,6 @@ stdenvNoCC.mkDerivation ( license = lib.licenses.issl; platforms = [ "x86_64-linux" - "x86_64-darwin" ]; }; } diff --git a/pkgs/by-name/mk/mkroot-utils/package.nix b/pkgs/by-name/mk/mkroot-utils/package.nix new file mode 100644 index 000000000000..dcc13d4285a5 --- /dev/null +++ b/pkgs/by-name/mk/mkroot-utils/package.nix @@ -0,0 +1,49 @@ +{ + busybox, + cmake, + fakeroot, + fetchFromGitLab, + gitUpdater, + lib, + python3, + stdenv, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "mkroot-utils"; + version = "0.5.3"; + + src = fetchFromGitLab { + owner = "arpa2"; + repo = "mkroot-utils"; + tag = "v${finalAttrs.version}"; + hash = "sha256-BT0OSK6QzxCegj8cXQcBbdfxoj+GxfGfDkyry0JN4Jo="; + }; + + __structuredAttrs = true; + strictDeps = true; + + nativeBuildInputs = [ + cmake + python3 + ]; + + prePatch = '' + substituteInPlace CMakeLists.txt flash/flash.c pico/picoget.c --replace-fail '/bin/ash' '${lib.getExe' busybox "ash"}' + patchShebangs test + ''; + + nativeCheckInputs = [ fakeroot ]; + + doCheck = true; + + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; + + meta = { + description = "Simple utilities to extend RunC and \"mkroot\""; + homepage = "https://gitlab.com/arpa2/mkroot-utils"; + license = lib.licenses.bsd2; + teams = with lib.teams; [ ngi ]; + }; +}) diff --git a/pkgs/by-name/ml/mlkit/package.nix b/pkgs/by-name/ml/mlkit/package.nix index 62b090e74a19..d845f8d4696a 100644 --- a/pkgs/by-name/ml/mlkit/package.nix +++ b/pkgs/by-name/ml/mlkit/package.nix @@ -59,7 +59,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/melsman/mlkit/blob/v${finalAttrs.version}/NEWS.md"; license = lib.licenses.gpl2Plus; platforms = [ - "x86_64-darwin" "x86_64-linux" ]; maintainers = with lib.maintainers; [ athas ]; diff --git a/pkgs/by-name/ml/mlt/package.nix b/pkgs/by-name/ml/mlt/package.nix index 85216c588e67..4d07ef764a36 100644 --- a/pkgs/by-name/ml/mlt/package.nix +++ b/pkgs/by-name/ml/mlt/package.nix @@ -1,4 +1,5 @@ { + alsa-lib, config, lib, stdenv, @@ -8,16 +9,23 @@ which, ffmpeg, fftw, + fontconfig, frei0r, libdv, + libebur128, + libexif, libjack2, libsamplerate, + libspatialaudio, libvorbis, libxml2, libx11, + lilv, makeWrapper, movit, opencv4, + pango, + rnnoise, rtaudio, rubberband, sox, @@ -44,13 +52,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mlt"; - version = "7.38.0"; + version = "7.40.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; tag = "v${finalAttrs.version}"; - hash = "sha256-tZWkgDffNZwJgfrFQNKfS+QzpcjaM0SEBbyxrVBqubc="; + hash = "sha256-rw1jnQJzbtpGsIe/AFMiy7k/3X0vkfkY3rG4E419aVM="; # The submodule contains glaxnimate code, since MLT uses internally some functions defined in glaxnimate. # Since glaxnimate is not available as a library upstream, we cannot remove for now this dependency on # submodules until upstream exports glaxnimate as a library: https://gitlab.com/mattbas/glaxnimate/-/issues/545 @@ -77,18 +85,28 @@ stdenv.mkDerivation (finalAttrs: { (opencv4.override { ffmpeg-headless = ffmpeg; }) ffmpeg fftw + fontconfig frei0r libdv + libebur128 + libexif libjack2 libsamplerate + libspatialaudio libvorbis libxml2 + lilv movit + pango + rnnoise rtaudio rubberband sox vid-stab ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ] @@ -134,7 +152,7 @@ stdenv.mkDerivation (finalAttrs: { postFixup = '' substituteInPlace "$dev"/lib/pkgconfig/mlt-framework-7.pc \ - --replace '=''${prefix}//' '=/' + --replace-fail '=''${prefix}//' '=/' ''; passthru = { diff --git a/pkgs/by-name/mm/mmdoc/package.nix b/pkgs/by-name/mm/mmdoc/package.nix index dd09c19978ec..c9e678bdb646 100644 --- a/pkgs/by-name/mm/mmdoc/package.nix +++ b/pkgs/by-name/mm/mmdoc/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mmdoc"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "ryantm"; repo = "mmdoc"; rev = finalAttrs.version; - hash = "sha256-NS8i5xvCwq0pSdfxnaxnpuwmDAkfH6Tkc4N2F6aGvWY="; + hash = "sha256-GxGYW10GZvDzeeKy9U9iyGvfN3IM/A/pnQivx8xXhHI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mo/mochi/package.nix b/pkgs/by-name/mo/mochi/package.nix index 81d56f9eb8ae..c513e7211733 100644 --- a/pkgs/by-name/mo/mochi/package.nix +++ b/pkgs/by-name/mo/mochi/package.nix @@ -41,12 +41,8 @@ let inherit pname version meta; src = fetchurl { - url = "https://download.mochi.cards/releases/Mochi-${version}${lib.optionalString stdenv.hostPlatform.isAarch64 "-arm64"}.dmg"; - hash = - if stdenv.hostPlatform.isAarch64 then - "sha256-2NADaVzkibWjxBymeF1McGEQH6xHaqDMBg080kCI0F8=" - else - "sha256-XM4vQVQ9QtvqyDu2Wx/8/Z+8H2DetfCufJYrX/1JHFw="; + url = "https://download.mochi.cards/releases/Mochi-${version}-arm64.dmg"; + hash = "sha256-2NADaVzkibWjxBymeF1McGEQH6xHaqDMBg080kCI0F8="; }; sourceRoot = "."; diff --git a/pkgs/by-name/mo/mochi/update.sh b/pkgs/by-name/mo/mochi/update.sh index cc6e20044d54..64c69ee0f4a9 100755 --- a/pkgs/by-name/mo/mochi/update.sh +++ b/pkgs/by-name/mo/mochi/update.sh @@ -17,10 +17,8 @@ fi # Update version and hash for x86_64-linux (AppImage) update-source-version mochi "$latestVersion" --system=x86_64-linux -# Update hashes for darwin systems -for system in x86_64-darwin aarch64-darwin; do - url=$(nix-instantiate --eval --json -E "with import ./. { system = \"$system\"; }; mochi.src.url" | tr -d '"') - hash=$(nix-prefetch-url "$url") - sriHash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri "$hash") - update-source-version mochi "$latestVersion" "$sriHash" --system="$system" --ignore-same-version -done +# Update hash for aarch64-darwin +url=$(nix-instantiate --eval --json -E "with import ./. { system = \"aarch64-darwin\"; }; mochi.src.url" | tr -d '"') +hash=$(nix-prefetch-url "$url") +sriHash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri "$hash") +update-source-version mochi "$latestVersion" "$sriHash" --system=aarch64-darwin --ignore-same-version diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix index ab296248c8e1..87326f81842d 100644 --- a/pkgs/by-name/mo/models-dev/package.nix +++ b/pkgs/by-name/mo/models-dev/package.nix @@ -8,12 +8,12 @@ }: let pname = "models-dev"; - version = "sdk-v0.0.5-unstable-2026-07-07"; + version = "sdk-v0.0.5-unstable-2026-07-17"; src = fetchFromGitHub { owner = "anomalyco"; repo = "models.dev"; - rev = "f1a9be19f62c24474d27947d5236067504dd755a"; - hash = "sha256-ty8l1jURV2uf245Xqm+I95qZ8gU9IjTGqR7+yLGxBUs="; + rev = "d15aa5a09dc0226f0a292699e35f14243e61d65e"; + hash = "sha256-S1WzSYs9of11Onw/hK+stSmakjJJhq1rs6mcW8m+xlc="; }; node_modules = stdenvNoCC.mkDerivation { diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix index 5d75e4a1c064..8b6a52acdebf 100644 --- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix +++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix @@ -31,13 +31,13 @@ in rustPlatform.buildRustPackage (finalAttrs: { pname = "modrinth-app-unwrapped"; - version = "0.15.7"; + version = "0.15.11"; src = fetchFromGitHub { owner = "modrinth"; repo = "code"; tag = "v${finalAttrs.version}"; - hash = "sha256-QBWRvctC9gPHLU8tX/GWJocx7hcNOfnTYeVY3Qbx2jo="; + hash = "sha256-F5jMmc0Rqnabxe7ayKbRjA0OZ+WRINILnB3bsyXJP5M="; }; patches = [ @@ -67,7 +67,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '1.0.0-local' '${finalAttrs.version}' ''; - cargoHash = "sha256-HeEdvmf7ZR5/suanmJMYN3F/O/Xrk9Qza4l4kGahpf0="; + cargoHash = "sha256-UO8X/MvY5p1zkv53Xqig2itvP4x5XSXBzp1FDa+4YF0="; mitmCache = gradle.fetchDeps { inherit (finalAttrs) pname; @@ -78,7 +78,7 @@ rustPlatform.buildRustPackage (finalAttrs: { inherit (finalAttrs) pname version src; pnpm = pnpm_10; fetcherVersion = 3; - hash = "sha256-pbEKD8xkO7+//m0PBcAL62q0LC5YEKR+wOPGnzXIRJk="; + hash = "sha256-T5Qa47iXM+nic/nnRqGE6bGlDPpV1SEMT5KpX5TMaAQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mo/mole-cleaner/package.nix b/pkgs/by-name/mo/mole-cleaner/package.nix index ad79f8ac2612..bd5380f824d0 100644 --- a/pkgs/by-name/mo/mole-cleaner/package.nix +++ b/pkgs/by-name/mo/mole-cleaner/package.nix @@ -4,32 +4,47 @@ fetchFromGitHub, makeWrapper, coreutils, - gnused, gawk, fd, - gitUpdater, + nix-update-script, versionCheckHook, writableTmpDirAsHomeHook, + writeShellScript, }: +let + duForTests = writeShellScript "mole-cleaner-du-for-tests" '' + args=() + while (( $# > 0 )); do + case "$1" in + -I) + shift + args+=("--exclude=$1") + ;; + *) + args+=("$1") + ;; + esac + shift + done + + exec ${lib.getExe' coreutils "du"} "''${args[@]}" + ''; +in buildGoModule (finalAttrs: { pname = "mole-cleaner"; - version = "1.31.0"; - __structuredAttrs = true; + version = "1.46.0"; src = fetchFromGitHub { owner = "tw93"; repo = "Mole"; tag = "V${finalAttrs.version}"; - hash = "sha256-dalmW3W/seGZreSWuYP7JN/nMUbs3WyDHzKU83EveeY="; + hash = "sha256-rIoVXEz4K0RFb1ir1gRCyDw5euNwQvLS0GwBsJhuApE="; }; - vendorHash = "sha256-LznLZ0NO8VBWP95ReAVORUMIDhh7/pgTY5mGNN2tND8="; + vendorHash = "sha256-hLFlAy4AE1eNOxd4d75Mbo3ZKlwvNK7QV2DNVPd7NHc="; - subPackages = [ - "cmd/analyze" - "cmd/status" - ]; + __structuredAttrs = true; nativeBuildInputs = [ makeWrapper @@ -39,59 +54,84 @@ buildGoModule (finalAttrs: { versionCheckHook writableTmpDirAsHomeHook coreutils - gnused gawk ]; - postInstall = '' + buildPhase = '' + runHook preBuild + go build -p "$NIX_BUILD_CORES" -o analyze ./cmd/analyze + go build -p "$NIX_BUILD_CORES" -o status ./cmd/status + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -Dm755 mole $out/libexec/mole/mole - install -Dm755 mo $out/libexec/mole/mo cp -r bin lib $out/libexec/mole/ - mv $out/bin/analyze $out/libexec/mole/bin/analyze-go - mv $out/bin/status $out/libexec/mole/bin/status-go + install -Dm755 analyze $out/libexec/mole/bin/analyze-go + install -Dm755 status $out/libexec/mole/bin/status-go patchShebangs $out/libexec/mole - makeWrapper $out/libexec/mole/mole $out/bin/mole \ - --prefix PATH : ${ - lib.makeBinPath [ - fd - coreutils - gnused - gawk - ] - } - makeWrapper $out/libexec/mole/mo $out/bin/mo \ - --prefix PATH : ${ - lib.makeBinPath [ - fd - coreutils - gnused - gawk - ] - } + substituteInPlace $out/libexec/mole/mole \ + --replace-fail 'update_message="$(read_update_message_cache "$msg_cache")"' 'update_message=""' + + mkdir -p $out/libexec/mole/nix-bin + ln -s ${lib.getExe' coreutils "timeout"} $out/libexec/mole/nix-bin/timeout + + makeWrapper $out/libexec/mole/mole $out/bin/mo \ + --run ' + case "$1" in + update|remove) + echo "mo $1 is unsupported for Nix-installed Mole; update or remove it through your Nix profile or configuration." >&2 + exit 1 + ;; + esac + export PATH=${ + lib.makeBinPath [ + fd + ] + }:'"$out"'/libexec/mole/nix-bin:/usr/bin:/bin:''${PATH} + ' + + runHook postInstall + ''; + + checkPhase = '' + runHook preCheck + # Keep buildGoModule's test behavior: tests can rely on their source paths. + export GOFLAGS="''${GOFLAGS//-trimpath/}" + mkdir -p "$TMPDIR/mole-test-bin" + ln -s ${duForTests} "$TMPDIR/mole-test-bin/du" + PATH="$TMPDIR/mole-test-bin:$PATH" go test ./... + runHook postCheck ''; doInstallCheck = true; - versionCheckKeepEnvironment = [ "HOME" ]; + versionCheckKeepEnvironment = "HOME PATH"; + versionCheckProgram = "${placeholder "out"}/bin/mo"; versionCheckProgramArg = "--version"; installCheckPhase = '' runHook preInstallCheck - $out/bin/mole --help > /dev/null $out/bin/mo --help > /dev/null + test -w "$HOME" + test ! -e $out/bin/mole runHook postInstallCheck ''; - passthru.updateScript = gitUpdater { rev-prefix = "V"; }; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version-regex=^V(.*)$" ]; + }; meta = { description = "CLI tool for cleaning and optimizing macOS systems"; homepage = "https://github.com/tw93/Mole"; changelog = "https://github.com/tw93/Mole/releases/tag/V${finalAttrs.version}"; - license = lib.licenses.mit; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ IanHollow ]; - mainProgram = "mole"; + mainProgram = "mo"; platforms = lib.platforms.darwin; }; }) diff --git a/pkgs/by-name/mo/mole/package.nix b/pkgs/by-name/mo/mole/package.nix index f704747b45ad..cee2fd9ac470 100644 --- a/pkgs/by-name/mo/mole/package.nix +++ b/pkgs/by-name/mo/mole/package.nix @@ -27,7 +27,7 @@ buildGoModule (finalAttrs: { meta = { description = "CLI application to create SSH tunnels"; homepage = "https://github.com/davrodpin/mole"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; broken = stdenv.hostPlatform.isDarwin; # build fails with go > 1.17 mainProgram = "mole"; diff --git a/pkgs/by-name/mo/molotov/package.nix b/pkgs/by-name/mo/molotov/package.nix index c7c018ec04db..39453f9aa5ec 100644 --- a/pkgs/by-name/mo/molotov/package.nix +++ b/pkgs/by-name/mo/molotov/package.nix @@ -26,7 +26,7 @@ appimageTools.wrapType2 { meta = { description = "French TV service"; homepage = "https://www.molotov.tv/"; - license = with lib.licenses; [ unfree ]; + license = lib.licenses.unfree; maintainers = with lib.maintainers; [ apeyroux ]; platforms = [ "x86_64-linux" ]; mainProgram = "molotov"; diff --git a/pkgs/by-name/mo/mongocxx/package.nix b/pkgs/by-name/mo/mongocxx/package.nix index 911ec75b40ad..1e7a68ee21ba 100644 --- a/pkgs/by-name/mo/mongocxx/package.nix +++ b/pkgs/by-name/mo/mongocxx/package.nix @@ -59,6 +59,5 @@ stdenv.mkDerivation (finalAttrs: { "libbsoncxx" ]; platforms = lib.platforms.all; - badPlatforms = [ "x86_64-darwin" ]; # needs sdk >= 10.14 }; }) diff --git a/pkgs/by-name/mo/mongodb-ce/package.nix b/pkgs/by-name/mo/mongodb-ce/package.nix index 5a7fe772b5e5..f7f763729501 100644 --- a/pkgs/by-name/mo/mongodb-ce/package.nix +++ b/pkgs/by-name/mo/mongodb-ce/package.nix @@ -66,10 +66,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://fastdl.mongodb.org/linux/mongodb-linux-aarch64-ubuntu2404-${finalAttrs.version}.tgz"; hash = "sha256-5AX8pb1jInbQTuE0RqpqqcRXon6wKwdvoDCNDF70krE="; }; - "x86_64-darwin" = fetchurl { - url = "https://fastdl.mongodb.org/osx/mongodb-macos-x86_64-${finalAttrs.version}.tgz"; - hash = "sha256-BLIFrmToU8tFHdjAD+0q827cyeDHoYiXwtsds6e7NMA="; - }; "aarch64-darwin" = fetchurl { url = "https://fastdl.mongodb.org/osx/mongodb-macos-arm64-${finalAttrs.version}.tgz"; hash = "sha256-M3/x/d2rVKUmIZBQ9hVuT6W9ajZy/Ut5+8aDeXF+HwY="; @@ -120,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://www.mongodb.com/docs/upcoming/release-notes/8.2/"; description = "MongoDB is a general purpose, document-based, distributed database"; homepage = "https://www.mongodb.com/"; - license = with lib.licenses; [ sspl ]; + license = lib.licenses.sspl; longDescription = '' MongoDB CE (Community Edition) is a general purpose, document-based, distributed database. It is designed to be flexible and easy to use, with the ability to store data of any structure. diff --git a/pkgs/by-name/mo/mongodb-compass/package.nix b/pkgs/by-name/mo/mongodb-compass/package.nix index dc7104f0b485..a1789c333cfc 100644 --- a/pkgs/by-name/mo/mongodb-compass/package.nix +++ b/pkgs/by-name/mo/mongodb-compass/package.nix @@ -62,13 +62,11 @@ let url = "https://downloads.mongodb.com/compass/${ selectSystem { x86_64-linux = "mongodb-compass_${version}_amd64.deb"; - x86_64-darwin = "mongodb-compass-${version}-darwin-x64.zip"; aarch64-darwin = "mongodb-compass-${version}-darwin-arm64.zip"; } }"; hash = selectSystem { x86_64-linux = "sha256-faD8sIbnho5urBWE0btcmD7tXT8eQCNyJYzpIyI+bA4="; - x86_64-darwin = "sha256-Ddue3jSvQecBjxQlyh/+ujrF9NheZ9PS0Dq7J08SJr8="; aarch64-darwin = "sha256-HGOJPYC4+CgLQQ3BNUTNZUln5oqPkC8ewHft99LCZQ8="; }; }; @@ -197,7 +195,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-darwin" - "x86_64-darwin" ]; }; }) diff --git a/pkgs/by-name/mo/monodraw/package.nix b/pkgs/by-name/mo/monodraw/package.nix index 3a80b9f382bf..386fe0127ef7 100644 --- a/pkgs/by-name/mo/monodraw/package.nix +++ b/pkgs/by-name/mo/monodraw/package.nix @@ -69,7 +69,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { license = lib.licenses.unfree; maintainers = with lib.maintainers; [ delafthi ]; platforms = [ - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/mo/morewaita-icon-theme/package.nix b/pkgs/by-name/mo/morewaita-icon-theme/package.nix index 82413b29852c..0cc65fc43082 100644 --- a/pkgs/by-name/mo/morewaita-icon-theme/package.nix +++ b/pkgs/by-name/mo/morewaita-icon-theme/package.nix @@ -46,7 +46,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { description = "Adwaita style extra icons theme for Gnome Shell"; homepage = "https://github.com/somepaulo/MoreWaita"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ pkosel diff --git a/pkgs/by-name/mo/moshi/package.nix b/pkgs/by-name/mo/moshi/package.nix index 964f47f06c9d..2e269857d4f8 100644 --- a/pkgs/by-name/mo/moshi/package.nix +++ b/pkgs/by-name/mo/moshi/package.nix @@ -129,7 +129,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/kyutai-labs/moshi"; # The rust implementation is licensed under Apache # https://github.com/kyutai-labs/moshi/tree/main/rust#license - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ GaetanLepage ]; platforms = lib.platforms.all; mainProgram = "moshi-cli"; diff --git a/pkgs/by-name/mo/motif/package.nix b/pkgs/by-name/mo/motif/package.nix index e26a574a4372..13fb70496167 100644 --- a/pkgs/by-name/mo/motif/package.nix +++ b/pkgs/by-name/mo/motif/package.nix @@ -144,7 +144,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://motif.ics.com"; description = "Unix standard widget-toolkit and window-manager"; platforms = lib.platforms.unix; - license = with lib.licenses; [ lgpl21Plus ]; + license = lib.licenses.lgpl21Plus; maintainers = with lib.maintainers; [ qyliss ]; broken = demoSupport && stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "16"; }; diff --git a/pkgs/by-name/mo/mousam/package.nix b/pkgs/by-name/mo/mousam/package.nix index 6ae21ef082b4..95be139e716b 100644 --- a/pkgs/by-name/mo/mousam/package.nix +++ b/pkgs/by-name/mo/mousam/package.nix @@ -51,7 +51,7 @@ python3Packages.buildPythonApplication (finalAttrs: { meta = { description = "Beautiful and lightweight weather app based on Python and GTK4"; homepage = "https://amit9838.github.io/mousam"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; mainProgram = "mousam"; maintainers = with lib.maintainers; [ aleksana ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/mo/mouser/package.nix b/pkgs/by-name/mo/mouser/package.nix index fd74ae98cb08..e51d8b9c2544 100644 --- a/pkgs/by-name/mo/mouser/package.nix +++ b/pkgs/by-name/mo/mouser/package.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "mouser"; - version = "3.6.0"; + version = "3.7.0"; pyproject = false; __structuredAttrs = true; @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication (finalAttrs: { owner = "TomBadash"; repo = "Mouser"; tag = "v${finalAttrs.version}"; - hash = "sha256-ESfkpswENa91wL1WSfDL/Wpu4sjhT8qibJ0wsEYHX+0="; + hash = "sha256-Pjcx7YChgu7R8Kdv8fOJcxq98nwh/izpjbOO+4/cdk4="; }; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/pkgs/by-name/mo/mov-cli/package.nix b/pkgs/by-name/mo/mov-cli/package.nix index 6c7167681675..4460f24724e3 100644 --- a/pkgs/by-name/mo/mov-cli/package.nix +++ b/pkgs/by-name/mo/mov-cli/package.nix @@ -61,7 +61,7 @@ python3.pkgs.buildPythonPackage (finalAttrs: { meta = { homepage = "https://github.com/mov-cli/mov-cli"; description = "Cli tool to browse and watch movies"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; mainProgram = "mov-cli"; maintainers = with lib.maintainers; [ baitinq ]; }; diff --git a/pkgs/by-name/mo/mozcdic-ut-neologd/package.nix b/pkgs/by-name/mo/mozcdic-ut-neologd/package.nix index 0486eb081bc2..7ed7ef095446 100644 --- a/pkgs/by-name/mo/mozcdic-ut-neologd/package.nix +++ b/pkgs/by-name/mo/mozcdic-ut-neologd/package.nix @@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation { meta = { description = "Dictionary converted from mecab-ipadic-NEologd for Mozc"; homepage = "https://github.com/utuhiro78/mozcdic-ut-neologd"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ pineapplehunter ]; platforms = lib.platforms.all; # this does not need to be separately built diff --git a/pkgs/by-name/mo/mozcdic-ut-sudachidict/package.nix b/pkgs/by-name/mo/mozcdic-ut-sudachidict/package.nix index 749fab6a8b55..f7eccc0b4062 100644 --- a/pkgs/by-name/mo/mozcdic-ut-sudachidict/package.nix +++ b/pkgs/by-name/mo/mozcdic-ut-sudachidict/package.nix @@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation { meta = { description = "Dictionary converted from SudachiDict for Mozc"; homepage = "https://github.com/utuhiro78/mozcdic-ut-sudachidict"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ pineapplehunter ]; platforms = lib.platforms.all; # this does not need to be separately built diff --git a/pkgs/by-name/mo/mozo/package.nix b/pkgs/by-name/mo/mozo/package.nix index f90066f4e1fe..c6c23e26894a 100644 --- a/pkgs/by-name/mo/mozo/package.nix +++ b/pkgs/by-name/mo/mozo/package.nix @@ -53,7 +53,7 @@ python3.pkgs.buildPythonApplication rec { description = "MATE Desktop menu editor"; mainProgram = "mozo"; homepage = "https://github.com/mate-desktop/mozo"; - license = with lib.licenses; [ lgpl2Plus ]; + license = lib.licenses.lgpl2Plus; platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; diff --git a/pkgs/by-name/mp/mpc-qt/package.nix b/pkgs/by-name/mp/mpc-qt/package.nix index b650f73842c4..d1c9a889cf71 100644 --- a/pkgs/by-name/mp/mpc-qt/package.nix +++ b/pkgs/by-name/mp/mpc-qt/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mpc-qt"; - version = "26.01"; + version = "26.07"; src = fetchFromGitHub { owner = "mpc-qt"; repo = "mpc-qt"; tag = "v${finalAttrs.version}"; - hash = "sha256-tgCdPzolUlp3Cy1ZbDlMQvl/4WcTl86QTZ8F18f0JME="; + hash = "sha256-1tm/Sw/6szY4k2ObFnOsXfffIJ31eokjqkOt90DquWE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/by-name/mp/mpg123/package.nix similarity index 98% rename from pkgs/applications/audio/mpg123/default.nix rename to pkgs/by-name/mp/mpg123/package.nix index ea1663b170e1..b216a5368895 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/by-name/mp/mpg123/package.nix @@ -11,7 +11,7 @@ libpulseaudio, withCoreAudio ? stdenv.hostPlatform.isDarwin, withJack ? stdenv.hostPlatform.isUnix, - jack, + libjack2, withConplay ? !stdenv.hostPlatform.isWindows, perl, writeScript, @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals withPulse [ libpulseaudio ] ++ lib.optionals withCoreAudio [ ] - ++ lib.optionals withJack [ jack ] + ++ lib.optionals withJack [ libjack2 ] ); configureFlags = diff --git a/pkgs/by-name/mp/mprime/package.nix b/pkgs/by-name/mp/mprime/package.nix index e3ac811c35e9..e059e845eff1 100644 --- a/pkgs/by-name/mp/mprime/package.nix +++ b/pkgs/by-name/mp/mprime/package.nix @@ -15,7 +15,6 @@ let { x86_64-linux = "linux64"; i686-linux = "linux"; - x86_64-darwin = "macosx64"; } ."${stdenv.hostPlatform.system}" or throwSystem; @@ -23,7 +22,6 @@ let { x86_64-linux = "make64"; i686-linux = "makefile"; - x86_64-darwin = "makemac"; } ."${stdenv.hostPlatform.system}" or throwSystem; @@ -111,7 +109,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "i686-linux" "x86_64-linux" - "x86_64-darwin" ]; maintainers = with lib.maintainers; [ dstremur ]; mainProgram = "mprime"; diff --git a/pkgs/by-name/mp/mpv-unwrapped/package.nix b/pkgs/by-name/mp/mpv-unwrapped/package.nix index 4333d1ce35f5..924f515fff27 100644 --- a/pkgs/by-name/mp/mpv-unwrapped/package.nix +++ b/pkgs/by-name/mp/mpv-unwrapped/package.nix @@ -61,6 +61,7 @@ wayland-protocols, wayland-scanner, zimg, + llvmPackages, # Boolean alsaSupport ? stdenv.hostPlatform.isLinux, @@ -163,6 +164,8 @@ stdenv.mkDerivation (finalAttrs: { buildPackages.darwin.sigtool swift makeBinaryWrapper + # TODO: Remove once #536365 reaches this branch + llvmPackages.lld ] ++ lib.optionals waylandSupport [ wayland-scanner ]; @@ -233,6 +236,9 @@ stdenv.mkDerivation (finalAttrs: { # ./osdep/mac/swift.h:270:9: fatal error: '.../app_bridge_objc-1.pch' file not found env = lib.optionalAttrs (stdenv.hostPlatform.isDarwin) { NIX_SWIFTFLAGS_COMPILE = "-disable-bridging-pch"; + + # TODO: Remove once #536365 reaches this branch + NIX_CFLAGS_LINK = "-fuse-ld=lld"; }; postBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/by-name/mp/mpv/package.nix b/pkgs/by-name/mp/mpv/package.nix index d08eaaae4562..7d709571efb3 100644 --- a/pkgs/by-name/mp/mpv/package.nix +++ b/pkgs/by-name/mp/mpv/package.nix @@ -117,8 +117,12 @@ symlinkJoin { passthru.tests.mpv-scripts-should-not-collide = buildEnv { name = "mpv-scripts-env"; paths = lib.pipe mpvScripts [ + # filters "throw" aliases + (lib.filterAttrs (key: script: (builtins.tryEval (lib.isDerivation script)).success)) # filters "override" "overrideDerivation" "recurseForDerivations" (lib.filterAttrs (key: script: lib.isDerivation script)) + # filters mpv scripts that opt out of this check + (lib.filterAttrs (key: script: !(script.passthru.dontCollideCheck or false))) # replaces unfree and meta.broken scripts with decent placeholders (lib.mapAttrsToList ( key: script: diff --git a/pkgs/by-name/mp/mpv/scripts/modernx-zydezu.nix b/pkgs/by-name/mp/mpv/scripts/modernx-zydezu.nix index 1e7e4b731c39..362031f19db3 100644 --- a/pkgs/by-name/mp/mpv/scripts/modernx-zydezu.nix +++ b/pkgs/by-name/mp/mpv/scripts/modernx-zydezu.nix @@ -4,6 +4,7 @@ fetchFromGitHub, installFonts, makeFontsConf, + mpvScripts, nix-update-script, }: buildLua (finalAttrs: { @@ -30,6 +31,9 @@ buildLua (finalAttrs: { passthru.updateScript = nix-update-script { }; + # FIXME?: collides with mpvScripts.modernx + passthru.dontCollideCheck = lib.hasAttr "modernx" mpvScripts; + meta = { description = "Modern OSC UI replacement for MPV that retains the functionality of the default OSC"; changelog = "https://github.com/zydezu/ModernX/releases/tag/${finalAttrs.version}"; diff --git a/pkgs/by-name/mp/mpv/scripts/mpv-osc-tethys.nix b/pkgs/by-name/mp/mpv/scripts/mpv-osc-tethys.nix index fe8908ba09d3..974a1a7125ad 100644 --- a/pkgs/by-name/mp/mpv/scripts/mpv-osc-tethys.nix +++ b/pkgs/by-name/mp/mpv/scripts/mpv-osc-tethys.nix @@ -2,6 +2,7 @@ lib, buildLua, fetchFromGitHub, + mpvScripts, }: buildLua (finalAttrs: { pname = "mpv-osc-tethys"; @@ -11,6 +12,9 @@ buildLua (finalAttrs: { extraScriptsToCopy = [ "mpv_thumbnail_script_server.lua" ]; extraScriptsToLoad = [ "mpv_thumbnail_script_server.lua" ]; + # FIXME?: collides with mpvScripts.thumbnail, this one yields since it is unfree + passthru.dontCollideCheck = lib.hasAttr "thumbnail" mpvScripts; + src = fetchFromGitHub { owner = "Zren"; repo = "mpv-osc-tethys"; diff --git a/pkgs/by-name/mp/mpv/scripts/twitch-chat.nix b/pkgs/by-name/mp/mpv/scripts/twitch-chat.nix index 33fb7d229737..cef4666be274 100644 --- a/pkgs/by-name/mp/mpv/scripts/twitch-chat.nix +++ b/pkgs/by-name/mp/mpv/scripts/twitch-chat.nix @@ -7,13 +7,13 @@ }: buildLua { pname = "twitch-chat"; - version = "0-unstable-2026-06-13"; + version = "0-unstable-2026-07-02"; src = fetchFromGitHub { owner = "CrendKing"; repo = "mpv-twitch-chat"; - rev = "1e9d2dfcd8ab9c343cc6a3c55363994dbafe5b58"; - hash = "sha256-vtv5YZO7qROhUL3TKCKaNfvv1uCjQv9kvfo7sno24BE="; + rev = "72d97a02fae1045dedc44979e60403a198bbef1c"; + hash = "sha256-PaPCAmvARbRrL+NY+CcJGiQRO+Ahjo0o5vz1av3h2Ds="; postFetch = "rm $out/screenshot.webp"; }; diff --git a/pkgs/by-name/mp/mpv/scripts/videoclip.nix b/pkgs/by-name/mp/mpv/scripts/videoclip.nix index 762bc7400eca..ee75757f57e8 100644 --- a/pkgs/by-name/mp/mpv/scripts/videoclip.nix +++ b/pkgs/by-name/mp/mpv/scripts/videoclip.nix @@ -10,13 +10,13 @@ }: buildLua { pname = "videoclip"; - version = "0.2-unstable-2026-05-31"; + version = "0.2-unstable-2026-07-07"; src = fetchFromGitHub { owner = "Ajatt-Tools"; repo = "videoclip"; - rev = "d9a3e0966b238b824b86767956eb44a11ac367c6"; - hash = "sha256-NZaflGehxoIf9eY3/p9WrKXXQj3x6GDZ6iMLeu5BhPc="; + rev = "979bae398da7ccd70cb2fb305c371b7af9259b10"; + hash = "sha256-k3fxSeAjRZg4J5x5IQhKGYtUqfBE4heR1KNurGTElGs="; }; patchPhase = '' diff --git a/pkgs/by-name/ms/msgraph-cli/package.nix b/pkgs/by-name/ms/msgraph-cli/package.nix index 6c166bf6f684..2878fc43cb20 100644 --- a/pkgs/by-name/ms/msgraph-cli/package.nix +++ b/pkgs/by-name/ms/msgraph-cli/package.nix @@ -34,7 +34,6 @@ buildDotnetModule rec { maintainers = with lib.maintainers; [ nazarewk ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" "x86_64-linux" ]; }; diff --git a/pkgs/by-name/mt/mt32emu-qt/package.nix b/pkgs/by-name/mt/mt32emu-qt/package.nix index b30c7f30aa3e..e379da4976d4 100644 --- a/pkgs/by-name/mt/mt32emu-qt/package.nix +++ b/pkgs/by-name/mt/mt32emu-qt/package.nix @@ -129,7 +129,7 @@ stdenv.mkDerivation (finalAttrs: { synthesis and conversion of pre-recorded SMF files to WAVE making use of the mt32emu library and the Qt framework. ''; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ OPNA2608 ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/mt/mt32emu-smf2wav/package.nix b/pkgs/by-name/mt/mt32emu-smf2wav/package.nix index b694f4fa7ee0..81af98a1a7b4 100644 --- a/pkgs/by-name/mt/mt32emu-smf2wav/package.nix +++ b/pkgs/by-name/mt/mt32emu-smf2wav/package.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://munt.sourceforge.net/"; description = "Produces a WAVE file from a Standard MIDI file (SMF)"; mainProgram = "mt32emu-smf2wav"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ OPNA2608 ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/mu/mullvad-browser/package.nix b/pkgs/by-name/mu/mullvad-browser/package.nix index f718e178f988..241cfe2420bd 100644 --- a/pkgs/by-name/mu/mullvad-browser/package.nix +++ b/pkgs/by-name/mu/mullvad-browser/package.nix @@ -97,7 +97,7 @@ let ++ lib.optionals mediaSupport [ ffmpeg_7 ] ); - version = "15.0.16"; + version = "15.0.18"; sources = { x86_64-linux = fetchurl { @@ -109,7 +109,7 @@ let "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-mlQUAdGcOUbqReROqhs4fwSUmTZqQAEhwsg6ulM2hx4="; + hash = "sha256-hvLft1HDj/5NgAfQb1igYdhJN5H/jZ2+7s/JKKLf4Gs="; }; }; diff --git a/pkgs/by-name/mu/multimarkdown/package.nix b/pkgs/by-name/mu/multimarkdown/package.nix index 503ab3da9236..249d6ee7b7e3 100644 --- a/pkgs/by-name/mu/multimarkdown/package.nix +++ b/pkgs/by-name/mu/multimarkdown/package.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { - glossary entries (LaTeX only) - document metadata (e.g. title, author, date, etc.) ''; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; platforms = lib.platforms.all; maintainers = [ ]; }; diff --git a/pkgs/by-name/mu/multipart-parser-c/package.nix b/pkgs/by-name/mu/multipart-parser-c/package.nix index 5406e880379e..482167366e09 100644 --- a/pkgs/by-name/mu/multipart-parser-c/package.nix +++ b/pkgs/by-name/mu/multipart-parser-c/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { description = "Http multipart parser implemented in C"; homepage = "https://github.com/iafonov/multipart-parser-c"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; }; } diff --git a/pkgs/by-name/mu/multiqc/package.nix b/pkgs/by-name/mu/multiqc/package.nix index 320da0f89667..b8acb3350220 100644 --- a/pkgs/by-name/mu/multiqc/package.nix +++ b/pkgs/by-name/mu/multiqc/package.nix @@ -114,7 +114,7 @@ python3Packages.buildPythonApplication (finalAttrs: { ''; homepage = "https://multiqc.info"; changelog = "https://github.com/MultiQC/MultiQC/releases/tag/v${finalAttrs.version}/"; - license = [ lib.licenses.gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.apraga ]; mainProgram = "multiqc"; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/mu/musescore/package.nix b/pkgs/by-name/mu/musescore/package.nix index dae5ea43ad8a..76e90f3b9c30 100644 --- a/pkgs/by-name/mu/musescore/package.nix +++ b/pkgs/by-name/mu/musescore/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, # nativeBuildInputs cmake, @@ -36,15 +37,25 @@ stdenv.mkDerivation (finalAttrs: { pname = "musescore"; - version = "4.7.3"; + version = "4.7.4"; src = fetchFromGitHub { owner = "musescore"; repo = "MuseScore"; tag = "v${finalAttrs.version}"; - hash = "sha256-wWqFJkXLRi3JtnEW3STTG/jBBIQK1dIYPZdKCiBn0m0="; + hash = "sha256-ny6s5hQUxopb6c45KJugYEZULkC8fLP+Au5ghic0KvI="; }; + patches = [ + # Fix for https://github.com/musescore/MuseScore/issues/34091 also reported + # downstream at: https://github.com/NixOS/nixpkgs/issues/540783. PR to + # track: https://github.com/musescore/MuseScore/pull/34204 + (fetchpatch { + url = "https://github.com/musescore/MuseScore/commit/f273501e418842351c4bda10cce32b0e329eaff1.patch"; + hash = "sha256-zrZRzeAHSFGtCuw/o4A3b1Blbo3FxKGxw1UDu9IggzY="; + }) + ]; + cmakeFlags = [ (lib.cmakeFeature "MUSE_APP_BUILD_MODE" "release") # Disable the build and usage of the `/bin/crashpad_handler` utility - it's diff --git a/pkgs/by-name/mu/museum/package.nix b/pkgs/by-name/mu/museum/package.nix index 9e43e19dbe83..27b5b1a8fcce 100644 --- a/pkgs/by-name/mu/museum/package.nix +++ b/pkgs/by-name/mu/museum/package.nix @@ -10,17 +10,17 @@ buildGoModule (finalAttrs: { pname = "museum"; - version = "1.3.36"; + version = "1.3.58"; src = fetchFromGitHub { owner = "ente"; repo = "ente"; sparseCheckout = [ "server" ]; tag = "photos-v${finalAttrs.version}"; - hash = "sha256-9MWmJ3QUgS7BToTnSZzTi4ywGW1RtwrCO+9yQJkvejM="; + hash = "sha256-G9T5qsBKzO7bMCf3IexF9YyDeHK+gZI1Unm4pBq69iI="; }; - vendorHash = "sha256-qrcfNacMR2hwdtezwYrYTPpr1ALCwZktSW8UiyzGXjQ="; + vendorHash = "sha256-Ri2hsPkBvAGGbk9vREmkYxY+JX+nv/OfIAkhU2y0xnQ="; sourceRoot = "${finalAttrs.src.name}/server"; diff --git a/pkgs/by-name/mu/music-assistant-desktop/package.nix b/pkgs/by-name/mu/music-assistant-desktop/package.nix index 725fd160b963..765490cdff45 100644 --- a/pkgs/by-name/mu/music-assistant-desktop/package.nix +++ b/pkgs/by-name/mu/music-assistant-desktop/package.nix @@ -32,13 +32,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "music-assistant-desktop"; - version = "0.5.7"; + version = "0.5.9"; src = fetchFromGitHub { owner = "music-assistant"; repo = "desktop-app"; tag = finalAttrs.version; - hash = "sha256-KKyIYSSIC134t46H7YOFNCdj4M/VoBrX9jN5aX/kSlc="; + hash = "sha256-hkG0e/WlnEQXdaYlE9tebzzE63l4RuwCVjHQVTcTo6Y="; }; patches = [ diff --git a/pkgs/by-name/mu/music-assistant/frontend.nix b/pkgs/by-name/mu/music-assistant/frontend.nix index e6cf66afac4d..4f9ca804376c 100644 --- a/pkgs/by-name/mu/music-assistant/frontend.nix +++ b/pkgs/by-name/mu/music-assistant/frontend.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "music-assistant-frontend"; - version = "2.17.186"; + version = "2.17.186.post3"; pyproject = true; src = fetchPypi { pname = "music_assistant_frontend"; inherit version; - hash = "sha256-dNGzXDRZuQLRkMY0erjJZE4h26yFP4Fdn9a3K6T0RvM="; + hash = "sha256-a+Z2HuUuvkZQragrRP6vlofk6x/xJHWmnZPBa2BHpso="; }; build-system = [ setuptools ]; diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix index 38490bcda4d0..508c6154dcee 100644 --- a/pkgs/by-name/mu/music-assistant/package.nix +++ b/pkgs/by-name/mu/music-assistant/package.nix @@ -40,7 +40,7 @@ assert pythonPackages.buildPythonApplication (finalAttrs: { pname = "music-assistant"; - version = "2.9.6"; + version = "2.9.8"; pyproject = true; __structuredAttrs = true; @@ -48,7 +48,7 @@ pythonPackages.buildPythonApplication (finalAttrs: { owner = "music-assistant"; repo = "server"; tag = finalAttrs.version; - hash = "sha256-lEbWQi6iUvqL2MXk/ZqkdX4Ou5pFWIVi6qfSyWCs8uQ="; + hash = "sha256-Zk9jgcGwksMQo45qzzlE2Dqw1IQr0rsBkzMnFHTdl1U="; }; patches = [ diff --git a/pkgs/by-name/mu/music-assistant/providers.nix b/pkgs/by-name/mu/music-assistant/providers.nix index 47fa0e297d4e..da5c0fc054f9 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.9.6"; + version = "2.9.8"; builtins = [ "builtin" "coverartarchive" diff --git a/pkgs/by-name/mu/muso/package.nix b/pkgs/by-name/mu/muso/package.nix index 76ec9e605175..727f2725624e 100644 --- a/pkgs/by-name/mu/muso/package.nix +++ b/pkgs/by-name/mu/muso/package.nix @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage { description = "Automatic music sorter (based on ID3 tags)"; mainProgram = "muso"; homepage = "https://github.com/quebin31/muso"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ crertel ]; }; } diff --git a/pkgs/by-name/mu/mustache-go/package.nix b/pkgs/by-name/mu/mustache-go/package.nix index 509484983afa..2e88898d9693 100644 --- a/pkgs/by-name/mu/mustache-go/package.nix +++ b/pkgs/by-name/mu/mustache-go/package.nix @@ -26,7 +26,7 @@ buildGoModule (finalAttrs: { meta = { homepage = "https://github.com/cbroglie/mustache"; description = "Mustache template language in Go"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ Zimmi48 ]; mainProgram = "mustache"; }; diff --git a/pkgs/by-name/mv/mvnd/package.nix b/pkgs/by-name/mv/mvnd/package.nix index 86da716dcc62..5249dbb8c8fd 100644 --- a/pkgs/by-name/mv/mvnd/package.nix +++ b/pkgs/by-name/mv/mvnd/package.nix @@ -15,7 +15,6 @@ let platformMap = { aarch64-darwin = "darwin-aarch64"; aarch64-linux = "linux-aarch64"; - x86_64-darwin = "darwin-amd64"; x86_64-linux = "linux-amd64"; }; in diff --git a/pkgs/by-name/my/mystmd/package.nix b/pkgs/by-name/my/mystmd/package.nix index 99e17b03767c..403f118c7c89 100644 --- a/pkgs/by-name/my/mystmd/package.nix +++ b/pkgs/by-name/my/mystmd/package.nix @@ -59,7 +59,6 @@ stdenv.mkDerivation (finalAttrs: { { x86_64-linux = "sha256-4EQkvsoji9M4VCrdwyHm+ncd4XFjgAf34Kt+YeM3qjs="; aarch64-linux = "sha256-xm4T1BL3AyRsYOERz4LhG4ZJQkSMzspoA+l60OND3E0="; - x86_64-darwin = "sha256-L+zY9O5ridMvZEhGH0R56P3XiDlYF3UrFZwmOYlqxYY="; aarch64-darwin = "sha256-ZUx+jF7IcEbUCnUUeW0uOFgEpO9UIJpP3/VpUJ5ulAM="; } .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/na/nagstamon/package.nix b/pkgs/by-name/na/nagstamon/package.nix index 64b3a880920c..d7cf37dfea78 100644 --- a/pkgs/by-name/na/nagstamon/package.nix +++ b/pkgs/by-name/na/nagstamon/package.nix @@ -41,8 +41,10 @@ python3Packages.buildPythonApplication (finalAttrs: { dbus-python keyring lxml + packaging psutil pyqt6 + pyqt6-webengine pysocks python-dateutil requests diff --git a/pkgs/by-name/na/nanoarrow/cpp20-arrow-cpp-fix.diff b/pkgs/by-name/na/nanoarrow/cpp20-arrow-cpp-fix.diff new file mode 100644 index 000000000000..ee8d2dcfa412 --- /dev/null +++ b/pkgs/by-name/na/nanoarrow/cpp20-arrow-cpp-fix.diff @@ -0,0 +1,13 @@ +diff --git i/meson.build w/meson.build +index 5c3032d..5ec2e56 100644 +--- i/meson.build ++++ w/meson.build +@@ -22,7 +22,7 @@ project( + version: '0.8.0', + license: 'Apache-2.0', + meson_version: '>=0.58.0', +- default_options: ['c_std=c99', 'warning_level=2', 'cpp_std=c++17'], ++ default_options: ['c_std=c99', 'warning_level=2', 'cpp_std=c++20'], + ) + + cc = meson.get_compiler('c') diff --git a/pkgs/by-name/na/nanoarrow/package.nix b/pkgs/by-name/na/nanoarrow/package.nix index 07b48bdb0dbf..862f2ce0bff3 100644 --- a/pkgs/by-name/na/nanoarrow/package.nix +++ b/pkgs/by-name/na/nanoarrow/package.nix @@ -30,6 +30,12 @@ stdenv.mkDerivation (finalAttrs: { tag = "apache-arrow-nanoarrow-${finalAttrs.version}"; hash = "sha256-1iLbT1eeyZaoB75uYTgg4qns+C7b4DErqMwJ9nQPRls="; }; + patches = [ + # Fixes an issue between our `arrow-cpp` and this version of `nanoarrow`. + # Not applicable for upstreaming so it seems. See discussion: + # https://github.com/apache/arrow-nanoarrow/issues/902 + ./cpp20-arrow-cpp-fix.diff + ]; nativeBuildInputs = [ meson diff --git a/pkgs/by-name/na/nats-top/package.nix b/pkgs/by-name/na/nats-top/package.nix index 18fdd1b7dd0a..1be44955424d 100644 --- a/pkgs/by-name/na/nats-top/package.nix +++ b/pkgs/by-name/na/nats-top/package.nix @@ -36,7 +36,7 @@ buildGoModule (finalAttrs: { description = "top-like tool for monitoring NATS servers"; homepage = "https://github.com/nats-io/nats-top"; changelog = "https://github.com/nats-io/nats-top/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "nats-top"; }; diff --git a/pkgs/by-name/na/navidrome/package.nix b/pkgs/by-name/na/navidrome/package.nix index 8e45a98dc3ff..21c404124953 100644 --- a/pkgs/by-name/na/navidrome/package.nix +++ b/pkgs/by-name/na/navidrome/package.nix @@ -21,13 +21,13 @@ buildGoModule (finalAttrs: { pname = "navidrome"; - version = "0.63.1"; + version = "0.63.2"; src = fetchFromGitHub { owner = "navidrome"; repo = "navidrome"; rev = "v${finalAttrs.version}"; - hash = "sha256-sqPqcvi1XIjPuo02qxygM3a3/ih5w5vqfz6D8XRTxiA="; + hash = "sha256-s0Pd6yT9NX2VFSPbLPX6Zqon8Y3qyDPGCKvqHPxcZ88="; }; vendorHash = "sha256-lNjOVrlRD6ptDBpmfGYCN3Vkal9ACciOyS1RANzKYK4="; diff --git a/pkgs/by-name/na/navidrome/plugins/discord-rich-presence/package.nix b/pkgs/by-name/na/navidrome/plugins/discord-rich-presence/package.nix index 07ebe9440af5..1aee85c00051 100644 --- a/pkgs/by-name/na/navidrome/plugins/discord-rich-presence/package.nix +++ b/pkgs/by-name/na/navidrome/plugins/discord-rich-presence/package.nix @@ -5,16 +5,16 @@ }: buildNavidromePlugin rec { pname = "discord-rich-presence-plugin"; - version = "1.0.0"; + version = "2.0.0"; src = pkgs.fetchFromGitHub { owner = "navidrome"; repo = "discord-rich-presence-plugin"; tag = "v${version}"; - hash = "sha256-YH1K6uagIloQQ4gdezKMAfx9KbGL9chiTx/i8CiH4io="; + hash = "sha256-j4iGymXH9JstPGdpPl5TFLiH8ShfE46U+BZk1n7a2yQ="; }; - vendorHash = "sha256-M5dI0gNfy2x9IVN1284pdvUaCui0sgxFCC+9weq2ipM="; + vendorHash = "sha256-5ZlqyUa+UcLCBdLQaYAlb818Y8sOENjIFfb2hpRsbpQ="; meta = { description = "Displays your currently playing track in your Discord status"; diff --git a/pkgs/by-name/nb/nbutools/package.nix b/pkgs/by-name/nb/nbutools/package.nix index 0c96e540bea2..e34468024fca 100644 --- a/pkgs/by-name/nb/nbutools/package.nix +++ b/pkgs/by-name/nb/nbutools/package.nix @@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication { meta = { description = "Tools for offensive security of NetBackup infrastructures"; homepage = "https://github.com/airbus-seclab/nbutools"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/ne/neo4j/package.nix b/pkgs/by-name/ne/neo4j/package.nix index 4b5da6269d0b..a370884bc3ea 100644 --- a/pkgs/by-name/ne/neo4j/package.nix +++ b/pkgs/by-name/ne/neo4j/package.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "neo4j"; - version = "2026.02.2"; + version = "2026.06.0"; src = fetchurl { url = "https://neo4j.com/artifact.php?name=neo4j-community-${finalAttrs.version}-unix.tar.gz"; - hash = "sha256-TpVibiE0ijAQl5mkRjnCFpvCTifhoTcZcv8lg8PYSTw="; + hash = "sha256-Hc9i5+gDXnFzK4ZTK5+OMhnOiVa9BpQNWgAkaWcnGSo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ne/neocmakelsp/package.nix b/pkgs/by-name/ne/neocmakelsp/package.nix index 38af546416d0..5c9d81724dfc 100644 --- a/pkgs/by-name/ne/neocmakelsp/package.nix +++ b/pkgs/by-name/ne/neocmakelsp/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "neocmakelsp"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "neocmakelsp"; repo = "neocmakelsp"; rev = "v${finalAttrs.version}"; - hash = "sha256-HfoVAUg9StAUXmP66LVRzCj4sd4kl6pCzWUS3lZEKtU="; + hash = "sha256-HTyLLhpCDlWoOHllVsB6V6BGvRpFQgsx7KCOfRq5UhE="; }; - cargoHash = "sha256-yddefmK5ftu1rUpK3QcjocJiWQq5Y9CTJGjn2LbubbU="; + cargoHash = "sha256-PA9KP17l9EVJQn9sUoZ02EZsw3xgiIMidDXk+tYdsIY="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ne/neomutt/package.nix b/pkgs/by-name/ne/neomutt/package.nix index dca6fcdd021a..ff97c41d134d 100644 --- a/pkgs/by-name/ne/neomutt/package.nix +++ b/pkgs/by-name/ne/neomutt/package.nix @@ -43,13 +43,13 @@ assert lib.warnIf enableMixmaster stdenv.mkDerivation (finalAttrs: { pname = "neomutt"; - version = "20260504"; + version = "20260616"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; tag = finalAttrs.version; - hash = "sha256-PVcQjuUWK0QwcDIuKsHTMWFCpYLHBG/3Hr1IbLtlJbg="; + hash = "sha256-MRFJ6y2XC3I0/IIWW/J09tW/IZpLcNy7hki0rqOB9RQ="; }; buildInputs = [ diff --git a/pkgs/by-name/ne/neowall/package.nix b/pkgs/by-name/ne/neowall/package.nix index a962a297ce4f..01d6fc39bea6 100644 --- a/pkgs/by-name/ne/neowall/package.nix +++ b/pkgs/by-name/ne/neowall/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "neowall"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "1ay1"; repo = "neowall"; tag = "v${finalAttrs.version}"; - hash = "sha256-NntwAm4LmGEcAJEp9W+y0mosn+jZXwatTp4ftMqcpSo="; + hash = "sha256-XK3A/B37R5mQWzdiMwwDkSHMC87sHXDvtOXvnaGCuJ0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ne/nerva/package.nix b/pkgs/by-name/ne/nerva/package.nix index 07be8a91c966..d9ba85e22c02 100644 --- a/pkgs/by-name/ne/nerva/package.nix +++ b/pkgs/by-name/ne/nerva/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "nerva"; - version = "1.40.1"; + version = "1.40.2"; src = fetchFromGitHub { owner = "praetorian-inc"; repo = "nerva"; tag = "v${finalAttrs.version}"; - hash = "sha256-JiTTcrdiH/gKt/7/PybUWBN4Qwn+5cmfE9VLwWmsuMk="; + hash = "sha256-znkY0R3g8ueazxx+ljCAdsBMkY1FmKn8R9GLYYIY2cA="; }; vendorHash = "sha256-Z0MSD+1/1VzrJ+pz5x0JvxrCxtJe59ckaTqHK/+TVN8="; diff --git a/pkgs/by-name/ne/nesting/package.nix b/pkgs/by-name/ne/nesting/package.nix index 207268ba9f20..bfe7a8326ad4 100644 --- a/pkgs/by-name/ne/nesting/package.nix +++ b/pkgs/by-name/ne/nesting/package.nix @@ -53,9 +53,5 @@ buildGoModule (finalAttrs: { license = lib.licenses.mit; mainProgram = "nesting"; maintainers = with lib.maintainers; [ commiterate ]; - badPlatforms = [ - # Only supports AArch64 for Darwin. - "x86_64-darwin" - ]; }; }) diff --git a/pkgs/by-name/ne/netbird/package.nix b/pkgs/by-name/ne/netbird/package.nix index 1f342526688d..5c3638e6d70f 100644 --- a/pkgs/by-name/ne/netbird/package.nix +++ b/pkgs/by-name/ne/netbird/package.nix @@ -73,13 +73,13 @@ let in buildGoModule (finalAttrs: { pname = "netbird-${componentName}"; - version = "0.74.2"; + version = "0.74.3"; src = fetchFromGitHub { owner = "netbirdio"; repo = "netbird"; tag = "v${finalAttrs.version}"; - hash = "sha256-+BGWZzw6a8Fp8NlhtbX81OA3hCTcQ9r6nLuXTsbXCZ8="; + hash = "sha256-JXmtoHe0CwO1nKOPi82+cxhJ3tf3XZUCpDstk8U6s94="; }; overrideModAttrs = final: prev: { diff --git a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-custom-objects/package.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-custom-objects/package.nix index 4a7d67384c07..987236a2cc56 100644 --- a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-custom-objects/package.nix +++ b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-custom-objects/package.nix @@ -9,7 +9,7 @@ buildPythonPackage (finalAttrs: { pname = "netbox-custom-objects"; - version = "0.5.2"; + version = "0.6.0"; pyproject = true; __structuredAttrs = true; @@ -17,7 +17,7 @@ buildPythonPackage (finalAttrs: { owner = "netboxlabs"; repo = "netbox-custom-objects"; tag = "v${finalAttrs.version}"; - hash = "sha256-bFPcv7eEUFfLB7XfxOnJR+pBSXUVKsAupcid2dxjtho="; + hash = "sha256-HnA2CJL0EOJctQpsu/G+9fULBIa8rrrYNiT0aaDw/rI="; }; build-system = [ setuptools ]; diff --git a/pkgs/by-name/ne/nethogs/package.nix b/pkgs/by-name/ne/nethogs/package.nix index 006122654ec5..2fe67b8d5fee 100644 --- a/pkgs/by-name/ne/nethogs/package.nix +++ b/pkgs/by-name/ne/nethogs/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nethogs"; - version = "0.8.8"; + version = "0.9.0"; src = fetchFromGitHub { owner = "raboof"; repo = "nethogs"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-+yVMyGSBIBWYjA9jaGWvrcsNPbJ6S4ax9H1BhWHYUUU="; + sha256 = "sha256-ojbsCoJ8fOaHgm1tWyM59siTDYmCllXOUNqNQJwRhws="; }; buildInputs = [ diff --git a/pkgs/by-name/ne/netsniff-ng/package.nix b/pkgs/by-name/ne/netsniff-ng/package.nix index 8f6438b9adbd..fb8a4014b730 100644 --- a/pkgs/by-name/ne/netsniff-ng/package.nix +++ b/pkgs/by-name/ne/netsniff-ng/package.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: { development and analysis, debugging, auditing or network reconnaissance. ''; homepage = "http://netsniff-ng.org/"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/ne/neural-amp-modeler-lv2/package.nix b/pkgs/by-name/ne/neural-amp-modeler-lv2/package.nix index d0bc1b54563b..ee4e267442a0 100644 --- a/pkgs/by-name/ne/neural-amp-modeler-lv2/package.nix +++ b/pkgs/by-name/ne/neural-amp-modeler-lv2/package.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = [ lib.maintainers.viraptor ]; description = "Neural Amp Modeler LV2 plugin implementation"; homepage = finalAttrs.src.meta.homepage; - license = [ lib.licenses.gpl3 ]; + license = lib.licenses.gpl3; }; }) diff --git a/pkgs/by-name/ne/newsflash/package.nix b/pkgs/by-name/ne/newsflash/package.nix index 0398d5db457f..653216ce4624 100644 --- a/pkgs/by-name/ne/newsflash/package.nix +++ b/pkgs/by-name/ne/newsflash/package.nix @@ -18,35 +18,33 @@ gtksourceview5, libadwaita, libglycin, - libseccomp, libxml2, openssl, sqlite, webkitgtk_6_0, glib-networking, - librsvg, gst_all_1, nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "newsflash"; - version = "5.1.0"; + version = "5.2.3"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; tag = "v.${finalAttrs.version}"; - hash = "sha256-BfzrnTyMLFiM+aHtrppvl/j/fjB4TbEkbl/yHYOnXa8="; + hash = "sha256-EeB2DNXxvo7biIv426+dkCKbjn2uxyXgvA1FbKevaFQ="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-4z2RGelDhi4RmVQ/+Ba340Pm05x4ruaRYAtJ1HuRHqA="; + hash = "sha256-OPxMsNhdMSt8mLhsNIBTjggSL1f3bZMH/5shESDV6yE="; }; postPatch = '' - patchShebangs build-aux/cargo.sh + patchShebangs --build build-aux/cargo.sh meson rewrite kwargs set project / version '${finalAttrs.version}' substituteInPlace src/meson.build --replace-fail \ "'src' / rust_target / 'news_flash_gtk'" \ @@ -79,7 +77,6 @@ stdenv.mkDerivation (finalAttrs: { gtksourceview5 libadwaita libglycin - libseccomp libxml2 openssl sqlite @@ -87,9 +84,6 @@ stdenv.mkDerivation (finalAttrs: { # TLS support for loading external content in webkitgtk WebView glib-networking - - # SVG support for gdk-pixbuf - librsvg ] ++ (with gst_all_1; [ # Audio & video support for webkitgtk WebView diff --git a/pkgs/by-name/ne/nextvi/package.nix b/pkgs/by-name/ne/nextvi/package.nix index 5781d5f27504..5611001eac0e 100644 --- a/pkgs/by-name/ne/nextvi/package.nix +++ b/pkgs/by-name/ne/nextvi/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nextvi"; - version = "6.0"; + version = "6.1"; src = fetchFromGitHub { owner = "kyx0r"; repo = "nextvi"; tag = finalAttrs.version; - hash = "sha256-xxkV2y3+TErR9GfI1ui9CmFgKCmNm/Sdc7BE881mRx8="; + hash = "sha256-SysBH4+Rp1M9HtdGUAHErmc+148/fTAtYrY/QQG2OS4="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix index 67f424342b6a..0f60677bb40c 100644 --- a/pkgs/by-name/ne/nexusmods-app/package.nix +++ b/pkgs/by-name/ne/nexusmods-app/package.nix @@ -197,7 +197,7 @@ buildDotnetModule (finalAttrs: { mainProgram = "NexusMods.App"; homepage = "https://github.com/Nexus-Mods/NexusMods.App"; changelog = "https://github.com/Nexus-Mods/NexusMods.App/releases/tag/${finalAttrs.src.tag}"; - license = [ lib.licenses.gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ l0b0 MattSturgeon diff --git a/pkgs/by-name/nf/nflz/package.nix b/pkgs/by-name/nf/nflz/package.nix index 43196b9c0ff2..09f11ba1de8b 100644 --- a/pkgs/by-name/nf/nflz/package.nix +++ b/pkgs/by-name/nf/nflz/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: { belong to a set of ordered files. An example are photos from a camera. ''; homepage = "https://github.com/phip1611/nflz"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ phip1611 ]; mainProgram = "nflz"; }; diff --git a/pkgs/by-name/nf/nfpm/package.nix b/pkgs/by-name/nf/nfpm/package.nix index c5d196bcaca0..1fab8eb455e6 100644 --- a/pkgs/by-name/nf/nfpm/package.nix +++ b/pkgs/by-name/nf/nfpm/package.nix @@ -49,7 +49,7 @@ buildGoModule (finalAttrs: { techknowlogick caarlos0 ]; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "nfpm"; }; }) diff --git a/pkgs/by-name/ng/ngrep/package.nix b/pkgs/by-name/ng/ngrep/package.nix index f0968740595b..0ea285cab87b 100644 --- a/pkgs/by-name/ng/ngrep/package.nix +++ b/pkgs/by-name/ng/ngrep/package.nix @@ -47,12 +47,10 @@ stdenv.mkDerivation (finalAttrs: { more common packet sniffing tools, such as tcpdump and snoop. ''; homepage = "https://github.com/jpr5/ngrep/"; - license = { - shortName = "ngrep"; # BSD-style, see README.md and LICENSE - url = "https://github.com/jpr5/ngrep/blob/master/LICENSE"; - free = true; - redistributable = true; - }; + license = lib.licenses.AND [ + lib.licenses.ngrep + lib.licenses.bsd3 + ]; platforms = with lib.platforms; linux ++ darwin; maintainers = [ lib.maintainers.bjornfor ]; mainProgram = "ngrep"; diff --git a/pkgs/by-name/ni/nim-atlas/package.nix b/pkgs/by-name/ni/nim-atlas/package.nix index 4c8d92b3e095..bc35b46ba46d 100644 --- a/pkgs/by-name/ni/nim-atlas/package.nix +++ b/pkgs/by-name/ni/nim-atlas/package.nix @@ -23,7 +23,7 @@ buildNimPackage ( meta = final.src.meta // { description = "Nim package cloner"; mainProgram = "atlas"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; }; } ) diff --git a/pkgs/by-name/ni/nimdow/package.nix b/pkgs/by-name/ni/nimdow/package.nix index 4e11d9a0d11d..475a5b7061d0 100644 --- a/pkgs/by-name/ni/nimdow/package.nix +++ b/pkgs/by-name/ni/nimdow/package.nix @@ -46,7 +46,7 @@ buildNimPackage (finalAttrs: { finalAttrs.src.meta // { description = "Nim based tiling window manager"; platforms = lib.platforms.linux; - license = [ lib.licenses.gpl2 ]; + license = lib.licenses.gpl2; maintainers = [ lib.maintainers.marcusramberg ]; mainProgram = "nimdow"; }; diff --git a/pkgs/by-name/ni/ninjas2/package.nix b/pkgs/by-name/ni/ninjas2/package.nix index 149a6c2c02e7..eb5d27294012 100644 --- a/pkgs/by-name/ni/ninjas2/package.nix +++ b/pkgs/by-name/ni/ninjas2/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/clearly-broken-software/ninjas2"; description = "Sample slicer plugin for LV2, VST, and jack standalone"; - license = with lib.licenses; [ gpl3 ]; + license = lib.licenses.gpl3; maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.linux; mainProgram = "ninjas2"; diff --git a/pkgs/by-name/ni/nitrokey-udev-rules/package.nix b/pkgs/by-name/ni/nitrokey-udev-rules/package.nix index ee66ef3a3618..5bb74b7f114d 100644 --- a/pkgs/by-name/ni/nitrokey-udev-rules/package.nix +++ b/pkgs/by-name/ni/nitrokey-udev-rules/package.nix @@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { description = "udev rules for Nitrokey devices"; homepage = "https://github.com/Nitrokey/nitrokey-udev-rules"; - license = [ lib.licenses.cc0 ]; + license = lib.licenses.cc0; maintainers = with lib.maintainers; [ robinkrahl ]; diff --git a/pkgs/by-name/ni/nix-index-unwrapped/package.nix b/pkgs/by-name/ni/nix-index-unwrapped/package.nix index 060f79e0ff17..347e5703ba98 100644 --- a/pkgs/by-name/ni/nix-index-unwrapped/package.nix +++ b/pkgs/by-name/ni/nix-index-unwrapped/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nix-index"; - version = "0.1.10"; + version = "0.1.11"; __structuredAttrs = true; @@ -19,10 +19,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "nix-community"; repo = "nix-index"; tag = "v${finalAttrs.version}"; - hash = "sha256-IBVI/4hwq84/vZx7Kr/Ci/P/CzPTsn1/oiCIF2vPHXg="; + hash = "sha256-yl/acohrgP0C5w4eozNcWcpCGhmMMjFbzgHsKwXKw00="; }; - cargoHash = "sha256-9xzC5PE2nyEtbhWGagCX2yZ0/tfo2v3fatnNU+GdVH8="; + cargoHash = "sha256-EJbNptLskphe+xfI8oQ0DVUx6y4dO52eeuPiG6FSQbI="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Files database for nixpkgs"; homepage = "https://github.com/nix-community/nix-index"; changelog = "https://github.com/nix-community/nix-index/blob/${finalAttrs.src.rev}/CHANGELOG.md"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ bennofs ncfavier diff --git a/pkgs/by-name/ni/nix-playground/package.nix b/pkgs/by-name/ni/nix-playground/package.nix index b816714ee882..8beb4f1a4438 100644 --- a/pkgs/by-name/ni/nix-playground/package.nix +++ b/pkgs/by-name/ni/nix-playground/package.nix @@ -47,7 +47,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { mainProgram = "np"; homepage = "https://github.com/LaunchPlatform/nix-playground"; changelog = "https://github.com/LaunchPlatform/nix-playground/releases/tag/${finalAttrs.src.tag}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fangpen ]; }; }) diff --git a/pkgs/by-name/ni/nix-query-tree-viewer/package.nix b/pkgs/by-name/ni/nix-query-tree-viewer/package.nix index dfb27ae232a6..f0f85837d794 100644 --- a/pkgs/by-name/ni/nix-query-tree-viewer/package.nix +++ b/pkgs/by-name/ni/nix-query-tree-viewer/package.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "GTK viewer for the output of `nix store --query --tree`"; mainProgram = "nix-query-tree-viewer"; homepage = "https://github.com/cdepillabout/nix-query-tree-viewer"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ cdepillabout ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/ni/nix-unit/package.nix b/pkgs/by-name/ni/nix-unit/package.nix index c79e4d10f2ee..c789215e7f9a 100644 --- a/pkgs/by-name/ni/nix-unit/package.nix +++ b/pkgs/by-name/ni/nix-unit/package.nix @@ -17,17 +17,17 @@ let # We pin the nix version to a known working one here as upgrades can likely break the build. # Since the nix language is rather stable we don't always need to have the latest and greatest for unit tests # On each update of nix unit we should re-evaluate what version we need. - nixComponents = nixVersions.nixComponents_2_34; + nixComponents = nixVersions.nixComponents_2_35; in stdenv.mkDerivation (finalAttrs: { pname = "nix-unit"; - version = "2.34.1"; + version = "2.35.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-unit"; rev = "v${finalAttrs.version}"; - hash = "sha256-XUgPlbtvuqxJHqaiVtwwxPxGa4seC/7XqZP2k0m3RXo="; + hash = "sha256-eXyZw2ddCKT5xMY8SDnV6lkr61zvSc7CNJeJSAjKqN4="; }; buildInputs = [ diff --git a/pkgs/by-name/ni/nix-visualize/package.nix b/pkgs/by-name/ni/nix-visualize/package.nix index c031036333ca..c81babd85732 100644 --- a/pkgs/by-name/ni/nix-visualize/package.nix +++ b/pkgs/by-name/ni/nix-visualize/package.nix @@ -39,7 +39,7 @@ python3Packages.buildPythonApplication { description = "Generate dependency graphs of a given nix package"; mainProgram = "nix-visualize"; homepage = "https://github.com/craigmbooth/nix-visualize"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ henrirosten ]; }; } diff --git a/pkgs/by-name/ni/nix-your-shell/package.nix b/pkgs/by-name/ni/nix-your-shell/package.nix index da3cc7c51d86..3dedca30b6e2 100644 --- a/pkgs/by-name/ni/nix-your-shell/package.nix +++ b/pkgs/by-name/ni/nix-your-shell/package.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "`nix` and `nix-shell` wrapper for shells other than `bash`"; homepage = "https://github.com/MercuryTechnologies/nix-your-shell"; changelog = "https://github.com/MercuryTechnologies/nix-your-shell/releases/tag/v${finalAttrs.version}"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ _9999years ]; }; }) diff --git a/pkgs/by-name/ni/nixdoc/package.nix b/pkgs/by-name/ni/nixdoc/package.nix index 3d6c90120f14..081c924166da 100644 --- a/pkgs/by-name/ni/nixdoc/package.nix +++ b/pkgs/by-name/ni/nixdoc/package.nix @@ -6,22 +6,22 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nixdoc"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixdoc"; tag = "v${finalAttrs.version}"; - hash = "sha256-7UOjmW8Ef4mEvj7SINaKWh2ZuyNMVEXB82mtuZTQiPA="; + hash = "sha256-FW8yZLO+hVDn2vs4pEUfjMM/5P508WKCLxd4AozLElk="; }; - cargoHash = "sha256-Aw794yhIET8/pnlQiK2xKVbYC/Kd5MExvFTwkv4LLTc="; + cargoHash = "sha256-pV/KEg3/UaT7bbgtRgjZZGq+RVyN1xY28YqzfslYoQo="; meta = { description = "Generate documentation for Nix functions"; mainProgram = "nixdoc"; homepage = "https://github.com/nix-community/nixdoc"; - license = [ lib.licenses.gpl3 ]; + license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ infinisil hsjobeki diff --git a/pkgs/by-name/ni/nixtamal/package.nix b/pkgs/by-name/ni/nixtamal/package.nix index 09a6e4687fe7..4e3a206bcb08 100644 --- a/pkgs/by-name/ni/nixtamal/package.nix +++ b/pkgs/by-name/ni/nixtamal/package.nix @@ -144,7 +144,7 @@ ocamlPackages.buildDunePackage (finalAttrs: { }; meta = { - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; mainProgram = "nixtamal"; outputsToInstall = [ diff --git a/pkgs/by-name/nm/nmh/package.nix b/pkgs/by-name/nm/nmh/package.nix index 49c9f935a20f..9ab44d38ce02 100644 --- a/pkgs/by-name/nm/nmh/package.nix +++ b/pkgs/by-name/nm/nmh/package.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://nmh.nongnu.org/"; downloadPage = "https://download.savannah.nongnu.org/releases/nmh/"; changelog = "https://savannah.nongnu.org/news/?group=nmh"; - license = [ lib.licenses.bsd3 ]; + license = lib.licenses.bsd3; longDescription = '' This is the nmh mail user agent (reader/sender), a command-line based mail reader that is powerful and extensible. nmh is an excellent choice diff --git a/pkgs/by-name/no/nohang/package.nix b/pkgs/by-name/no/nohang/package.nix index 3b9e01a12043..aacbd3c14357 100644 --- a/pkgs/by-name/no/nohang/package.nix +++ b/pkgs/by-name/no/nohang/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/hakavlad/nohang"; description = "Sophisticated low memory handler for Linux"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "nohang"; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ Dev380 ]; diff --git a/pkgs/by-name/no/nomacs/package.nix b/pkgs/by-name/no/nomacs/package.nix index 143522dcb93b..423622825096 100644 --- a/pkgs/by-name/no/nomacs/package.nix +++ b/pkgs/by-name/no/nomacs/package.nix @@ -13,8 +13,8 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "nomacs"; - version = "3.22.1"; - hash = "sha256-20ieFrIkoz4/T4QLK2PNdGPhw9Aj1+a9PimDvTKLqpg="; + version = "3.23.1"; + hash = "sha256-Udc+J+AYJZviWJhPtWvtXDss7Wqm9Gc9T8KsfOkx4EE="; src = fetchFromGitHub { owner = "nomacs"; @@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: { between images. ''; changelog = "https://github.com/nomacs/nomacs/releases/tag/${finalAttrs.src.rev}"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; mainProgram = "nomacs"; maintainers = with lib.maintainers; [ mindavi diff --git a/pkgs/by-name/no/nono/package.nix b/pkgs/by-name/no/nono/package.nix index 271b2e56ae4c..9a5187275e82 100644 --- a/pkgs/by-name/no/nono/package.nix +++ b/pkgs/by-name/no/nono/package.nix @@ -9,11 +9,13 @@ dbus, writableTmpDirAsHomeHook, + gitMinimal, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "nono"; - version = "0.61.1"; + version = "0.68.0"; __darwinAllowLocalNetworking = true; # required for tests @@ -21,9 +23,9 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "always-further"; repo = "nono"; tag = "v${finalAttrs.version}"; - hash = "sha256-y5oMR5Vawf/1QUj3ACDdqAjKT+Q2gizRfKkal340EP8="; + hash = "sha256-RxVYatzKjv6LJ+M4Js+sTvg0hMnovXxtr6WxwFYF16Y="; }; - cargoHash = "sha256-Oy/IqAK5ml1vu0eee+pF5pRjzk0Na/Fb04e1Mx0d924="; + cargoHash = "sha256-9gMhW2qt5gbf6x/uPLc4vl3rn6UdneoxRmWpeRqI4V0="; nativeBuildInputs = [ pkg-config @@ -35,12 +37,14 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeCheckInputs = [ writableTmpDirAsHomeHook + gitMinimal ]; checkFlags = map (t: "--skip=${t}") ( [ # fails to initialize the sandbox under '/build' "test_all_profiles_signal_mode_resolves" + "test_restrict_execute_does_not_break_rename_into_new_subdir" # panic "build_run_profile_patch_adds_override_deny_for_sensitive_file" "build_run_profile_patch_merges_read_and_write_to_allow_file" @@ -55,7 +59,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "rollback_signed_session_verifies_from_audit_dir_bundle" # nono-cli - # wants a script `cripts/test-list-aliases.sh`, `git`, and `.git` history + # wants a script `scripts/test-list-aliases.sh`, `git`, and `.git` history "alias_inventory_script_passes" # fails to initialize the sandbox under '/build' # has also failed due to running on darwin despite testing the linux only @@ -69,6 +73,9 @@ rustPlatform.buildRustPackage (finalAttrs: { "alias_inventory_rejects_unapproved_deprecated_module_reach_in" "lint_docs_accepts_clean_tree" "lint_docs_rejects_quoted_override_deny_outside_allowlist" + # need /bin/cat + "granted_path_exits_zero" + "env_credentials_with_command_policies_non_shim_entry_succeeds" # nono-proxy # fails to prepare TLS bundle inside build sandbox @@ -76,6 +83,18 @@ rustPlatform.buildRustPackage (finalAttrs: { "server::tests::test_route_diagnostics_summarises_each_route" "tls_intercept::bundle::tests::bundle_contains_ephemeral_and_system_roots" "tls_intercept::bundle::tests::bundle_file_has_restrictive_permissions" + # fail due to credential capture not configured + "proxy_runtime::tests::capture_helper_with_interaction_stdin_true_inherits_terminal_stdin" + "proxy_runtime::tests::capture_helper_with_stdio_true_receives_null_not_terminal_stdin" + "proxy_runtime::tests::proxy_credential_capture_backend_captures_and_caches" + "proxy_runtime::tests::proxy_credential_capture_backend_parses_json_headers" + "proxy_runtime::tests::proxy_credential_capture_backend_rejects_empty_stdout" + "proxy_runtime::tests::proxy_credential_capture_backend_sends_request_json_stdin" + "proxy_runtime::tests::proxy_credential_capture_backend_uses_path_cache_scope" + # panic + "server::tests::reactive_proxy_auth_retry_answered_after_407" + "server::tests::test_oauth_capture_routes_activate_intercept" + "server::tests::test_route_diagnostics_groups_credential_and_endpoint_routes" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # panics with "exact-path fallback must not recursively cover descendants" @@ -109,9 +128,18 @@ rustPlatform.buildRustPackage (finalAttrs: { "environment_allow_vars_default_allows_all" "environment_allow_vars_prefix_patterns" "environment_allow_vars_with_profile" + + "tool_sandbox::macos::tests::executable_shape_baseline_grants_env_shebang_target_interpreter" + "tool_sandbox::macos::tests::macos_runtime_baseline_does_not_grant_system_volumes_data" + "env_nono_capability_elevation_accepts_truthy" + "env_nono_trust_override_accepts_truthy" + "env_nono_trust_proxy_ca_accepts_truthy" + "dry_run_does_not_modify_workspace" + "rollback_restores_file_after_write" ] ); + passthru.updateScript = nix-update-script { }; meta = { description = "Secure, kernel-enforced sandbox for AI agents, MCP and LLM workloads"; homepage = "https://github.com/always-further/nono"; diff --git a/pkgs/by-name/no/nosql-workbench/package.nix b/pkgs/by-name/no/nosql-workbench/package.nix index f79d7c92c358..6964f8bf667a 100644 --- a/pkgs/by-name/no/nosql-workbench/package.nix +++ b/pkgs/by-name/no/nosql-workbench/package.nix @@ -13,10 +13,6 @@ let src = fetchurl { - x86_64-darwin = { - url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-mac-x64-${version}.dmg"; - hash = "sha256-ewlaaaWxPHxaOdAMbkHChzbxAB5MNdZS/p8ROD/SvcQ="; - }; aarch64-darwin = { url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-mac-arm64-${version}.dmg"; hash = "sha256-U6Gea89/cXY9Fd6JAWrUtf7Q4VfEXDPzbjCQcHMRjiE="; @@ -36,7 +32,6 @@ let maintainers = with lib.maintainers; [ DataHearth ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" "x86_64-linux" ]; }; diff --git a/pkgs/by-name/no/nosqli/package.nix b/pkgs/by-name/no/nosqli/package.nix index 2bf5a55ec61d..154e3d6d51dc 100644 --- a/pkgs/by-name/no/nosqli/package.nix +++ b/pkgs/by-name/no/nosqli/package.nix @@ -21,7 +21,7 @@ buildGoModule (finalAttrs: { description = "NoSql Injection tool for finding vulnerable websites using MongoDB"; mainProgram = "nosqli"; homepage = "https://github.com/Charlie-belmer/nosqli"; - license = with lib.licenses; [ agpl3Plus ]; + license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/no/notesnook/package.nix b/pkgs/by-name/no/notesnook/package.nix index e388c4407c13..a963443c55a6 100644 --- a/pkgs/by-name/no/notesnook/package.nix +++ b/pkgs/by-name/no/notesnook/package.nix @@ -18,7 +18,6 @@ let { x86_64-linux = "linux_x86_64.AppImage"; aarch64-linux = "linux_arm64.AppImage"; - x86_64-darwin = "mac_x64.dmg"; aarch64-darwin = "mac_arm64.dmg"; } .${system} or throwSystem; @@ -29,7 +28,6 @@ let { x86_64-linux = "sha256-NmhV+x5HrKBO7BX1bJyjChKQF/j38kQqJ3x0amSXzGU="; aarch64-linux = "sha256-IU4hF/ol4pyh+ABTri2aqwqaB+cfrHLtsF7wrqE+wEY="; - x86_64-darwin = "sha256-YhJvkKreWUReEgs4R9lWV0/cx3d0hrjKTHZn0hDsp3k="; aarch64-darwin = "sha256-9CTGpCPJY6sq6JWDpoCTyOTt/vtCazDaoDzFFUzR9zg="; } .${system} or throwSystem; @@ -57,7 +55,6 @@ let platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "notesnook"; diff --git a/pkgs/by-name/no/notesnook/update.sh b/pkgs/by-name/no/notesnook/update.sh index ed977f182a0d..fcf8f5c6027e 100755 --- a/pkgs/by-name/no/notesnook/update.sh +++ b/pkgs/by-name/no/notesnook/update.sh @@ -18,7 +18,6 @@ fi for i in \ "x86_64-linux linux_x86_64.AppImage" \ "aarch64-linux linux_arm64.AppImage" \ - "x86_64-darwin mac_x64.dmg" \ "aarch64-darwin mac_arm64.dmg"; do set -- $i hash=$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url "https://github.com/streetwriters/notesnook/releases/download/v$latestVersion/notesnook_$2")") diff --git a/pkgs/by-name/no/noti/package.nix b/pkgs/by-name/no/noti/package.nix index 264e5e34fbfe..a51018ab362d 100644 --- a/pkgs/by-name/no/noti/package.nix +++ b/pkgs/by-name/no/noti/package.nix @@ -1,7 +1,9 @@ { lib, + stdenv, buildGoModule, fetchFromCodeberg, + llvmPackages, installShellFiles, }: @@ -18,10 +20,19 @@ buildGoModule (finalAttrs: { vendorHash = null; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.lld ]; subPackages = [ "cmd/noti" ]; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + # Work around ld64's libc++ hardening issue. + # TODO: Remove once #536365 reaches this branch. + NIX_CFLAGS_LINK = "-fuse-ld=lld"; + }; + ldflags = [ "-s" "-w" diff --git a/pkgs/by-name/no/notion-app/package.nix b/pkgs/by-name/no/notion-app/package.nix index e99f9bb0fa1e..767bda0e3b33 100644 --- a/pkgs/by-name/no/notion-app/package.nix +++ b/pkgs/by-name/no/notion-app/package.nix @@ -5,9 +5,7 @@ unzip, }: let - info = - (lib.importJSON ./sources.json)."${stdenvNoCC.hostPlatform.parsed.cpu.name}-darwin" - or (throw "Unsupported CPU architecture: ${stdenvNoCC.hostPlatform.parsed.cpu.name}"); + info = lib.importJSON ./source.json; in stdenvNoCC.mkDerivation (finalAttrs: { pname = "notion-app"; @@ -37,7 +35,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { pradyuman ]; platforms = [ - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/no/notion-app/source.json b/pkgs/by-name/no/notion-app/source.json new file mode 100644 index 000000000000..8d095dc524f7 --- /dev/null +++ b/pkgs/by-name/no/notion-app/source.json @@ -0,0 +1,5 @@ +{ + "version": "7.25.1", + "url": "https://desktop-release.notion-static.com/Notion-arm64-7.25.1.zip", + "hash": "sha512-1t+hNS33R3CX+inR8ArKvm4LDn0Wu7JiCU91ucnaAgQm85XUcWFdxk/f421M9XqG1Wte+webFX45LXDlixKa2A==" +} diff --git a/pkgs/by-name/no/notion-app/sources.json b/pkgs/by-name/no/notion-app/sources.json deleted file mode 100644 index 61b33e14609e..000000000000 --- a/pkgs/by-name/no/notion-app/sources.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "x86_64-darwin": { - "version": "7.25.1", - "url": "https://desktop-release.notion-static.com/Notion-7.25.1.zip", - "hash": "sha512-HBhe2onWY44JbMVIfiLglyNDk1tqepwCerqbgUuI56mstBlg+B0KuepTl+plJODoTVtRasmrg/WRBw+ESWpEeg==" - }, - "aarch64-darwin": { - "version": "7.25.1", - "url": "https://desktop-release.notion-static.com/Notion-arm64-7.25.1.zip", - "hash": "sha512-1t+hNS33R3CX+inR8ArKvm4LDn0Wu7JiCU91ucnaAgQm85XUcWFdxk/f421M9XqG1Wte+webFX45LXDlixKa2A==" - } -} diff --git a/pkgs/by-name/no/notion-app/update/update.mjs b/pkgs/by-name/no/notion-app/update/update.mjs index a4d56e8ff3d8..c6a7e3e4baf9 100755 --- a/pkgs/by-name/no/notion-app/update/update.mjs +++ b/pkgs/by-name/no/notion-app/update/update.mjs @@ -23,15 +23,10 @@ const __dirname = import.meta.dirname; hash: `sha512-${string}`; }} Info */ -/** @typedef {{ - "x86_64-darwin": Info; - "aarch64-darwin": Info; -}} InfoMap */ - const BASE_URL = "https://desktop-release.notion-static.com/"; /** * - * @param {"latest-mac.yml" | "arm64-mac.yml"} liveCheckFile + * @param {"arm64-mac.yml"} liveCheckFile * @returns {Promise} */ async function getInfo(liveCheckFile) { @@ -57,26 +52,20 @@ async function getInfo(liveCheckFile) { } async function main() { - const filePath = path.join(__dirname, "../sources.json"); - /** @type {InfoMap} */ + const filePath = path.join(__dirname, "../source.json"); + /** @type {Info} */ const oldInfo = JSON.parse( await fsPromises.readFile(filePath, { encoding: "utf-8" }) ); - /** @type {InfoMap} */ - const info = { - "x86_64-darwin": await getInfo("latest-mac.yml"), - "aarch64-darwin": await getInfo("arm64-mac.yml"), - }; + /** @type {Info} */ + const info = await getInfo("arm64-mac.yml"); if (JSON.stringify(oldInfo) === JSON.stringify(info)) { console.log("[update] No updates found"); return; } - const platforms = /** @type {const} */ (["x86_64-darwin", "aarch64-darwin"]); - for (const platform of platforms) { - console.log( - `[update] Updating Notion ${platform} ${oldInfo[platform].version} -> ${info[platform].version}` - ); - } + console.log( + `[update] Updating Notion ${oldInfo.version} -> ${info.version}` + ); await fsPromises.writeFile( filePath, JSON.stringify(info, null, 2) + "\n", diff --git a/pkgs/by-name/no/noto-fonts-monochrome-emoji/package.nix b/pkgs/by-name/no/noto-fonts-monochrome-emoji/package.nix index 1cc052beeeee..3c2be5e1c90f 100644 --- a/pkgs/by-name/no/noto-fonts-monochrome-emoji/package.nix +++ b/pkgs/by-name/no/noto-fonts-monochrome-emoji/package.nix @@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation { meta = { description = "Monochrome emoji font"; homepage = "https://fonts.google.com/noto/specimen/Noto+Emoji"; - license = [ lib.licenses.ofl ]; + license = lib.licenses.ofl; maintainers = [ lib.maintainers.nicoo ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/no/novelwriter/package.nix b/pkgs/by-name/no/novelwriter/package.nix index bfa500012e6a..0a8e6a4da2a6 100644 --- a/pkgs/by-name/no/novelwriter/package.nix +++ b/pkgs/by-name/no/novelwriter/package.nix @@ -58,7 +58,7 @@ python3.pkgs.buildPythonApplication { description = "Open source plain text editor designed for writing novels"; homepage = "https://novelwriter.io"; changelog = "https://github.com/vkbo/novelWriter/blob/main/CHANGELOG.md"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ pluiedev ]; mainProgram = "novelwriter"; diff --git a/pkgs/by-name/nr/nrfutil/update.sh b/pkgs/by-name/nr/nrfutil/update.sh index 72bb4763a361..c8329f892aec 100755 --- a/pkgs/by-name/nr/nrfutil/update.sh +++ b/pkgs/by-name/nr/nrfutil/update.sh @@ -17,7 +17,6 @@ declare -a packages architectures["x86_64-linux"]="x86_64-unknown-linux-gnu" architectures["aarch64-linux"]="aarch64-unknown-linux-gnu" # NOTE: segger-jlink is not yet packaged for darwin -# architectures["x86_64-darwin"]="x86_64-apple-darwin" # architectures["aarch64-darwin"]="aarch64-apple-darwin" packages=( diff --git a/pkgs/by-name/ns/nsc/package.nix b/pkgs/by-name/ns/nsc/package.nix index 7b4371ea366c..2138cf274aba 100644 --- a/pkgs/by-name/ns/nsc/package.nix +++ b/pkgs/by-name/ns/nsc/package.nix @@ -56,7 +56,7 @@ buildGoModule rec { meta = { description = "Tool for creating NATS account and user access configurations"; homepage = "https://github.com/nats-io/nsc"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ cbrewster ]; mainProgram = "nsc"; }; diff --git a/pkgs/by-name/nt/ntfs2btrfs/package.nix b/pkgs/by-name/nt/ntfs2btrfs/package.nix index 7ad2579512c4..730eb51e9912 100644 --- a/pkgs/by-name/nt/ntfs2btrfs/package.nix +++ b/pkgs/by-name/nt/ntfs2btrfs/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "CLI tool which does in-place conversion of Microsoft's NTFS filesystem to the open-source filesystem Btrfs"; homepage = "https://github.com/maharmstone/ntfs2btrfs"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ j1nxie ]; mainProgram = "ntfs2btrfs"; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/nt/ntfs3g/package.nix b/pkgs/by-name/nt/ntfs3g/package.nix index 8b4aa462b4e9..3c7d25a6d49a 100644 --- a/pkgs/by-name/nt/ntfs3g/package.nix +++ b/pkgs/by-name/nt/ntfs3g/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "ntfs3g"; - version = "2026.2.25"; + version = "2026.7.7"; outputs = [ "out" @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "tuxera"; repo = "ntfs-3g"; tag = finalAttrs.version; - hash = "sha256-uiVh87ExLXq94NVqR8MEg7Lrvamm6MrH+qP3Nosii5c="; + hash = "sha256-7Z3rMOHBwrWqkxeksic3+Z+WvwJy2ra9rRxGjESsd04="; }; buildInputs = [ diff --git a/pkgs/by-name/nt/ntlmrecon/package.nix b/pkgs/by-name/nt/ntlmrecon/package.nix index 17f1ae8bbcd1..1a0f8a9b7161 100644 --- a/pkgs/by-name/nt/ntlmrecon/package.nix +++ b/pkgs/by-name/nt/ntlmrecon/package.nix @@ -37,7 +37,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { mainProgram = "ntlmrecon"; homepage = "https://github.com/pwnfoo/NTLMRecon"; changelog = "https://github.com/pwnfoo/NTLMRecon/releases/tag/v-${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/nt/ntp/package.nix b/pkgs/by-name/nt/ntp/package.nix index ea7fda8098a9..e36dad33bf80 100644 --- a/pkgs/by-name/nt/ntp/package.nix +++ b/pkgs/by-name/nt/ntp/package.nix @@ -52,10 +52,10 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://www.ntp.org/"; description = "Implementation of the Network Time Protocol"; - license = { - # very close to isc and bsd2 - url = "https://www.eecis.udel.edu/~mills/ntp/html/copyright.html"; - }; + license = lib.licenses.AND [ + lib.licenses.ntp + lib.licenses.bsd2 + ]; maintainers = with lib.maintainers; [ thoughtpolice ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/nu/nu_scripts/package.nix b/pkgs/by-name/nu/nu_scripts/package.nix index 0355a62e8350..454b6a692fa7 100644 --- a/pkgs/by-name/nu/nu_scripts/package.nix +++ b/pkgs/by-name/nu/nu_scripts/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "nu_scripts"; - version = "0-unstable-2026-07-02"; + version = "0-unstable-2026-07-15"; src = fetchFromGitHub { owner = "nushell"; repo = "nu_scripts"; - rev = "4af42d7f10993ee488ae37762a0e7034b9a004f6"; - hash = "sha256-Q+RxZ7j1odpxbZXdex2gfJ7uUqmIpNk1W/Cq39K1g0s="; + rev = "e0b8d1e0c167efa32e9f4c69761b67dc625cb529"; + hash = "sha256-hIjJLoeep28PxivoGl2f5jihb0ljrp6ObrWZ9oyeWi4="; }; installPhase = '' diff --git a/pkgs/by-name/nu/nuclei-templates/package.nix b/pkgs/by-name/nu/nuclei-templates/package.nix index 37a0d5a9631d..a79a6c7d9961 100644 --- a/pkgs/by-name/nu/nuclei-templates/package.nix +++ b/pkgs/by-name/nu/nuclei-templates/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "nuclei-templates"; - version = "10.4.5"; + version = "10.4.6"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei-templates"; tag = "v${finalAttrs.version}"; - hash = "sha256-6czf84bHyvHIT9rA2HUYqQe7lgODl4uRMP/8QepV3AU="; + hash = "sha256-Mv+W1CmUUAs6KntuTBgrp5JDlvyMC1C2Ddm5AGDPtbU="; }; installPhase = '' diff --git a/pkgs/by-name/nu/nufmt/package.nix b/pkgs/by-name/nu/nufmt/package.nix index 7222a9bc675a..ae3aa762b58c 100644 --- a/pkgs/by-name/nu/nufmt/package.nix +++ b/pkgs/by-name/nu/nufmt/package.nix @@ -7,13 +7,13 @@ }: rustPlatform.buildRustPackage { pname = "nufmt"; - version = "0-unstable-2026-07-05"; + version = "0-unstable-2026-07-16"; src = fetchFromGitHub { owner = "nushell"; repo = "nufmt"; - rev = "de410853fc4d0f04e101a2573ebba8c15978ea33"; - hash = "sha256-tNdoHiSZRi0PMUtlHqD5vjjPNDzNyZ73QnCOw8rmEPs="; + rev = "cae92f70d4f04aca062a9d1ce935dedaa71052f3"; + hash = "sha256-MQ3M/8UmCPt93OLu5ZWkSqbQLZeHpR5QKnzPzu37slw="; }; nativeBuildInputs = [ @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-MLfhuFjYv2Vi3BGJFzbmi+xhhm6M0a4oOe7wpHtfObc="; - # NOTE: Patch follows similar intention upstream https://github.com/nushell/nufmt/commit/de410853fc4d0f04e101a2573ebba8c15978ea33 + # NOTE: Patch follows similar intention upstream https://github.com/nushell/nufmt/commit/cae92f70d4f04aca062a9d1ce935dedaa71052f3 postPatch = '' substituteInPlace tests/ground_truth.rs --replace-fail \ ' let path = PathBuf::from(target_dir).join("debug").join(exe_name);' \ diff --git a/pkgs/by-name/nu/nushell-plugin-desktop_notifications/package.nix b/pkgs/by-name/nu/nushell-plugin-desktop_notifications/package.nix index cd4d1026ea33..76cc59030954 100644 --- a/pkgs/by-name/nu/nushell-plugin-desktop_notifications/package.nix +++ b/pkgs/by-name/nu/nushell-plugin-desktop_notifications/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nu_plugin_desktop_notifications"; - version = "0.113.1"; + version = "0.114.1"; src = fetchFromGitHub { owner = "FMotalleb"; repo = "nu_plugin_desktop_notifications"; tag = "v${finalAttrs.version}"; - hash = "sha256-aA47T3Fxo2eH0JclZRC7zY4RK8eRnAqj712LhgXEMpU="; + hash = "sha256-/41DHPv9UKHUY551UppiauEiwoB0qQnkSrl6pHytwLs="; }; - cargoHash = "sha256-e/q/X0Temmkoj6DcPLUC+QfN9lVDrE4esVEx9LF4bHc="; + cargoHash = "sha256-csBlo1Gly1LbvMxfmydmLlzhQh7ul2haLr7IAq/GlbI="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/nu/nushell-plugin-highlight/package.nix b/pkgs/by-name/nu/nushell-plugin-highlight/package.nix index 716eba425c10..3b6ac7f9588c 100644 --- a/pkgs/by-name/nu/nushell-plugin-highlight/package.nix +++ b/pkgs/by-name/nu/nushell-plugin-highlight/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nu_plugin_highlight"; - version = "1.4.12+0.110.0"; + version = "1.4.15+0.113.1"; src = fetchFromGitHub { owner = "cptpiepmatz"; repo = "nu-plugin-highlight"; tag = "v${finalAttrs.version}"; - hash = "sha256-20b+EiB95BzDVWibWQuG8ozPRV8LbxG7fHEbyTk3xTE="; + hash = "sha256-zJYbtGpQU0CrAu7sEQWv06hJj/PCD/iYCLOLrNmsL5U="; fetchSubmodules = true; }; - cargoHash = "sha256-pkLcTjZYLERMhK18zPdfldHrECHXQpcg5i6rsyxw7nQ="; + cargoHash = "sha256-oJtmmKRylOZQjBBifvWBx7ikwK2inGg8rGb/rPZ/t/s="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; diff --git a/pkgs/by-name/nu/nuxmv/package.nix b/pkgs/by-name/nu/nuxmv/package.nix index 5896cbb0edf8..561fa8c2b09d 100644 --- a/pkgs/by-name/nu/nuxmv/package.nix +++ b/pkgs/by-name/nu/nuxmv/package.nix @@ -41,7 +41,6 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ siraben ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/nv/nv-codec-headers/package.nix b/pkgs/by-name/nv/nv-codec-headers/package.nix index 1e0ae0656ebc..5aaad8a20871 100644 --- a/pkgs/by-name/nv/nv-codec-headers/package.nix +++ b/pkgs/by-name/nv/nv-codec-headers/package.nix @@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation { description = "FFmpeg version of headers for NVENC - major version ${pick.version}"; homepage = "https://ffmpeg.org/"; downloadPage = "https://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/nv/nvfancontrol/package.nix b/pkgs/by-name/nv/nvfancontrol/package.nix index 1d79639b80bd..bded96ad5490 100644 --- a/pkgs/by-name/nv/nvfancontrol/package.nix +++ b/pkgs/by-name/nv/nvfancontrol/package.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { description = "Nvidia dynamic fan control for Linux"; homepage = "https://github.com/foucault/nvfancontrol"; changelog = "https://github.com/foucault/nvfancontrol/releases/tag/${version}"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ devins2518 ]; mainProgram = "nvfancontrol"; diff --git a/pkgs/applications/science/chemistry/nwchem/default.nix b/pkgs/by-name/nw/nwchem/package.nix similarity index 88% rename from pkgs/applications/science/chemistry/nwchem/default.nix rename to pkgs/by-name/nw/nwchem/package.nix index 9b082276f676..a11d651b3d7a 100644 --- a/pkgs/applications/science/chemistry/nwchem/default.nix +++ b/pkgs/by-name/nw/nwchem/package.nix @@ -10,9 +10,9 @@ gfortran, perl, mpi, - blas, - lapack, - scalapack, + blas-ilp64, + lapack-ilp64, + scalapack-ilp64, libxc, python3, tcsh, @@ -20,10 +20,11 @@ autoconf, libtool, makeWrapper, + mpich, }: -assert blas.isILP64 == lapack.isILP64; -assert blas.isILP64 == scalapack.isILP64; +assert blas-ilp64.isILP64 == lapack-ilp64.isILP64; +assert blas-ilp64.isILP64 == scalapack-ilp64.isILP64; let versionGA = "5.8.2"; # Fixed by nwchem @@ -48,17 +49,20 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nwchem"; version = "7.2.3"; src = fetchFromGitHub { owner = "nwchemgit"; repo = "nwchem"; - rev = "v${version}-release"; + tag = "v${finalAttrs.version}-release"; hash = "sha256-2qc4kLb/WmUJuJGonIyS7pgCfyt8yXdcpDAKU0RMY58="; }; + strictDeps = true; + __structuredAttrs = true; + outputs = [ "out" "dev" @@ -72,13 +76,15 @@ stdenv.mkDerivation rec { makeWrapper gfortran which + mpich + python3 + openssh ]; buildInputs = [ tcsh - openssh - blas - lapack - scalapack + blas-ilp64 + lapack-ilp64 + scalapack-ilp64 libxc python3 ]; @@ -134,12 +140,12 @@ stdenv.mkDerivation rec { export PYTHONHOME="${python3}" export PYTHONVERSION=${lib.versions.majorMinor python3.version} - export BLASOPT="-L${blas}/lib -lblas" - export LAPACK_LIB="-L${lapack}/lib -llapack" - export BLAS_SIZE=${if blas.isILP64 then "8" else "4"} + export BLASOPT="-L${blas-ilp64}/lib -lblas" + export LAPACK_LIB="-L${lapack-ilp64}/lib -llapack" + export BLAS_SIZE=${if blas-ilp64.isILP64 then "8" else "4"} export USE_SCALAPACK="y" - export SCALAPACK="-L${scalapack}/lib -lscalapack" - export SCALAPACK_SIZE=${if scalapack.isILP64 then "8" else "4"} + export SCALAPACK="-L${scalapack-ilp64}/lib -lscalapack" + export SCALAPACK_SIZE=${if scalapack-ilp64.isILP64 then "8" else "4"} export LIBXC_INCLUDE="${lib.getDev libxc}/include" export LIBXC_MODDIR="${lib.getDev libxc}/include" @@ -166,7 +172,7 @@ stdenv.mkDerivation rec { ln -s ${gaSrc} src/tools/ga-${versionGA}.tar.gz cd src make nwchem_config - ${lib.optionalString (!blas.isILP64) "make 64_to_32"} + ${lib.optionalString (!blas-ilp64.isILP64) "make 64_to_32"} ''; postBuild = '' @@ -236,4 +242,4 @@ stdenv.mkDerivation rec { homepage = "https://nwchemgit.github.io"; license = lib.licenses.ecl20; }; -} +}) diff --git a/pkgs/by-name/nw/nwg-drawer/package.nix b/pkgs/by-name/nw/nwg-drawer/package.nix index 342e6566c2b3..d62dc4c9b861 100644 --- a/pkgs/by-name/nw/nwg-drawer/package.nix +++ b/pkgs/by-name/nw/nwg-drawer/package.nix @@ -63,7 +63,7 @@ buildGoModule { description = "Application drawer for sway Wayland compositor"; homepage = "https://github.com/nwg-piotr/nwg-drawer"; changelog = "https://github.com/nwg-piotr/nwg-drawer/releases/tag/${src.rev}"; - license = with lib.licenses; [ agpl3Plus ]; + license = lib.licenses.agpl3Plus; mainProgram = "nwg-drawer"; maintainers = [ ]; platforms = with lib.platforms; linux; diff --git a/pkgs/by-name/nz/nzportable/assets.nix b/pkgs/by-name/nz/nzportable/assets.nix index 3161c24a7af5..3474f8145f8d 100644 --- a/pkgs/by-name/nz/nzportable/assets.nix +++ b/pkgs/by-name/nz/nzportable/assets.nix @@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation { meta = { description = "Game asset repository for Nazi Zombies: Portable"; homepage = "https://github.com/nzp-team/assets"; - license = with lib.licenses; [ cc-by-sa-40 ]; + license = lib.licenses.cc-by-sa-40; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ pluiedev ]; }; diff --git a/pkgs/by-name/oa/oakctl/package.nix b/pkgs/by-name/oa/oakctl/package.nix index ae194502129f..3d1f56e53502 100644 --- a/pkgs/by-name/oa/oakctl/package.nix +++ b/pkgs/by-name/oa/oakctl/package.nix @@ -26,10 +26,6 @@ let url = "https://oakctl-releases.luxonis.com/data/${version}/darwin_arm64/oakctl"; hash = "sha256-tJl9OKhaY9dIxkN+tsbQ3isyAfFPSDOqkgLgDDaRaSg="; }; - x86_64-darwin = fetchurl { - url = "https://oakctl-releases.luxonis.com/data/${version}/darwin_x86_64/oakctl"; - hash = "sha256-xjmMqECqZ+ukXAPRKoJ1m1y7ABMIltw9u236q9k56/o="; - }; }; src = @@ -73,7 +69,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "oakctl"; diff --git a/pkgs/by-name/ob/objection/package.nix b/pkgs/by-name/ob/objection/package.nix index 08b5f65a2bc6..3090b7d979ad 100644 --- a/pkgs/by-name/ob/objection/package.nix +++ b/pkgs/by-name/ob/objection/package.nix @@ -42,10 +42,6 @@ let fridaArch = "linux-ia32"; fridaHash = "sha256-vLwf+EwWNDLznda8J+xVqp8XmuivdZ0VKgISR9YoQR0="; }; - x86_64-darwin = { - fridaArch = "darwin-x64"; - fridaHash = "sha256-raODa/EHRpMYNwFK9gxTXWrxnx1G1IbKTKV1343MTm8="; - }; aarch64-darwin = { fridaArch = "darwin-arm64"; fridaHash = "sha256-mR6HM9rmRmXhWqXA0GC4Xkdj9KVSthhtvMAzijE+j5c="; diff --git a/pkgs/by-name/ob/obsidian/package.nix b/pkgs/by-name/ob/obsidian/package.nix index ba5471ecedf0..97ac4d8ed740 100644 --- a/pkgs/by-name/ob/obsidian/package.nix +++ b/pkgs/by-name/ob/obsidian/package.nix @@ -33,12 +33,11 @@ let platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; - srcs = rec { + srcs = { x86_64-linux = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz"; hash = "sha256-/L4IsRHZwf2wm5wIlSsG4cgpxiFj66JYTEtOyFm+B50="; @@ -49,12 +48,10 @@ let hash = "sha256-a8hye/27bXMdWvmgb1HW3nBhxoyQjIrotDqe03miAmA="; }; - x86_64-darwin = fetchurl { + aarch64-darwin = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/Obsidian-${version}.dmg"; hash = "sha256-O4XBO0zlVRLobhcKfNKklOLbaVrIiMBgHhU8uFt3iBs="; }; - - aarch64-darwin = x86_64-darwin; }; src = diff --git a/pkgs/by-name/oc/oci2git/package.nix b/pkgs/by-name/oc/oci2git/package.nix index 67de8e4ab9e2..e62c45995245 100644 --- a/pkgs/by-name/oc/oci2git/package.nix +++ b/pkgs/by-name/oc/oci2git/package.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Introspecting Docker images as easy as using Git"; homepage = "https://github.com/Virviil/oci2git"; changelog = "https://github.com/Virviil/oci2git/releases/tag/v${finalAttrs.version}"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.kpbaks ]; mainProgram = "oci2git"; platforms = lib.platforms.all; diff --git a/pkgs/by-name/oc/ocis_5-bin/package.nix b/pkgs/by-name/oc/ocis_5-bin/package.nix index 47ff4aace7e7..00e35dfab40c 100644 --- a/pkgs/by-name/oc/ocis_5-bin/package.nix +++ b/pkgs/by-name/oc/ocis_5-bin/package.nix @@ -12,7 +12,6 @@ let x86_64-linux = "amd64"; aarch64-linux = "arm64"; armv7l-linux = "arm"; - x86_64-darwin = "amd64"; aarch64-darwin = "arm64"; } ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -31,7 +30,6 @@ let hash_amd64-linux = "sha256-tmUfDKLO35qCs1hauJQKhJhcnMhqOpcqDFtAggMFhLE="; hash_arm64-linux = "sha256-ggRDW1cnTHMQKvOvCDH3eptH3O3PgYaondlzOGHTjio="; hash_arm-linux = "sha256-uMLRow1NeHufSI5B4k5qSIfH3lTxg+WxzLxgdedAz40="; - hash_amd64-darwin = "sha256-LZ6n/f2MdbFaPnBCoJqZZ7HQiLG3Z6ZoatgFsxaFvMc="; hash_arm64-darwin = "sha256-k5X2ZInFS/HlToOZPX23TRJqlx/XM1ZG++Xr4BHn8SY="; } ."hash_${arch}-${os}"; @@ -74,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.intersectLists lib.platforms.linux ( lib.platforms.arm ++ lib.platforms.aarch64 ++ lib.platforms.x86 )) - ++ (lib.intersectLists lib.platforms.darwin (lib.platforms.aarch64 ++ lib.platforms.x86_64)); + ++ lib.platforms.darwin; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; mainProgram = "ocis"; diff --git a/pkgs/by-name/oc/ocis_5-bin/update.py b/pkgs/by-name/oc/ocis_5-bin/update.py index c2f717cb41d5..8436e735b6cb 100755 --- a/pkgs/by-name/oc/ocis_5-bin/update.py +++ b/pkgs/by-name/oc/ocis_5-bin/update.py @@ -251,7 +251,6 @@ def main(): systems = [ ("darwin", "arm64", "aarch64-darwin"), - ("darwin", "amd64", "x86_64-darwin"), ("linux", "arm64", "aarch64-linux"), ("linux", "arm", "armv7l-linux"), ("linux", "amd64", "x86_64-linux"), diff --git a/pkgs/by-name/od/odin/package.nix b/pkgs/by-name/od/odin/package.nix index b23e7a24a94b..2c4dc1838814 100644 --- a/pkgs/by-name/od/odin/package.nix +++ b/pkgs/by-name/od/odin/package.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "odin"; - version = "dev-2026-07"; + version = "dev-2026-07a"; src = fetchFromGitHub { owner = "odin-lang"; repo = "Odin"; tag = finalAttrs.version; - hash = "sha256-pVCZB6YOk73tBGVE1i73JJG3z9SZNakFuMp4Kepqnvc="; + hash = "sha256-sjL6mj2zfUVpiwkooTTBCVkPRoPWR7ci/hb9TYF+J/I="; }; patches = [ diff --git a/pkgs/by-name/od/odpic/package.nix b/pkgs/by-name/od/odpic/package.nix index b65b3058466e..807171475992 100644 --- a/pkgs/by-name/od/odpic/package.nix +++ b/pkgs/by-name/od/odpic/package.nix @@ -51,7 +51,6 @@ stdenv.mkDerivation { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" ]; hydraPlatforms = [ ]; }; diff --git a/pkgs/by-name/oe/oed/package.nix b/pkgs/by-name/oe/oed/package.nix index fe96dc2f906a..fc47875ee2d8 100644 --- a/pkgs/by-name/oe/oed/package.nix +++ b/pkgs/by-name/oe/oed/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Portable ed editor from OpenBSD"; homepage = "https://github.com/ibara/oed"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; mainProgram = "ed"; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/oh/oh-my-git/package.nix b/pkgs/by-name/oh/oh-my-git/package.nix index 26cfeef71534..6915d8dc4d51 100644 --- a/pkgs/by-name/oh/oh-my-git/package.nix +++ b/pkgs/by-name/oh/oh-my-git/package.nix @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { homepage = "https://ohmygit.org/"; description = "Interactive Git learning game"; mainProgram = "oh-my-git"; - license = with lib.licenses; [ blueOak100 ]; + license = lib.licenses.blueOak100; platforms = [ "x86_64-linux" ]; maintainers = with lib.maintainers; [ jojosch ]; }; diff --git a/pkgs/by-name/oh/oh-my-posh/package.nix b/pkgs/by-name/oh/oh-my-posh/package.nix index 87ea74ede309..b99f25ba4cbd 100644 --- a/pkgs/by-name/oh/oh-my-posh/package.nix +++ b/pkgs/by-name/oh/oh-my-posh/package.nix @@ -6,13 +6,13 @@ }: buildGoModule (finalAttrs: { pname = "oh-my-posh"; - version = "29.26.1"; + version = "29.28.0"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = "oh-my-posh"; tag = "v${finalAttrs.version}"; - hash = "sha256-hE3L7emTk7MxzBUqSUDNKYiA2H1w9mcGhPYiR1OhYxg="; + hash = "sha256-8V1Wu3wqakwSVNb/WPlxRy9KL33frb8nqWeorHuIuzI="; }; vendorHash = "sha256-6DX/x9uWUbwXy9ccB6NIVRKsOc1nJXtctItONAI7zPQ="; diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index 056b977b741b..16508c4919eb 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -152,13 +152,13 @@ let in goBuild (finalAttrs: { pname = "ollama"; - version = "0.31.2"; + version = "0.32.0"; src = fetchFromGitHub { owner = "ollama"; repo = "ollama"; tag = "v${finalAttrs.version}"; - hash = "sha256-/ySx6vfOGPo5twwKiNtkuROaTV7SvCeHX2fQiilmTkA="; + hash = "sha256-NyZ3H1gsC692IcmdTXjIA9jDtTobUEfJladGW72aNGw="; }; vendorHash = "sha256-HMwoaFBMbpoy8f0I+O+i7kIa9BslLu3FcVWeaIOkpvs="; diff --git a/pkgs/by-name/om/ombi/package.nix b/pkgs/by-name/om/ombi/package.nix index 6e8d8d8cd40f..b21ac3e7e702 100644 --- a/pkgs/by-name/om/ombi/package.nix +++ b/pkgs/by-name/om/ombi/package.nix @@ -18,7 +18,6 @@ let { x86_64-linux = "x64"; aarch64-linux = "arm64"; - x86_64-darwin = "x64"; } ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -89,7 +88,6 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" ]; mainProgram = "Ombi"; }; diff --git a/pkgs/by-name/on/oneko/package.nix b/pkgs/by-name/on/oneko/package.nix index c43f40b3fac6..6f28b27d4172 100644 --- a/pkgs/by-name/on/oneko/package.nix +++ b/pkgs/by-name/on/oneko/package.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { When the cat is done catching the mouse, it starts sleeping. ''; homepage = "https://github.com/IreneKnapp/oneko"; - license = with lib.licenses; [ publicDomain ]; + license = lib.licenses.publicDomain; maintainers = with lib.maintainers; [ xaverdh irenes diff --git a/pkgs/by-name/oo/ookla-speedtest/package.nix b/pkgs/by-name/oo/ookla-speedtest/package.nix index ca3019ec8232..630338789e91 100644 --- a/pkgs/by-name/oo/ookla-speedtest/package.nix +++ b/pkgs/by-name/oo/ookla-speedtest/package.nix @@ -10,7 +10,7 @@ let pname = "ookla-speedtest"; version = "1.2.0"; - srcs = rec { + srcs = { x86_64-linux = fetchurl { url = "https://install.speedtest.net/app/cli/${pname}-${version}-linux-x86_64.tgz"; sha256 = "sha256-VpBZbFT/m+1j+jcy+BigXbwtsZrTbtaPIcpfZNXP7rc="; @@ -27,11 +27,10 @@ let url = "https://install.speedtest.net/app/cli/${pname}-${version}-linux-armhf.tgz"; sha256 = "sha256-5F/N672KGFVTU1Uz3QMtaxC8jGTu5BObEUe5wJg10I0="; }; - x86_64-darwin = fetchurl { + aarch64-darwin = fetchurl { url = "https://install.speedtest.net/app/cli/${pname}-${version}-macosx-universal.tgz"; sha256 = "sha256-yfgZIUnryI+GmZmM7Ksc4UQUQEWQfs5vU89Qh39N5m8="; }; - aarch64-darwin = x86_64-darwin; }; in diff --git a/pkgs/by-name/oo/ooklaserver/package.nix b/pkgs/by-name/oo/ooklaserver/package.nix index dcf20a3fedb2..53604b67e2f1 100644 --- a/pkgs/by-name/oo/ooklaserver/package.nix +++ b/pkgs/by-name/oo/ooklaserver/package.nix @@ -8,8 +8,6 @@ let filenameMapping = { "x86_64-linux" = "OoklaServer-linux-x86_64-static-musl.zip"; "aarch64-linux" = "OoklaServer-linux-aarch64-static-musl.zip"; - # Mach-O universal binary with 2 architectures: [x86_64:Mach-O 64-bit executable x86_64] [arm64] - "x86_64-darwin" = "OoklaServer-macosx.zip"; "aarch64-darwin" = "OoklaServer-macosx.zip"; "x86_64-windows" = "OoklaServer-windows64.zip"; "i686-windows" = "OoklaServer-windows32.zip"; diff --git a/pkgs/by-name/op/open5gs-webui/package.nix b/pkgs/by-name/op/open5gs-webui/package.nix index 872f7ccf77f2..a61c76de621c 100644 --- a/pkgs/by-name/op/open5gs-webui/package.nix +++ b/pkgs/by-name/op/open5gs-webui/package.nix @@ -9,5 +9,5 @@ buildNpmPackage (finalAttrs: { sourceRoot = "${finalAttrs.src.name}/webui"; - npmDepsHash = "sha256-Epz+pCbgejkj7vcdwbPC2RfAkp2HRqGV0urXiiBrjZQ="; + npmDepsHash = "sha256-PtZzC9PWIAAuh4Hy/whZHgzzlnXykevhGT2f1Mc+VFM="; }) diff --git a/pkgs/by-name/op/open5gs/package.nix b/pkgs/by-name/op/open5gs/package.nix index f934093ffc48..462b464f8837 100644 --- a/pkgs/by-name/op/open5gs/package.nix +++ b/pkgs/by-name/op/open5gs/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "open5gs"; - version = "2.7.7"; + version = "2.8.0"; diameter = fetchFromGitHub { owner = "open5gs"; @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "open5gs"; repo = "open5gs"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZK4q6m/9v+us+6dWpi0k188KfFu1b6G9pGE4VGAe4+4="; + hash = "sha256-e8iCcgJRJFEdVN3TeNwFFbBkShZebxKqvsCpBv/WLVk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/op/openapv/package.nix b/pkgs/by-name/op/openapv/package.nix index 27d31127a004..949b98b7dbac 100644 --- a/pkgs/by-name/op/openapv/package.nix +++ b/pkgs/by-name/op/openapv/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/AcademySoftwareFoundation/openapv/releases/tag/v${finalAttrs.version}"; description = "Reference implementation of the APV codec"; homepage = "https://github.com/AcademySoftwareFoundation/openapv"; - license = [ lib.licenses.bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ pyrox0 ]; }; }) diff --git a/pkgs/by-name/op/openbao/package.nix b/pkgs/by-name/op/openbao/package.nix index 2ca7c101dd8b..68348dc22ae7 100644 --- a/pkgs/by-name/op/openbao/package.nix +++ b/pkgs/by-name/op/openbao/package.nix @@ -14,16 +14,16 @@ buildGoModule (finalAttrs: { pname = "openbao"; - version = "2.5.5"; + version = "2.6.0"; src = fetchFromGitHub { owner = "openbao"; repo = "openbao"; tag = "v${finalAttrs.version}"; - hash = "sha256-75Rm9EGkvUKJ05d55bboPAE+Nm/GLLgH1TqDrExkJO0="; + hash = "sha256-FJ+34HeRT025EFwFXY8ewfnJbQirqFb3j+kPNxpGOA4="; }; - vendorHash = "sha256-3d3g6f0O7X+aedYCfLbqLNuITKNQuxZkApWTTKSk7lA="; + vendorHash = "sha256-O0xx61S0KEk5QB/NsV+kBlErvVuKBfI/81o29rDye1w="; proxyVendor = true; diff --git a/pkgs/by-name/op/openbao/ui.nix b/pkgs/by-name/op/openbao/ui.nix index 0a6e634e2b5e..44b2c4e1a377 100644 --- a/pkgs/by-name/op/openbao/ui.nix +++ b/pkgs/by-name/op/openbao/ui.nix @@ -1,50 +1,46 @@ { stdenvNoCC, openbao, - yarn-berry_3, - nodejs_22, + fetchPnpmDeps, + pnpmConfigHook, + pnpmBuildHook, + pnpm_10, + # https://github.com/openbao/openbao/issues/731 + nodejs-slim_22, }: let - - yarn = yarn-berry_3.override { nodejs = nodejs_22; }; - + nodejs-slim = nodejs-slim_22; + pnpm = pnpm_10.override { inherit nodejs-slim; }; in stdenvNoCC.mkDerivation (finalAttrs: { pname = openbao.pname + "-ui"; inherit (openbao) version src; sourceRoot = "${finalAttrs.src.name}/ui"; - offlineCache = yarn.fetchYarnBerryDeps { - inherit (finalAttrs) src sourceRoot; - hash = "sha256-XK3ZVnzOTbFzrpPgaz1cx7okTycLhrvBHk9P2Nwv1cg="; - }; - nativeBuildInputs = [ - yarn.yarnBerryConfigHook - nodejs_22 - yarn + pnpmConfigHook + pnpmBuildHook + pnpm + nodejs-slim ]; - env.YARN_ENABLE_SCRIPTS = 0; - - preConfigure = '' - printYarnErrors() { - cat /build/*.log - } - failureHooks+=(printYarnErrors) - ''; + pnpmDeps = fetchPnpmDeps { + inherit (finalAttrs) + pname + version + src + sourceRoot + ; + inherit pnpm; + fetcherVersion = 4; + hash = "sha256-9Q5celZSwMgSS8qcj8sDH/JLv48lgDMOylANvXSnhsU="; + }; postConfigure = '' substituteInPlace .ember-cli \ --replace-fail "../http/web_ui" "$out" ''; - buildPhase = '' - runHook preBuild - yarn run ember build --environment=production - runHook postBuild - ''; - dontInstall = true; meta = (builtins.removeAttrs openbao.meta [ "mainProgram" ]) // { diff --git a/pkgs/by-name/op/openboard/package.nix b/pkgs/by-name/op/openboard/package.nix index c68a6034eb91..ee2fd8646c40 100644 --- a/pkgs/by-name/op/openboard/package.nix +++ b/pkgs/by-name/op/openboard/package.nix @@ -48,6 +48,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-MjUbfv+3o3f4qsLPxLDeUn+/h5YupMMhC/SecwmCR8Q="; }; + patches = [ + ./poppler-26-compat.patch # https://github.com/OpenBoard-org/OpenBoard/pull/1474 + ]; + postPatch = '' substituteInPlace resources/etc/OpenBoard.config \ --replace-fail 'EnableAutomaticSoftwareUpdates=true' 'EnableAutomaticSoftwareUpdates=false' \ diff --git a/pkgs/by-name/op/openboard/poppler-26-compat.patch b/pkgs/by-name/op/openboard/poppler-26-compat.patch new file mode 100644 index 000000000000..1630211ff88f --- /dev/null +++ b/pkgs/by-name/op/openboard/poppler-26-compat.patch @@ -0,0 +1,69 @@ +diff --git a/src/pdf/PDFRenderer.h b/src/pdf/PDFRenderer.h +index 8f0cb93e03c9fe03414e394a91ec7ec73a542739..a5e872611e2060ee84a7a8382297af1e81dff7da 100644 +--- a/src/pdf/PDFRenderer.h ++++ b/src/pdf/PDFRenderer.h +@@ -58,8 +58,6 @@ class PDFRenderer : public QObject + + virtual QSizeF pointSizeF(int pageNumber) const = 0; + +- virtual QString title() const = 0; +- + void attach(); + void detach(); + +diff --git a/src/pdf/XPDFRenderer.cpp b/src/pdf/XPDFRenderer.cpp +index 8e361430c031e21fdde6faa23594ee561aedf21a..bb4bca36cec30f6992181d59f8417b4ffb442594 100644 +--- a/src/pdf/XPDFRenderer.cpp ++++ b/src/pdf/XPDFRenderer.cpp +@@ -157,39 +157,6 @@ int XPDFRenderer::pageCount() const + return 0; + } + +-QString XPDFRenderer::title() const +-{ +- if (isValid()) +- { +-#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 55 +- Object pdfInfo = mDocument->getDocInfo(); +-#else +- Object pdfInfo; +- mDocument->getDocInfo(&pdfInfo); +-#endif +- if (pdfInfo.isDict()) +- { +- Dict *infoDict = pdfInfo.getDict(); +-#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 55 +- Object title = infoDict->lookup((char*)"Title"); +-#else +- Object title; +- infoDict->lookup((char*)"Title", &title); +-#endif +- if (title.isString()) +- { +-#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 72 +- return QString(title.getString()->c_str()); +-#else +- return QString(title.getString()->getCString()); +-#endif +- } +- } +- } +- +- return QString(); +-} +- + + QSizeF XPDFRenderer::pageSizeF(int pageNumber) const + { +diff --git a/src/pdf/XPDFRenderer.h b/src/pdf/XPDFRenderer.h +index 6264ae1b087fefe82fa7ec8291a52ead657b3697..7a9bdf7777aa6cbc1b823a7a6adf52e837a7fc59 100644 +--- a/src/pdf/XPDFRenderer.h ++++ b/src/pdf/XPDFRenderer.h +@@ -73,7 +73,6 @@ class XPDFRenderer : public PDFRenderer + virtual QSizeF pageSizeF(int pageNumber) const override; + virtual int pageRotation(int pageNumber) const override; + virtual QSizeF pointSizeF(int pageNumber) const override; +- virtual QString title() const override; + virtual void render(QPainter *p, int pageNumber, const bool cacheAllowed, const QRectF &bounds = QRectF()) override; + + signals: diff --git a/pkgs/by-name/op/opencloud/idp-web.nix b/pkgs/by-name/op/opencloud/idp-web.nix index 1d7f65bda3e5..46e322e7424f 100644 --- a/pkgs/by-name/op/opencloud/idp-web.nix +++ b/pkgs/by-name/op/opencloud/idp-web.nix @@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpm = pnpm_11; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.pnpmRoot}"; fetcherVersion = 4; - hash = "sha256-pQ01vBvC29B5oxDWtt7anI5QtFbvQFFBVamQtA2WTNo="; + hash = "sha256-buDYvRw4NTLxFSdDRZHiuXMVe9fJbe2iu5hr+zh6KLs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/op/opencloud/package.nix b/pkgs/by-name/op/opencloud/package.nix index 983299455638..6f9b665171fd 100644 --- a/pkgs/by-name/op/opencloud/package.nix +++ b/pkgs/by-name/op/opencloud/package.nix @@ -28,13 +28,13 @@ let in buildGoModule (finalAttrs: { pname = "opencloud"; - version = "7.2.0"; + version = "7.3.0"; src = fetchFromGitHub { owner = "opencloud-eu"; repo = "opencloud"; tag = "v${finalAttrs.version}"; - hash = "sha256-GAoDEXk7sBN7N0V/msi/fcJS72RqqlF6Qb5B9hArmvk="; + hash = "sha256-2YwDH4qD4PCbfi/nNGPqwtJIpf8MPMGrVRslNWOoDPM="; }; postPatch = '' diff --git a/pkgs/by-name/op/opencloud/web.nix b/pkgs/by-name/op/opencloud/web.nix index 63367385af39..13e0d4a25879 100644 --- a/pkgs/by-name/op/opencloud/web.nix +++ b/pkgs/by-name/op/opencloud/web.nix @@ -10,20 +10,20 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencloud-web"; - version = "7.1.2"; + version = "7.2.0"; src = fetchFromGitHub { owner = "opencloud-eu"; repo = "web"; tag = "v${finalAttrs.version}"; - hash = "sha256-zwD/Mn7jL960EVaG3gVqFo6FPPMhQTMz3LKy8ZnOObk="; + hash = "sha256-BiOue8+zQ3+6RLiDbLMnxKEen2aav3bljji4d+0Hr5c="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_11; fetcherVersion = 4; - hash = "sha256-YEdZ5B11I6U140qam7e1TMOacRqUeINhr/TI13ddAa0="; + hash = "sha256-gCsgnOEi9rvtwTZy8J/i63D92Gl2V9ZihxCJ+Y5hLUE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index 4704804e5ae8..7191e168b064 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencode"; - version = "1.17.18"; + version = "1.18.3"; __structuredAttrs = true; strictDeps = true; @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { owner = "anomalyco"; repo = "opencode"; tag = "v${finalAttrs.version}"; - hash = "sha256-Y0rcO6r9yqhYux8IS5oAtgzcMXfJE8I1Lre4HdJ5nBg="; + hash = "sha256-Wdkzms59oHw3M/Em2RH7BPhZME8AtLmtNFSnsUxO1V4="; }; node_modules = stdenvNoCC.mkDerivation { @@ -78,7 +78,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { # NOTE: Required else we get errors that our fixed-output derivation references store paths dontFixup = true; - outputHash = "sha256-kXdXw264JQdlNoZPv5GUyWZvb/A8h2CTRdiX79jyvys="; + outputHash = "sha256-1NUtprMH8GnSUqQ+mHQSC+JLU7lwzHe6XXYHe129WmE="; outputHashAlgo = "sha256"; outputHashMode = "recursive"; }; diff --git a/pkgs/by-name/op/opencomposite/package.nix b/pkgs/by-name/op/opencomposite/package.nix index 1afa20c3e3e8..6a05be08e1c8 100644 --- a/pkgs/by-name/op/opencomposite/package.nix +++ b/pkgs/by-name/op/opencomposite/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Reimplementation of OpenVR, translating calls to OpenXR"; homepage = "https://gitlab.com/znixian/OpenOVR"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ Scrumplex ]; # This can realistically only work on systems that support OpenXR Loader inherit (openxr-loader.meta) platforms; diff --git a/pkgs/by-name/op/openfga-cli/package.nix b/pkgs/by-name/op/openfga-cli/package.nix index c6472e3d5b8d..23d6877db17a 100644 --- a/pkgs/by-name/op/openfga-cli/package.nix +++ b/pkgs/by-name/op/openfga-cli/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "openfga-cli"; - version = "0.7.17"; + version = "0.7.19"; src = fetchFromGitHub { owner = "openfga"; repo = "cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-cx1lKyEeXpQS3NePd5JSylAU7qqfGidx9gGQh/WPeCY="; + hash = "sha256-/DhvUvcvopYGAdLCAqsLxTs09q0sqOd1BglxaM4as/0="; }; - vendorHash = "sha256-f/gJr7cBO2G7USqujuBPmlbcCDrLw495RLG0pncQ97I="; + vendorHash = "sha256-sIBD7Diqx16X7OHNpVCgD1XVByu8TGwFlIR6FIITTlc="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/op/openh264/package.nix b/pkgs/by-name/op/openh264/package.nix index 3e0d12e14257..4c2d79ec60f2 100644 --- a/pkgs/by-name/op/openh264/package.nix +++ b/pkgs/by-name/op/openh264/package.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.openh264.org"; description = "Codec library which supports H.264 encoding and decoding"; changelog = "https://github.com/cisco/openh264/releases/tag/${finalAttrs.src.rev}"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = [ ]; # See meson.build platforms = diff --git a/pkgs/by-name/op/openmvg/package.nix b/pkgs/by-name/op/openmvg/package.nix index 82d6951ad55f..0a37cfad64df 100644 --- a/pkgs/by-name/op/openmvg/package.nix +++ b/pkgs/by-name/op/openmvg/package.nix @@ -94,9 +94,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/openMVG/openMVG/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mpl20; platforms = lib.platforms.unix; - badPlatforms = [ - "x86_64-darwin" - ]; maintainers = with lib.maintainers; [ mdaiter bouk diff --git a/pkgs/by-name/op/openocd/package.nix b/pkgs/by-name/op/openocd/package.nix index e8fdd29854b7..8f71e54961a8 100644 --- a/pkgs/by-name/op/openocd/package.nix +++ b/pkgs/by-name/op/openocd/package.nix @@ -17,10 +17,19 @@ extraHardwareSupport ? [ ], }: let - isWindows = stdenv.hostPlatform.isWindows; notWindows = !isWindows; + # OpenOCD needs JimTcl 0.82 and fails to build with the latest version (0.84). + # When updating OpenOCD, check which JimTcl version its jimtcl submodule uses. + jimtcl_0_82 = jimtcl.overrideAttrs (oldAttrs: rec { + version = "0.82"; + src = oldAttrs.src.override { + rev = version; + sha256 = "sha256-CDjjrxpoTbLESAbCiCjQ8+E/oJP87gDv9SedQOzH3QY="; + }; + }); + in stdenv.mkDerivation (finalAttrs: { pname = "openocd"; @@ -40,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals notWindows [ hidapi - jimtcl + jimtcl_0_82 libftdi1 libjaylink ] diff --git a/pkgs/by-name/op/openorbitaloptimizer/package.nix b/pkgs/by-name/op/openorbitaloptimizer/package.nix index e7e74680acca..6b608bf94f66 100644 --- a/pkgs/by-name/op/openorbitaloptimizer/package.nix +++ b/pkgs/by-name/op/openorbitaloptimizer/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Common orbital optimisation algorithms for quantum chemistry"; - license = [ lib.licenses.mpl20 ]; + license = lib.licenses.mpl20; homepage = "https://github.com/susilehtola/OpenOrbitalOptimizer"; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.sheepforce ]; diff --git a/pkgs/by-name/op/openscad/package.nix b/pkgs/by-name/op/openscad/package.nix index 7cf1da9371b2..ede0cdbd0c8c 100644 --- a/pkgs/by-name/op/openscad/package.nix +++ b/pkgs/by-name/op/openscad/package.nix @@ -127,9 +127,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ eigen boost - # OpenSCAD's GLX offscreen renderer needs GLEW's GLXEW symbols (`__GLXEW_SGIX_pbuffer`, `__GLXEW_SGIX_fbconfig`) - # which are not found in the default EGL-enabled glew and causes the build failure in https://github.com/NixOS/nixpkgs/issues/530529 - (glew.override { enableEGL = false; }) + glew opencsg cgal_5 mpfr diff --git a/pkgs/by-name/op/openshot-qt/package.nix b/pkgs/by-name/op/openshot-qt/package.nix index 7e84ad63bed9..ae7e4b63b647 100644 --- a/pkgs/by-name/op/openshot-qt/package.nix +++ b/pkgs/by-name/op/openshot-qt/package.nix @@ -68,7 +68,7 @@ python3Packages.buildPythonApplication (finalAttrs: { and effects, and then export your film to DVD, YouTube, Vimeo, Xbox 360, and many other common formats. ''; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; mainProgram = "openshot-qt"; maintainers = [ ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/op/openspeedrun/package.nix b/pkgs/by-name/op/openspeedrun/package.nix index 73ea17ef9e3e..34cfdd802cb3 100644 --- a/pkgs/by-name/op/openspeedrun/package.nix +++ b/pkgs/by-name/op/openspeedrun/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "openspeedrun"; - version = "0.3.3"; + version = "0.4.3"; src = fetchFromGitHub { owner = "SrWither"; repo = "OpenSpeedRun"; tag = "v${finalAttrs.version}"; - hash = "sha256-EZPApXUVhsaOYa6CnpR8IWeEoHEl89KJGGoBOYFqBV0="; + hash = "sha256-0gVFnQbbtlQG2H0oD28cbbqvGsAxqC5DPsKvHC1CUw8="; }; - cargoHash = "sha256-WzsLEfDZpjpUrbyPOr5QUkTMrlAJoC9Rej5BMOKF7OM="; + cargoHash = "sha256-xOz/Ru6NqpI20t+hz/81xaVU6XrsqGx0tI04O6nkRj4="; nativeBuildInputs = [ autoPatchelfHook diff --git a/pkgs/by-name/op/opentelemetry-cpp/package.nix b/pkgs/by-name/op/opentelemetry-cpp/package.nix index e144e405b3a0..4bd91de3da4c 100644 --- a/pkgs/by-name/op/opentelemetry-cpp/package.nix +++ b/pkgs/by-name/op/opentelemetry-cpp/package.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "OpenTelemetry C++ Client Library"; homepage = "https://github.com/open-telemetry/opentelemetry-cpp"; - license = [ lib.licenses.asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ jfroche panicgh diff --git a/pkgs/by-name/op/openttd-ttf/package.nix b/pkgs/by-name/op/openttd-ttf/package.nix index 29c995ee948f..9aa45a2a1315 100644 --- a/pkgs/by-name/op/openttd-ttf/package.nix +++ b/pkgs/by-name/op/openttd-ttf/package.nix @@ -50,7 +50,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://github.com/zephyris/openttd-ttf"; changelog = "https://github.com/zephyris/openttd-ttf/releases/tag/${finalAttrs.version}"; description = "TrueType typefaces for text in a pixel art style, designed for use in OpenTTD"; - license = [ lib.licenses.gpl2 ]; + license = lib.licenses.gpl2; platforms = lib.platforms.all; maintainers = [ lib.maintainers.sfrijters ]; }; diff --git a/pkgs/by-name/op/openusage/package.nix b/pkgs/by-name/op/openusage/package.nix index 6d4326bc5d68..7db3f84249e2 100644 --- a/pkgs/by-name/op/openusage/package.nix +++ b/pkgs/by-name/op/openusage/package.nix @@ -2,41 +2,35 @@ lib, stdenvNoCC, fetchurl, + _7zz, nix-update-script, - undmg, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "openusage"; - version = "0.6.13"; + version = "0.7.5"; - # if is aarch64 download aarch64, otherwise intel - src = - if stdenvNoCC.hostPlatform.isAarch64 then - fetchurl { - url = "https://github.com/robinebers/openusage/releases/download/v${finalAttrs.version}/OpenUsage_${finalAttrs.version}_aarch64.dmg"; - hash = "sha256-Zfv1VAJSDHFdo2R9KgZ3TN/gu2Ua9Uleq5wNXrBBEH4="; - } - else if stdenvNoCC.hostPlatform.isx86_64 then - fetchurl { - url = "https://github.com/robinebers/openusage/releases/download/v${finalAttrs.version}/OpenUsage_${finalAttrs.version}_x64.dmg"; - hash = "sha256-tllecJOGNUDG3GwQhjeRaNrTHVK2GPzstfiT/GanZmM="; - } - else - throw "Unsupported architecture"; + src = fetchurl { + url = "https://github.com/robinebers/openusage/releases/download/v${finalAttrs.version}/OpenUsage-${finalAttrs.version}.dmg"; + hash = "sha256-ycKm7kzOM+fv5Jhjv3JrG+oyK3LEOj9Ps7ll2Pz0T9c="; + }; + + unpackCmd = "7zz -snld x $src"; + + nativeBuildInputs = [ _7zz ]; + + sourceRoot = "."; installPhase = '' runHook preInstall - mkdir -p $out/Applications - cp -r "OpenUsage.app" $out/Applications/ + mkdir -p $out/Applications $out/bin + cp -r OpenUsage.app $out/Applications/ + ln -s $out/Applications/OpenUsage.app/Contents/MacOS/OpenUsage $out/bin/openusage runHook postInstall ''; - nativeBuildInputs = [ undmg ]; - sourceRoot = "."; - dontBuild = true; dontFixup = true; @@ -49,6 +43,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = lib.platforms.darwin; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ myzel394 ]; + maintainers = with lib.maintainers; [ + myzel394 + Br1ght0ne + ]; + mainProgram = "openusage"; }; }) diff --git a/pkgs/by-name/op/openutau/package.nix b/pkgs/by-name/op/openutau/package.nix index c6cd7004a650..43b6809d64ed 100644 --- a/pkgs/by-name/op/openutau/package.nix +++ b/pkgs/by-name/op/openutau/package.nix @@ -110,7 +110,6 @@ buildDotnetModule rec { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "OpenUtau"; diff --git a/pkgs/by-name/op/openvino/package.nix b/pkgs/by-name/op/openvino/package.nix index 73557961b21b..581d9b007c14 100644 --- a/pkgs/by-name/op/openvino/package.nix +++ b/pkgs/by-name/op/openvino/package.nix @@ -189,7 +189,7 @@ stdenv.mkDerivation (finalAttrs: { It supports pre-trained models from the Open Model Zoo, along with 100+ open source and public models in popular formats such as Caffe*, TensorFlow*, MXNet* and ONNX*. ''; homepage = "https://docs.openvinotoolkit.org/"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; platforms = lib.platforms.all; broken = stdenv.hostPlatform.isDarwin; # Cannot find macos sdk }; diff --git a/pkgs/by-name/op/openvpn3/package.nix b/pkgs/by-name/op/openvpn3/package.nix index 1e02705d6a55..6fa76e6e2ff3 100644 --- a/pkgs/by-name/op/openvpn3/package.nix +++ b/pkgs/by-name/op/openvpn3/package.nix @@ -37,13 +37,13 @@ let in stdenv.mkDerivation rec { pname = "openvpn3"; - version = "27"; + version = "27.1"; src = fetchFromGitHub { owner = "OpenVPN"; repo = "openvpn3-linux"; tag = "v${version}"; - hash = "sha256-H+QF0Z1IUKx2U0+V7KHaAd/AKbuJEKLIwqyK2srD8DM="; + hash = "sha256-Egt6lVcvlmxnABw4v0cdROQzVdkA3DgOGGCSgl+QFdM="; # `openvpn3-core` is a submodule. # TODO: make it into a separate package fetchSubmodules = true; diff --git a/pkgs/by-name/op/openvscode-server/package.nix b/pkgs/by-name/op/openvscode-server/package.nix index 95e9cce85fd9..856519dfbe52 100644 --- a/pkgs/by-name/op/openvscode-server/package.nix +++ b/pkgs/by-name/op/openvscode-server/package.nix @@ -32,7 +32,6 @@ let { x86_64-linux = "linux-x64"; aarch64-linux = "linux-arm64"; - x86_64-darwin = "darwin-x64"; aarch64-darwin = "darwin-arm64"; } .${system} or (throw "Unsupported system ${system}"); @@ -242,13 +241,11 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ dguenther - ghuntley emilytrau ]; platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "openvscode-server"; diff --git a/pkgs/by-name/op/openxray/package.nix b/pkgs/by-name/op/openxray/package.nix index 2881f39126ca..e8aac8d9b55a 100644 --- a/pkgs/by-name/op/openxray/package.nix +++ b/pkgs/by-name/op/openxray/package.nix @@ -96,7 +96,6 @@ stdenv.mkDerivation (finalAttrs: { "x86_64-linux" "i686-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/op/ophcrack/package.nix b/pkgs/by-name/op/ophcrack/package.nix index 31b341415cc0..fd67f0d24f03 100644 --- a/pkgs/by-name/op/ophcrack/package.nix +++ b/pkgs/by-name/op/ophcrack/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Free Windows password cracker based on rainbow tables"; homepage = "https://ophcrack.sourceforge.io"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ tochiaha ]; mainProgram = "ophcrack"; platforms = lib.platforms.all; diff --git a/pkgs/by-name/or/oracle-instantclient/package.nix b/pkgs/by-name/or/oracle-instantclient/package.nix index 6cd1c5d2829a..ebf46278030e 100644 --- a/pkgs/by-name/or/oracle-instantclient/package.nix +++ b/pkgs/by-name/or/oracle-instantclient/package.nix @@ -33,7 +33,6 @@ let { x86_64-linux = "21.10.0.0.0"; aarch64-linux = "19.10.0.0.0"; - x86_64-darwin = "19.8.0.0.0"; aarch64-darwin = "23.3.0.23.09"; } .${stdenv.hostPlatform.system} or throwSystem; @@ -42,7 +41,6 @@ let { x86_64-linux = "2110000"; aarch64-linux = "191000"; - x86_64-darwin = "198000"; aarch64-darwin = "233023"; } .${stdenv.hostPlatform.system} or throwSystem; @@ -64,13 +62,6 @@ let tools = "sha256-4QY0EwcnctwPm6ZGDZLudOFM4UycLFmRIluKGXVwR0M="; odbc = "sha256-T+RIIKzZ9xEg/E72pfs5xqHz2WuIWKx/oRfDrQbw3ms="; }; - x86_64-darwin = { - basic = "sha256-V+1BmPOhDYPNXdwkcsBY1MOwt4Yka66/a7/HORzBIIc="; - sdk = "sha256-D6iuTEQYqmbOh1z5LnKN16ga6vLmjnkm4QK15S/Iukw="; - sqlplus = "sha256-08uoiwoKPZmTxLZLYRVp0UbN827FXdhOukeDUXvTCVk="; - tools = "sha256-1xFFGZapFq9ogGQ6ePSv4PrXl5qOAgRZWAp4mJ5uxdU="; - odbc = "sha256-S6+5P4daK/+nXwoHmOkj4DIkHtwdzO5GOkCCI612bRY="; - }; aarch64-darwin = { basic = "sha256-G83bWDhw9wwjLVee24oy/VhJcCik7/GtKOzgOXuo1/4="; sdk = "sha256-PerfzgietrnAkbH9IT7XpmaFuyJkPHx0vl4FCtjPzLs="; @@ -96,7 +87,6 @@ let { x86_64-linux = "linux.x64"; aarch64-linux = "linux.arm64"; - x86_64-darwin = "macos.x64"; aarch64-darwin = "macos.arm64"; } .${stdenv.hostPlatform.system} or throwSystem; @@ -105,7 +95,6 @@ let { x86_64-linux = "linux"; aarch64-linux = "linux"; - x86_64-darwin = "mac"; aarch64-darwin = "mac"; } .${stdenv.hostPlatform.system} or throwSystem; @@ -199,7 +188,6 @@ stdenv.mkDerivation { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; maintainers = with lib.maintainers; [ dylanmtaylor ]; diff --git a/pkgs/by-name/or/orbstack/package.nix b/pkgs/by-name/or/orbstack/package.nix index a307199fa416..d9ac7e1107af 100644 --- a/pkgs/by-name/or/orbstack/package.nix +++ b/pkgs/by-name/or/orbstack/package.nix @@ -8,32 +8,17 @@ let inherit (stdenvNoCC.hostPlatform) system; version = "2.2.1-20628"; - sourceData = { - aarch64-darwin = { - arch = "arm64"; - hash = "sha256-W8FxnDyYfExgxlvp/dZbRzCZDhaX7Byxwz5rujG/krU="; - }; - x86_64-darwin = { - arch = "amd64"; - hash = "sha256-8woVgREEpJT+IGaVsash/PruEuye+8uhKaADTrtoMZs="; - }; - }; - sources = lib.mapAttrs ( - system: - { arch, hash }: - fetchurl { - url = "https://cdn-updates.orbstack.dev/${arch}/OrbStack_v${ - lib.replaceString "-" "_" version - }_${arch}.dmg"; - inherit hash; - } - ) sourceData; in stdenvNoCC.mkDerivation (finalAttrs: { pname = "orbstack"; inherit version; - src = finalAttrs.passthru.sources.${system} or (throw "unsupported system ${system}"); + src = fetchurl { + url = "https://cdn-updates.orbstack.dev/arm64/OrbStack_v${ + lib.replaceString "-" "_" version + }_arm64.dmg"; + hash = "sha256-W8FxnDyYfExgxlvp/dZbRzCZDhaX7Byxwz5rujG/krU="; + }; # -snld prevents "ERROR: Dangerous symbolic link path was ignored" # -xr'!*:com.apple.*' prevents macOS extended attributes (e.g. macl or @@ -70,7 +55,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; passthru = { - inherit sources; updateScript = ./update.sh; }; diff --git a/pkgs/by-name/or/orbstack/update.sh b/pkgs/by-name/or/orbstack/update.sh index 39c1c2ffe787..582719072a99 100755 --- a/pkgs/by-name/or/orbstack/update.sh +++ b/pkgs/by-name/or/orbstack/update.sh @@ -4,21 +4,8 @@ set -eu -o pipefail -update_arch() { - local arch="$1" - local system="$2" +source_url="$(curl -L -I "https://orbstack.dev/download/stable/latest/arm64" | grep -i "location:" | awk '{print $2}' | tr -d '\r')" +version="$(echo "$source_url" | grep -o '\([0-9]\+\.\)\{2\}[0-9]\+_[0-9]\+' | sed 's/_/-/')" +hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$(nix-prefetch-url --type sha256 "$source_url")") - local source_url - source_url="$(curl -L -I "https://orbstack.dev/download/stable/latest/$arch" | grep -i "location:" | awk '{print $2}' | tr -d '\r')" - - local version - version="$(echo "$source_url" | grep -o '\([0-9]\+\.\)\{2\}[0-9]\+_[0-9]\+' | sed 's/_/-/')" - - local hash - hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$(nix-prefetch-url --type sha256 "$source_url")") - - update-source-version orbstack "$version" "$hash" --system="$system" --source-key="sources.$system" --ignore-same-version -} - -update_arch "arm64" "aarch64-darwin" -update_arch "amd64" "x86_64-darwin" +update-source-version orbstack "$version" "$hash" --ignore-same-version diff --git a/pkgs/by-name/os/os-agent/package.nix b/pkgs/by-name/os/os-agent/package.nix index a776018160ba..be83d942b6d1 100644 --- a/pkgs/by-name/os/os-agent/package.nix +++ b/pkgs/by-name/os/os-agent/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "os-agent"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "home-assistant"; repo = "os-agent"; tag = finalAttrs.version; - hash = "sha256-Bc/EXVjq0tTxCslKB9zszu10htq/xPgJ5zaiCZ9CHAw="; + hash = "sha256-jO7TE4lBqyxUYcy3ZsZAFO98orGJ6hTM97+G/ueawNg="; }; - vendorHash = "sha256-PXl/1CW6hQhGFWZDiRo4DNvnaN3CfEIz/fx0a+UVEpo="; + vendorHash = "sha256-WC251fHO3XRICP7q7RdHCTnf8WfqNKnueCp36uEtrIg="; ldFlags = [ "-X main.version=" diff --git a/pkgs/by-name/os/osmo-hlr/package.nix b/pkgs/by-name/os/osmo-hlr/package.nix index ccde871dae95..27e8fe9cceb6 100644 --- a/pkgs/by-name/os/osmo-hlr/package.nix +++ b/pkgs/by-name/os/osmo-hlr/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "osmo-hlr"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "osmocom"; repo = "osmo-hlr"; rev = finalAttrs.version; - hash = "sha256-SYyL7evxxmXGwv2TLr8ZuIrbu+GliAyuz/sKTIveQvc="; + hash = "sha256-+wAwMP3zoFFOlZa4LhCr2hxP97mEZPViniwoOxpINyk="; }; postPatch = '' diff --git a/pkgs/by-name/os/osu-lazer-bin/package.nix b/pkgs/by-name/os/osu-lazer-bin/package.nix index f2751bd4e951..f45fcc84c347 100644 --- a/pkgs/by-name/os/osu-lazer-bin/package.nix +++ b/pkgs/by-name/os/osu-lazer-bin/package.nix @@ -19,11 +19,6 @@ let hash = "sha256-XwfNO38dDaUmu/3AEgRwV0VW6JrAUCxWD6Wt0Ew23Eo="; stripRoot = false; }; - x86_64-darwin = fetchzip { - url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Intel.zip"; - hash = "sha256-Crj40NkKasqc2JF1LeJwOlnCzHxsPiKG77SKTo8DS/8="; - stripRoot = false; - }; x86_64-linux = fetchurl { url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.AppImage"; hash = "sha256-KyA5UCvb9epk7jRtdG5wl0LzKc6/D2rkw5EJQxIaihw="; @@ -48,7 +43,6 @@ let mainProgram = "osu!"; platforms = [ "aarch64-darwin" - "x86_64-darwin" "x86_64-linux" ]; }; diff --git a/pkgs/by-name/os/osu-lazer-bin/update.sh b/pkgs/by-name/os/osu-lazer-bin/update.sh index 19508b7825e9..7a1edd076fc5 100755 --- a/pkgs/by-name/os/osu-lazer-bin/update.sh +++ b/pkgs/by-name/os/osu-lazer-bin/update.sh @@ -15,7 +15,6 @@ echo "Updating osu-lazer-bin from $old_version to $new_version..." for pair in \ 'aarch64-darwin osu.app.Apple.Silicon.zip' \ - 'x86_64-darwin osu.app.Intel.zip' \ 'x86_64-linux osu.AppImage' do set -- $pair diff --git a/pkgs/by-name/ot/otf2/package.nix b/pkgs/by-name/ot/otf2/package.nix index 432647edf929..e06f0f183349 100644 --- a/pkgs/by-name/ot/otf2/package.nix +++ b/pkgs/by-name/ot/otf2/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "otf2"; - version = "3.1.1"; + version = "3.2"; outputs = [ "out" @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://perftools.pages.jsc.fz-juelich.de/cicd/otf2/tags/otf2-${finalAttrs.version}/otf2-${finalAttrs.version}.tar.gz"; - hash = "sha256-Wk4BOlGsTteU/jXFW3AM1yA0b9p/M+yEx2uGpfuICm4="; + hash = "sha256-grOoilUMuMPOyP1F7Kgs3Lr5RSCZd0gkcbS15DDWSo0="; }; postPatch = '' diff --git a/pkgs/by-name/ou/ouch/package.nix b/pkgs/by-name/ou/ouch/package.nix index 10458eae1768..005ccb829ba5 100644 --- a/pkgs/by-name/ou/ouch/package.nix +++ b/pkgs/by-name/ou/ouch/package.nix @@ -19,16 +19,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ouch"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "ouch-org"; repo = "ouch"; rev = finalAttrs.version; - hash = "sha256-yQt+FeEUgC6JurFwOU1Yd++OYT75TmGO7/qchng/BUA="; + hash = "sha256-fxBalMi5xdLNBnd5VIdAYDIjbSBrOPrmpKlKW1DmbxQ="; }; - cargoHash = "sha256-3/uO5WLcGXWryJSQ8UhJGecpAD2vQVE2c19vYAHtT/4="; + cargoHash = "sha256-kYef8Xsi1gO0V2yXHiTkPi2rFjECw3jjhADSMhhu5zg="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/ou/oui/package.nix b/pkgs/by-name/ou/oui/package.nix index 3856b9158101..0b673e975f59 100644 --- a/pkgs/by-name/ou/oui/package.nix +++ b/pkgs/by-name/ou/oui/package.nix @@ -29,7 +29,7 @@ buildGoModule (finalAttrs: { meta = { description = "MAC Address CLI Toolkit"; homepage = "https://github.com/thatmattlove/oui"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ johannwagner ]; mainProgram = "oui"; }; diff --git a/pkgs/by-name/ou/outline/missing-hashes.json b/pkgs/by-name/ou/outline/missing-hashes.json index c557b5e13483..a14c79a082e7 100644 --- a/pkgs/by-name/ou/outline/missing-hashes.json +++ b/pkgs/by-name/ou/outline/missing-hashes.json @@ -31,79 +31,102 @@ "@msgpackr-extract/msgpackr-extract-linux-arm@npm:3.0.3": "115f627bcd7c290ddfa1d16405cc1ce388be0b295a26adb1ee2d774133a77809aa0bae83775d3c11f220544e77d34c01d607037bf9dfc6aaac67329cb5fe2818", "@msgpackr-extract/msgpackr-extract-linux-x64@npm:3.0.3": "ab74755aa2afd27ad8f5277c7cb7a0c721028ba63c3e3109458689340d76ed4c901aa2c71ae5950f3a2149ae9e835e711a12842db219864107cc0c5c1fbdc0da", "@msgpackr-extract/msgpackr-extract-win32-x64@npm:3.0.3": "edfea4f5455f71f608c15163467b98245d46fbd6078019347418e193968431afe632a11e8729ec39755a54563d86940899e2fe8f3d124393f91855956bd1d745", - "@oxc-parser/binding-android-arm-eabi@npm:0.121.0": "bca1043494dacc0b7b5de15ae18605faaf7bcc35bdebb3d7de3b6ca092b7b0813148a487e80910541f3f6dc8c95e833beff653b6cff2503f45f78982711fd69c", - "@oxc-parser/binding-android-arm64@npm:0.121.0": "ceceedd4695fed202d87c9b2b09107ac1fac6b64ac6f7299e78827920ce915ae6684434c730d95d07cd05d998a862477f6d21d2f3ee5a68e80b4000a890a6e1c", - "@oxc-parser/binding-darwin-arm64@npm:0.121.0": "6bc756fe6874ea0c9f2e4a717b32f3297a3368330ea9a41774a0ebd4b9ad95e021d393d556fd1f7f8dac9c3093c373f4a495dc3249e4de4e5ef05f788cd4c304", - "@oxc-parser/binding-darwin-x64@npm:0.121.0": "7733902e1cab1a17b79c52dc1d934900438343e3eed0357fbd088f39a52ab6ddf25d31b3214134ba0e0e0e486ff1735da0bbc5142cc91d1aca69d073dc43c290", - "@oxc-parser/binding-freebsd-x64@npm:0.121.0": "019c17c3a5bd4d419a5e378d3c401735e9f9c5f0d34b3f31f3c18cf37b7a5004e15c39326b47b8e5bd74bf74355709d524747f3b16252898759f20c2d0d2ceba", - "@oxc-parser/binding-linux-arm-gnueabihf@npm:0.121.0": "5562174d8fa0a5665934bcd8d65f5895b9d03a79e502ed823bb47b14edd57c6f997da22cfbf7caa122a02a3c527b09947ad06d39ad1f3b9f30a23f4edae3432b", - "@oxc-parser/binding-linux-arm-musleabihf@npm:0.121.0": "1ca1d1ba6897cd67c33561199805dfe8cf709eac9ccfa9fd7a9127daf6b57157a1141c88c5c5c822800b57d2abc8bc9344408fc5d6890c1e6d78d820aa011e81", - "@oxc-parser/binding-linux-arm64-gnu@npm:0.121.0": "5aea47f9b977d5004ce697a0b13b519183198cc63c074a4ec932e61398851639bcaa3b44a98226e8b644c89114654b70a70356c199badfa0491c04c4460ac925", - "@oxc-parser/binding-linux-arm64-musl@npm:0.121.0": "4212fdfb73d16be3c60feaf2548060e85f17b807933bb81426578fd0bc5a89ac1e7b77b594b5c9a3b60daf0ee3ad9594a61554f3f9aac35e219cec7cece07f2e", - "@oxc-parser/binding-linux-ppc64-gnu@npm:0.121.0": "6c4ad09387ee66b0ead91f5632bcecd78297d4be50f3e17e2b16f460c877552d1943c8fd6648e3ac1d9806870c91c2bffd088fa9b368119b8d4b1dc2cbc08d95", - "@oxc-parser/binding-linux-riscv64-gnu@npm:0.121.0": "d41cdce188365392bd52852a3309d92daa203f240da0e5e7217aa9805fcb0db5ac8a10a26ab48570e16af9daa46622b19a89410e8cbec1d064c931f785225d22", - "@oxc-parser/binding-linux-riscv64-musl@npm:0.121.0": "6ae9ade15ea6ff648569d2f83e857c92873e90eb5649f62e0cf000213873b549a2dd4bb4547358f20776aa2f912fd9495721bcce429ad4c02742fffae2d92d47", - "@oxc-parser/binding-linux-s390x-gnu@npm:0.121.0": "14ba521e885676eb8e05cb6173d5071505e9a3798f9cb19f45fb3383eefb6def2c0e7cccea43a62eab8d73e22bb3f66143d82355e0e5ef3b8a388e4301b4d9a4", - "@oxc-parser/binding-linux-x64-gnu@npm:0.121.0": "0e56d93be40652b0916aa6505de2978b17949665dc4d98e2420d667f6aa8c26437b0137c909124d6adfbfc1e2ff0eb3f31cf93c7ec6e5580dd3b88cfdcb75367", - "@oxc-parser/binding-linux-x64-musl@npm:0.121.0": "b1c30cded47edc8ce76dc5c80e5dc70c3bbdbc09505a0f70a4f16b6f55fad7eb3e67b381556d92b883272cbf530dfb8b69cafee06e380a5a47c0debd378b1494", - "@oxc-parser/binding-openharmony-arm64@npm:0.121.0": "b4cc609840cc2bd914ab142ebf2404d24452a54d6673469289c100bf1af40dbd1cdfebba1b8c7804a7b285a8f2293ab748da6ebc059ab2043216af069e9ecd2f", - "@oxc-parser/binding-wasm32-wasi@npm:0.121.0": "20d260df5bda2e225d7253049890d99ac2a3ce8ad5df8d0f6cec9f23cda9dfd2ddbfc87457fde3e8613109868d4f885beee9df6fcb8f267adb08ed2ab5303bc0", - "@oxc-parser/binding-win32-arm64-msvc@npm:0.121.0": "ffb3ae5443b87baa932316bc4bf2fe92d3d67299ec16e06270047fdb6d8c5d33b19f76e486ad6dc5f7cdc3e038bde8c8cdcc3e316007f1bfdac393136f372170", - "@oxc-parser/binding-win32-ia32-msvc@npm:0.121.0": "768d242e04f4809101d00a383d05e47a8e90852b65f342861266910e0912eee814e6f5b2b92fa82d7712c15424f63c6a877005c2375083aa5734d7a55d83ab8b", - "@oxc-parser/binding-win32-x64-msvc@npm:0.121.0": "03daa39843f83f963eae2a1151029887e9c5449cf3da8dd32588c45045be53ce1d8f1b0699abfff05fc1a49911b4eafbdac1b76696ad23dd3f67bfe685acc8f9", - "@oxlint-tsgolint/darwin-arm64@npm:0.22.1": "7c744e93b68ce39cefc63c4ba5efe5084f96f7607eea1efe3559c3e0cac1dd6f2983f1342e4ca23660980094dd4ffcb131b299347d8fcb8f72ebff8e21ae7ab7", - "@oxlint-tsgolint/darwin-x64@npm:0.22.1": "bae78458587b8323484bb2ae67c1059c08ee58325e136a901e954734bf702fb7c3d2e1a08c5ce9bc72d9285d976a7813cf838f1ab8a83a9076ad6809a28bbb91", - "@oxlint-tsgolint/linux-arm64@npm:0.22.1": "f660bdef1eb9a27ba41d5fdeb43fd82d59b1531c266b8d2ca36c3163fccab0ea58af9de35086de0335259b4e4c59d592088abcda100dfde0b96a5d867bee8b2e", - "@oxlint-tsgolint/linux-x64@npm:0.22.1": "96c6b63e3b83440550de9bc2fcc85f1cda460139d9f8b7f82705aab944d85c27a79d2d95d28d3a0d6f31cd25fc668e74319f014ff1a655c3035468c841045e0d", - "@oxlint-tsgolint/win32-arm64@npm:0.22.1": "e4d5c1190579523aa93055307b8bbc9725898ddebfcd54746fa65bc93ef2a7d0a152acbd3f987ea75ea93d2788f8e868b003f9ed281780995f9c81210079f9cc", - "@oxlint-tsgolint/win32-x64@npm:0.22.1": "cc330b9096c50b579fa822952684a92fd10264d12ca13a4668e2fdfbfb5fdde1332e10668e42ecf64fb747707bddd76116ec083f7b4e9da6021b7412afbbfe1a", - "@oxlint/binding-android-arm-eabi@npm:1.66.0": "9e77e0b30de606bff3a4f6c3de7105aaf1aad43d3058e111d3c50bfb1e567bbee807d19a3d0285320edb9783c9ed5bb44fada8de0549788614787b4bfee2c607", - "@oxlint/binding-android-arm64@npm:1.66.0": "fa2aabcc7efd43adf725a15b645963f885442ed6fcceceb25158eb0f33bad84446cf2f70f604451ea1be4e4725a71e7a285f0debbf2f7e80a6acaaf5ca4e4302", - "@oxlint/binding-darwin-arm64@npm:1.66.0": "ec3904a64891c175271e15de0a5e5080ab68dd5add9511e0ee245a71de16bfe42e361ece4d60f049cf6ac5cc0ce637c94a71d4cb13b29d4356d811bec11f4eac", - "@oxlint/binding-darwin-x64@npm:1.66.0": "bbd31bffefc6fe77fcdf47717c9adc0523fa553a3bd7938a6b7394fac5115945db8ec5f6e7a5364b7987502699d33313176324e4a509f08720a919578b6aad59", - "@oxlint/binding-freebsd-x64@npm:1.66.0": "612a97b0a27b68e60107c5daac10e34beb1004c107cfd21bac81d4dc1b326361462ce8d34a916ee7568494e5fe7eb1b50275512559c640951ff46fc0a3688168", - "@oxlint/binding-linux-arm-gnueabihf@npm:1.66.0": "030fb03f14ec63cf486e4a690762dfe9d2e7e84af102cd57a0425c9654bf9e5908dc9b755d874aadc8fe8eb96fd43aa73e8fe346c06ab6ce12a352710cd28405", - "@oxlint/binding-linux-arm-musleabihf@npm:1.66.0": "9313ab7f453bb907c40f53fe1f452da4b3ca3f3adfa663dade5d78b6e7f9bac59897bafdc9b0ad3554db20b923bb42b00e304225f73fb5d6ac6925ad950788f3", - "@oxlint/binding-linux-arm64-gnu@npm:1.66.0": "f6de4fb2596095b14fb66d8a0423723f1293ffe31a0d7dfca210b851e8f96ec263600b6cbb9afbb6e3340d094b96fb9c745a56e0b70c09f5d466574ca1b6cf6a", - "@oxlint/binding-linux-arm64-musl@npm:1.66.0": "0959431b2b29796082f194a658b50bd66a6816451c2670f92d34f271abb538cf1c574dd423d648068e8d17bff0e98373b93bbc2883aad2f36945d9d84715f845", - "@oxlint/binding-linux-ppc64-gnu@npm:1.66.0": "becb9b048dcedd3f883d113898ed1d9ed674467263c37aae1cb19f3c4475eb5cc94a4f89ab57c89514de5418d8c0547ef712d117c49a2edcde77162a556fc4f2", - "@oxlint/binding-linux-riscv64-gnu@npm:1.66.0": "65b5bbc84bd2289c2a1974ba2274b9c8b38046ba22f8e8821d0197ff097c66578b7ce53a46985e554953c5a14f07f38fd173e2c8fbf22c8a0548953cc6dbacff", - "@oxlint/binding-linux-riscv64-musl@npm:1.66.0": "80486e2482f66517af323ae6b616f08dd78367cc07f53b40eb3c636a540127f07929d7aaaf67fd046f9e47c7cb9378fdf9da468637e11bc742962f4fffec7aee", - "@oxlint/binding-linux-s390x-gnu@npm:1.66.0": "0d0fa2dba19d7aee4fb9817bf2266fbfd32fc1eeed0786f668df269a116cdcf42a92be94170989239c5867f8ba98554124df5c3f398381e485ab00486fcba200", - "@oxlint/binding-linux-x64-gnu@npm:1.66.0": "d0297d2bb4bf4669caca2b6b0e7def92749cbcf85b27cca9d4530b49fa54fc009f8981dac99dfabfd8472b9e4a5b74ac9009f8659e73bd1fb3386c48f80c636e", - "@oxlint/binding-linux-x64-musl@npm:1.66.0": "c5a9efc367a811b68131a991132002c5fe0c8cb534543374f8f5eb6e595199fe6d4c241eea9c1fa71f9fe20685233ed199cc6574bc5d5ec274ec2d7524f50233", - "@oxlint/binding-openharmony-arm64@npm:1.66.0": "13424a0403b7b9feeaf578d716d0d0dcb23654c389e2c82c8b23d6f72e0eae818533f900e0716d58d6649b7b19c4a3d59004cc778225172b426dd5865f2aed12", - "@oxlint/binding-win32-arm64-msvc@npm:1.66.0": "77d14ced247fa9cb20104bf50ade58e085a141232ec5cfc44dfc6ee5d098fcaf2d6da96db94adaeb09e507b0cfe254abf155e79c2e4d8c4b4fca240446383ea8", - "@oxlint/binding-win32-ia32-msvc@npm:1.66.0": "2943723b356ad6a0a4f9a3ce16f362261d79481dbced24d9447611cc3a7ac99c844d6dbecc76eb04e2eb462ed77d6da495f8a09ad0f64bdfef8f1a3b2a35f283", - "@oxlint/binding-win32-x64-msvc@npm:1.66.0": "9c9a8691b2d5a64b1ab5c4798269db89e6432fd870f213e7e16a3fc04a150b9ff0371e5d4e1d4ebc8fbabd278c9aceeb053fcc60bd0b2c6341d8055359d68050", - "@rolldown/binding-android-arm64@npm:1.0.0-beta.53": "e2972fe9399066bb418f659c24e7589e87d8373a3b4ec7dd01c06f516c90cd04ea2dc801f2739f05e714f002bd4ef8d505dabbb9ab55437ed3d5f8395db91df5", - "@rolldown/binding-android-arm64@npm:1.0.0-rc.17": "7c821eb984e2dd03b05979be3116d927326a1752e7d04462f6c78721fc47fb33d1a584e8c739b181dbfb5c28170541d05f775ada38e81bb685e43d03d974abe3", - "@rolldown/binding-darwin-arm64@npm:1.0.0-beta.53": "79587c0686dc0ee54368e4eeb0b8e8cc6f5786c3d55c3b0acd2ccea067b6ba21faffe82140268e7de7126192c3e54fa33742346d82ceaebf5d4c33a94c3575fc", - "@rolldown/binding-darwin-arm64@npm:1.0.0-rc.17": "ddedec6840b8e32b7c45a4afe9d797bb24ea74ef222a1b443161045f0b53ec3a5752b108552fe6c99182e2553dd53498d96d3b30551cd3f1e8057559f23b1ed7", - "@rolldown/binding-darwin-x64@npm:1.0.0-beta.53": "4b855c7208400453f29aac138c8c050fee3e3f08ff7d36afb3efd705abfc67b11e55bb12ead5d845ae9c464b9855c02380772592ed09e43434ade8dd4e32f703", - "@rolldown/binding-darwin-x64@npm:1.0.0-rc.17": "b66ce82e3162261c045027b3aa061cd735c9b1395e77756e06b973f8d0e4256247ddfdb7ee8134363dfcd9d83e665b647b45b666a65c8454babdee19f6d57b40", - "@rolldown/binding-freebsd-x64@npm:1.0.0-beta.53": "98672b2ececbcab5bf8732033b9e38553f75a37d0c8198762af5609ea57b9809bc8d9c8ec3e5cc6df7c9535c1a08d063d106b984fa1dfda066dc71ae6e70350d", - "@rolldown/binding-freebsd-x64@npm:1.0.0-rc.17": "87b9045771edda717c7d66df105bba2c22c88214254eae48d54ca641f79b4558c2d1ae3db27d8e36b230728263d539c5f6e03e895dbed6e08afa495f634eb42d", - "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-beta.53": "0760612704b1381580c337eef6b0ef096902b81dca1ff2b536a8a4f529335465d9739ea3c0883d3f7b1548089d237e18a485f0ee2e3d2d9191b0a788f95c81f9", - "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-rc.17": "43e60168d359a5edae352d948a6515c40a8e047fef7541693cbf18a09d80076efb9308a804c5ea7f645883f8f6b7b43e0e14ea677df63fb4016a55ba6f63b947", - "@rolldown/binding-linux-arm64-gnu@npm:1.0.0-beta.53": "a4e4e59a5d316f72c691360027e4a843db4fad1ccf9ddac736890f4182f59612c5bcb4286420b88454658a0735ca63d0692fbba93c2fcc8009e15b3126e62266", - "@rolldown/binding-linux-arm64-gnu@npm:1.0.0-rc.17": "d6bfe49089d598886e8c9c92e45240a2404e9594c4abc25f303c8655b859e0f0b67c18947e23177ccc5fb81c9b22a1bd32f2ed052531cc41491b4261ed728342", - "@rolldown/binding-linux-arm64-musl@npm:1.0.0-beta.53": "4f465651c516cc78513fa2b6685667acf248b076a19809252063644512ad7949faf46a64738024c266a39c411cb4be15142aa4a352dcd01e1c65486f9f623578", - "@rolldown/binding-linux-arm64-musl@npm:1.0.0-rc.17": "be5459bf78de0931993158783af8e349a68d03610876eb131f48fa51414a45683047cd9b4ad7631f385fedc9bb89677e8d12e874104a038b63932aaa1d7bceb3", - "@rolldown/binding-linux-ppc64-gnu@npm:1.0.0-rc.17": "e36194c8a39afc6522ca71c2ebf4c038792bf2c0141da76e8a385bebdda077a52f95ece9bd0a3818d5c0023e7e8ce708566d42ecd2ff31296a26a41ed6847aa4", - "@rolldown/binding-linux-s390x-gnu@npm:1.0.0-rc.17": "288ce91c69b13e37b2106fcfb663a981aba9de65d3bb4d3cd8c17b9e8193f3de44d08d1201c4d3a18fdeec5a89256d5b3b4d5bb913ff023cb577c403f8889917", - "@rolldown/binding-linux-x64-gnu@npm:1.0.0-beta.53": "702a095a2c4b59a48da26be306172585ee01d284900984c56e663cd15b82748e90b7fa96c0d894651d98ca456ac59fe3e70ff88680a636b6c23353919a04d762", - "@rolldown/binding-linux-x64-gnu@npm:1.0.0-rc.17": "d532e43e02e0a84c71ff9be34791d7b32b71786bac4921f9e4f92da39a7d5daeabeb4188c7cc088a8a80ab0691dcf1cc9d414396ce7ff6a970b1374e033df8f6", - "@rolldown/binding-linux-x64-musl@npm:1.0.0-beta.53": "b410d862c88ec59e8e8a31934ab78ed81b31ed00ed69057038a232d44ee9b7942d1f29ee48991e3a0b2fbcbec889d7819166f77679c907271e7f9a381414d1db", - "@rolldown/binding-linux-x64-musl@npm:1.0.0-rc.17": "56aecbe0a2aeaedd558c62a5057a7f915ecada0528a27b5edd80478d948c3645104a56c88121c71edefe9a6af7500f053724103099a90764eb8b84c3ee1f9536", - "@rolldown/binding-openharmony-arm64@npm:1.0.0-beta.53": "3dd98fa2c676472bfcf825ee561ac3e8046d48d87d4beab5cc312c871be65387e5b527977b9ac7e2c2d4c8f0e7249d2d536c7cd5124b5550e37bf295cb91729d", - "@rolldown/binding-openharmony-arm64@npm:1.0.0-rc.17": "cc7a806e106f4c0d24400af42155b8b396f712e25d76e13b033895b3b635e21edb2246d3c8592c86989c7aaae1ded1708d36516472555bbed3ccaffc939403a4", - "@rolldown/binding-wasm32-wasi@npm:1.0.0-beta.53": "3645fc9eac2f4e8b6f5f1552154a8ae1ed5c1975a37f0da22bb4ec9d8dcd4b8d346feb013a927e9254c33bea7b2b4fc2ff5cfebe3c791f215663ac983bf03306", - "@rolldown/binding-wasm32-wasi@npm:1.0.0-rc.17": "e6fb0aff901de475a4874af6b0473b396bf1bddf6cbb9acbdb6d4c9318ab2fa3e09d80435ecaeb7866b03effea79c57db9a271b5c720007341949e06828c8385", - "@rolldown/binding-win32-arm64-msvc@npm:1.0.0-beta.53": "d0ecd1a1fe4388ae11d7bacace91694ad0135cf25a0200f7b7ae3ce9fac637ff079c5140a680288d3f7fc35eea0100d1a176ed43db4d88c86429804cb6a800e1", - "@rolldown/binding-win32-arm64-msvc@npm:1.0.0-rc.17": "d3724ce9f4117d28f903ae1bfc34e3a3efac853691577e511cef91259eb8355dc24f2f27a832bbbd9ad3323dc1b0c3ddbdc4c791ae2a6dd5e5b0c9051384d4d0", - "@rolldown/binding-win32-x64-msvc@npm:1.0.0-beta.53": "bbc80dbfb97a1780f0666ffd111f1fbe2b6b2cc1d60102cf41bb0fd03788e020552c94a5e82f95dc75b3696fe0f986a1a362fc7c62bcd899892986a4391fc63a", - "@rolldown/binding-win32-x64-msvc@npm:1.0.0-rc.17": "6f4a348202955f74481ccf1c0ec5fa96671507353b6a7f680b920c773f0dda4ebd46c1561428efcefacb9b4d279cd550c80a79fa261f8db173b527ae9a671eca", + "@napi-rs/nice-android-arm-eabi@npm:1.1.1": "a1f8caf7bba36f2131303d7bee53e98f46521e499f4b1ba25f5ab770d8acea36abc1792c53e5c6db4235ff1873ee7c94d2ab2f38c8d492ddbdf47fbc6e92c423", + "@napi-rs/nice-android-arm64@npm:1.1.1": "5f623438ee64b9e9df5fa8f7b6533776e9774e8edd2aca6945f85869a4f3232c2f30d3a69ad1ce54e775e4747085e57ab473c8421551bda65d809ab65332a8bd", + "@napi-rs/nice-darwin-arm64@npm:1.1.1": "733a2d0b606efb52d5532c9a00c54e8c664ecb794fba302c14055d0145baa02b5a50459ef07c171416a5f941e2779cef7406181df7e7969f978ee1d1fdcf2b5f", + "@napi-rs/nice-darwin-x64@npm:1.1.1": "f99af3768f04db9fb91d54e460e4e315242d3d8ff3ab0d013c56f4bdf62497d223459cf41554dc0914d11e97f39c2b154c517c3d5996c0ef0297d18702c51b29", + "@napi-rs/nice-freebsd-x64@npm:1.1.1": "0d317f65d4d07ae3c8d5d6a424b6b10c599728eef8d58f89ceef2491dffb849bf5744b0eb59c0feeea461b1fd4959db676dc471cdff10ce1304d06246178ce0e", + "@napi-rs/nice-linux-arm-gnueabihf@npm:1.1.1": "ed67fd70224048f84401cc1167210d2ab306eac252a83eed96357c49499029205b83e1cfdc606427c46edafb113c0c17613a5de7f122947d4ed6bf3cd7663287", + "@napi-rs/nice-linux-arm64-gnu@npm:1.1.1": "9477d397afb1df69647adb449c0d05300a99abf6038a3e2eb63307908375b9a6fa271fe5f7ed211b1b55e87dd9c6ce25f41a6f0f270fa45af13a3a84f546be72", + "@napi-rs/nice-linux-arm64-musl@npm:1.1.1": "a754ae5275a306f70eb621e855f234318c9b4db323e10dac3d180c1e66953cb5505e8a1ef13677492839f160c28cc14583b22b3953a061d5b42a7cb7b0dcf42e", + "@napi-rs/nice-linux-ppc64-gnu@npm:1.1.1": "91c96752d3b0c57156dfe0885b8124e933197a3a84d4f312986721b37abc1f129f9f071b73142c2074d7e848bab8b8a16e6d246e8c355fda9ed6817ea6450330", + "@napi-rs/nice-linux-riscv64-gnu@npm:1.1.1": "e898401c486a5b637426562bb93b12609349119812273b5c19ebc565e516c1246043888ee2c5d24c6178c93288a761284813e495c026c74466f832ef5d63d906", + "@napi-rs/nice-linux-s390x-gnu@npm:1.1.1": "0ef13c6beca52613a76c38f70e60ac4959ad08f9d898f64036be8d45ad8266e1f4fc64cf1ba669e55a5869c64a3c2c9a9ea4d4d3836a5b6941fb147a7ee0abd7", + "@napi-rs/nice-linux-x64-gnu@npm:1.1.1": "d5ce16822498a12d29c59d5aaa5af4346bb9394d45342706392c2e27915dea9cb37692f0c7fc69dab8c65d31556dec851d631a8d557598bc32d57c3788835dc6", + "@napi-rs/nice-linux-x64-musl@npm:1.1.1": "debb8a7067c1d20ce4c29c897e470ef84fa8f66014c0c8e7fe66d6676d6e9199a0936ec3cf3098f89ca1fa1f2628c27d32991f933a7a33da304f1baa45af0eb9", + "@napi-rs/nice-openharmony-arm64@npm:1.1.1": "086899cc30d453380399afea4e827cca1428f9cdfc7e253289b0fd41a84c76850315f0070432a00c3c9f80608ac42d638ad836fcad742f437c1fd9465d8a83c4", + "@napi-rs/nice-win32-arm64-msvc@npm:1.1.1": "653a7b04d9caa311d793f12d2c2323830a0863737fa4e0cf4ceb5adbb85d30b29d02fb59e5d513e5375273054a965777c83732b25592e80a574f15114bdf96c2", + "@napi-rs/nice-win32-ia32-msvc@npm:1.1.1": "f32fcebde27d2e8022e6ea2c8a4fad0676b59c24373c8f7e6fafe3711932a743798909122937278f94c42cba952f5403ed1dc1879544e508299af88ecbbbd68c", + "@napi-rs/nice-win32-x64-msvc@npm:1.1.1": "657bf5caa5b07b16f39b3fca7d7f99a0609a01ffbb620ff167652145c0e5c3ee1bbc19f4ed09b9e4373da8a1f84870b58152bb6c44288a3e9cb46ca8a236cec8", + "@oxc-parser/binding-android-arm-eabi@npm:0.132.0": "11d7e411090bbec8d07a867a7954aee5417c0ee9a985f1bb217aa6ff12e53d0a6919fc06e27c2d091dbfd02ffbf74edfcee0224b38e642a4138c4a522a1a861b", + "@oxc-parser/binding-android-arm64@npm:0.132.0": "dc00b1c88ef74c101af44aa62f54659a720e169339ef0971df70ffe32ff2e768051c24e1038d087fe2f9733045f213fd806bd73f3493280f1c170a1bfd04cea6", + "@oxc-parser/binding-darwin-arm64@npm:0.132.0": "8705914f91d01f534bf61cebead3e90cb4497787292faf46e5d198093a9500a2466a74a00f5efd204a1d329ff7da4b7329ef4b8840ba2e378a98872a0e21a3d3", + "@oxc-parser/binding-darwin-x64@npm:0.132.0": "4b90b26f7a997556e89c7d4648ee845f5e502dabbfbd2b330cccad756dd7b322e9a6195fdd1f33e278059a40292f754b7da7dd15db4baafb441c304e4cafc7eb", + "@oxc-parser/binding-freebsd-x64@npm:0.132.0": "60c04e9f3dd5f3addecdf85873ccc8a79d880e0237be07a597c1fff980e0cfe60d3b0a6b9400a89323c8fd48776a7e172a58b6bde9e3bff781ab5e4d80f2def0", + "@oxc-parser/binding-linux-arm-gnueabihf@npm:0.132.0": "eba579d9c7444748f9e82aad19accb80dfbff7ab66dc7f3766da790f97abc190dec8fe430a3af97d4c0f34c9353bb0563094f91efe7f893083a80f2f7ca4dbc8", + "@oxc-parser/binding-linux-arm-musleabihf@npm:0.132.0": "03765d72b81dacfd98c46c40fbdddff3361b92cf65e55176886780f158d563a18800bd744c374db28b3664c5eb1b14cd71b1a84cafc64e93d291ec226ed77a7c", + "@oxc-parser/binding-linux-arm64-gnu@npm:0.132.0": "aa9f9386d334953839bf0febb457c670f29b2545fba81c957efbf5701600c8f7024ac69f97a8d76de28609f00ffb2488be5c47907328f96c11d4d544c8c55277", + "@oxc-parser/binding-linux-arm64-musl@npm:0.132.0": "3f7037a6d4c81816509944a316f239ba7d233a099608ee08f882160067b4542570625bd81ac4029060da1f48a1ca12de74a049c6dfe84f6215d8fb8d77d06bc0", + "@oxc-parser/binding-linux-ppc64-gnu@npm:0.132.0": "63937000054bd2a986ebdaf6a92c6bdab926b52744b2e805727503f785eef692a3e1fa1fc85163f63020c6222107ce7fc4c97b4175a847c3774b67a1a904d1ba", + "@oxc-parser/binding-linux-riscv64-gnu@npm:0.132.0": "ce3c1c0f048d93fb75399f82bebb97f8c6079e3811bc9a741709906dee379a57660e45d379471beb4b52bd84223750acbdc4a52d34d0a0b6d9b49db5aa1f6ea6", + "@oxc-parser/binding-linux-riscv64-musl@npm:0.132.0": "f0eee8f514ae5906981594566180b11e5a8eff72840b3219493ce9bcb0ece6f7e69e37ca3e98b0e228a3a175b65a9730573be1e567652bd91875137a03a42aba", + "@oxc-parser/binding-linux-s390x-gnu@npm:0.132.0": "99988465bd899276e9e1c89715080493b91d5096e2a76433b44ee5225a761d77ce932ccd5c47ec16f2c259a11e6ee34e0074334e437774dde6ab74c4637bba07", + "@oxc-parser/binding-linux-x64-gnu@npm:0.132.0": "c4416d3014931b1831bf9cd11eaeafd44876a3dcf56f45c052a6d8f634b047f5851a0b822ac1621d1fe185a0109f2acefcd10507c51c2845c219cac08a16e185", + "@oxc-parser/binding-linux-x64-musl@npm:0.132.0": "4b45901795cf1eb2f53617e0619fca45b6efb52690ef1d77b3fcad07dbb25f854e7eb2c6317883ba6895521ec38828655ac9cf77fab2d2b27e4a59e7b14abcb5", + "@oxc-parser/binding-openharmony-arm64@npm:0.132.0": "46b3d666749e0e66e46810fcfbda37b65196fbedb31ffb9461bda2881f007a233f1c360d533d692f5789864ea99f842f1101edc4dd85e929cb64ef3a8f4c0684", + "@oxc-parser/binding-wasm32-wasi@npm:0.132.0": "63c0ca72ad2439c46212687caa3ca77f79312382d313c492b4f940edf71eecb14057325c4bfc78614f66579813add04aad8409ff32a684dcba7e32888d93d5e7", + "@oxc-parser/binding-win32-arm64-msvc@npm:0.132.0": "1c8db4cddad78adf0d5113047e7d85ca99ee6cf24db0b5cf143cc30461620e141cc42038928903c3d605e7dd449bb9a48030d15bfdcbccdd648c86e80f6316ce", + "@oxc-parser/binding-win32-ia32-msvc@npm:0.132.0": "38d5fe8cd2c5c0d2b3761fcc33062945e030951507b2d434ae060f9363686f267560ddad79e693d56cc9a784d74f5721eae019b18b283ae4f3651215a0a64aca", + "@oxc-parser/binding-win32-x64-msvc@npm:0.132.0": "3730b86c60ecc874a4c084cf7b020d7290996360bab49d669e2a931f999d53d9fecf9fda9b64fcfcaae34a08dbb41f6088ba10b03f1557f97dc8d91f67aa4074", + "@oxfmt/binding-android-arm-eabi@npm:0.55.0": "db8a91daa54aefc35d0df1514e1e62aa3e2c91e9de8aa8ed7405ca5c156265b99b07013b36739605283d4156a2aef76ef09d0958c4d81a3be54a0cbbfef4335d", + "@oxfmt/binding-android-arm64@npm:0.55.0": "8da5bc33f3e9a1ab77ff6e605b4f0a552caf0e1a25d01d0283751be241895aee803813a01b4f0afad0eefcec6617cbc22231907911d305f613f2af7ae0bc4b30", + "@oxfmt/binding-darwin-arm64@npm:0.55.0": "ecb275e4cecdab5a662b447f47e4543cfefa2a80fcca5866495059588e1b501ac9ca43d3dfedbc4c1c575c89bc28ceba861e6fbbd46b0a348e57a7a6e02267ab", + "@oxfmt/binding-darwin-x64@npm:0.55.0": "8f26b824c2e45346b3fdb2b3b9077a0a23248c30a0c658a4b7fdba96d241ff6dec9b5ae1cc194ccd237da6f0ff728cfd0c7a93536735d94f50ed6fbbeeeeb3a1", + "@oxfmt/binding-freebsd-x64@npm:0.55.0": "06893834ac0a8b260395124da57202a7064bd663b7cc573273e92695169f01c68250c4d6a6654e19ff59ae9cd47e56294da053a792a7433637174ade3db10430", + "@oxfmt/binding-linux-arm-gnueabihf@npm:0.55.0": "95b008c5eb6853a955ef3d12ed8def4be2527dd1b16bc27df739e6673f6eec4ffe5ce534bd5330b9211e85a6c12efa40c19d6676001dddf83aebc0c8edd28451", + "@oxfmt/binding-linux-arm-musleabihf@npm:0.55.0": "37ce178c61351907abafc8a7ca3502f884f9a01a07c89f0ab8b4fd7e585f7993beb391f7c334a59195b61c976fd3827896a8a6beb41302cde57f0d09991d1ee6", + "@oxfmt/binding-linux-arm64-gnu@npm:0.55.0": "bf70fd44e3b78e27dec4a9b8af1b5490131edee6e6a634a9eae5459dc57c23b05eb1b749777b640ea3f6a71841ad99e4528a5868ebe21afceea79e8dbf1c58a3", + "@oxfmt/binding-linux-arm64-musl@npm:0.55.0": "f86c290c3af1009cbf1961fd6069859a2611b3da7ce8ba445a30b981d561883f744b485be49b9aa9edb9b3da3e27cbf641ea55ecd8cb38e4693326e8b79a4aa8", + "@oxfmt/binding-linux-ppc64-gnu@npm:0.55.0": "dee16ab629f31db5f0158d2f444776373a8e27f8640b72e03286beb3b5ba250d1fcd0f10f2c3d14e81d2817fc48bf5a5ae67899ee372d76f9df62db997dff69a", + "@oxfmt/binding-linux-riscv64-gnu@npm:0.55.0": "2903deed7cd31924a98e40bf1ceec4607c95cfc5780264646b0e598fc26a1141febf2fdb154dfff9b49a7be7856bd4bd67a7c59a3f0e3e07903067e1d51373da", + "@oxfmt/binding-linux-riscv64-musl@npm:0.55.0": "5c64f07da7847c745872fe837e393222a1e8827f292dfffef4217e42cb8a0b41b81a0bede62173508528b3d8a0fb4dc4eedb319d9406c87d412589d4496a47da", + "@oxfmt/binding-linux-s390x-gnu@npm:0.55.0": "8e484ececcc25fbd5379c31f8599af97929e9a2baa46731e351b757df3b0df50cd7e04dd9a28317b2b148cb18c720409712f7b8c0f42b2fd5b18123e3c509369", + "@oxfmt/binding-linux-x64-gnu@npm:0.55.0": "4040e25bfa22475c2fefb47dafacaad9cb0c97845c0b541aa3730e4fcd83ef03da815d5116d04364cea111941670000423689b08b8dacb9fc3699d2cb55a2466", + "@oxfmt/binding-linux-x64-musl@npm:0.55.0": "85ea999af23c3b1e5ddf8f06aeb619895328475d1824eec599f6de408ef7ad9f917513329ed47e0867aa606b4718d451699a393a7f23f3c45950199a0bd20da5", + "@oxfmt/binding-openharmony-arm64@npm:0.55.0": "e23c4e65a7dfe5cae461972ac944e25a567b03a4e8ae04f19ffc79b6e97d222b4c52616cd66ae476f67e3837dfb53d8ff5e01ce96446875874a1a2f3a39004a2", + "@oxfmt/binding-win32-arm64-msvc@npm:0.55.0": "6b60e8f6d17b613fb4c0972562cc30fb52848f432d93053933e2b308a1ca6b278ef76512cb7f9fd6b1f91bd4d09f682fa30a84a04b6efeab18868b9d13c57f3d", + "@oxfmt/binding-win32-ia32-msvc@npm:0.55.0": "e62d050b0bd25ff69a0e05871748a0f1ecbab6422d316011dde1ee7282b3aa486b935b696c227f1974213cf694a2ddf990612d60397082be980e8baec4e91ef0", + "@oxfmt/binding-win32-x64-msvc@npm:0.55.0": "0253d8ba81515c47cb3f1e50a41f47b57c6bf8ec547f9c8a95195e109f9478beb37a69a304663499a610514c4f2f778f91be9b62a6bdb953e1b85a8430ceee9d", + "@oxlint-tsgolint/darwin-arm64@npm:0.23.0": "e17e81055c2182b06ec51766941d1ae6a0381b4a1e052b026d2f592e6da3880258ab19e064bd118dcc48f86b60a18c33b4c8abaced11370da3ee0c4ca00e3e5b", + "@oxlint-tsgolint/darwin-x64@npm:0.23.0": "37cc945adfc7b647880f76bc67d51eac57a99cac22a096338eaebd1e2f37b1553124f244bee52e7f8434820dfd909a2ea95c383091f6d3b5e79636c6cf09b660", + "@oxlint-tsgolint/linux-arm64@npm:0.23.0": "8e86218c4d947affa90b2fd148d75899f88fad013cafadfd7f3e7d780230f23af982502c4e3c28c418ac39b3ecb1e19bb9e00011176950c93ecc7a95b95df307", + "@oxlint-tsgolint/linux-x64@npm:0.23.0": "6bf6a5ff95c7bc92a6a6590db83f9b6dc595b60cc5237aa4262f7c9c5ee025b351a6b541bd01f7c9ef5d5e48e636d758e3e23242197a7d7181c42e99bb101879", + "@oxlint-tsgolint/win32-arm64@npm:0.23.0": "19d0e140073c7bb4b0df1845df03b33fde14889331c99978d4052aeae8ae288fbd1e968ab7ac163f39d0fef35ac026f27f049eabfa713f69a8bdad5416ff509e", + "@oxlint-tsgolint/win32-x64@npm:0.23.0": "c4cc0d3155382b81e6949297b993db383b37130dae254aaa450e72d5991b7d8ef9d34dde95e86f42297ad896c276eb2a5b1cd54da101dcec09153e99a8fa8e0f", + "@oxlint/binding-android-arm-eabi@npm:1.70.0": "576c756510ae4141c731669f45d89d4e66b80c40e094c492d5a96f6f6fe8e91af7010ff3760199a305cf788310692f832dc059ef38ccfbc74ebcfdb7afe6ab55", + "@oxlint/binding-android-arm64@npm:1.70.0": "85bbf851de0860fb18bb8c839ef50edfe95a2eae9e59a393055f1ece175e5b5324193c9be6c784e5d97ec300e7dcab4f83a29c7e50346b36efd7c16d8a901a19", + "@oxlint/binding-darwin-arm64@npm:1.70.0": "1b80940373898596c5fcfba65815581ea34ad916d41c97894f626abce094acac8555bf416e308b46ae81afdf42623618cb7463863a159c000ab130dd25bfdfd5", + "@oxlint/binding-darwin-x64@npm:1.70.0": "c84cdc76878cd085c2a2a963e5fac7d2e07fc7601e747404710e074a3766ac438438a047c48745ace76eb59f92cc8ab72036868af10068a549ed694301d55978", + "@oxlint/binding-freebsd-x64@npm:1.70.0": "9f76aa70ca71851978a9461f2d2bb3b009bde4a06f930b3f59e35a803c4718961cd7cc64b6d20996832529fe99f5d47a0c8a9fe5137ce18b7e9c879a0f721b0d", + "@oxlint/binding-linux-arm-gnueabihf@npm:1.70.0": "0755e542d531ff5a282714bfe6b207cd787f959952bd7cc3dca1567dbbe414cea6e50a99a1e83950b2e2ac4909c8191206cb7f592636dd332f0e69c90e2af641", + "@oxlint/binding-linux-arm-musleabihf@npm:1.70.0": "116fae450766a6d935c1ea72cab0ae34b07a0131bc81aa40741c506c682392d6f988fb4674aec9d27e43f3621df6d3a7c6621226d2884b26540db9cba289fa90", + "@oxlint/binding-linux-arm64-gnu@npm:1.70.0": "078d14a8c161453c885f85a96d8ca65875d2010decbd53dee97ed5b2e36df6a2bb4e49e5a8877ffafcdcae87442af560579be2bc504689d422b6bb6e1223ab04", + "@oxlint/binding-linux-arm64-musl@npm:1.70.0": "bf470dcc1fe242e2dba012a78cbd9aadda938e3864125df407457ae8a3d6372768b3107018ed935e994d567660d65b114f8125a29cb6aeaa28cd0c3c9be1ce8b", + "@oxlint/binding-linux-ppc64-gnu@npm:1.70.0": "c2c6e315722208d0a5b69b6914123879fb575d1a47114b86b6bc642978305302e4a442065eba68613870d262f37bce4d76f94f2e33ffbfa009cdacc7d911b3c3", + "@oxlint/binding-linux-riscv64-gnu@npm:1.70.0": "281cb6a85618c8d18416976627f5aad57efe9c6f9bc4a3f9846832616d38aff1811018575aa4e86446d54eb56bfa9a50f3fab50b79ed3fe342cff3e02894ec97", + "@oxlint/binding-linux-riscv64-musl@npm:1.70.0": "c583ba96d48900d3d62aaf9399fed3b1d4c0f6310883192c5dc1624baa6ab80428453eeb56452cbfd636359b853b5582895e7075d844235d79d3f8227a606910", + "@oxlint/binding-linux-s390x-gnu@npm:1.70.0": "a831b82844d8de4d9914c8a7083f65460309a00f2cd06e01b5b4b5709bca10261143c8742c5f332e76a477a9f49706d91ba03700f68ca973a689226509d1345a", + "@oxlint/binding-linux-x64-gnu@npm:1.70.0": "8aec65aa456257f37462083fa532b7fac14956320dc5e59d94b7fa2bf38783ffb30e0b1d01ed86f097bffc922f4e0ee7b5381aa17e3e31342c30191dc91944cb", + "@oxlint/binding-linux-x64-musl@npm:1.70.0": "cbfe64382cd29e256146e03aa7d424ba52d6cd097f413abf4e905b4eebe8b1a71aade73a09fe4afe7b1a43be3709161c0d0fede9042678eabf406dcffac9fd33", + "@oxlint/binding-openharmony-arm64@npm:1.70.0": "f0138fe9858816026bc50a84332a53d9c9c7121b621539a1d3de87eddadb2c5c8fb387ebbb4cc6676e99a9b16921db9d6138570d43c217d41c215751f1ac357b", + "@oxlint/binding-win32-arm64-msvc@npm:1.70.0": "338873a04a5c00ff76be3bcdc1991cfe65c35257f1703b984da009c6e0abf31d06a6b3b3943d76db4c1423116299d6f29a1c0485c4f528cc24b49b3ef1302103", + "@oxlint/binding-win32-ia32-msvc@npm:1.70.0": "3149d183b7f4d8c90348a24521d0a442d3673b55e4e0a6d2bc26e618e57a33f24cc76492156254d79acaf986803ebdec8d7f310db1547802a49c5e0a4a0fa593", + "@oxlint/binding-win32-x64-msvc@npm:1.70.0": "bc410bfd875fe7e677bed2c8c90a5380155543136130dbc363a72c796c84926e1e79cf072da040ba82c87f5d1ed616e71a17caebf876a76d880217d22760a698", + "@rolldown/binding-android-arm64@npm:1.0.3": "35e2b7f9e54c526cee5433351b0ef376dd1657d8a6eecf00512dec4720bb02594268bf8d3b661199917bdd286d4370bf3c3461b08eb74f0eae77bd13585e260a", + "@rolldown/binding-darwin-arm64@npm:1.0.3": "7e7d168d091053100a785c0240d6d6134039bf0fb7a658624fa33426b148e9b8131d1690729b32a7b1e65329879c15601b7afd576e149ca6feb6302c530ed860", + "@rolldown/binding-darwin-x64@npm:1.0.3": "0721c045d1446138e49dca250c8716c1b2eb4f1595bf1226a2c273befa063f91c4623e4cd5d338e969626e4281541b958c4a3d4649c0c553da0ec42292450a8d", + "@rolldown/binding-freebsd-x64@npm:1.0.3": "faa48a73ac1b1a4af8ed7b67932a59b62f139d76f21d1ccbe5efb5ab8a5a61e1f5de0b5d9367a9ecd8759bdab3aa1734aefd2214bbe2cfc4b0cb119f6e5391da", + "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.3": "fab607d7639bf6d3393f6e0da0c9680e2d357b550abc50d7dc60cd45e25c788cddee38deac074d9c987e22532d83dcd8a76564710654663bd65622a190548c72", + "@rolldown/binding-linux-arm64-gnu@npm:1.0.3": "a067fc8d80a6af88893010abb55d697221afa8f9d3f468082bc759305f2decbf16f8655a5313e6e608d1b2f103d28922607290ab85d575b78930bc9daa777204", + "@rolldown/binding-linux-arm64-musl@npm:1.0.3": "b1264d8302780c991260991733cf156c1ed43fed66fce60e5a265577aced196b92907cfcbe8d3262621b8e08106f1f555743c601fe60676c08ffae0edd821128", + "@rolldown/binding-linux-ppc64-gnu@npm:1.0.3": "82f33061f5003b99bac68a0637bf7665f6fb2b22cfc025e4d7762afefe703af2acc1cd2df8ff07bb000b0eecd3e59959992481a5b03794604af090eaa843c70f", + "@rolldown/binding-linux-s390x-gnu@npm:1.0.3": "a6a3811352aa5db6a793879bf405bb98eaeca06cfd1aae959a9ed70db39b28e0a022ca50524cdd26d0447fa7b9c5ef913281cf543f816ac6e3ea6b6d620af88a", + "@rolldown/binding-linux-x64-gnu@npm:1.0.3": "13ece4e580f022a1a70031da2036448097bc38d040d1e87ee81cffd9e1ab8b64673e92843718470e3d07ea664171dc2c20d766cbafbb0ca8774e3c4f0b122c7d", + "@rolldown/binding-linux-x64-musl@npm:1.0.3": "6beeffe835e820679868021e01fb629fe124813911dd625bd3d24b1592450c06131b360e284396aca04798e6a85f988917ea00e95b3ea087a32a45441bad3235", + "@rolldown/binding-openharmony-arm64@npm:1.0.3": "f8e8352edde4d2345e3e360bb050915daf0d9ee4c491024a08e56088801994f2cbdf0152f81115a089c1870863e6384135765126114cf8481933bc15678e1dde", + "@rolldown/binding-wasm32-wasi@npm:1.0.3": "3f73081fc41cbd8c117183fecb0f491a71278472c0640b54e57a3a6705005f54d7997c610244d2ff651d5d688a20596ab1119e3dccf607f59fdea4ec0621da49", + "@rolldown/binding-win32-arm64-msvc@npm:1.0.3": "a29f05721b276acdeb7f00b43b9c6241f9c4cc60b820d6b9217d205cfd0ee66a82a29da501e60163c66ce7cc8cb6362f88933b466dea66e3219b38d15954873e", + "@rolldown/binding-win32-x64-msvc@npm:1.0.3": "d6afa484d89c9479561a0621709dfc9737584515f87e96fa74f7d153bbde74f81b6ba7aac92187189ffb4dd1795fa152c596a04ae9a41ffab7437babc5a15838", "@rollup/rollup-android-arm-eabi@npm:4.60.4": "713883389421bcaea56b37c79e624da343aeaa28812de226542407bb1e62c3593c24b0b94ee2fa74893963b124b1d6a6eac4b10bbd54c1736923dc67a953b3de", "@rollup/rollup-android-arm64@npm:4.60.4": "04117967684c227a7d764e13f85c66093619ff8a800a2004138a258cbfeb4748db8bc477496e0c9421c1cbb1ad5ca92e2665a143c6cdba33502aa59cd2c04ffe", "@rollup/rollup-darwin-arm64@npm:4.60.4": "3e7fe7279af3981c4e9b5cc4ca3099ff403545a1b63e2e66c2f5fae400fdd05c82ec430d087c0f444b59fb56a23a5ac3b802129d99c9e13be4a299aa8d2cf538", diff --git a/pkgs/by-name/ou/outline/package.nix b/pkgs/by-name/ou/outline/package.nix index 468cf3a78012..b8ed986bc21b 100644 --- a/pkgs/by-name/ou/outline/package.nix +++ b/pkgs/by-name/ou/outline/package.nix @@ -3,7 +3,6 @@ lib, fetchFromGitHub, makeWrapper, - nix-update-script, nodejs, nixosTests, yarn-berry_4, @@ -11,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "outline"; - version = "1.8.1"; + version = "1.9.1"; src = fetchFromGitHub { owner = "outline"; repo = "outline"; rev = "v${finalAttrs.version}"; - hash = "sha256-jdG1sIJN1UiajsZ86+ztY3uXZgdS5MxjaPaKw/Glepo="; + hash = "sha256-F9JdeCuzmYeV2hxk0b1thQgo4cRl+aeUbBjK0MLzKH8="; }; patches = [ @@ -36,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { offlineCache = yarn-berry_4.fetchYarnBerryDeps { inherit (finalAttrs) src missingHashes patches; - hash = "sha256-uSXw/x+4d22ow7QE3nduTUDNlZebCrnW6OIzhSugcXw="; + hash = "sha256-xj6IBvANRQr2C/R47KrsSacPXqwtrAGv4ZeidJ4T5Hc="; }; buildPhase = '' @@ -70,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { tests = { basic-functionality = nixosTests.outline; }; - updateScript = nix-update-script { }; + updateScript = ./update.sh; # alias for nix-update to be able to find and update this attribute inherit (finalAttrs) offlineCache; }; @@ -78,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Fastest wiki and knowledge base for growing teams. Beautiful, feature rich, and markdown compatible"; homepage = "https://www.getoutline.com/"; - changelog = "https://github.com/outline/outline/releases"; + changelog = "https://github.com/outline/outline/releases/v${finalAttrs.version}"; license = lib.licenses.bsl11; maintainers = with lib.maintainers; [ cab404 diff --git a/pkgs/by-name/ou/outline/update.sh b/pkgs/by-name/ou/outline/update.sh new file mode 100755 index 000000000000..b87238817a8d --- /dev/null +++ b/pkgs/by-name/ou/outline/update.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p common-updater-scripts coreutils curl git gnused jq nix-prefetch-github yarn-berry.yarn-berry-fetcher + +set -o errexit -o nounset -o pipefail + +package="outline" +owner="outline" +repo="outline" +package_dir="pkgs/by-name/${package::2}/${package}" + +# +# package +# + +current_version=$(nix-instantiate --eval --expr "with import ./. {}; ${package}.version" --raw) +echo "Current version: ${current_version}" + +latest_version=$(curl --silent "https://api.github.com/repos/${owner}/${repo}/releases" | jq '.[0].tag_name' --raw-output | sed 's/^v//') +echo "Latest version: ${latest_version}" + +if [[ "${current_version}" == "${latest_version}" ]]; then + echo "${package} is up to date: ${current_version}" + exit 0 +fi + +echo "Updating ${package} from ${current_version} to ${latest_version}…" + +update-source-version "${package}" "${latest_version}" + +# +# yarn deps +# + +echo "Regenerating missing-hashes.json…" +src_path=$(nix-build --attr "${package}.src" --no-link) +yarn-berry-fetcher missing-hashes "${src_path}/yarn.lock" >"${package_dir}/missing-hashes.json" + +echo "Updating offline cache hash…" +update-source-version "${package}" --ignore-same-version --source-key=offlineCache + +echo "Done." diff --git a/pkgs/by-name/ov/overmind/package.nix b/pkgs/by-name/ov/overmind/package.nix index 618a13d7e12a..96edb1fdadf6 100644 --- a/pkgs/by-name/ov/overmind/package.nix +++ b/pkgs/by-name/ov/overmind/package.nix @@ -35,7 +35,7 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/DarthSim/overmind"; description = "Process manager for Procfile-based applications and tmux"; mainProgram = "overmind"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ ]; }; }) diff --git a/pkgs/by-name/ov/ovftool/package.nix b/pkgs/by-name/ov/ovftool/package.nix index 7dee55070560..a910a409b709 100644 --- a/pkgs/by-name/ov/ovftool/package.nix +++ b/pkgs/by-name/ov/ovftool/package.nix @@ -99,11 +99,6 @@ let fileName = "VMware-ovftool-${version}-lin.x86_64.zip"; hash = "sha256-LIOXCiEswBJirbds47nFKvOW+tg0D/cay3SeM+hsjjM="; }; - "x86_64-darwin" = rec { - version = "5.1.0-25410048"; - fileName = "VMware-ovftool-${version}-mac.x64.zip"; - hash = "sha256-gDSraL+B3As+QxT2GlAmL8KjsIelxAd2e4iSRaXOTtI="; - }; }; ovftoolSystem = ovftoolSystems.${stdenv.system} or (throw "unsupported system ${stdenv.system}"); diff --git a/pkgs/by-name/ow/owmods-cli/package.nix b/pkgs/by-name/ow/owmods-cli/package.nix index 1e3b266f44cb..b204820e1efd 100644 --- a/pkgs/by-name/ow/owmods-cli/package.nix +++ b/pkgs/by-name/ow/owmods-cli/package.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "owmods-cli"; - version = "0.15.5"; + version = "0.15.7"; src = fetchFromGitHub { owner = "ow-mods"; repo = "ow-mod-man"; rev = "cli_v${finalAttrs.version}"; - hash = "sha256-8ZHLb57/gC03+rWe8mHcBS0nJVNjjRMtLADwGcSZ0CI="; + hash = "sha256-ohCP0VKf2jEtjZsDN5ISZ5c/EGYANvjuCPyKQcNCwyc="; }; - cargoHash = "sha256-WxfbkfOXU1NgUYagsDu3ri26k+XytG7Vy8+ofuQEwjE="; + cargoHash = "sha256-oYTz7Dzdv9prHzDSSjX9PozzKToMXRW6qs8Y2dfYQ8A="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ow/owmods-gui/package.nix b/pkgs/by-name/ow/owmods-gui/package.nix index 6e364c17b342..0986a2c42ed3 100644 --- a/pkgs/by-name/ow/owmods-gui/package.nix +++ b/pkgs/by-name/ow/owmods-gui/package.nix @@ -21,12 +21,12 @@ }: let pname = "owmods-gui"; - version = "0.15.6"; + version = "0.15.7"; src = fetchFromGitHub { owner = "ow-mods"; repo = "ow-mod-man"; tag = "gui_v${version}"; - hash = "sha256-2jf9yjvWvE6If2ChdbgdLwSJtyj4AYSKkV9E7jgQ3G8="; + hash = "sha256-xGohK7ki82gvfTnjPUdpamnvPDf8vpuAuC0gjRvx7mQ="; }; frontend = buildNpmPackage { pname = "owmods-gui-ui"; @@ -37,7 +37,7 @@ let src = "${src}/owmods_gui/frontend"; packageJSON = "${src}/owmods_gui/frontend/package.json"; - npmDepsHash = "sha256-Ske3EFiLDPMLI2ln65pZL22pExT/OfT0v0x+TxiZjQo="; + npmDepsHash = "sha256-+2PlfZijwYeGXDYycwgOfjbZCRazHs/O3iDDuKLIwxM="; postBuild = '' cp -r ../dist/ $out @@ -57,7 +57,7 @@ in rustPlatform.buildRustPackage { inherit pname version src; - cargoHash = "sha256-UsqkamsWyJ+SUOD8Ab0wZIfcL6NBe0kKbLXSm7rFOGM="; + cargoHash = "sha256-oYTz7Dzdv9prHzDSSjX9PozzKToMXRW6qs8Y2dfYQ8A="; buildNoDefaultFeatures = true; buildFeatures = [ diff --git a/pkgs/by-name/p4/p4d/package.nix b/pkgs/by-name/p4/p4d/package.nix index 27d1fa46381c..c87592b00b38 100644 --- a/pkgs/by-name/p4/p4d/package.nix +++ b/pkgs/by-name/p4/p4d/package.nix @@ -12,10 +12,6 @@ let url = "https://web.archive.org/web/20231109221336id_/https://ftp.perforce.com/perforce/r23.1/bin.linux26x86_64/helix-core-server.tgz"; sha256 = "b68c4907cf9258ab47102e8f0e489c11d528a8f614bfa45e3a2fa198639e2362"; }; - "x86_64-darwin" = fetchurl { - url = "https://web.archive.org/web/20231109221937id_/https://ftp.perforce.com/perforce/r23.1/bin.macosx1015x86_64/helix-core-server.tgz"; - sha256 = "fcbf09787ffc29f7237839711447bf19a37ae18a8a7e19b2d30deb3715ae2c11"; - }; }; in stdenv.mkDerivation { diff --git a/pkgs/by-name/p4/p4v/libs.patch b/pkgs/by-name/p4/p4v/libs.patch new file mode 100644 index 000000000000..7afa37c63ac8 --- /dev/null +++ b/pkgs/by-name/p4/p4v/libs.patch @@ -0,0 +1,54 @@ +diff -ru bin-before/p4admin bin-after/p4admin +--- before/bin/p4admin 2026-05-05 13:38:26.865099841 -0700 ++++ after/bin/p4admin 2026-05-05 13:40:01.377761574 -0700 +@@ -43,14 +43,6 @@ + progname=`basename "$realfullprogname"` + prefix=`topdir "$realfullprogname"` + +- # check for symbolic links for libssl.so and libcrypto.so +- if [ ! -f $prefix/lib/libssl.so ]; then +- p4vlibssl=$( find $prefix/lib/libssl.so.* ) +- ln -s $p4vlibssl $prefix/lib/libssl.so; +- p4vlibcrypto=$( find $prefix/lib/libcrypto.so.* ) +- ln -s $p4vlibcrypto $prefix/lib/libcrypto.so; +- fi +- + XDG_SESSION_TYPE= + QT_QPA_PLATFORM=xcb + P4VRES=$prefix/lib/P4VResources +diff -ru bin-before/p4merge bin-after/p4merge +--- before/bin/p4merge 2026-05-05 13:38:26.865161794 -0700 ++++ after/bin/p4merge 2026-05-05 13:39:51.100750813 -0700 +@@ -43,14 +43,6 @@ + progname=`basename "$realfullprogname"` + prefix=`topdir "$realfullprogname"` + +- # check for symbolic links for libssl.so and libcrypto.so +- if [ ! -f $prefix/lib/libssl.so ]; then +- p4vlibssl=$( find $prefix/lib/libssl.so.* ) +- ln -s $p4vlibssl $prefix/lib/libssl.so; +- p4vlibcrypto=$( find $prefix/lib/libcrypto.so.* ) +- ln -s $p4vlibcrypto $prefix/lib/libcrypto.so; +- fi +- + XDG_SESSION_TYPE= + QT_QPA_PLATFORM=xcb + P4VRES=$prefix/lib/P4VResources +diff -ru bin-before/p4v bin-after/p4v +--- before/bin/p4v 2026-05-05 13:38:26.865192103 -0700 ++++ after/bin/p4v 2026-05-05 13:39:20.028718286 -0700 +@@ -43,14 +43,6 @@ + progname=`basename "$realfullprogname"` + prefix=`topdir "$realfullprogname"` + +- # check for symbolic links for libssl.so and libcrypto.so +- if [ ! -f $prefix/lib/libssl.so ]; then +- p4vlibssl=$( find $prefix/lib/libssl.so.* ) +- ln -s $p4vlibssl $prefix/lib/libssl.so; +- p4vlibcrypto=$( find $prefix/lib/libcrypto.so.* ) +- ln -s $p4vlibcrypto $prefix/lib/libcrypto.so; +- fi +- + XDG_SESSION_TYPE= + QT_QPA_PLATFORM=xcb + P4VRES=$prefix/lib/P4VResources diff --git a/pkgs/by-name/p4/p4v/linux.nix b/pkgs/by-name/p4/p4v/linux.nix index df6d516e1cbe..665bf22da20f 100644 --- a/pkgs/by-name/p4/p4v/linux.nix +++ b/pkgs/by-name/p4/p4v/linux.nix @@ -77,6 +77,10 @@ let # Don't wrap the Qt apps; upstream has its own wrapper scripts. dontWrapQtApps = true; + patches = [ + ./libs.patch # Fixes issues with bundled libraries that we've stripped out + ]; + postPatch = '' rm -r lib/plugins lib/libQt6* lib/libssl* lib/libicu* lib/libcrypto* ''; diff --git a/pkgs/by-name/p4/p4v/package.nix b/pkgs/by-name/p4/p4v/package.nix index 5466a29ecb0a..1e0deb5f9b0b 100644 --- a/pkgs/by-name/p4/p4v/package.nix +++ b/pkgs/by-name/p4/p4v/package.nix @@ -8,17 +8,15 @@ let # Upstream replaces minor versions, so use archived URLs. - srcs = rec { + srcs = { x86_64-linux = fetchurl { - url = "https://web.archive.org/web/20240612193642id_/https://ftp.perforce.com/perforce/r24.2/bin.linux26x86_64/p4v.tgz"; - sha256 = "sha256-HA99fHcmgli/vVnr0M8ZJEsaZ2ZLzpG3M8S77oDYJyE="; + url = "https://web.archive.org/web/20260414052921/https://filehost.perforce.com/perforce/r26.1/bin.linux26x86_64/p4v.tgz"; + sha256 = "sha256-89Xz9dxAeLGOOr90K0CdlxjrfIf9vUmyZV3tzWspWdQ="; }; aarch64-darwin = fetchurl { - url = "https://web.archive.org/web/20240612194532id_/https://ftp.perforce.com/perforce/r24.2/bin.macosx12u/P4V.dmg"; - sha256 = "sha256-PS7gfDdWspyL//YWLkrsGi5wh6SIeAry2yef1/V0d6o="; + url = "https://web.archive.org/web/20260414052748/https://filehost.perforce.com/perforce/r26.1/bin.macosx12u/P4V.dmg"; + sha256 = "sha256-8MBLS6EQOVenxZ1Uv75kPzU8aO2AldmxkwOz+JcBRpY="; }; - # this is universal - x86_64-darwin = aarch64-darwin; }; mkDerivation = @@ -29,7 +27,7 @@ let in mkDerivation { pname = "p4v"; - version = "2024.2/2606884"; + version = "2026.1/2933292"; src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/pa/packer/extra/mk-packer-plugin.nix b/pkgs/by-name/pa/packer/extra/mk-packer-plugin.nix index b5a8cf71711e..3fa737b75554 100644 --- a/pkgs/by-name/pa/packer/extra/mk-packer-plugin.nix +++ b/pkgs/by-name/pa/packer/extra/mk-packer-plugin.nix @@ -1,7 +1,6 @@ let platformSuffix = { x86_64-linux = "linux_amd64"; - x86_64-darwin = "darwin_amd64"; aarch64-linux = "linux_arm64"; aarch64-darwin = "darwin_arm64"; }; diff --git a/pkgs/by-name/pa/paging-calculator/package.nix b/pkgs/by-name/pa/paging-calculator/package.nix index 6fd238e3b66d..e904bb1cb9c1 100644 --- a/pkgs/by-name/pa/paging-calculator/package.nix +++ b/pkgs/by-name/pa/paging-calculator/package.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; homepage = "https://github.com/phip1611/paging-calculator"; changelog = "https://github.com/phip1611/paging-calculator/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ phip1611 ]; }; }) diff --git a/pkgs/by-name/pa/pam_ssh_agent_auth/package.nix b/pkgs/by-name/pa/pam_ssh_agent_auth/package.nix index 6ba71b483e24..45f7a5b5cfcc 100644 --- a/pkgs/by-name/pa/pam_ssh_agent_auth/package.nix +++ b/pkgs/by-name/pa/pam_ssh_agent_auth/package.nix @@ -88,6 +88,8 @@ stdenv.mkDerivation rec { "--with-cflags=-I$PWD" ]; + makeFlags = [ "LD=$(CC)" ]; + prePatch = "cp -r ${ed25519-donna}/. ed25519-donna/."; enableParallelBuilding = true; diff --git a/pkgs/by-name/pa/pana/package.nix b/pkgs/by-name/pa/pana/package.nix index 6881bae84334..6b279726dcbf 100644 --- a/pkgs/by-name/pa/pana/package.nix +++ b/pkgs/by-name/pa/pana/package.nix @@ -9,13 +9,13 @@ }: buildDartApplication rec { pname = "pana"; - version = "0.23.13"; + version = "0.23.14"; src = fetchFromGitHub { owner = "dart-lang"; repo = "pana"; tag = version; - hash = "sha256-LPTcmAb0eZKhxzz/LzV4GnHfw/RAKCItoC7Vn9vvOuw="; + hash = "sha256-yBheou/u8TjL+MDhxd6AhWPJARLEcQF+ojmDqkv8zi4="; }; dartEntryPoints = { diff --git a/pkgs/by-name/pa/pana/pubspec.lock.json b/pkgs/by-name/pa/pana/pubspec.lock.json index 2ca72fb00a18..56f6f5b351b8 100644 --- a/pkgs/by-name/pa/pana/pubspec.lock.json +++ b/pkgs/by-name/pa/pana/pubspec.lock.json @@ -54,41 +54,41 @@ "dependency": "direct dev", "description": { "name": "build", - "sha256": "a156715e7cd728130c592f30552575908aae5b100005fbc1f0fb16b3c03a3d10", + "sha256": "45d14a0fb23e018d8287c32fc98d726ce466b231928ed9b9200f29bd3ccd39ae", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.6" + "version": "4.0.7" }, "build_config": { "dependency": "direct dev", "description": { "name": "build_config", - "sha256": "4070d2a59f8eec34c97c86ceb44403834899075f66e8a9d59706f8e7834f6f71", + "sha256": "f2c223156a26eea323e6244b85141d76413a80aeee9fe0b380773789fabaf8ae", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.3.1" }, "build_daemon": { "dependency": "transitive", "description": { "name": "build_daemon", - "sha256": "bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957", + "sha256": "fd754058c342243718d5171a95f352cfc9fcf0cba8cfa26df67cb13a5836db78", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.1.1" + "version": "4.1.2" }, "build_runner": { "dependency": "direct dev", "description": { "name": "build_runner", - "sha256": "1523ce62448ebac2c15a8ba5fbad8acac169788658a7dd2a1c2d9c2a9318b9a6", + "sha256": "5367e521935b102bdf1e735d2aab461e36b2edca6517662d088dd04cc39f8d16", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.15.0" + "version": "2.15.1" }, "build_verify": { "dependency": "direct dev", @@ -224,11 +224,11 @@ "dependency": "transitive", "description": { "name": "dart_style", - "sha256": "59d53ef8eaed9d288ed9767618e2b31c4fa0383a127db59d5eb2e737a7638a60", + "sha256": "b60b8cb28aa514346eb8f6b005c60484ea65190f213b1986f6e391e0292d18f4", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.9" + "version": "3.1.11" }, "ffi": { "dependency": "transitive", @@ -404,11 +404,11 @@ "dependency": "direct main", "description": { "name": "meta", - "sha256": "c82594181e3312f3d0695fc95aaaf7758d75b8d4ae2bbecf223b9fd5109a059d", + "sha256": "307249ce4ff29d58a18e97f6345f539382eb9c9c29ecda628900f31de0443dd9", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.18.3" + "version": "1.19.0" }, "mime": { "dependency": "transitive", diff --git a/pkgs/by-name/pa/pandoc-imagine/package.nix b/pkgs/by-name/pa/pandoc-imagine/package.nix index aed98010d7f3..7678dc6d1342 100644 --- a/pkgs/by-name/pa/pandoc-imagine/package.nix +++ b/pkgs/by-name/pa/pandoc-imagine/package.nix @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { A pandoc filter that will turn code blocks tagged with certain classes into images or ASCII art ''; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ ]; mainProgram = "pandoc-imagine"; }; diff --git a/pkgs/by-name/pa/paperlib/package.nix b/pkgs/by-name/pa/paperlib/package.nix index 3bc6c94decdb..e8fdb2226fc2 100644 --- a/pkgs/by-name/pa/paperlib/package.nix +++ b/pkgs/by-name/pa/paperlib/package.nix @@ -16,10 +16,6 @@ let url = "https://github.com/Future-Scholars/paperlib/releases/download/release-electron-${version}/Paperlib_${version}_arm.dmg"; hash = "sha256-KNMPUeCNtODHzMJhCwI4SJPRfa87RmAe6CRRazgRZCQ="; }; - x86_64-darwin = { - url = "https://github.com/Future-Scholars/paperlib/releases/download/release-electron-${version}/Paperlib_${version}.dmg"; - hash = "sha256-5QwF0+7Y4LzReHCj8yZrAJDAZVyY0ANC5gjAxdaVRkU="; - }; x86_64-linux = { url = "https://github.com/Future-Scholars/paperlib/releases/download/release-electron-${version}/Paperlib_${version}.AppImage"; hash = "sha256-uBYhiUL4YWwnLLPvXMoXjlQqlqFep/OpwwnmPx7s5dY="; @@ -38,7 +34,6 @@ let maintainers = with lib.maintainers; [ ByteSudoer ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" "x86_64-linux" ]; mainProgram = "paperlib"; diff --git a/pkgs/by-name/pa/paperview/package.nix b/pkgs/by-name/pa/paperview/package.nix index 174f9bd2065a..b51b637214f8 100644 --- a/pkgs/by-name/pa/paperview/package.nix +++ b/pkgs/by-name/pa/paperview/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { description = "High performance X11 animated wallpaper setter"; homepage = "https://github.com/glouw/paperview"; platforms = lib.platforms.linux; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ _3JlOy-PYCCKUi ]; mainProgram = "paperview"; }; diff --git a/pkgs/by-name/pa/papilo/package.nix b/pkgs/by-name/pa/papilo/package.nix index 6320d10a0928..5f45db7930fb 100644 --- a/pkgs/by-name/pa/papilo/package.nix +++ b/pkgs/by-name/pa/papilo/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://scipopt.org/"; description = "Parallel Presolve for Integer and Linear Optimization"; - license = with lib.licenses; [ lgpl3Plus ]; + license = lib.licenses.lgpl3Plus; mainProgram = "papilo"; maintainers = [ ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/pa/par-lang/package.nix b/pkgs/by-name/pa/par-lang/package.nix index 3c69167e1598..53353c009c84 100644 --- a/pkgs/by-name/pa/par-lang/package.nix +++ b/pkgs/by-name/pa/par-lang/package.nix @@ -19,13 +19,13 @@ rustPlatform.buildRustPackage { pname = "par-lang"; - version = "0-unstable-2026-06-24"; + version = "0-unstable-2026-07-15"; src = fetchFromGitHub { owner = "par-team"; repo = "par-lang"; - rev = "fb93d7dd2c21a7825a57c74d6f22b250bb25d9bc"; - hash = "sha256-9NKBjOMyemgPX/r7ot/RLut1FqWl8RfuuHhXUnkv1IM="; + rev = "8b10f081aee0bb553ce5eecf2886e4c8360acc77"; + hash = "sha256-kDPUQCUHPUM4d9M+ljPPPw3H9MulWbsxCMsVe6+VpoI="; }; cargoHash = "sha256-8lG+cKN3/W+LYWhmOfDwGiq6u3nlLJaD5uNABaY0zRY="; diff --git a/pkgs/by-name/pa/parla/package.nix b/pkgs/by-name/pa/parla/package.nix index 738fc018fb4f..1de6d1d09658 100644 --- a/pkgs/by-name/pa/parla/package.nix +++ b/pkgs/by-name/pa/parla/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "parla"; - version = "0.6.4"; + version = "0.6.8"; __structuredAttrs = true; strictDeps = true; @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "trufae"; repo = "parla"; tag = finalAttrs.version; - hash = "sha256-tlqrUxzQS+u4DlSIKAp9oR69KRW2gTgwBoroUJzvsaY="; + hash = "sha256-buUu3+HhK00rRg3ry6m8yBvH/wln7tUJfB5eXCwLCKc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pa/pasco/package.nix b/pkgs/by-name/pa/pasco/package.nix index 5b6fbd09840b..ee51bc04b9a8 100644 --- a/pkgs/by-name/pa/pasco/package.nix +++ b/pkgs/by-name/pa/pasco/package.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://sourceforge.net/projects/fast/files/Pasco/"; maintainers = [ ]; platforms = lib.platforms.unix; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; }; }) diff --git a/pkgs/by-name/pa/passwdqc/package.nix b/pkgs/by-name/pa/passwdqc/package.nix index 5188b6640223..e0d48f7361e9 100644 --- a/pkgs/by-name/pa/passwdqc/package.nix +++ b/pkgs/by-name/pa/passwdqc/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://www.openwall.com/passwdqc/"; description = "Passphrase strength checking and enforcement"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = [ ]; mainProgram = "passwdqc"; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/pa/patchcil/package.nix b/pkgs/by-name/pa/patchcil/package.nix index 4f019dfe4516..e883ed4b80dc 100644 --- a/pkgs/by-name/pa/patchcil/package.nix +++ b/pkgs/by-name/pa/patchcil/package.nix @@ -67,7 +67,6 @@ buildDotnetModule rec { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" "x86_64-windows" "i686-windows" diff --git a/pkgs/by-name/pa/payloadsallthethings/package.nix b/pkgs/by-name/pa/payloadsallthethings/package.nix index e3402065b523..ec3575891007 100644 --- a/pkgs/by-name/pa/payloadsallthethings/package.nix +++ b/pkgs/by-name/pa/payloadsallthethings/package.nix @@ -56,7 +56,7 @@ stdenvNoCC.mkDerivation { meta = { homepage = "https://github.com/swisskyrepo/PayloadsAllTheThings"; description = "List of useful payloads and bypass for Web Application Security and Pentest/CTF"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ shard7 felbinger diff --git a/pkgs/by-name/pc/pc/package.nix b/pkgs/by-name/pc/pc/package.nix index d8bf35a59b51..090065346d4f 100644 --- a/pkgs/by-name/pc/pc/package.nix +++ b/pkgs/by-name/pc/pc/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Programmer's calculator"; homepage = "https://git.sr.ht/~ft/pc"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ moody ]; platforms = lib.platforms.unix; mainProgram = "pc"; diff --git a/pkgs/by-name/pc/pcsx2-bin/package.nix b/pkgs/by-name/pc/pcsx2-bin/package.nix deleted file mode 100644 index 7310b25301d5..000000000000 --- a/pkgs/by-name/pc/pcsx2-bin/package.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - lib, - stdenvNoCC, - fetchurl, - makeWrapper, -}: - -stdenvNoCC.mkDerivation (finalAttrs: { - pname = "pcsx2-bin"; - version = "2.4.0"; - - src = fetchurl { - url = "https://github.com/PCSX2/pcsx2/releases/download/v${finalAttrs.version}/pcsx2-v${finalAttrs.version}-macos-Qt.tar.xz"; - hash = "sha256-nExKu5WwBVxUA8P3DZ7SVln5zORXcR3lM/gWjFxgAV8="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - dontPatch = true; - dontConfigure = true; - dontBuild = true; - - sourceRoot = "."; - - installPhase = '' - runHook preInstall - mkdir -p $out/Applications - cp -r "PCSX2-v${finalAttrs.version}.app" $out/Applications/PCSX2.app - runHook postInstall - ''; - - passthru = { - updateScript = ./update.sh; - }; - - meta = { - homepage = "https://pcsx2.net"; - description = "Playstation 2 emulator (precompiled binary, repacked from official website)"; - longDescription = '' - PCSX2 is an open-source PlayStation 2 (AKA PS2) emulator. Its purpose is - to emulate the PS2 hardware, using a combination of MIPS CPU Interpreters, - Recompilers and a Virtual Machine which manages hardware states and PS2 - system memory. This allows you to play PS2 games on your PC, with many - additional features and benefits. - ''; - changelog = "https://github.com/PCSX2/pcsx2/releases/tag/v${finalAttrs.version}"; - downloadPage = "https://github.com/PCSX2/pcsx2"; - license = with lib.licenses; [ - gpl3Plus - lgpl3Plus - ]; - maintainers = with lib.maintainers; [ matteopacini ]; - platforms = [ "x86_64-darwin" ]; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - }; -}) diff --git a/pkgs/by-name/pc/pcsx2-bin/update.sh b/pkgs/by-name/pc/pcsx2-bin/update.sh deleted file mode 100755 index 943d2693d201..000000000000 --- a/pkgs/by-name/pc/pcsx2-bin/update.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq gnused - -set -euo pipefail - -cd "$(dirname "$0")" || exit 1 - -# Grab latest version, ignoring "latest" and "preview" tags -LATEST_VER="$(curl --fail -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/PCSX2/pcsx2/releases/latest" | jq -r '.tag_name' | sed 's/^v//')" -CURRENT_VER="$(grep -oP 'version = "\K[^"]+' package.nix)" - -if [[ "$LATEST_VER" == "$CURRENT_VER" ]]; then - echo "pcsx2-bin is up-to-date" - exit 0 -fi - -HASH="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/PCSX2/pcsx2/releases/download/v${LATEST_VER}/pcsx2-v${LATEST_VER}-macos-Qt.tar.xz")")" - -sed -i "s#hash = \".*\"#hash = \"$HASH\"#g" package.nix -sed -i "s#version = \".*\";#version = \"$LATEST_VER\";#g" package.nix diff --git a/pkgs/by-name/pd/pdal/package.nix b/pkgs/by-name/pd/pdal/package.nix index 88cb48468f45..80ccb9bbba2e 100644 --- a/pkgs/by-name/pd/pdal/package.nix +++ b/pkgs/by-name/pd/pdal/package.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pdal"; - version = "2.9.3"; + version = "2.10.2"; src = fetchFromGitHub { owner = "PDAL"; repo = "PDAL"; tag = finalAttrs.version; - hash = "sha256-htuvNheRwzpdSKc4FbwugBWWaCNC7/20TSKwRpLr+7Y="; + hash = "sha256-VxELHAiiFMKjsvgBK4Cm6YJSrs/4QhhF1haZv4/FlZg="; }; nativeBuildInputs = [ @@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: { "pdal_io_stac_reader_test" # Require data to be downloaded from Internet - "pdal_io_copc_reader_test" + "pdal_io_copc_remote_reader_test" ]; nativeCheckInputs = [ diff --git a/pkgs/by-name/pd/pdfcrack/package.nix b/pkgs/by-name/pd/pdfcrack/package.nix index 67fbe8cc8f33..9369fefa6cb5 100644 --- a/pkgs/by-name/pd/pdfcrack/package.nix +++ b/pkgs/by-name/pd/pdfcrack/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://pdfcrack.sourceforge.net/"; description = "Small command line driven tool for recovering passwords and content from PDF files"; mainProgram = "pdfcrack"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ qoelet ]; }; diff --git a/pkgs/by-name/pd/pdfid/package.nix b/pkgs/by-name/pd/pdfid/package.nix index ace3467577e6..67d233a12a47 100644 --- a/pkgs/by-name/pd/pdfid/package.nix +++ b/pkgs/by-name/pd/pdfid/package.nix @@ -36,7 +36,7 @@ python3Packages.buildPythonApplication (finalAttrs: { meta = { description = "Scan a file to look for certain PDF keywords"; homepage = "https://blog.didierstevens.com/programs/pdf-tools/"; - license = with lib.licenses; [ free ]; + license = lib.licenses.free; mainProgram = "pdfid"; maintainers = [ ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/pd/pdfium-binaries/package.nix b/pkgs/by-name/pd/pdfium-binaries/package.nix index 316f8410f10d..a605af9f7c2e 100644 --- a/pkgs/by-name/pd/pdfium-binaries/package.nix +++ b/pkgs/by-name/pd/pdfium-binaries/package.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation (finalAttrs: { system = selectSystem { x86_64-linux = "linux-x64"; aarch64-linux = "linux-arm64"; - x86_64-darwin = "mac-x64"; aarch64-darwin = "mac-arm64"; }; in @@ -29,14 +28,12 @@ stdenv.mkDerivation (finalAttrs: { selectSystem { x86_64-linux = "sha256-I3JTNnqXpDHwl+sOS/AlPj4znG2OFIqRxtJNhXD+w6I="; aarch64-linux = "sha256-PBkwxcjsqeEElNC+V74h4P1e508IB/zXjGoQuwK6Krk="; - x86_64-darwin = "sha256-aumdSND6Lefr6GgmWBSX4pQhZj8jJIABi6VJSqKNin8="; aarch64-darwin = "sha256-DpoPHGaFkjfOa3tXItYLeJpTLfRXOrjlN/+eyPEcgOQ="; } else selectSystem { x86_64-linux = "sha256-0VaBPO4angdRqerquTjqizZWvGxrRP8k7DZXLw8Yqaw="; aarch64-linux = "sha256-h7JJxmCg9GIaVMajNZb+AeClIeX8w9XWM2RYqGhPoUY="; - x86_64-darwin = "sha256-1Or4cuxvx13Z70kIj7Q1DM1hg/bW5SPAGEDEtnBU6YI="; aarch64-darwin = "sha256-rJqrpCo+5bzqyUsRubGOsBZ8orV1dSuXfjADFJmxBOw="; }; stripRoot = false; @@ -70,7 +67,6 @@ stdenv.mkDerivation (finalAttrs: { "aarch64-linux" "aarch64-darwin" "x86_64-linux" - "x86_64-darwin" ]; }; }) diff --git a/pkgs/by-name/pd/pdfium-binaries/update.sh b/pkgs/by-name/pd/pdfium-binaries/update.sh index 7546a8926329..05957cc0d630 100755 --- a/pkgs/by-name/pd/pdfium-binaries/update.sh +++ b/pkgs/by-name/pd/pdfium-binaries/update.sh @@ -19,7 +19,6 @@ update-source-version pdfium-binaries $latestVersion || true for system in \ x86_64-linux \ aarch64-linux \ - x86_64-darwin \ aarch64-darwin; do hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url --unpack $(nix-instantiate --eval -E "with import ./. {}; pdfium-binaries.src.url" --system "$system" | tr -d '"'))) update-source-version pdfium-binaries $latestVersion $hash --system=$system --ignore-same-version @@ -28,7 +27,6 @@ done for system in \ x86_64-linux \ aarch64-linux \ - x86_64-darwin \ aarch64-darwin; do hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url --unpack $(nix-instantiate --eval -E "with import ./. {}; pdfium-binaries-v8.src.url" --system "$system" | tr -d '"'))) update-source-version pdfium-binaries-v8 $latestVersion $hash --system=$system --ignore-same-version diff --git a/pkgs/by-name/pe/pear-desktop/package.nix b/pkgs/by-name/pe/pear-desktop/package.nix index 06fa70cc0950..e011c3e4a230 100644 --- a/pkgs/by-name/pe/pear-desktop/package.nix +++ b/pkgs/by-name/pe/pear-desktop/package.nix @@ -122,7 +122,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/pe/pebble/package.nix b/pkgs/by-name/pe/pebble/package.nix index 94cb097f5dfc..418e499bd84a 100644 --- a/pkgs/by-name/pe/pebble/package.nix +++ b/pkgs/by-name/pe/pebble/package.nix @@ -33,7 +33,7 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/letsencrypt/pebble"; description = "Small RFC 8555 ACME test server"; longDescription = "Miniature version of Boulder, Pebble is a small RFC 8555 ACME test server not suited for a production CA"; - license = [ lib.licenses.mpl20 ]; + license = lib.licenses.mpl20; mainProgram = "pebble"; teams = [ lib.teams.acme ]; }; diff --git a/pkgs/by-name/pe/peertube/package.nix b/pkgs/by-name/pe/peertube/package.nix index 408dd20c1d2d..326846061102 100644 --- a/pkgs/by-name/pe/peertube/package.nix +++ b/pkgs/by-name/pe/peertube/package.nix @@ -174,7 +174,7 @@ stdenv.mkDerivation (finalAttrs: { "x86_64-linux" "aarch64-linux" # feasible, looking for maintainer to help out - # "x86_64-darwin" "aarch64-darwin" + # "aarch64-darwin" ]; maintainers = with lib.maintainers; [ immae diff --git a/pkgs/by-name/pe/perseus-cli/package.nix b/pkgs/by-name/pe/perseus-cli/package.nix index 0de27545fe47..2579f9b6d830 100644 --- a/pkgs/by-name/pe/perseus-cli/package.nix +++ b/pkgs/by-name/pe/perseus-cli/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://framesurge.sh/perseus/en-US"; description = "High-level web development framework for Rust with full support for server-side rendering and static generation"; maintainers = with lib.maintainers; [ max-niederman ]; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "perseus"; }; }) diff --git a/pkgs/by-name/pe/pest-ide-tools/package.nix b/pkgs/by-name/pe/pest-ide-tools/package.nix index 2352fb12ddeb..2e2aa95bdc85 100644 --- a/pkgs/by-name/pe/pest-ide-tools/package.nix +++ b/pkgs/by-name/pe/pest-ide-tools/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "IDE support for Pest, via the LSP"; homepage = "https://pest.rs"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ nickhu ]; mainProgram = "pest-language-server"; }; diff --git a/pkgs/by-name/pf/pfixtools/package.nix b/pkgs/by-name/pf/pfixtools/package.nix index 1733aadb6ec6..910df7af3da1 100644 --- a/pkgs/by-name/pf/pfixtools/package.nix +++ b/pkgs/by-name/pf/pfixtools/package.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation { meta = { description = "Collection of postfix-related tools"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; homepage = "https://github.com/Fruneau/pfixtools"; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ jerith666 ]; diff --git a/pkgs/by-name/pg/pgsql-tools/package.nix b/pkgs/by-name/pg/pgsql-tools/package.nix index e8ac7a04be46..8a1675a76b8a 100644 --- a/pkgs/by-name/pg/pgsql-tools/package.nix +++ b/pkgs/by-name/pg/pgsql-tools/package.nix @@ -23,10 +23,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/microsoft/pgsql-tools/releases/download/v${finalAttrs.version}/pgsqltoolsservice-linux-arm64.tar.gz"; hash = "sha256-rD8jymGdM1RDGDbrKu6E7xoWtSMRNuc2ngCmR+sHgQI="; }; - x86_64-darwin = { - url = "https://github.com/microsoft/pgsql-tools/releases/download/v${finalAttrs.version}/pgsqltoolsservice-osx-x86.tar.gz"; - hash = "sha256-KLl7HPChurzB6QYV6AqAP3g1J3VKl61+we3opzJQwG0="; - }; aarch64-darwin = { url = "https://github.com/microsoft/pgsql-tools/releases/download/v${finalAttrs.version}/pgsqltoolsservice-osx-arm64.tar.gz"; hash = "sha256-tpabEKB1kqse7D58FsP/9jywk+vgAAvptL9MadwxWg8="; diff --git a/pkgs/by-name/pg/pgsql-tools/update.sh b/pkgs/by-name/pg/pgsql-tools/update.sh index ddd35c318e8a..f6932338bd7f 100644 --- a/pkgs/by-name/pg/pgsql-tools/update.sh +++ b/pkgs/by-name/pg/pgsql-tools/update.sh @@ -19,7 +19,6 @@ update-source-version pgsql-tools "$latestVersion" --file=pkgs/by-name/pg/pgsql- declare -A platforms=( ["x86_64-linux"]="pgsqltoolsservice-linux-x64.tar.gz" ["aarch64-linux"]="pgsqltoolsservice-linux-arm64.tar.gz" - ["x86_64-darwin"]="pgsqltoolsservice-osx-x86.tar.gz" ["aarch64-darwin"]="pgsqltoolsservice-osx-arm64.tar.gz" ) diff --git a/pkgs/by-name/pg/pgtop/package.nix b/pkgs/by-name/pg/pgtop/package.nix index fdb3153caf5f..3f868bbca6d8 100644 --- a/pkgs/by-name/pg/pgtop/package.nix +++ b/pkgs/by-name/pg/pgtop/package.nix @@ -31,6 +31,6 @@ perlPackages.buildPerlPackage rec { homepage = "https://github.com/cosimo/pgtop"; changelog = "https://github.com/cosimo/pgtop/releases/tag/v${version}"; maintainers = [ lib.maintainers.hagl ]; - license = [ lib.licenses.gpl2Only ]; + license = lib.licenses.gpl2Only; }; } diff --git a/pkgs/by-name/ph/phoenixd/package.nix b/pkgs/by-name/ph/phoenixd/package.nix index ae8392392e5c..9e6357913b2a 100644 --- a/pkgs/by-name/ph/phoenixd/package.nix +++ b/pkgs/by-name/ph/phoenixd/package.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation (finalAttrs: { attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); suffix = selectSystem { aarch64-darwin = "macos-arm64"; - x86_64-darwin = "macos-x64"; x86_64-linux = "linux-x64"; aarch64-linux = "linux-arm64"; }; @@ -29,7 +28,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/ACINQ/phoenixd/releases/download/v${finalAttrs.version}/phoenixd-${finalAttrs.version}-${suffix}.zip"; hash = selectSystem { aarch64-darwin = "sha256-eVrwJGjXZNl9e2QGtVVEHjptCMPQgGaxljDEqr7LE7s="; - x86_64-darwin = "sha256-vHu+9GwN0jWvjH/bKceZHDPRidVLFLzzMen2Zc+L1ck="; x86_64-linux = "sha256-n/yvAisqpnbHs3XV0sHq0sUpq0+mqXmG+3LXRNmrLpI="; aarch64-linux = "sha256-mfhLpPXFvkO0mz4okdOXALIk8MR2CQQ8mZ6aI+QgNZs="; }; @@ -63,7 +61,6 @@ stdenv.mkDerivation (finalAttrs: { "aarch64-linux" "aarch64-darwin" "x86_64-linux" - "x86_64-darwin" ]; }; }) diff --git a/pkgs/by-name/ph/phoenixd/update.sh b/pkgs/by-name/ph/phoenixd/update.sh index a983312c6a71..4c051abfede3 100755 --- a/pkgs/by-name/ph/phoenixd/update.sh +++ b/pkgs/by-name/ph/phoenixd/update.sh @@ -17,7 +17,6 @@ fi for system in \ aarch64-linux \ - x86_64-darwin \ aarch64-darwin; do hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix-instantiate --eval -E "with import ./. {}; phoenixd.src.url" --system "$system" | tr -d '"'))) update-source-version phoenixd $latestVersion $hash --system=$system --ignore-same-version diff --git a/pkgs/by-name/pi/pi-coding-agent/package.nix b/pkgs/by-name/pi/pi-coding-agent/package.nix index 2f036acdaab1..4f6ca2cfe83b 100644 --- a/pkgs/by-name/pi/pi-coding-agent/package.nix +++ b/pkgs/by-name/pi/pi-coding-agent/package.nix @@ -12,16 +12,16 @@ }: buildNpmPackage (finalAttrs: { pname = "pi-coding-agent"; - version = "0.80.6"; + version = "0.80.8"; src = fetchFromGitHub { owner = "earendil-works"; repo = "pi"; tag = "v${finalAttrs.version}"; - hash = "sha256-e/wcHruEcBAHDF5tKvwew7LXjVp0eraHh2k+QaL2sCA="; + hash = "sha256-wCsZA1gb9sFri6OdTWBf0UCXYxqxlbImG8iE6K+D9u4="; }; - npmDepsHash = "sha256-xXEOR0epZcfbXayYGyJdBiFVliamBexqA+1Sd7wlGhU="; + npmDepsHash = "sha256-WdSQHKKOVzEFxUQH3QnSVzs+HpJPATnCQ701nbRB0lc="; npmWorkspace = "packages/coding-agent"; @@ -104,7 +104,10 @@ buildNpmPackage (finalAttrs: { downloadPage = "https://www.npmjs.com/package/@earendil-works/pi-coding-agent"; changelog = "https://github.com/earendil-works/pi/blob/main/packages/coding-agent/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ munksgaard ]; + maintainers = with lib.maintainers; [ + munksgaard + bryanhonof + ]; mainProgram = "pi"; }; }) diff --git a/pkgs/by-name/pi/picat/package.nix b/pkgs/by-name/pi/picat/package.nix index 9686bb196c47..511899f77f0d 100644 --- a/pkgs/by-name/pi/picat/package.nix +++ b/pkgs/by-name/pi/picat/package.nix @@ -31,7 +31,6 @@ stdenv.mkDerivation { x86_64-linux = "linux64"; aarch64-linux = "linux64"; x86_64-cygwin = "cygwin64"; - x86_64-darwin = "mac64"; aarch64-darwin = "mac64"; } ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -69,7 +68,6 @@ stdenv.mkDerivation { "x86_64-linux" "aarch64-linux" "x86_64-cygwin" - "x86_64-darwin" "aarch64-darwin" ]; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/pi/picgo/package.nix b/pkgs/by-name/pi/picgo/package.nix index e751fa0e7c50..24bcc055a3e1 100644 --- a/pkgs/by-name/pi/picgo/package.nix +++ b/pkgs/by-name/pi/picgo/package.nix @@ -18,20 +18,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "picgo"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "Molunerfinn"; repo = "PicGo"; tag = "v${finalAttrs.version}"; - hash = "sha256-ruTgNgZsjpdu2Cc2Q4HxPdoQHUww1UTbvLazglaz75c="; + hash = "sha256-uxgrtuxcIlwCuz3X2hL0ZSpq8hMA4JxQD8ibNFw+35g="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) version src; inherit pnpm; pname = "picgo"; - hash = "sha256-IAuTtI0Ljm4+xCeMGIQAf7lK37CQ6qf7PJsksLIti7Q="; + hash = "sha256-a08WFoWcjo0mV1eu8oOQgbOiu/xfpoMxx3v17Eltsbk="; fetcherVersion = 3; # lockfileVersion 9.0 corresponds to fetcherVersion 3 }; diff --git a/pkgs/by-name/pi/picosnitch/package.nix b/pkgs/by-name/pi/picosnitch/package.nix index d2fa2667bc60..6462446f3138 100644 --- a/pkgs/by-name/pi/picosnitch/package.nix +++ b/pkgs/by-name/pi/picosnitch/package.nix @@ -11,12 +11,12 @@ python3.pkgs.buildPythonApplication rec { pname = "picosnitch"; - version = "2.1.2"; + version = "2.2.1"; pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "sha256-JTvuZOPgSjdD5jJYLmsqzy8ATzuhtoAu+uGvOVsChks="; + sha256 = "sha256-HJQOO8WTNsan3hMoFu7C2DMYrg98GF5hmK2SR6iy5ew="; }; build-system = with python3.pkgs; [ hatchling ]; diff --git a/pkgs/by-name/pi/pict-rs/package.nix b/pkgs/by-name/pi/pict-rs/package.nix index f7525ec4500f..5bdf1e096728 100644 --- a/pkgs/by-name/pi/pict-rs/package.nix +++ b/pkgs/by-name/pi/pict-rs/package.nix @@ -51,7 +51,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Simple image hosting service"; mainProgram = "pict-rs"; homepage = "https://git.asonix.dog/asonix/pict-rs"; - license = with lib.licenses; [ agpl3Plus ]; + license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ happysalada ]; }; }) diff --git a/pkgs/by-name/pi/pigeon/package.nix b/pkgs/by-name/pi/pigeon/package.nix index de228c80efaa..889c337e0900 100644 --- a/pkgs/by-name/pi/pigeon/package.nix +++ b/pkgs/by-name/pi/pigeon/package.nix @@ -28,6 +28,6 @@ buildGoModule (finalAttrs: { description = "PEG parser generator for Go"; mainProgram = "pigeon"; maintainers = with lib.maintainers; [ zimbatm ]; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; }; }) diff --git a/pkgs/by-name/pi/pijul/package.nix b/pkgs/by-name/pi/pijul/package.nix index 75e35a8bf6f0..cf1cf740d9d0 100644 --- a/pkgs/by-name/pi/pijul/package.nix +++ b/pkgs/by-name/pi/pijul/package.nix @@ -52,7 +52,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Distributed version control system"; homepage = "https://pijul.org"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ gal_bolle dywedir diff --git a/pkgs/by-name/pi/pik/package.nix b/pkgs/by-name/pi/pik/package.nix index 021a00c7fe4f..37c8b07f1ec0 100644 --- a/pkgs/by-name/pi/pik/package.nix +++ b/pkgs/by-name/pi/pik/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: { It works like pkill command but search is interactive. ''; homepage = "https://github.com/jacek-kurlit/pik"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ bew ]; mainProgram = "pik"; }; diff --git a/pkgs/by-name/pi/pinegrow/package.nix b/pkgs/by-name/pi/pinegrow/package.nix index fdcb41335c28..c62ede8a5590 100644 --- a/pkgs/by-name/pi/pinegrow/package.nix +++ b/pkgs/by-name/pi/pinegrow/package.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation { description = "UI Web Editor"; platforms = [ "x86_64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = with lib.licenses; [ unfreeRedistributable ]; + license = lib.licenses.unfreeRedistributable; maintainers = with lib.maintainers; [ gador ]; mainProgram = "pinegrow"; }; diff --git a/pkgs/by-name/pi/pinnacle/package.nix b/pkgs/by-name/pi/pinnacle/package.nix index 7c62582fa34e..3e42a9c08ed8 100644 --- a/pkgs/by-name/pi/pinnacle/package.nix +++ b/pkgs/by-name/pi/pinnacle/package.nix @@ -53,6 +53,12 @@ let src = pinnacle-src; sourceRoot = "${src.name}/api/lua"; knownRockspec = "${pinnacle-src}/api/lua/rockspecs/pinnacle-api-0.2.4-1.rockspec"; + + postConfigure = '' + substituteInPlace "$rockspecFilename" \ + --replace-fail '"compat53 ~> 0.14"' '"compat53 >= 0.14"' + ''; + propagatedBuildInputs = with lua54Packages; [ cqueues http diff --git a/pkgs/by-name/pi/pinokio/package.nix b/pkgs/by-name/pi/pinokio/package.nix index 94491c396b06..37925159de60 100644 --- a/pkgs/by-name/pi/pinokio/package.nix +++ b/pkgs/by-name/pi/pinokio/package.nix @@ -11,10 +11,6 @@ let src = fetchurl { - x86_64-darwin = { - url = "https://github.com/pinokiocomputer/pinokio/releases/download/${version}/Pinokio-${version}.dmg"; - hash = "sha256-Il5zaVWu4icSsKmMjU9u1/Mih34fd+xNpF1nkFAFFGo="; - }; x86_64-linux = { url = "https://github.com/pinokiocomputer/pinokio/releases/download/${version}/Pinokio-${version}.AppImage"; hash = "sha256-/E/IAOUgxH9RWpE2/vLlQy92LOgwpHF79K/1XEtSpXI="; @@ -30,7 +26,6 @@ let license = lib.licenses.mit; maintainers = with lib.maintainers; [ ByteSudoer ]; platforms = [ - "x86_64-darwin" "x86_64-linux" ]; mainProgram = "pinokio"; diff --git a/pkgs/by-name/pi/piped/package.nix b/pkgs/by-name/pi/piped/package.nix index aab4f2408d10..e09939daa812 100644 --- a/pkgs/by-name/pi/piped/package.nix +++ b/pkgs/by-name/pi/piped/package.nix @@ -5,20 +5,20 @@ fetchPnpmDeps, pnpmConfigHook, fetchFromGitHub, - unstableGitUpdater, + nix-update-script, }: let pnpm = pnpm_10; in buildNpmPackage rec { pname = "piped"; - version = "0-unstable-2024-11-04"; + version = "0-unstable-2026-07-06"; src = fetchFromGitHub { owner = "TeamPiped"; repo = "piped"; - rev = "7866c06801baef16ce94d6f4dd0f8c1b8bc88153"; - hash = "sha256-o3TwE0s5rim+0VKR+oW9Rv3/eQRf2dgRQK4xjZ9pqCE="; + rev = "335b10d0c02e407b4ba9113e32912b0d783ad455"; + hash = "sha256-vcXmsgDZJ3v/1XNXtU3v9GWlDJBatXK9peTPVQe5De0="; }; nativeBuildInputs = [ pnpm ]; @@ -39,16 +39,18 @@ buildNpmPackage rec { pnpm ; fetcherVersion = 4; - hash = "sha256-o5NKMMIVPkKiPx++ALcZ+3oN80DMQHPwQqGT4f4q5P8="; + hash = "sha256-55nG7tfXtxnyfZop+8Wg8rSFOHQi0TjRc0QT16erX1E="; }; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; meta = { homepage = "https://github.com/TeamPiped/Piped"; description = "Efficient and privacy-friendly YouTube frontend"; maintainers = [ ]; - license = [ lib.licenses.agpl3Plus ]; + license = lib.licenses.agpl3Plus; }; } diff --git a/pkgs/by-name/pi/pipeweaver/package.nix b/pkgs/by-name/pi/pipeweaver/package.nix index ac386a89f88c..cd64c4d802d8 100644 --- a/pkgs/by-name/pi/pipeweaver/package.nix +++ b/pkgs/by-name/pi/pipeweaver/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage ( sourceRoot = "${finalAttrs.src.name}/web"; - npmDepsHash = "sha256-ZX/3H/VdRdWC2j+mPA/0rZflDhslqTN1mqA9vvQRQG0="; + npmDepsHash = "sha256-kInUUBeau7alBB9GcIyrBf6PwYSEj4NTMoO1/lguRQU="; installPhase = '' runHook preInstall @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage ( in { pname = "pipeweaver"; - version = "0.1.6"; + version = "0.1.9"; __structuredAttrs = true; @@ -37,10 +37,10 @@ rustPlatform.buildRustPackage ( owner = "pipeweaver"; repo = "pipeweaver"; tag = "v${finalAttrs.version}"; - hash = "sha256-wf3gxCLT5vOz+5+CpfmkX0stKoAOpQ6KIoW6xBNV1xk="; + hash = "sha256-aGZ5VfHv5DHPsGhFGXhQBl3DNt6J+h5daMu38LJshI4="; }; - cargoHash = "sha256-Jv0fF6keg2NcUnCJhCId7rwPVZK1/Q9+otQNjp54RCI="; + cargoHash = "sha256-XC/jK70FZs8jF0A85MpoxcMmxF/FmExD/qfF4KL9Y0M="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/pi/pipeworld/package.nix b/pkgs/by-name/pi/pipeworld/package.nix index 9f8835de61b9..850d2c0363bd 100644 --- a/pkgs/by-name/pi/pipeworld/package.nix +++ b/pkgs/by-name/pi/pipeworld/package.nix @@ -44,7 +44,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { application within another desktop as a 'substitute' for your normal terminal emulator. ''; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = [ ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/pi/piskel/package.nix b/pkgs/by-name/pi/piskel/package.nix new file mode 100644 index 000000000000..ef95c4c1bd8d --- /dev/null +++ b/pkgs/by-name/pi/piskel/package.nix @@ -0,0 +1,70 @@ +{ + lib, + fetchFromGitHub, + buildNpmPackage, + makeDesktopItem, + makeWrapper, + + nwjs, +}: + +let + desktopItem = makeDesktopItem { + desktopName = "Piskel"; + comment = "Easy-to-use sprite editor"; + name = "piskel"; + exec = "piskel"; + icon = "piskel"; + terminal = false; + categories = [ "Graphics" ]; + }; +in +buildNpmPackage rec { + pname = "piskel"; + # Newest version is 0.15.0 and is years old already (also doesn't build correctly) + version = "0.15.2-SNAPSHOT-unstable-2026-04-09"; + + src = fetchFromGitHub { + owner = "piskelapp"; + repo = "piskel"; + rev = "a6b9c02daefceb10093f71e92d52d16920ccb16e"; + hash = "sha256-AorkV1mqZJ9coRMRCCdYIdAwhedrBRG8GR7Y0/zPPHo="; + }; + npmDepsHash = "sha256-tu0A5Xcz2V12pRF0LxHA48czkPR/0SslA3SEGdhdqMQ="; + + env = { + "PUPPETEER_SKIP_DOWNLOAD" = "1"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/site/dest/ + + cp -r dest/prod $out/site/dest/ + cp package.json $out/site/ + + install -Dm644 ${desktopItem}/share/applications/piskel.desktop -t $out/share/applications + install -Dm644 src/logo.png $out/share/icons/hicolor/64x64/apps/piskel.png + + makeWrapper ${nwjs}/bin/nw $out/bin/${pname} \ + --add-flags $out/site + + runHook postInstall + ''; + + meta = { + description = "Easy-to-use sprite editor"; + homepage = "https://github.com/piskelapp/piskel"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + rsahwe + ]; + mainProgram = "piskel"; + platforms = nwjs.meta.platforms; + }; + + __structuredAttrs = true; +} diff --git a/pkgs/by-name/pi/pixieditor/package.nix b/pkgs/by-name/pi/pixieditor/package.nix index 7153f6efc502..bbfd9eac45ef 100644 --- a/pkgs/by-name/pi/pixieditor/package.nix +++ b/pkgs/by-name/pi/pixieditor/package.nix @@ -182,7 +182,6 @@ buildDotnetModule (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/pk/pkarr/package.nix b/pkgs/by-name/pk/pkarr/package.nix index fa5c8352b03c..f709cd6f4a17 100644 --- a/pkgs/by-name/pk/pkarr/package.nix +++ b/pkgs/by-name/pk/pkarr/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Public Key Addressable Resource Records (sovereign TLDs) "; homepage = "https://github.com/pubky/pkarr"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ dpc ]; mainProgram = "pkarr-server"; }; diff --git a/pkgs/by-name/pk/pkgsite/package.nix b/pkgs/by-name/pk/pkgsite/package.nix index 678d072ed143..e7a9769ca64e 100644 --- a/pkgs/by-name/pk/pkgsite/package.nix +++ b/pkgs/by-name/pk/pkgsite/package.nix @@ -7,16 +7,16 @@ buildGoModule { pname = "pkgsite"; - version = "0.2.0-unstable-2026-07-07"; + version = "0.3.0-unstable-2026-07-16"; src = fetchFromGitHub { owner = "golang"; repo = "pkgsite"; - rev = "0cc61a18508245cabd093f065961abd5df0af028"; - hash = "sha256-tgLjEs9dt7TA9yRq/toUWPiorA4b20GnjmO6HJbFFd8="; + rev = "8d05c43dae2e668886572ee959babdb429ad6429"; + hash = "sha256-xc/pPJIRGuTGrdh2VFwPY+uud98ST0HaFPUsa5GvvhQ="; }; - vendorHash = "sha256-a53JKkoJmnSO+ShxUt68LEq9uDeNi/vN/d0OuhrIUvA="; + vendorHash = "sha256-NZzA9QxVSYuSjeZOiwUAXAPBrN00JLHQNPp1lXqtmCw="; subPackages = [ "cmd/pkgsite" ]; diff --git a/pkgs/by-name/pl/platformsh/package.nix b/pkgs/by-name/pl/platformsh/package.nix index 2f6d7c0a4b9a..5558fe7ed7e4 100644 --- a/pkgs/by-name/pl/platformsh/package.nix +++ b/pkgs/by-name/pl/platformsh/package.nix @@ -70,7 +70,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/pl/plezy/package.nix b/pkgs/by-name/pl/plezy/package.nix index 17ef30c364d1..2b289563e176 100644 --- a/pkgs/by-name/pl/plezy/package.nix +++ b/pkgs/by-name/pl/plezy/package.nix @@ -58,7 +58,6 @@ let BatteredBunny ]; platforms = lib.platforms.linux ++ [ - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = lib.optionals stdenv.hostPlatform.isDarwin ( diff --git a/pkgs/by-name/pl/plus42/package.nix b/pkgs/by-name/pl/plus42/package.nix index 232710d80be7..38503d07f6f8 100644 --- a/pkgs/by-name/pl/plus42/package.nix +++ b/pkgs/by-name/pl/plus42/package.nix @@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://thomasokken.com/plus42/"; changelog = "https://thomasokken.com/plus42/history.html"; description = "Software clone of the HP-42S calculator (enhanced version)"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ elfenermarcell ]; mainProgram = "plus42dec"; platforms = with lib.platforms; unix; diff --git a/pkgs/by-name/pm/pmbootstrap/package.nix b/pkgs/by-name/pm/pmbootstrap/package.nix index 256e1533000e..62c43e31df8f 100644 --- a/pkgs/by-name/pm/pmbootstrap/package.nix +++ b/pkgs/by-name/pm/pmbootstrap/package.nix @@ -15,14 +15,14 @@ python3Packages.buildPythonApplication rec { pname = "pmbootstrap"; - version = "3.10.3"; + version = "3.11.1"; pyproject = true; src = fetchFromGitLab { owner = "postmarketOS"; repo = "pmbootstrap"; tag = version; - hash = "sha256-Zl7Ti0HwMQSjMeW4GjdEKIRoCNjV15Qiv8bzhktNoyQ="; + hash = "sha256-8i2CUJL/FALS3B/q39OlpQbhrY4ar2qdn0gnbFuJjUk="; domain = "gitlab.postmarketos.org"; }; diff --git a/pkgs/by-name/pm/pmtiles/package.nix b/pkgs/by-name/pm/pmtiles/package.nix index 1f0468702abb..eb155ef71e56 100644 --- a/pkgs/by-name/pm/pmtiles/package.nix +++ b/pkgs/by-name/pm/pmtiles/package.nix @@ -5,13 +5,13 @@ }: buildGoModule (finalAttrs: { pname = "pmtiles"; - version = "1.31.0"; + version = "1.31.1"; src = fetchFromGitHub { owner = "protomaps"; repo = "go-pmtiles"; tag = "v${finalAttrs.version}"; - hash = "sha256-OWf66RsOvYoJEsDI4rVsimX60uxuZoqTgIwAI7kxvs0="; + hash = "sha256-Hx20rNKmoxryD+/GClJpbXvjta6TUzaHJIRCu1f+lRU="; }; vendorHash = "sha256-0u/04mpqhpRideIf8eOzgC7ZWNp4P2c2ssQvyWlcD4M="; diff --git a/pkgs/by-name/pn/pngout/package.nix b/pkgs/by-name/pn/pngout/package.nix index c257ea350a83..29fa25fd74ce 100644 --- a/pkgs/by-name/pn/pngout/package.nix +++ b/pkgs/by-name/pn/pngout/package.nix @@ -22,9 +22,6 @@ let folder = "i686"; ld-linux = "ld-linux.so.2"; }; - x86_64-darwin = { - folder = "."; - }; x86_64-linux = { folder = "amd64"; ld-linux = "ld-linux-x86-64.so.2"; diff --git a/pkgs/by-name/pn/pnmixer/package.nix b/pkgs/by-name/pn/pnmixer/package.nix index a8046dc4f78e..4840b0f5f6f0 100644 --- a/pkgs/by-name/pn/pnmixer/package.nix +++ b/pkgs/by-name/pn/pnmixer/package.nix @@ -10,13 +10,16 @@ glib, libnotify, libx11, - pcre, }: stdenv.mkDerivation (finalAttrs: { pname = "pnmixer"; version = "0.7.2"; + strictDeps = true; + __structuredAttrs = true; + enableParallelBuilding = true; + src = fetchFromGitHub { owner = "nicklan"; repo = "pnmixer"; @@ -41,7 +44,6 @@ stdenv.mkDerivation (finalAttrs: { glib libnotify libx11 - pcre ]; meta = { diff --git a/pkgs/by-name/po/pocket-id/package.nix b/pkgs/by-name/po/pocket-id/package.nix index 8aab3ee29b46..9ddd5193ac3a 100644 --- a/pkgs/by-name/po/pocket-id/package.nix +++ b/pkgs/by-name/po/pocket-id/package.nix @@ -1,30 +1,31 @@ { lib, fetchFromGitHub, - buildGo126Module, + buildGo127Module, stdenvNoCC, nodejs, pnpm_10, fetchPnpmDeps, pnpmConfigHook, + pnpmBuildHook, nixosTests, nix-update-script, versionCheckHook, }: -buildGo126Module (finalAttrs: { +buildGo127Module (finalAttrs: { pname = "pocket-id"; - version = "2.9.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "pocket-id"; repo = "pocket-id"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZGjlEbx7gU1HHJRRSONFq/nYnubHOjfxQsVYpEHQkGE="; + hash = "sha256-ad8YlWwWeGEwsrx29qpq1asEr4UNN7BueGTBPfFrRuE="; }; sourceRoot = "${finalAttrs.src.name}/backend"; - vendorHash = "sha256-elY0YGOOtZtlLnyFiDJ6ZzZULhI183kZgsFmQQAg2EE="; + vendorHash = "sha256-bQNeocRCmhiV7gwCJppjsNw7K5MnsJMK9M18jf0X/oM="; env.CGO_ENABLED = 0; ldflags = [ @@ -59,24 +60,19 @@ buildGo126Module (finalAttrs: { nativeBuildInputs = [ nodejs pnpmConfigHook + pnpmBuildHook pnpm_10 ]; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_10; - fetcherVersion = 3; - hash = "sha256-lQw+hmJcEBzMe3uOTmRErfHojAHwnRBN6aTy7yK9BCA="; + fetcherVersion = 4; + hash = "sha256-LVhTS3ertpGqLMsoodaoEgDb7sK3kTRTVB3KOyvJwpE="; }; env.BUILD_OUTPUT_PATH = "dist"; - buildPhase = '' - runHook preBuild - - pnpm --filter pocket-id-frontend build - - runHook postBuild - ''; + pnpmWorkspaces = [ "pocket-id-frontend" ]; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/po/pocketbase/package.nix b/pkgs/by-name/po/pocketbase/package.nix index c717b2df6932..e31c998bf487 100644 --- a/pkgs/by-name/po/pocketbase/package.nix +++ b/pkgs/by-name/po/pocketbase/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "pocketbase"; - version = "0.39.5"; + version = "0.39.6"; src = fetchFromGitHub { owner = "pocketbase"; repo = "pocketbase"; rev = "v${finalAttrs.version}"; - hash = "sha256-3OsvxKhYd/kQuxDVBjClJrOdFevTeBJmT3gImP/aTcE="; + hash = "sha256-EQMgqdxssB4FbVJDoYZTdk9vq+++k52MJe/6ZiGgHjo="; }; - vendorHash = "sha256-8ABdBsV7FhXNbKkUUcje8OgtVHB4BfRjWVfFAK4I8As="; + vendorHash = "sha256-Xu9jokD5Dkov5kZjO05q60YpM3NZlbwOZs0XJmQ8kC8="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; diff --git a/pkgs/by-name/po/podman-bootc/package.nix b/pkgs/by-name/po/podman-bootc/package.nix index 59c7fa4388c0..cf1d644e0d26 100644 --- a/pkgs/by-name/po/podman-bootc/package.nix +++ b/pkgs/by-name/po/podman-bootc/package.nix @@ -66,8 +66,6 @@ buildGoModule (finalAttrs: { changelog = "https://github.com/bootc-dev/podman-bootc/releases/tag/${finalAttrs.src.tag}"; maintainers = with lib.maintainers; [ evan-goode ]; license = lib.licenses.asl20; - # x86_64-darwin does not seem to be supported at this time: - # https://github.com/containers/podman-bootc/issues/46 platforms = [ "aarch64-linux" "aarch64-darwin" diff --git a/pkgs/by-name/po/pods/package.nix b/pkgs/by-name/po/pods/package.nix index 7838c7c3c75c..efe8edd68f3b 100644 --- a/pkgs/by-name/po/pods/package.nix +++ b/pkgs/by-name/po/pods/package.nix @@ -23,18 +23,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "pods"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "marhkb"; repo = "pods"; tag = "v${finalAttrs.version}"; - hash = "sha256-50NOkLffLbs5/qug6xzoSWSMZ3+/Lau9sTPi9za4+LA="; + hash = "sha256-GMFrcWFozRR0G0+7g5JJyMkWzPY79cVF4Go1Wd/4HtA="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-JbYJQdli3OAxnbGApVe5+KAAcGePTTH59fdXdFx0+hA="; + hash = "sha256-P0teC048Z61pMrl5cvlvrGaPcccxTki/AIthyzQusGI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/po/policycoreutils/package.nix b/pkgs/by-name/po/policycoreutils/package.nix index 41b9919dcafd..89a2e30e324c 100644 --- a/pkgs/by-name/po/policycoreutils/package.nix +++ b/pkgs/by-name/po/policycoreutils/package.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "policycoreutils"; - version = "3.10"; + version = "3.11"; inherit (libsepol) se_url; src = fetchurl { url = "${finalAttrs.se_url}/${finalAttrs.version}/policycoreutils-${finalAttrs.version}.tar.gz"; - hash = "sha256-jb1Q2Gisv66dGpcva7slh/BsnsczCNEa9qyzpAHemDI="; + hash = "sha256-BU5B7AOXMaXua3l6jguNbjRu4dCpusLyUttIwj+aixs="; }; postPatch = '' diff --git a/pkgs/by-name/po/pomerium-cli/package.nix b/pkgs/by-name/po/pomerium-cli/package.nix index 0f1409717ad0..e92bfb62d7aa 100644 --- a/pkgs/by-name/po/pomerium-cli/package.nix +++ b/pkgs/by-name/po/pomerium-cli/package.nix @@ -14,16 +14,16 @@ let in buildGoModule (finalAttrs: { pname = "pomerium-cli"; - version = "0.32.2"; + version = "0.33.0"; src = fetchFromGitHub { owner = "pomerium"; repo = "cli"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-t2Sp4zAIybUsxaBdQ9ev+EJsFpWqM8KWaE2UOI4xw5A="; + sha256 = "sha256-Rn/TUTqqUtd4vWfj51aRrdst25B9Weiajesa2AtcEt4="; }; - vendorHash = "sha256-LzXcHGRBn99WhDsxLQKY3t8Zp4sw9Ec5CbA/rU/3SQ0="; + vendorHash = "sha256-Jr+sGTjFB/6cNggdbCL3PqwVaHqr/hWrVLLjdPbL82Y="; subPackages = [ "cmd/pomerium-cli" diff --git a/pkgs/by-name/po/ponyc/package.nix b/pkgs/by-name/po/ponyc/package.nix index 3d01332e124f..56d979f892f7 100644 --- a/pkgs/by-name/po/ponyc/package.nix +++ b/pkgs/by-name/po/ponyc/package.nix @@ -199,7 +199,6 @@ stdenv.mkDerivation (finalAttrs: { ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; diff --git a/pkgs/by-name/po/pop-hp-wallpapers/package.nix b/pkgs/by-name/po/pop-hp-wallpapers/package.nix index 535476b673cb..badaf14cfa28 100644 --- a/pkgs/by-name/po/pop-hp-wallpapers/package.nix +++ b/pkgs/by-name/po/pop-hp-wallpapers/package.nix @@ -28,7 +28,7 @@ stdenvNoCC.mkDerivation { meta = { description = "Wallpapers for High-Performance System76 products"; homepage = "https://pop.system76.com/"; - license = with lib.licenses; [ cc-by-sa-40 ]; + license = lib.licenses.cc-by-sa-40; maintainers = with lib.maintainers; [ pandapip1 ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/po/pop/package.nix b/pkgs/by-name/po/pop/package.nix index 2793314a8f2c..8e01b0cf022f 100644 --- a/pkgs/by-name/po/pop/package.nix +++ b/pkgs/by-name/po/pop/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "pop"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "pop"; rev = "v${finalAttrs.version}"; - hash = "sha256-MG6mkWT+cjtE646P4K7I+jW9VxFSrI8wJ2D8Kwtia7k="; + hash = "sha256-2114PK3xcIykC4QTTzj54S4EjHVbcxpy8D7C735xdew="; }; - vendorHash = "sha256-ZF/nINEqAgcsYwkzCepHX/vqODrzcEKoL3LvQmjRphU="; + vendorHash = "sha256-v3rozaY/kp/M4K397c+qtktIPyJJ+RIvPtPvd9qVpwU="; env.GOWORK = "off"; diff --git a/pkgs/by-name/po/postman/package.nix b/pkgs/by-name/po/postman/package.nix index 7a4d0162dd2f..5f62e19b473f 100644 --- a/pkgs/by-name/po/postman/package.nix +++ b/pkgs/by-name/po/postman/package.nix @@ -19,7 +19,6 @@ let system = selectSystem { aarch64-darwin = "osx_arm64"; aarch64-linux = "linuxarm64"; - x86_64-darwin = "osx_64"; x86_64-linux = "linux64"; }; in @@ -29,7 +28,6 @@ let hash = selectSystem { aarch64-darwin = "sha256-rZLqbcX5ZRNeDUyEWcsLWMr3KXsnXRKBRmLZKMH9gIs="; aarch64-linux = "sha256-sMJohqgY8DrC7DLgU9AQofLWMhebznAJSLFe5D65c4M="; - x86_64-darwin = "sha256-Bit/M3Z+3bJsGSWdCDp9xK9RnxH6bptI0eMqt28dwHQ="; x86_64-linux = "sha256-PsTFM5UwX104G8YIwAy1OY4EgNhspupkPJ53y3qwGUc="; }; }; @@ -66,7 +64,6 @@ let platforms = [ "aarch64-darwin" "aarch64-linux" - "x86_64-darwin" "x86_64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/po/pouf/package.nix b/pkgs/by-name/po/pouf/package.nix index fe4e0747162e..22ad54f4a30d 100644 --- a/pkgs/by-name/po/pouf/package.nix +++ b/pkgs/by-name/po/pouf/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/mothsart/pouf"; changelog = "https://github.com/mothsart/pouf/releases/tag/${finalAttrs.version}"; maintainers = with lib.maintainers; [ mothsart ]; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "pouf"; }; }) diff --git a/pkgs/by-name/po/powerdns-admin/0007-Fix-oidc.patch b/pkgs/by-name/po/powerdns-admin/0007-Fix-oidc.patch new file mode 100644 index 000000000000..39623650cd9d --- /dev/null +++ b/pkgs/by-name/po/powerdns-admin/0007-Fix-oidc.patch @@ -0,0 +1,48 @@ +diff --git a/powerdnsadmin/routes/index.py b/powerdnsadmin/routes/index.py +index 23d88bb..edfab3f 100644 +--- a/powerdnsadmin/routes/index.py ++++ b/powerdnsadmin/routes/index.py +@@ -392,11 +392,38 @@ def login(): + return authenticate_user(user, 'Azure OAuth') + + if 'oidc_token' in session: +- user_data = json.loads(oidc.get('userinfo').text) +- oidc_username = user_data[Setting().get('oidc_oauth_username')] +- oidc_first_name = user_data[Setting().get('oidc_oauth_firstname')] +- oidc_last_name = user_data[Setting().get('oidc_oauth_last_name')] +- oidc_email = user_data[Setting().get('oidc_oauth_email')] ++ try: ++ oidc_metadata = oidc.load_server_metadata() ++ except Exception as e: ++ current_app.logger.warning( ++ 'OIDC: unable to load server metadata ({}); ' ++ 'falling back to relative userinfo endpoint'.format(e)) ++ oidc_metadata = {} ++ ++ userinfo_endpoint = oidc_metadata.get('userinfo_endpoint') ++ try: ++ if userinfo_endpoint: ++ userinfo_resp = oidc.get(userinfo_endpoint, timeout=15) ++ else: ++ userinfo_resp = oidc.get('userinfo', timeout=15) ++ userinfo_resp.raise_for_status() ++ user_data = userinfo_resp.json() ++ except Exception as e: ++ current_app.logger.error('OIDC: failed to fetch userinfo: {}'.format(e)) ++ session.pop('oidc_token', None) ++ return redirect(url_for('index.login')) ++ ++ oidc_username = user_data.get(Setting().get('oidc_oauth_username')) ++ oidc_first_name = user_data.get(Setting().get('oidc_oauth_firstname'), '') ++ oidc_last_name = user_data.get(Setting().get('oidc_oauth_last_name'), '') ++ oidc_email = user_data.get(Setting().get('oidc_oauth_email'), '') ++ ++ if not oidc_username: ++ current_app.logger.error( ++ 'OIDC: username claim "{}" not present in userinfo'.format( ++ Setting().get('oidc_oauth_username'))) ++ session.pop('oidc_token', None) ++ return redirect(url_for('index.login')) + + user = User.query.filter_by(username=oidc_username).first() + if not user: diff --git a/pkgs/by-name/po/powerdns-admin/0008-Fix-profile-save-overwriting-password-with-empty-val.patch b/pkgs/by-name/po/powerdns-admin/0008-Fix-profile-save-overwriting-password-with-empty-val.patch new file mode 100644 index 000000000000..22479605cd90 --- /dev/null +++ b/pkgs/by-name/po/powerdns-admin/0008-Fix-profile-save-overwriting-password-with-empty-val.patch @@ -0,0 +1,30 @@ +diff --git a/powerdnsadmin/models/user.py b/powerdnsadmin/models/user.py +index 42f894f..f9d845e 100644 +--- a/powerdnsadmin/models/user.py ++++ b/powerdnsadmin/models/user.py +@@ -435,7 +435,7 @@ class User(db.Model): + name='Administrator').first().id + + if hasattr(self, "plain_text_password"): +- if self.plain_text_password != None: ++ if self.plain_text_password: + self.password = self.get_hashed_password( + self.plain_text_password) + else: +@@ -476,7 +476,7 @@ class User(db.Model): + + # store new password hash (only if changed) + if hasattr(self, "plain_text_password"): +- if self.plain_text_password != None: ++ if self.plain_text_password: + user.password = self.get_hashed_password( + self.plain_text_password).decode("utf-8") + +@@ -495,7 +495,7 @@ class User(db.Model): + user.lastname = self.lastname if self.lastname else user.lastname + + if hasattr(self, "plain_text_password"): +- if self.plain_text_password != None: ++ if self.plain_text_password: + user.password = self.get_hashed_password( + self.plain_text_password).decode("utf-8") diff --git a/pkgs/by-name/po/powerdns-admin/package.nix b/pkgs/by-name/po/powerdns-admin/package.nix index ad085252faba..424fc71278cd 100644 --- a/pkgs/by-name/po/powerdns-admin/package.nix +++ b/pkgs/by-name/po/powerdns-admin/package.nix @@ -133,6 +133,8 @@ stdenv.mkDerivation { ./0004-Fix-flask-session-and-powerdns-admin-compatibility.patch ./0005-Fix-app-context-and-register-modules.patch ./0006-Fix-regex.patch + ./0007-Fix-oidc.patch + ./0008-Fix-profile-save-overwriting-password-with-empty-val.patch ]; postPatch = '' diff --git a/pkgs/by-name/po/powershell/package.nix b/pkgs/by-name/po/powershell/package.nix index b7c267790d9e..b8611e6701a3 100644 --- a/pkgs/by-name/po/powershell/package.nix +++ b/pkgs/by-name/po/powershell/package.nix @@ -102,10 +102,6 @@ stdenv.mkDerivation rec { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-arm64.tar.gz"; hash = "sha256-ehSjheyn3FvtwciqPYt2X0Sa2jCqvleFqf0zEmbrBi0="; }; - x86_64-darwin = fetchurl { - url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-x64.tar.gz"; - hash = "sha256-8CBzpEJRWHeqWo82H1WGaAAQDEG2Zc+2SIO3fbuglBI="; - }; x86_64-linux = fetchurl { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-x64.tar.gz"; hash = "sha256-hW0HZdIzI3f516Sup279/eTeUURudzjd4t/aQdup4qc="; diff --git a/pkgs/by-name/po/powersploit/package.nix b/pkgs/by-name/po/powersploit/package.nix index 9c452d954b28..dfd88e9b1d9c 100644 --- a/pkgs/by-name/po/powersploit/package.nix +++ b/pkgs/by-name/po/powersploit/package.nix @@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation { changelog = "https://github.com/PowerShellMafia/PowerSploit/releases/"; description = "PowerShell Post-Exploitation Framework"; homepage = "https://github.com/PowerShellMafia/PowerSploit"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ shard7 ]; platforms = lib.platforms.all; sourceProvenance = with lib.sourceTypes; [ fromSource ]; diff --git a/pkgs/by-name/po/powertabeditor/package.nix b/pkgs/by-name/po/powertabeditor/package.nix index 0825bbf51d7f..ab165971ee25 100644 --- a/pkgs/by-name/po/powertabeditor/package.nix +++ b/pkgs/by-name/po/powertabeditor/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { description = "View and edit guitar tablature"; homepage = "https://powertab.github.io/"; changelog = "https://github.com/powertab/powertabeditor/blob/refs/tags/${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; platforms = with lib.platforms; linux ++ darwin ++ windows; maintainers = with lib.maintainers; [ pluiedev ]; mainProgram = "powertabeditor"; diff --git a/pkgs/by-name/pr/precice/package.nix b/pkgs/by-name/pr/precice/package.nix index b1b215d4afe8..5e7999db30a2 100644 --- a/pkgs/by-name/pr/precice/package.nix +++ b/pkgs/by-name/pr/precice/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "PreCICE stands for Precise Code Interaction Coupling Environment"; homepage = "https://precice.org/"; - license = with lib.licenses; [ lgpl3Only ]; + license = lib.licenses.lgpl3Only; maintainers = with lib.maintainers; [ Scriptkiddi ]; mainProgram = "precice-tools"; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/pr/prek/package.nix b/pkgs/by-name/pr/prek/package.nix index 90396474384d..886b6b5b971a 100644 --- a/pkgs/by-name/pr/prek/package.nix +++ b/pkgs/by-name/pr/prek/package.nix @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Better `pre-commit`, re-engineered in Rust "; mainProgram = "prek"; changelog = "https://github.com/j178/prek/blob/${finalAttrs.src.tag}/CHANGELOG.md"; - license = [ lib.licenses.mit ]; - maintainers = [ ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.thunze ]; }; }) diff --git a/pkgs/by-name/pr/prettyping/package.nix b/pkgs/by-name/pr/prettyping/package.nix index c03d72783e4a..182da0787170 100644 --- a/pkgs/by-name/pr/prettyping/package.nix +++ b/pkgs/by-name/pr/prettyping/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/denilsonsa/prettyping"; description = "Wrapper around the standard ping tool with the objective of making the output prettier, more colorful, more compact, and easier to read"; mainProgram = "prettyping"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ qoelet ]; }; diff --git a/pkgs/by-name/pr/principia/package.nix b/pkgs/by-name/pr/principia/package.nix index 6256a94789ca..faaae3be19ec 100644 --- a/pkgs/by-name/pr/principia/package.nix +++ b/pkgs/by-name/pr/principia/package.nix @@ -12,22 +12,18 @@ libGL, libjpeg, libpng, - SDL2, - SDL2_gfx, - SDL2_image, - SDL2_mixer, - SDL2_ttf, + sdl3, }: stdenv.mkDerivation (finalAttrs: { pname = "principia"; - version = "2026.06.19"; + version = "2026.07.09"; src = fetchFromGitHub { owner = "Bithack"; repo = "principia"; - rev = finalAttrs.version; - hash = "sha256-LYU8ctsEndBS3AGuQ9BtFaWR6RgTyoG4WAd91+B4zwY="; + tag = finalAttrs.version; + hash = "sha256-DlAhlbJjVCWpcwa6WDRU3Vms3AgDZdjZjBuBy9MOPh4="; }; nativeBuildInputs = [ @@ -43,11 +39,7 @@ stdenv.mkDerivation (finalAttrs: { libGL libjpeg libpng - SDL2 - SDL2_gfx - SDL2_image - SDL2_mixer - SDL2_ttf + sdl3 ]; cmakeFlags = [ diff --git a/pkgs/by-name/pr/prio/package.nix b/pkgs/by-name/pr/prio/package.nix index dc610a27da38..8a01b457bdd2 100644 --- a/pkgs/by-name/pr/prio/package.nix +++ b/pkgs/by-name/pr/prio/package.nix @@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/letoram/prio"; description = "Plan9- Rio like Window Manager for Arcan"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = [ ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix index ded8fff6818d..b5ffa065ab24 100644 --- a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix +++ b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix @@ -28,13 +28,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "prismlauncher-unwrapped"; - version = "11.0.2"; + version = "11.0.3"; src = fetchFromGitHub { owner = "PrismLauncher"; repo = "PrismLauncher"; tag = finalAttrs.version; - hash = "sha256-GvAfrZxQSlBnCJ59nvK87jDTVo60D8n25K42SokE1q8="; + hash = "sha256-0o31pLKnYY0mulLrZKzZtaTPzCviGsgCnEcBt0Y/aG4="; }; postUnpack = '' diff --git a/pkgs/by-name/pr/prmt/package.nix b/pkgs/by-name/pr/prmt/package.nix index e239a4d931e9..6181c6ab74b3 100644 --- a/pkgs/by-name/pr/prmt/package.nix +++ b/pkgs/by-name/pr/prmt/package.nix @@ -7,17 +7,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "prmt"; - version = "0.6.0"; + version = "0.7.0"; __structuredAttrs = true; src = fetchFromGitHub { repo = "prmt"; owner = "3axap4eHko"; tag = "v${finalAttrs.version}"; - hash = "sha256-pLxWArZzGU1vjS2DOJ6PyrhYC2XbkAD5SfiFjHTaQfI="; + hash = "sha256-5UgHnQl/kfeJm3EHATmcWF4V7C/rhaGnpDa6Ym41Ns4="; }; - cargoHash = "sha256-hmtKmnSnSGgivY+dmC4WlMuCJGTVM6GI5k0pZcfzYso="; + cargoHash = "sha256-TQHe0FJomKZMSrt/VEhsbVNdxhvYmi/1vQxp4vxtH1U="; # Fail to run in sandbox environment checkFlags = map (t: "--skip=${t}") [ diff --git a/pkgs/by-name/pr/prometheus-cpp/package.nix b/pkgs/by-name/pr/prometheus-cpp/package.nix index d656565f7bee..88fb261a8415 100644 --- a/pkgs/by-name/pr/prometheus-cpp/package.nix +++ b/pkgs/by-name/pr/prometheus-cpp/package.nix @@ -51,6 +51,6 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Prometheus Client Library for Modern C++"; homepage = "https://github.com/jupp0r/prometheus-cpp"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; }; }) diff --git a/pkgs/by-name/pr/prometheus-redis-exporter/package.nix b/pkgs/by-name/pr/prometheus-redis-exporter/package.nix index 2869d2f5676a..353805132402 100644 --- a/pkgs/by-name/pr/prometheus-redis-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-redis-exporter/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "redis_exporter"; - version = "1.86.0"; + version = "1.87.0"; src = fetchFromGitHub { owner = "oliver006"; repo = "redis_exporter"; rev = "v${version}"; - sha256 = "sha256-N7IW1u/ifo8S0yRmdRYFAXfqke/GUVy5omrEqaCZ/3I="; + sha256 = "sha256-c2+3pV81p8TxJQ3QUKFnwXKHlV9Gl8Ezghv8rH4dVGg="; }; - vendorHash = "sha256-muGgriK1DDkKk4DOWf7m+W6/qquwYwqgTOzyNGbjV+U="; + vendorHash = "sha256-WvQx0UzORuDZPM0IDk2q4l6pfrecrUvzD3jP3vqV1Zo="; ldflags = [ "-X main.BuildVersion=${version}" diff --git a/pkgs/by-name/pr/prometheus-squid-exporter/package.nix b/pkgs/by-name/pr/prometheus-squid-exporter/package.nix index 40be646bdb98..93ebc6366d6c 100644 --- a/pkgs/by-name/pr/prometheus-squid-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-squid-exporter/package.nix @@ -20,6 +20,7 @@ buildGoModule (finalAttrs: { meta = { description = "Squid Prometheus exporter"; homepage = "https://github.com/boynux/squid-exporter"; + mainProgram = "squid-exporter"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ srhb ]; }; diff --git a/pkgs/by-name/pr/prometheus-xmpp-alerts/package.nix b/pkgs/by-name/pr/prometheus-xmpp-alerts/package.nix index dc18f47d6965..97d8337c022d 100644 --- a/pkgs/by-name/pr/prometheus-xmpp-alerts/package.nix +++ b/pkgs/by-name/pr/prometheus-xmpp-alerts/package.nix @@ -58,6 +58,6 @@ python3Packages.buildPythonApplication rec { mainProgram = "prometheus-xmpp-alerts"; homepage = "https://github.com/jelmer/prometheus-xmpp-alerts"; maintainers = with lib.maintainers; [ fpletz ]; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; }; } diff --git a/pkgs/by-name/pr/protege/package.nix b/pkgs/by-name/pr/protege/package.nix index b126923e85d7..4d62b1530a65 100644 --- a/pkgs/by-name/pr/protege/package.nix +++ b/pkgs/by-name/pr/protege/package.nix @@ -81,7 +81,7 @@ maven.buildMavenPackage rec { connections to description logic reasoners. ''; maintainers = with lib.maintainers; [ nessdoor ]; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; # TODO Protege is able to run on Darwin as well, but I (@nessdoor) had no # way of testing it nor any experience in packaging Darwin apps, so I # will leave the task to someone who has the right tools and knowledge. diff --git a/pkgs/by-name/pr/protoc-gen-grpc-java/package.nix b/pkgs/by-name/pr/protoc-gen-grpc-java/package.nix index a988d9bcc4e0..43589f649163 100644 --- a/pkgs/by-name/pr/protoc-gen-grpc-java/package.nix +++ b/pkgs/by-name/pr/protoc-gen-grpc-java/package.nix @@ -80,7 +80,6 @@ stdenv.mkDerivation (finalAttrs: { "powerpc64le-linux" "s390x-linux" # Darwin - "x86_64-darwin" "aarch64-darwin" # Windows "x86_64-windows" diff --git a/pkgs/by-name/pr/proton-pass-cli/package.nix b/pkgs/by-name/pr/proton-pass-cli/package.nix index 857d02899a24..7d48c6754153 100644 --- a/pkgs/by-name/pr/proton-pass-cli/package.nix +++ b/pkgs/by-name/pr/proton-pass-cli/package.nix @@ -63,10 +63,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-linux-aarch64"; hash = "sha256-NdBabzetuIJEbu81Rfg3hUVEw8BJ2A3Who/i08/qwMs="; }; - "x86_64-darwin" = fetchurl { - url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-macos-x86_64"; - hash = "sha256-K6vfr0ut8cQo1mrNeEN35akxLIo1sftt6hnn6wUa6Dk="; - }; "x86_64-linux" = fetchurl { url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-linux-x86_64"; hash = "sha256-cYjwKnweeahg9xZq0sNPei5slhJltwZ34nBPIW3Rdtk="; diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix index b0d22a8e6cbc..e0a50c92611f 100644 --- a/pkgs/by-name/pr/proton-pass/package.nix +++ b/pkgs/by-name/pr/proton-pass/package.nix @@ -22,7 +22,6 @@ let url = "https://proton.me/download/pass/macos/ProtonPass_${version}.dmg"; hash = "sha256-CwdiHEqKnk+ELoavs1p6ND48e2rvEFBqbXQs79ihQ4M="; }; - "x86_64-darwin" = passthru.sources."aarch64-darwin"; }; updateScript = writeShellScript "update-proton-pass" '' set -o errexit diff --git a/pkgs/by-name/pr/proton-vpn/darwin.nix b/pkgs/by-name/pr/proton-vpn/darwin.nix index f688f1d78e1f..ed7e2cb3dded 100644 --- a/pkgs/by-name/pr/proton-vpn/darwin.nix +++ b/pkgs/by-name/pr/proton-vpn/darwin.nix @@ -55,7 +55,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = meta // { platforms = [ - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/pr/protonmail-desktop/package.nix b/pkgs/by-name/pr/protonmail-desktop/package.nix index 3b9df20572d8..50a343297fa8 100644 --- a/pkgs/by-name/pr/protonmail-desktop/package.nix +++ b/pkgs/by-name/pr/protonmail-desktop/package.nix @@ -10,9 +10,9 @@ }: let mainProgram = "proton-mail"; - version = "1.13.0"; - linuxHash = "sha256-ehvDkemVmKQuNm9FgKtUM/M/z4YMjXA8qtLt94SN73U="; - darwinHash = "sha256-YtLlW+fSRd3hJMjHOA3kXKKq2j71Edc8NW/55zTLywY="; + version = "1.13.3"; + linuxHash = "sha256-ZG3l9QhNtSXjkJ4wa/bJ15Kd7MIgw68tJTPP653HTIg="; + darwinHash = "sha256-C0URhmxcbQfP8uMe8nRuUx5f0JL0BMvvrWFfXHCVR90="; in stdenv.mkDerivation { pname = "protonmail-desktop"; @@ -28,10 +28,6 @@ stdenv.mkDerivation { url = "https://proton.me/download/mail/macos/${version}/ProtonMail-desktop.dmg"; hash = darwinHash; }; - "x86_64-darwin" = fetchurl { - url = "https://proton.me/download/mail/macos/${version}/ProtonMail-desktop.dmg"; - hash = darwinHash; - }; } ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/pr/protonup-rs/package.nix b/pkgs/by-name/pr/protonup-rs/package.nix index a5c53575ab0e..a5b9771fa77b 100644 --- a/pkgs/by-name/pr/protonup-rs/package.nix +++ b/pkgs/by-name/pr/protonup-rs/package.nix @@ -6,14 +6,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "protonup-rs"; - version = "0.12.2"; + version = "0.14.0"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-u5SvZuuHPRBwOTUlVmtg9nY98INqKvSnHE83I8UsA0E="; + hash = "sha256-FHT//OHxMm7FXm/L+tZ+diGwbQ1i4EABKuFKO9SPm1M="; }; - cargoHash = "sha256-LKZaTwJur4eBLFPtsMZEmaqTzFAxLJEytl61KMs2+Y4="; + cargoHash = "sha256-NOLYmJx0SvZ6azk34Ha/3512VSx+UHsepQQIYrHdLwM="; checkFlags = [ # Requires internet access diff --git a/pkgs/by-name/pr/proxysql/package.nix b/pkgs/by-name/pr/proxysql/package.nix index 373a1bab4b58..852c812b6d66 100644 --- a/pkgs/by-name/pr/proxysql/package.nix +++ b/pkgs/by-name/pr/proxysql/package.nix @@ -226,7 +226,7 @@ stdenv.mkDerivation (finalAttrs: { description = "High-performance MySQL proxy"; mainProgram = "proxysql"; homepage = "https://proxysql.com/"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/ps/psc-package/package.nix b/pkgs/by-name/ps/psc-package/package.nix index 63fcd8c03328..e369775298c0 100644 --- a/pkgs/by-name/ps/psc-package/package.nix +++ b/pkgs/by-name/ps/psc-package/package.nix @@ -71,7 +71,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd3; maintainers = [ ]; platforms = [ - "x86_64-darwin" "x86_64-linux" ]; }; diff --git a/pkgs/by-name/pu/pufferpanel/package.nix b/pkgs/by-name/pu/pufferpanel/package.nix index eca9974399ad..82ca7ccf0a21 100644 --- a/pkgs/by-name/pu/pufferpanel/package.nix +++ b/pkgs/by-name/pu/pufferpanel/package.nix @@ -107,7 +107,7 @@ buildGoModule rec { meta = { description = "Free, open source game management panel"; homepage = "https://www.pufferpanel.com/"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ tie ]; mainProgram = "pufferpanel"; }; diff --git a/pkgs/by-name/pu/pulldown-cmark/package.nix b/pkgs/by-name/pu/pulldown-cmark/package.nix index a9f32bfc446b..40e8e0e6ca58 100644 --- a/pkgs/by-name/pu/pulldown-cmark/package.nix +++ b/pkgs/by-name/pu/pulldown-cmark/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Pull parser for CommonMark written in Rust"; homepage = "https://github.com/raphlinus/pulldown-cmark"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ CobaltCause ]; mainProgram = "pulldown-cmark"; }; diff --git a/pkgs/by-name/pu/pulsarctl/package.nix b/pkgs/by-name/pu/pulsarctl/package.nix index dbb3b1a247ae..8e35378991fe 100644 --- a/pkgs/by-name/pu/pulsarctl/package.nix +++ b/pkgs/by-name/pu/pulsarctl/package.nix @@ -70,7 +70,7 @@ buildGoModule rec { meta = { description = "CLI for Apache Pulsar written in Go"; homepage = "https://github.com/streamnative/pulsarctl"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; platforms = lib.platforms.unix; maintainers = [ ]; mainProgram = "pulsarctl"; diff --git a/pkgs/by-name/pu/pulumi-bin/data.nix b/pkgs/by-name/pu/pulumi-bin/data.nix index 2a4b004ea6d4..d501b8b4083b 100644 --- a/pkgs/by-name/pu/pulumi-bin/data.nix +++ b/pkgs/by-name/pu/pulumi-bin/data.nix @@ -1,12 +1,12 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.250.0"; + version = "3.253.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.250.0-linux-x64.tar.gz"; - sha256 = "1wxqf2c6v2l721bf0ajhjiypcfsyd15ijyd6bkadnsn9rhvgs5l9"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.253.0-linux-x64.tar.gz"; + sha256 = "1b6ini1p2232wq0lh9fzj251377zlpdl8qx4jmrwgrl02991w5ik"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.58.0-linux-amd64.tar.gz"; @@ -21,28 +21,28 @@ sha256 = "1hkg2h7q5g4swjm07wfjfww7y3ssbm3ffi38vdy0p6xs1aamcn4q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.11.3-linux-amd64.tar.gz"; - sha256 = "0q4m959ynywipzyznarq1y1wzkn8yiwc6sbd8sllpfwi6ny3dlpn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.11.4-linux-amd64.tar.gz"; + sha256 = "1h7fk2c83d6qxb2n3mvmdpmxk7b67mwkg6zv1isjmdfmkxiz84ir"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.47.0-linux-amd64.tar.gz"; - sha256 = "0n08ywnndbqqs2mfifi4cvxzwi2l5zkijy08hvjqb20c03j40zr2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.48.0-linux-amd64.tar.gz"; + sha256 = "0ja9jm9giz231ip8mi0phnfm50hz991kwgnp94yiq25hmk3h5ifl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.35.0-linux-amd64.tar.gz"; sha256 = "1bwbdm21a5kr2z6jd36idn78yas9ysgg29d14wqjjwhqb0hw3pkq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.9.1-linux-amd64.tar.gz"; - sha256 = "10nl0b3wgr7rhgy195z67w3013yvxl4dasdr4sy4v368lz7rvk7j"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.10.0-linux-amd64.tar.gz"; + sha256 = "1h1yrkxd2w8vc2kj097mb7jzv21948vp6kv0x7p5bgcbgpyh69qp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.15.0-linux-amd64.tar.gz"; sha256 = "0hx94wf890a8cz9k66q4p89w9330axb1a3lg2g6j5lbxhrp2bvac"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.38.0-linux-amd64.tar.gz"; - sha256 = "0hb10w22n602shb73my53d79qb91h87qa2q02xkpmaqkkwblz36a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.39.0-linux-amd64.tar.gz"; + sha256 = "13crj1h932vf9ch4m3yphm701dqc86j8pmi4ymjlg0yzfm6b8xwb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.17.0-linux-amd64.tar.gz"; @@ -53,12 +53,12 @@ sha256 = "0xbx66jaknq7n8s77s1zkv3jdacqv4pnxfnlg424vlk04laar6q0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v5.7.0-linux-amd64.tar.gz"; - sha256 = "1gyw3jy8dj2q67rkgm1jgx209h2941qsjirvl5p11pzm70x42nbh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v5.8.0-linux-amd64.tar.gz"; + sha256 = "0lv8bsm05rw1xv5m8wscanq1crrphhrdah8nd28vww3akr36af2q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.73.0-linux-amd64.tar.gz"; - sha256 = "1bq7wnd2bj11gvjcac6f2s95iw03xxkm8i1rnak4qkfk7pn5wk0p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.75.0-linux-amd64.tar.gz"; + sha256 = "0lccw7i98d43v0pipabb7i67588jllil2s882fjlvj3afk7njqza"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v5.1.0-linux-amd64.tar.gz"; @@ -69,12 +69,12 @@ sha256 = "0hnardid0kbzy65dmn7vz8ddy5hq78nf2871zz6srf2hfyiv7qa4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v12.3.0-linux-amd64.tar.gz"; - sha256 = "1n011z28l4ppgh77vyv79r4d9i0z26fywgd7jbigvrw88zrgwpj9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v12.3.1-linux-amd64.tar.gz"; + sha256 = "0qgyrfy24bsny0l0kyb4dwyfrpk0a8bh7cl0c11gjh7idwazrn9p"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.29.0-linux-amd64.tar.gz"; - sha256 = "0mzi4crgrrzl912wjqaw9w3c8xqxzx0bv5pr1r410zxqkkml9qwd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.30.0-linux-amd64.tar.gz"; + sha256 = "1dq271jcbqi705w691yrfnk09qwj3d5zghz058hsv6b7zmjzp5mf"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.14.0-linux-amd64.tar.gz"; @@ -93,12 +93,12 @@ sha256 = "030rn7smyfq1j5lgrx50psqbabdjiqr7qmrq965aydjwb2kfs8lx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.32.0-linux-amd64.tar.gz"; - sha256 = "0wqngqq46a8z0m5milbc90aqblwi6sh389ix133zvnjcmag2gx7h"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.33.0-linux-amd64.tar.gz"; + sha256 = "09j62fdkmsn1kzqyqcbs2sykx58db13nw3mlsmdm9pnnkskh02p5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v6.0.0-linux-amd64.tar.gz"; - sha256 = "0sqf6g99dyml386rpmn662lb54q5c33wgyv2ddl23cz2w1vz2x9a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v6.1.0-linux-amd64.tar.gz"; + sha256 = "18s9p81kqf89807wm77g8s6dvh99wpaxd5f064k1kdypb6snbp6p"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.8.0-linux-amd64.tar.gz"; @@ -121,8 +121,8 @@ sha256 = "07lqjsz8d7cn52zfawhxj6k9n6g1a220kcckdfnf6135h26w75h0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.17.0-linux-amd64.tar.gz"; - sha256 = "00lbq7w5qdkpa8xywb9mhfa1x6niik9a17qifz22akb57p8fkzky"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.18.0-linux-amd64.tar.gz"; + sha256 = "1y9wcln87jpy22fvdx5l44kj1n4fw1kkk3jmdvkz5byjy64yf7ji"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.134.1-linux-amd64.tar.gz"; @@ -133,8 +133,8 @@ sha256 = "0pppwgwl726rfy92fnya9afj3cciw13vzs9r60w2477i3250slqj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.28.0-linux-amd64.tar.gz"; - sha256 = "0d15p18as2y37ay40bmwnffmvww0gx5gk8ldy05w42lppkpvf216"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.29.0-linux-amd64.tar.gz"; + sha256 = "0203qf994hjablrl6nm51f6j69z469q46rm1d15gvxsgi17g23sx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.5.0-linux-amd64.tar.gz"; @@ -161,168 +161,10 @@ sha256 = "14qsnjafhd8ppachxr7j9541p5rbf1cakqlr7mra86fli1r49z9p"; } ]; - x86_64-darwin = [ - { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.250.0-darwin-x64.tar.gz"; - sha256 = "0j730hkbhvb3qrxqg26brvwy3g1pmf1z22q5si4jj0ipsxg638ca"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.58.0-darwin-amd64.tar.gz"; - sha256 = "0fdpnggk551z63580d6vky3sm51ihhvg05ikg8p2vq0d8axji164"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v11.4.0-darwin-amd64.tar.gz"; - sha256 = "13jmk6hf5d4v98hdrb1p5h6606mpkrm4v1ypcmvpjzcsal0psqjc"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.104.0-darwin-amd64.tar.gz"; - sha256 = "070c1yqx79r8fd1dw4b14h5rgzbb2wkh15wgy2dqdknp2558h47m"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.11.3-darwin-amd64.tar.gz"; - sha256 = "02ynw60l8rz7ri5fnwlpm6qmsj2f266y7gmm01yia3l84xmj0rx6"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.47.0-darwin-amd64.tar.gz"; - sha256 = "16qx8g6zp7vdic86pzwrd4i8rvyrjjwdhylww7b5a4sfy3vwacg9"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.35.0-darwin-amd64.tar.gz"; - sha256 = "1q96gdbpaax397v7pd300c4zi27xxhhxw1vhsdpxir1gl1yabzas"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.9.1-darwin-amd64.tar.gz"; - sha256 = "1yql4aacwb6am3q9zldazmss262z19hvfp3jcysw7jskbsqa3gr5"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.15.0-darwin-amd64.tar.gz"; - sha256 = "16h5brr42f9fhhpwplxl0h2iqa0h5h11dj6vg024p3sgqb2p5qxx"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.38.0-darwin-amd64.tar.gz"; - sha256 = "044zrb629jsqvigdmqz9dx53cnhjvksxdf6rg2pw6v3ajxzbz80y"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.17.0-darwin-amd64.tar.gz"; - sha256 = "0s81lkz7bzi5z9jzgllvnf5gsvyvnc6fhdgm5xiggca5pg7a48xv"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.15.0-darwin-amd64.tar.gz"; - sha256 = "028nbjydy61zks5brpk5bhn2b1ah3w0w4f279gg04h0adc0lyvfp"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v5.7.0-darwin-amd64.tar.gz"; - sha256 = "0hyxdmmhaihvsmqlfmrid388l0z130w5yl24rkjvzgxg28v11zbh"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.73.0-darwin-amd64.tar.gz"; - sha256 = "0k24h0d6hlr4fvbm100w2fkbf25wpj05q12j7wqid1vk77m4icza"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v5.1.0-darwin-amd64.tar.gz"; - sha256 = "1g5ygb3mv58mbfb2a53042s87iw3m1gf1i1qyqb3qclmqqaymi7x"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-amd64.tar.gz"; - sha256 = "1m5lh59h7nck1flzxs9m4n0ag0klk3jmnpf7hc509vffxs89xnjq"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v12.3.0-darwin-amd64.tar.gz"; - sha256 = "0cpj6dcjrvqz5x9b4m084cqbz9mlhl7x74j0z4s7pjg1k4s0cyw6"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.29.0-darwin-amd64.tar.gz"; - sha256 = "13hcvn3njrr2iraq12gf9rr6ym7m1whq82vvbbs4z973knmrmn56"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.14.0-darwin-amd64.tar.gz"; - sha256 = "1avxgva74gcvsnc82k9vp9xskr8ddxjnbqryfbxw0mvsgp6iby0g"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v10.0.0-darwin-amd64.tar.gz"; - sha256 = "1wcf9sd4hqabn4ycwjbmhylic2cd3nsgs7xqz49l691alv97m1yi"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-amd64.tar.gz"; - sha256 = "0ddd0pgpyywq291r9q8w6bn41r2px595017iihx4n2cnb1c4v6d5"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.39.0-darwin-amd64.tar.gz"; - sha256 = "1dabrwwl9qn316r2c5ldmv9a8ddlm7gfkkgbaj2jspk4qswgbxfr"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.32.0-darwin-amd64.tar.gz"; - sha256 = "09jhjsgg5sa1a78zak21wxhi3pjml9sl3y1vh59qb0dlq2hp9whd"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v6.0.0-darwin-amd64.tar.gz"; - sha256 = "1dgx29v753hprw1cql4hkz2m7gc1a14p2wx5qrbxcf971z2lir17"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.8.0-darwin-amd64.tar.gz"; - sha256 = "1phwjh9y6grc1mcppxim6q7v3wj02pdy2lj464y3v4ydy6xdw7ha"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.3.0-darwin-amd64.tar.gz"; - sha256 = "0bf9m8gczh1a5b8b2xc7w98z5swd3a9r2dbd6b40g18kyc29mwjf"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.5.0-darwin-amd64.tar.gz"; - sha256 = "0a0zs556yx2cskym7w9xfv88wfscvxip0nwzib6i8cf901732xq7"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.17.0-darwin-amd64.tar.gz"; - sha256 = "09kly1i1p9jw939k1pr51w3ja9ixh53hyv40dm6xb6fkxcpbj1q6"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.21.0-darwin-amd64.tar.gz"; - sha256 = "1qrl998hs6iyvc35kas97dalr2bdrzb63k08i3bgaplj8f0p6pqy"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.17.0-darwin-amd64.tar.gz"; - sha256 = "1c49701g8r3565hvf55xjgbsc5hgh8rxmbsz86dp4lffsj2748sx"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.134.1-darwin-amd64.tar.gz"; - sha256 = "1zbgpbp7kxll9jmrhf009l4kc7amz7mvgxwj18rcrbf2q118v9pc"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-darwin-amd64.tar.gz"; - sha256 = "1jpcyp3lqiz4aab331x7shhqxzp4m6nz68vhkyqksvdplzr9rj44"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.28.0-darwin-amd64.tar.gz"; - sha256 = "0piwpxykabjczmd4jzzvl3fnn6g8gis02glmch2fshplgdanj7yy"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.5.0-darwin-amd64.tar.gz"; - sha256 = "1hm2lbph6i0g2hl8z0cykv55yyqmzyk52wbzzr1snj5lpygrnwc8"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.10.0-darwin-amd64.tar.gz"; - sha256 = "01vysx2nl7lm5s2398sx80b3mxmjl6kcxpnspiwyvcw8h9vp2g9s"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.13.0-darwin-amd64.tar.gz"; - sha256 = "03gblpxr9y4c1k5zd0j50q045rvq9r8k3s619rp8clnxz23khk59"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.17.0-darwin-amd64.tar.gz"; - sha256 = "1w0xj0bsmpjm56yafajpqin6aljyj2x6wk5n9z8a76gvwh6c5awn"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.12-darwin-amd64.tar.gz"; - sha256 = "00xk2mz37n2szb7yswcifgrcanqdlbxqcah04a4b7d4b09d3rwz3"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-amd64.tar.gz"; - sha256 = "11wm9c125154brisncm9cgb41nbjl9q9h4bq6z0ym8v681qq0fc4"; - } - ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.250.0-linux-arm64.tar.gz"; - sha256 = "1rdl6yj7fs0kv3m3hcz377qfpl4s0d2glbzqvhxazjxl0l6vzd6y"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.253.0-linux-arm64.tar.gz"; + sha256 = "1skpnnrh4inw20p2ldji4a75vm7v2igkdck3q4k944vngbb78w3x"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.58.0-linux-arm64.tar.gz"; @@ -337,28 +179,28 @@ sha256 = "0s6h6l77jkz38bifcb61sfx1bqwdyf4ayi7f0m0idcji5b28anpr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.11.3-linux-arm64.tar.gz"; - sha256 = "0wjpmwfnbm0hqknbzzy9kxzrwds2phbhavc3bbahp1ggzvx3r7pl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.11.4-linux-arm64.tar.gz"; + sha256 = "1dnkx3qhh2ln6gps8z7gwknb6cjzl0v5ximvz91gqz1i8pshvqz4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.47.0-linux-arm64.tar.gz"; - sha256 = "0xygw9q77vs4k59m8ngszrjhy2mi7g1bchfbc9yycha2iidgd4r1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.48.0-linux-arm64.tar.gz"; + sha256 = "16ckjw8375yrz92wm0dgdp1yamswikr9gbrigad2f3yf6crmlyia"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.35.0-linux-arm64.tar.gz"; sha256 = "0hmwjbg8l32vgy8ydl5makl1l6x9frz6abg3yah597flwdy8afgd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.9.1-linux-arm64.tar.gz"; - sha256 = "1w1j0k70ah61zrad83j8ksnws18ic31i1g352il0fsidm7bhxy8p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.10.0-linux-arm64.tar.gz"; + sha256 = "06bkdfipmgjq1ahfmpjzsfz73kkasxwajciym9y1gmlb62zq75ac"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.15.0-linux-arm64.tar.gz"; sha256 = "0660ml58rak26im6fc6vr7mj943xpn7fnrysg7h8a6yi2rs31vb1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.38.0-linux-arm64.tar.gz"; - sha256 = "1lqmk6wmx8r2ip706v3mdlwp7ji8m10xvy0dyc5p81vlx95inpgi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.39.0-linux-arm64.tar.gz"; + sha256 = "1zwqw37zvv5yqdy95vs7dvq8x6a34glfy5sg336rgz36mnrbs2fb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.17.0-linux-arm64.tar.gz"; @@ -369,12 +211,12 @@ sha256 = "0jgqk4sp7rkapxfi3gs5z74rrrs050bqs6kggpfz32v6sp5514z1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v5.7.0-linux-arm64.tar.gz"; - sha256 = "07lc11mk0agnrd3wxlkzq7fgfv5icicvacrdr2si6ycz0hwzpbqi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v5.8.0-linux-arm64.tar.gz"; + sha256 = "1gsi703xf1zl508wsrwpcgnj0g6g81fjdqhgc4shd7sk1iykjnd3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.73.0-linux-arm64.tar.gz"; - sha256 = "1c5caj9djz0q98k73sldmi211d0xq2af0yjxv6h3nficiwjx74p5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.75.0-linux-arm64.tar.gz"; + sha256 = "1n3hkniyzd14sijcbhd9kl7nvq6gfmmg42q4knp4vwjrf26dv86a"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v5.1.0-linux-arm64.tar.gz"; @@ -385,12 +227,12 @@ sha256 = "111pia2f5xwkwaqs6p90ri29l5b3ivmahsa1bji4fwyyjyp22h4r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v12.3.0-linux-arm64.tar.gz"; - sha256 = "1pv5nsdv060pfhkh2g2ryf0xvpiingnyklpi0mdk24w91axr09ax"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v12.3.1-linux-arm64.tar.gz"; + sha256 = "1viavidp6g7s2pyczic4iq5p7pakg3g7994yfx03nar76sv94rgp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.29.0-linux-arm64.tar.gz"; - sha256 = "0vmijcammjlb7grycrgn1xwkx24jvmz8s9ib86kdrb1dcr43fq1q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.30.0-linux-arm64.tar.gz"; + sha256 = "09v3mpdscgsjpd3h1g8q2fk7amh5z7iindszf0wf8zml4qcg187v"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.14.0-linux-arm64.tar.gz"; @@ -409,12 +251,12 @@ sha256 = "0w0caqipdipj56qqv2vkcn5srbb6h1xv741d53v5863ax1hgp0w3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.32.0-linux-arm64.tar.gz"; - sha256 = "1hnri0akhifaanibmpp23lfrr4ns2fv5nj2xp3adhqw4qm5nq03d"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.33.0-linux-arm64.tar.gz"; + sha256 = "1ab0pl2i1bphy8y5ws82s23l3iz99dmfsz6n09b0yb8wwzwzcphj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v6.0.0-linux-arm64.tar.gz"; - sha256 = "09v8fabiwj8hr3bxh9jr5whrmcm3v3xjqw4iwv9wx001lmf35jf9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v6.1.0-linux-arm64.tar.gz"; + sha256 = "16gwcr4j5fwmsxkcvna1wkx1hjxzyiycv4b4fwysd5y7myh4zsnb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.8.0-linux-arm64.tar.gz"; @@ -437,8 +279,8 @@ sha256 = "1d6j1hqy0w3w4jssyp3w7xdkg8501vljra8299giiv0cycmhd3w8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.17.0-linux-arm64.tar.gz"; - sha256 = "0x5c0zjpb2i27yblv22izhaa86wfxfkq1qvyczsnh1pizyd4jlr6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.18.0-linux-arm64.tar.gz"; + sha256 = "12pd2ms6xkmbl0d1lfa1p63gpdc9vqv05hsjp4naj9clmd8l0wm5"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.134.1-linux-arm64.tar.gz"; @@ -449,8 +291,8 @@ sha256 = "0glljz03v764n53n5l33ji64vj86ipdv5bkr03ijl8wrc22j5syy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.28.0-linux-arm64.tar.gz"; - sha256 = "0nnshs122f00lw5xpfhz1rd73kc62nn55pi8v7fgndl31f9b6ca7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.29.0-linux-arm64.tar.gz"; + sha256 = "0bi1i8ysx2way6gix1bxixdiipk6w0wqp3xh8vvzw8s61ax4awsa"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.5.0-linux-arm64.tar.gz"; @@ -479,8 +321,8 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.250.0-darwin-arm64.tar.gz"; - sha256 = "0a6sbxpz7wv4dwlgfvalbxvk7xdf4vi84815hdv5dkv96378klnv"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.253.0-darwin-arm64.tar.gz"; + sha256 = "0glfsanndr725r4dr0cjj24yhd529kczp6ksy2dan4b4387d1l8j"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.58.0-darwin-arm64.tar.gz"; @@ -495,28 +337,28 @@ sha256 = "1mqzky6ilc14jsdxpzjyx9ldhiiid2akmhj3wqw2mjqlcmz4sxvd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.11.3-darwin-arm64.tar.gz"; - sha256 = "1qh627z9ql54nhhh5qi1laq7lxcrznh3dyhqknwybfh5vgb197yl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.11.4-darwin-arm64.tar.gz"; + sha256 = "0q5i2mx7isdgiqscqkswnqgrg25xm4wf2nqxcpmr91bvwc5rrjsi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.47.0-darwin-arm64.tar.gz"; - sha256 = "0sabxdbzhqy6243m0p8nf2dpcgbmvdghb0nvv65i7haj07xb0ilb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.48.0-darwin-arm64.tar.gz"; + sha256 = "03ymhjv30xyi3nsw40mz7saazaw7xw20l2bnmia37nnn5336qlhd"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.35.0-darwin-arm64.tar.gz"; sha256 = "0m5xbg919vvmhv6v644wivfgaq4mzsfbf7bdq001z4065v6im2sg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.9.1-darwin-arm64.tar.gz"; - sha256 = "0lbfv8md4zkxgvg9rg0l2j4h3p3lnmp3q0dgc30m2637qf19ggdn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.10.0-darwin-arm64.tar.gz"; + sha256 = "17rfxhnfkdwkpnv1kfzl427s6ysaggdy6z37d4h5cxpl6d6kf8nr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.15.0-darwin-arm64.tar.gz"; sha256 = "0rzjlcwq1gpp7v9a4xcfwcc09g9ry6c8d7s00jiy8ix5cfzmwv10"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.38.0-darwin-arm64.tar.gz"; - sha256 = "0nlhi9i0l0csw9s86fkzaxccqs622jzjbhny14lggakx6g00ynjh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.39.0-darwin-arm64.tar.gz"; + sha256 = "01cfgmb13ylbi2dk7ng8mda6lsrjgaccyrffjp6jhfp245fj97pb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.17.0-darwin-arm64.tar.gz"; @@ -527,12 +369,12 @@ sha256 = "1ly07rsqrrxqcbgwf0a0dhjgv16bbsanc56k04yhvsq1i4cis8v3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v5.7.0-darwin-arm64.tar.gz"; - sha256 = "1qfl1nmynp2lbjbjrhysp5pyqxhamyklz4xx4pw64y01b30zy09l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v5.8.0-darwin-arm64.tar.gz"; + sha256 = "0833vlgcy3jcnnlhb94wr1fn1j1r4sjqlwhxsqldkd53w1x0rxqs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.73.0-darwin-arm64.tar.gz"; - sha256 = "1afmxz2cmsxmrhcyng6vf56swpv3clbrvf2i4q160ds6kx5hyzw5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.75.0-darwin-arm64.tar.gz"; + sha256 = "16nv45p1gfbyjxcvmw9w28yzk9vygd5w1l2ifhax27g63zwzb7yk"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v5.1.0-darwin-arm64.tar.gz"; @@ -543,12 +385,12 @@ sha256 = "12bzicm43l7yvh02v5fx3z8v46l9i7a9f677735xi5rjbmd2an4c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v12.3.0-darwin-arm64.tar.gz"; - sha256 = "0s85j50l66fjrnrzrxwygf0zqfipliqv396q3af6hi9rd1sdpz7w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v12.3.1-darwin-arm64.tar.gz"; + sha256 = "1dsr4d1i1rrq6801x1mmqgqg5rw2fibvqid5gbv9gyb73vkaafkn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.29.0-darwin-arm64.tar.gz"; - sha256 = "0i9ccb49mv6xl5kzgpxcapxs7fiqsczrh5md67cc1g4hbsxiacp0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.30.0-darwin-arm64.tar.gz"; + sha256 = "1vzaypv5wqa9vdggcv5m7kkxcmbwim100j85jsbylkhnf8lg5sq3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.14.0-darwin-arm64.tar.gz"; @@ -567,12 +409,12 @@ sha256 = "1mfv6qlzm6l94j12pfy1dni5w9laix3s5fak7csmpwywnyf82dgx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.32.0-darwin-arm64.tar.gz"; - sha256 = "1aj0axqnd4pmcchir2hy4dyjhgsby7si2swk0407wgam3kafbrnw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.33.0-darwin-arm64.tar.gz"; + sha256 = "1c4l129v163p31vc8wnbqq3pq9ai5rfj0zcrhhvwajbwdfv7g719"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v6.0.0-darwin-arm64.tar.gz"; - sha256 = "1jni02v137jcwcg0f6sjd817ycm9krbynqplycn2zkwlydz3fcx6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v6.1.0-darwin-arm64.tar.gz"; + sha256 = "1xf9k1aqqrpq6apjgmqs4l276w5qzg2337ixcp3f12z8l476yv40"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.8.0-darwin-arm64.tar.gz"; @@ -595,8 +437,8 @@ sha256 = "1ccyxmkzmj5qah2z912vks548bbrhiifa65h0dm5bkihyjk1bi95"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.17.0-darwin-arm64.tar.gz"; - sha256 = "0k1y0vxnavmp9q0hl3rp2srkddhjwg7r540lvl0i766y6l4n69ha"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.18.0-darwin-arm64.tar.gz"; + sha256 = "0c5lsqfh4bmkws9lmrg0rrsvsh4i2zpyblf93hnl8sybq53h21rb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.134.1-darwin-arm64.tar.gz"; @@ -607,8 +449,8 @@ sha256 = "1c4pn5nr8d97n9bqd7vz9gzlbi50hnfjylwwch445ylqp5l8gvqf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.28.0-darwin-arm64.tar.gz"; - sha256 = "0cbdkcphzkfchz3xipf950np79i8hyazdlgjycp173zfq8n7323y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.29.0-darwin-arm64.tar.gz"; + sha256 = "0bjp4076cbkvdcjj3jcvy4r50zdv74vwbzq706i31rz1c121dm3x"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.5.0-darwin-arm64.tar.gz"; diff --git a/pkgs/by-name/pu/pulumi-bin/package.nix b/pkgs/by-name/pu/pulumi-bin/package.nix index 6a10d4ca58eb..fa5950c5aa65 100644 --- a/pkgs/by-name/pu/pulumi-bin/package.nix +++ b/pkgs/by-name/pu/pulumi-bin/package.nix @@ -46,10 +46,9 @@ stdenv.mkDerivation { homepage = "https://pulumi.io/"; description = "Pulumi is a cloud development platform that makes creating cloud programs easy and productive"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; platforms = builtins.attrNames data.pulumiPkgs; maintainers = with lib.maintainers; [ - ghuntley jlesquembre cpcloud wrbbz diff --git a/pkgs/by-name/pu/pulumi-bin/update.sh b/pkgs/by-name/pu/pulumi-bin/update.sh index f71812135552..4da7ff0fc381 100755 --- a/pkgs/by-name/pu/pulumi-bin/update.sh +++ b/pkgs/by-name/pu/pulumi-bin/update.sh @@ -141,11 +141,6 @@ EOF genSrcs "linux" "amd64" echo " ];" - echo " x86_64-darwin = [" - genMainSrc "darwin" "x64" - genSrcs "darwin" "amd64" - echo " ];" - echo " aarch64-linux = [" genMainSrc "linux" "arm64" genSrcs "linux" "arm64" diff --git a/pkgs/by-name/pv/pvs-studio/package.nix b/pkgs/by-name/pv/pvs-studio/package.nix index 9a2fa2f2fb81..03e9c5c2b494 100644 --- a/pkgs/by-name/pv/pvs-studio/package.nix +++ b/pkgs/by-name/pv/pvs-studio/package.nix @@ -25,12 +25,10 @@ stdenv.mkDerivation rec { fetchzip { url = selectSystem { aarch64-darwin = "https://web.archive.org/web/20260131193428/https://files.pvs-studio.com/pvs-studio-${version}-macos-arm64.zip"; - x86_64-darwin = "https://web.archive.org/web/20260131193142/https://files.pvs-studio.com/pvs-studio-${version}-macos-x86_64.zip"; x86_64-linux = "https://web.archive.org/web/20260131192910/https://files.pvs-studio.com/pvs-studio-${version}-x86_64.tgz"; }; hash = selectSystem { aarch64-darwin = "sha256-ExJldpqwD9dqGtY/QQ2i3qiNXSyR6exhYKIrwgdQrtQ="; - x86_64-darwin = "sha256-zKwUVDoi9yWCD0gooeDslTwzQ/9N17OkMqwkAL0EQe8="; x86_64-linux = "sha256-c7+Zvo+cHtGtdaHi+3w7Vjluo7uQ2CfptCO8RkVm7wU="; }; }; @@ -73,7 +71,6 @@ stdenv.mkDerivation rec { license = lib.licenses.unfreeRedistributable; platforms = [ "aarch64-darwin" - "x86_64-darwin" "x86_64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/pv/pvz-portable-unwrapped/package.nix b/pkgs/by-name/pv/pvz-portable-unwrapped/package.nix index 99ec68180031..acb31ca70530 100644 --- a/pkgs/by-name/pv/pvz-portable-unwrapped/package.nix +++ b/pkgs/by-name/pv/pvz-portable-unwrapped/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pvz-portable-unwrapped"; - version = "0.1.26"; + version = "0.1.27"; src = fetchFromGitHub { owner = "wszqkzqk"; repo = "PvZ-Portable"; tag = finalAttrs.version; - hash = "sha256-IsU/l7k7F79nfM6TYdbcofOmJKm6v55HR7HHAZc7sH0="; + hash = "sha256-kebgKQRju2CRboKRytkTEIjm7Hl+1KkIOdrvbwG/ufs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pw/pwdsafety/package.nix b/pkgs/by-name/pw/pwdsafety/package.nix index f822c3b9dfb5..580927c6dd73 100644 --- a/pkgs/by-name/pw/pwdsafety/package.nix +++ b/pkgs/by-name/pw/pwdsafety/package.nix @@ -26,7 +26,7 @@ buildGoModule (finalAttrs: { description = "Command line tool checking password safety"; homepage = "https://github.com/edoardottt/pwdsafety"; changelog = "https://github.com/edoardottt/pwdsafety/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ fab ]; mainProgram = "pwdsafety"; }; diff --git a/pkgs/by-name/px/pxattr/package.nix b/pkgs/by-name/px/pxattr/package.nix index 9d08f7b0d58e..a687b2514461 100644 --- a/pkgs/by-name/px/pxattr/package.nix +++ b/pkgs/by-name/px/pxattr/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.lesbonscomptes.com/pxattr/index.html"; description = "Provides a single interface to extended file attributes"; maintainers = [ ]; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; platforms = lib.platforms.unix; mainProgram = "pxattr"; }; diff --git a/pkgs/by-name/py/pyfa/package.nix b/pkgs/by-name/py/pyfa/package.nix index 034254572c8a..3a75269e3d9d 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.67.0"; + version = "2.68.0"; in python3Packages.buildPythonApplication rec { inherit version; @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { owner = "pyfa-org"; repo = "Pyfa"; tag = "v${version}"; - hash = "sha256-LS8KW6dZe/CYdA1LvZlq1vL8YllnDZkD9WEEDOToY1M="; + hash = "sha256-obx4YG75XxpdlaFlmFmkXdkazHERhm5boOzSx7zDRQs="; }; desktopItems = [ diff --git a/pkgs/by-name/py/pyp/package.nix b/pkgs/by-name/py/pyp/package.nix index 6d0a126f84c1..34df06103d50 100644 --- a/pkgs/by-name/py/pyp/package.nix +++ b/pkgs/by-name/py/pyp/package.nix @@ -44,7 +44,7 @@ python3Packages.buildPythonApplication (finalAttrs: { homepage = "https://github.com/hauntsaninja/pyp"; description = "Easily run Python at the shell"; changelog = "https://github.com/hauntsaninja/pyp/blob/${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "pyp"; maintainers = with lib.maintainers; [ rmcgibbo diff --git a/pkgs/by-name/py/pyspread/package.nix b/pkgs/by-name/py/pyspread/package.nix index ab6706468ad8..6bb3b984431e 100644 --- a/pkgs/by-name/py/pyspread/package.nix +++ b/pkgs/by-name/py/pyspread/package.nix @@ -86,7 +86,7 @@ python3Packages.buildPythonApplication (finalAttrs: { that can be accessed from other cells. These objects can represent anything including lists or matrices. ''; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; mainProgram = "pyspread"; maintainers = with lib.maintainers; [ Merikei ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/py/python-caja/package.nix b/pkgs/by-name/py/python-caja/package.nix index b06000ba2e13..f7a09d2358a0 100644 --- a/pkgs/by-name/py/python-caja/package.nix +++ b/pkgs/by-name/py/python-caja/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Python binding for Caja components"; homepage = "https://github.com/mate-desktop/python-caja"; - license = [ lib.licenses.gpl2Plus ]; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; diff --git a/pkgs/by-name/py/pyxel/package.nix b/pkgs/by-name/py/pyxel/package.nix index 7ab45a73ad22..456378be116f 100644 --- a/pkgs/by-name/py/pyxel/package.nix +++ b/pkgs/by-name/py/pyxel/package.nix @@ -11,36 +11,26 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "pyxel"; - version = "2.8.10"; + version = "2.9.7"; pyproject = true; src = fetchFromGitHub { owner = "kitao"; repo = "pyxel"; tag = "v${finalAttrs.version}"; - hash = "sha256-+SitYe2HFA6rwqk5lipcKFdBy69zdAhw3Q+Nb0iBx6s="; + hash = "sha256-k86VRX25yVNZvsnsWl0EYGd8njhx9yl6gkqI7mznjEs="; }; - patches = [ - (fetchpatch { - name = "add-Cargo.lock.patch"; - url = "https://github.com/kitao/pyxel/commit/821286112ea0c26141aa64b25aaa076611a2a91d.patch"; - excludes = [ "CHANGELOG.md" ]; - hash = "sha256-XtFdtmprPKrdjFOzEsNMJjc4PpNv6KDtWX2Hes2IKe0="; - }) - ]; - cargoRoot = "crates"; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src - patches pname version cargoRoot ; - hash = "sha256-SGrQmGZeM2NcooDqCTO2HOXgLg7h+VvDIierDacqSFs="; + hash = "sha256-tpJSUdjdXwXK/n1nyMga5uTk7TAz/JLQVN0rSdbKxGk="; }; buildAndTestSubdir = "python"; @@ -62,6 +52,11 @@ python3Packages.buildPythonApplication (finalAttrs: { env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL2}/include/SDL2"; + preBuild = '' + # logic taken from Makefile + cp LICENSE README.md python/pyxel/ + ''; + # Tests want to use the display doCheck = false; diff --git a/pkgs/by-name/py/pyznap/package.nix b/pkgs/by-name/py/pyznap/package.nix index 3242caefe190..75f76d05bcc5 100644 --- a/pkgs/by-name/py/pyznap/package.nix +++ b/pkgs/by-name/py/pyznap/package.nix @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication (finalAttrs: { homepage = "https://github.com/yboetz/pyznap"; description = "ZFS snapshot tool written in python"; mainProgram = "pyznap"; - license = with lib.licenses; [ gpl3 ]; + license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ rbrewer ]; }; }) diff --git a/pkgs/by-name/qa/qalculate-qt/package.nix b/pkgs/by-name/qa/qalculate-qt/package.nix index 82cb820f2394..9b0504ddd8c8 100644 --- a/pkgs/by-name/qa/qalculate-qt/package.nix +++ b/pkgs/by-name/qa/qalculate-qt/package.nix @@ -9,15 +9,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "qalculate-qt"; - version = "5.11.0"; + version = "5.12.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-qt"; tag = "v${finalAttrs.version}"; - hash = "sha256-5u/YA5/k7JQclIqJUKvzGEenEhndo52m23XlFjkhw78="; + hash = "sha256-zeHpTe4DlurFqdsrJBlXSl+vXCOdhJRCjHLDpFf2u1o="; }; + __structuredAttrs = true; + nativeBuildInputs = with qt6; [ qmake pkg-config @@ -47,7 +49,9 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Ultimate desktop calculator"; homepage = "http://qalculate.github.io"; - maintainers = [ ]; + maintainers = [ + lib.maintainers.magicquark + ]; license = lib.licenses.gpl2Plus; mainProgram = "qalculate-qt"; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/qb/qbittorrent/package.nix b/pkgs/by-name/qb/qbittorrent/package.nix index 671e1d0e3d2b..07f1fe49193e 100644 --- a/pkgs/by-name/qb/qbittorrent/package.nix +++ b/pkgs/by-name/qb/qbittorrent/package.nix @@ -17,6 +17,7 @@ wrapGAppsHook3, zlib, nixosTests, + llvmPackages, }: stdenv.mkDerivation (finalAttrs: { @@ -35,6 +36,10 @@ stdenv.mkDerivation (finalAttrs: { pkg-config wrapGAppsHook3 qt6.wrapQtAppsHook + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # TODO: Remove once #536365 reaches this branch + llvmPackages.lld ]; buildInputs = [ @@ -60,6 +65,11 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (!webuiSupport) [ "-DWEBUI=OFF" ]; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + # TODO: Remove once #536365 reaches this branch + NIX_CFLAGS_LINK = "-fuse-ld=lld"; + }; + qtWrapperArgs = lib.optionals trackerSearch [ "--prefix PATH : ${lib.makeBinPath [ python3 ]}" ]; dontWrapGApps = true; diff --git a/pkgs/by-name/qf/qFlipper/package.nix b/pkgs/by-name/qf/qFlipper/package.nix index a9d2156d07f9..9a82d06de575 100644 --- a/pkgs/by-name/qf/qFlipper/package.nix +++ b/pkgs/by-name/qf/qFlipper/package.nix @@ -94,7 +94,6 @@ stdenv.mkDerivation { maintainers = with lib.maintainers; [ cab404 ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-linux" ]; # qtbase doesn't build yet on aarch64-darwin }; diff --git a/pkgs/by-name/ql/qlog/package.nix b/pkgs/by-name/ql/qlog/package.nix index a33c4f16fcb1..f3fc79443fe6 100644 --- a/pkgs/by-name/ql/qlog/package.nix +++ b/pkgs/by-name/ql/qlog/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Amateur radio logbook software"; mainProgram = "qlog"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; homepage = "https://github.com/foldynl/QLog"; maintainers = with lib.maintainers; [ oliver-koss diff --git a/pkgs/by-name/qm/qmk_hid/package.nix b/pkgs/by-name/qm/qmk_hid/package.nix index 09d94c215fa5..557277f70e79 100644 --- a/pkgs/by-name/qm/qmk_hid/package.nix +++ b/pkgs/by-name/qm/qmk_hid/package.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Commandline tool for interactng with QMK devices over HID"; homepage = "https://github.com/FrameworkComputer/qmk_hid"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = [ ]; mainProgram = "qmk_hid"; }; diff --git a/pkgs/by-name/qo/qogir-icon-theme/package.nix b/pkgs/by-name/qo/qogir-icon-theme/package.nix index bb80479dc9c6..d1111f72d39a 100644 --- a/pkgs/by-name/qo/qogir-icon-theme/package.nix +++ b/pkgs/by-name/qo/qogir-icon-theme/package.nix @@ -73,7 +73,7 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "dark" "all" ] color meta = { description = "Flat colorful design icon theme"; homepage = "https://github.com/vinceliuice/Qogir-icon-theme"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ romildo ]; }; diff --git a/pkgs/by-name/qo/qolibri/package.nix b/pkgs/by-name/qo/qolibri/package.nix index 0d8e6088b5ba..b92ab6372e07 100644 --- a/pkgs/by-name/qo/qolibri/package.nix +++ b/pkgs/by-name/qo/qolibri/package.nix @@ -57,7 +57,6 @@ stdenv.mkDerivation { license = lib.licenses.gpl2; maintainers = [ lib.maintainers.azahi ]; platforms = lib.platforms.unix; - broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; # Looks like a libcxx version mismatch problem. mainProgram = "qolibri"; }; } diff --git a/pkgs/by-name/qo/qovery-cli/package.nix b/pkgs/by-name/qo/qovery-cli/package.nix index 47a33f715938..5424752a9a05 100644 --- a/pkgs/by-name/qo/qovery-cli/package.nix +++ b/pkgs/by-name/qo/qovery-cli/package.nix @@ -52,7 +52,7 @@ buildGoModule (finalAttrs: { description = "Qovery Command Line Interface"; homepage = "https://github.com/Qovery/qovery-cli"; changelog = "https://github.com/Qovery/qovery-cli/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; mainProgram = "qovery-cli"; }; diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix index c0ed53a4b757..65be7f8d2a9e 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.7.3"; + version = "26.7.7"; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz"; - hash = "sha256-8xlt9rH64B4A+vNFB67Wodrg2XLPF1fnSM3kKSxePKU="; + hash = "sha256-3m/JErBDXQeCu1ShITPJtZkf/c0PL/RrKJshV/CXYls="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/qp/qpwgraph/package.nix b/pkgs/by-name/qp/qpwgraph/package.nix index c11000e8c3cb..54bb292c8227 100644 --- a/pkgs/by-name/qp/qpwgraph/package.nix +++ b/pkgs/by-name/qp/qpwgraph/package.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "qpwgraph"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-mCsjNkQw4yalwZvkMzEmK/NVviVZCLxkROtaNrgEAUo="; + sha256 = "sha256-xzAnZG9tPeVKgOBIX0PdB6bWlK49nMLZWpfDJpnjP4o="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/qq/qq/package.nix b/pkgs/by-name/qq/qq/package.nix index 71e592b1d694..fe372117e064 100644 --- a/pkgs/by-name/qq/qq/package.nix +++ b/pkgs/by-name/qq/qq/package.nix @@ -47,7 +47,6 @@ let platforms = [ "aarch64-darwin" "aarch64-linux" - "x86_64-darwin" "x86_64-linux" ]; license = lib.licenses.unfree; diff --git a/pkgs/by-name/qq/qq/sources.nix b/pkgs/by-name/qq/qq/sources.nix index 069b9861e72e..563fb6bc5ad9 100644 --- a/pkgs/by-name/qq/qq/sources.nix +++ b/pkgs/by-name/qq/qq/sources.nix @@ -12,7 +12,6 @@ let in { aarch64-darwin = any-darwin; - x86_64-darwin = any-darwin; aarch64-linux = { version = "3.2.29-2026-05-28"; src = fetchurl { diff --git a/pkgs/by-name/qq/qq/update.sh b/pkgs/by-name/qq/qq/update.sh index ecc1c769d0dd..af58939b7598 100755 --- a/pkgs/by-name/qq/qq/update.sh +++ b/pkgs/by-name/qq/qq/update.sh @@ -36,18 +36,14 @@ cat >sources.nix < version.h + #define VERSION "1.7.4+${finalAttrs.src.rev}" + EOF ''; nativeBuildInputs = [ @@ -102,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/rakitzis/rc"; description = "Plan 9 shell"; - license = [ lib.licenses.zlib ]; + license = lib.licenses.zlib; mainProgram = "rc"; maintainers = with lib.maintainers; [ ramkromberg ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/rc/rcp/package.nix b/pkgs/by-name/rc/rcp/package.nix index 88e66d9926d2..40f8072897e8 100644 --- a/pkgs/by-name/rc/rcp/package.nix +++ b/pkgs/by-name/rc/rcp/package.nix @@ -6,16 +6,16 @@ pkgsStatic.rustPlatform.buildRustPackage (finalAttrs: { pname = "rcp"; - version = "0.36.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "wykurz"; repo = "rcp"; rev = "v${finalAttrs.version}"; - hash = "sha256-laGQWJbke+q0dAdqR8opXw4oQm6wdJJT0/t/A9c7d9s="; + hash = "sha256-svJA9QyqwpY1xzOQ09qFlZwrGp3HZXW9T2AICVJfqOs="; }; - cargoHash = "sha256-+T9aGsewRHdmKMtZisXv4st+9kBTNtEZnPraLz8S4e8="; + cargoHash = "sha256-QJr6kM520OWxje7Q5FZWgJH1IS8j+Jv1vNf7VyCINNA="; env.RUSTFLAGS = "--cfg tokio_unstable"; @@ -63,7 +63,7 @@ pkgsStatic.rustPlatform.buildRustPackage (finalAttrs: { changelog = "https://github.com/wykurz/rcp/releases/tag/v${finalAttrs.version}"; description = "Tools to efficiently copy, remove and link large filesets"; homepage = "https://github.com/wykurz/rcp"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "rcp"; maintainers = with lib.maintainers; [ wykurz ]; # procfs only supports Linux and Android diff --git a/pkgs/by-name/rd/rdap/package.nix b/pkgs/by-name/rd/rdap/package.nix index 4713875f843b..09834e1e63c6 100644 --- a/pkgs/by-name/rd/rdap/package.nix +++ b/pkgs/by-name/rd/rdap/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "rdap"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "openrdap"; repo = "rdap"; tag = "v${finalAttrs.version}"; - hash = "sha256-FiaUyhiwKXZ3xnFPmdxb8bpbm5eRRFNDL3duOGDnc/A="; + hash = "sha256-dlRIKf/NikCxiKub6qFmC+e3J1XllaVodzVZvUyvycE="; }; - vendorHash = "sha256-8b1EAnR8PkEAw9yLBqPKFeANJit0OCJG+fssAGR/iTk="; + vendorHash = "sha256-F9kwlUwrV6cUT9C/xZx5TyDPoqTt8mt/uh+QYaSCiUw="; doCheck = false; diff --git a/pkgs/by-name/re/re-appintentsmetadataprocessor/package.nix b/pkgs/by-name/re/re-appintentsmetadataprocessor/package.nix index b0aeb3aa66d8..b85c886eb744 100644 --- a/pkgs/by-name/re/re-appintentsmetadataprocessor/package.nix +++ b/pkgs/by-name/re/re-appintentsmetadataprocessor/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { mainProgram = "appintentsmetadataprocessor"; description = "Open reimplementation of Apple's appintentsmetadataprocessor"; homepage = "https://codeberg.org/viraptor/re-appintentsmetadataprocessor"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ viraptor ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/re/re-derq/package.nix b/pkgs/by-name/re/re-derq/package.nix index a242fd29ab18..a8a5f125fa83 100644 --- a/pkgs/by-name/re/re-derq/package.nix +++ b/pkgs/by-name/re/re-derq/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { mainProgram = "derq"; description = "Open reimplementation of Apple's derq"; homepage = "https://codeberg.org/viraptor/re-derq"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ viraptor ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/re/re-intentbuilderc/package.nix b/pkgs/by-name/re/re-intentbuilderc/package.nix index d6391c8f04ef..ff26751b8ff3 100644 --- a/pkgs/by-name/re/re-intentbuilderc/package.nix +++ b/pkgs/by-name/re/re-intentbuilderc/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { mainProgram = "intentbuilderc"; description = "Open reimplementation of Apple's intentbuilderc"; homepage = "https://codeberg.com/viraptor/re-intentbuilderc"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ viraptor ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/re/re-plistbuddy/package.nix b/pkgs/by-name/re/re-plistbuddy/package.nix index 8e51a23b8378..d5c215dd00ab 100644 --- a/pkgs/by-name/re/re-plistbuddy/package.nix +++ b/pkgs/by-name/re/re-plistbuddy/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Open reimplementation of Apple's PlistBuddy and plutil"; homepage = "https://github.com/viraptor/re-plistbuddy"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ viraptor ]; platforms = lib.platforms.darwin; }; diff --git a/pkgs/by-name/re/readarr/package.nix b/pkgs/by-name/re/readarr/package.nix index 5f2874bd8c3c..78a0bd08d1e2 100644 --- a/pkgs/by-name/re/readarr/package.nix +++ b/pkgs/by-name/re/readarr/package.nix @@ -19,7 +19,6 @@ let { x86_64-linux = "x64"; aarch64-linux = "arm64"; - x86_64-darwin = "x64"; } ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = @@ -80,7 +79,6 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" ]; }; } diff --git a/pkgs/by-name/re/readsb/package.nix b/pkgs/by-name/re/readsb/package.nix index a3e17b7a2216..1a213b5b44ea 100644 --- a/pkgs/by-name/re/readsb/package.nix +++ b/pkgs/by-name/re/readsb/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "ADS-B decoder swiss knife"; homepage = "https://github.com/wiedehopf/readsb"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ wucke13 ]; platforms = lib.platforms.linux; # uses epoll, hence its linux only }; diff --git a/pkgs/by-name/re/reap/package.nix b/pkgs/by-name/re/reap/package.nix index 3417e3babf53..c1a46e4fa02a 100644 --- a/pkgs/by-name/re/reap/package.nix +++ b/pkgs/by-name/re/reap/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { homepage = "https://github.com/leahneukirchen/reap"; description = "Run process until all its spawned processes are dead"; mainProgram = "reap"; - license = with lib.licenses; [ publicDomain ]; + license = lib.licenses.publicDomain; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.leahneukirchen ]; }; diff --git a/pkgs/by-name/re/reaper-reapack-extension/darwin.nix b/pkgs/by-name/re/reaper-reapack-extension/darwin.nix index d44bf2c324bb..d8fedc11f106 100644 --- a/pkgs/by-name/re/reaper-reapack-extension/darwin.nix +++ b/pkgs/by-name/re/reaper-reapack-extension/darwin.nix @@ -13,17 +13,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta ; src = fetchurl { - url = - let - arch = if stdenvNoCC.hostPlatform.system == "x86_64-darwin" then "x86_64" else "arm64"; - in - "https://github.com/cfillion/reapack/releases/download/v${finalAttrs.version}/reaper_reapack-${arch}.dylib"; - hash = - { - x86_64-darwin = "sha256-slLzjIWpEzOn4GAcRwb6WdJSVExuQK0cVgHgd7qM4oE="; - aarch64-darwin = "sha256-eFKEUuTUWE4Wp/vWVrvTbK78U6TicvRXSWggVAH2Og4="; - } - .${stdenvNoCC.hostPlatform.system}; + url = "https://github.com/cfillion/reapack/releases/download/v${finalAttrs.version}/reaper_reapack-arm64.dylib"; + hash = "sha256-eFKEUuTUWE4Wp/vWVrvTbK78U6TicvRXSWggVAH2Og4="; }; dontUnpack = true; diff --git a/pkgs/by-name/re/reaper-reapack-extension/package.nix b/pkgs/by-name/re/reaper-reapack-extension/package.nix index 1f5bafa0574c..1c40ddc28e9c 100644 --- a/pkgs/by-name/re/reaper-reapack-extension/package.nix +++ b/pkgs/by-name/re/reaper-reapack-extension/package.nix @@ -20,7 +20,6 @@ callPackage p { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/re/reaper-sws-extension/darwin.nix b/pkgs/by-name/re/reaper-sws-extension/darwin.nix index 3011ad5e7ee6..dc84ddba15ff 100644 --- a/pkgs/by-name/re/reaper-sws-extension/darwin.nix +++ b/pkgs/by-name/re/reaper-sws-extension/darwin.nix @@ -16,17 +16,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { let plugin = fetchurl { - url = - let - arch = if stdenvNoCC.hostPlatform.system == "x86_64-darwin" then "x86_64" else "arm64"; - in - "https://github.com/reaper-oss/sws/releases/download/v${finalAttrs.version}/reaper_sws-${arch}.dylib"; - hash = - { - x86_64-darwin = "sha256-c0enRIXFN+dMDdxTQ3hFv0almTF0dfrSHILNigJp2Js="; - aarch64-darwin = "sha256-jmuob0qslYhxiE2ShfTwY4RJAKBLJSUb+VBEM0sQPbo="; - } - .${stdenvNoCC.hostPlatform.system}; + url = "https://github.com/reaper-oss/sws/releases/download/v${finalAttrs.version}/reaper_sws-arm64.dylib"; + hash = "sha256-jmuob0qslYhxiE2ShfTwY4RJAKBLJSUb+VBEM0sQPbo="; }; in [ diff --git a/pkgs/by-name/re/reaper-sws-extension/package.nix b/pkgs/by-name/re/reaper-sws-extension/package.nix index f4f2a33aadee..1c4d22bf271f 100644 --- a/pkgs/by-name/re/reaper-sws-extension/package.nix +++ b/pkgs/by-name/re/reaper-sws-extension/package.nix @@ -22,7 +22,6 @@ callPackage p { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/re/reaper/package.nix b/pkgs/by-name/re/reaper/package.nix index 3363d1e1d760..dd34c1d76d44 100644 --- a/pkgs/by-name/re/reaper/package.nix +++ b/pkgs/by-name/re/reaper/package.nix @@ -148,7 +148,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/re/recoll-kio/package.nix b/pkgs/by-name/re/recoll-kio/package.nix new file mode 100644 index 000000000000..fbb87cb18230 --- /dev/null +++ b/pkgs/by-name/re/recoll-kio/package.nix @@ -0,0 +1,41 @@ +{ + lib, + stdenv, + cmake, + kdePackages, + recoll, + xapian, +}: + +stdenv.mkDerivation { + pname = "recoll-kio"; + version = recoll.version; + + src = recoll.src; + + strictDeps = true; + buildInputs = [ + kdePackages.kio + recoll + xapian + ]; + + postPatch = '' + cp ./kde/kioslave/kio_recoll/CMakeLists-KF6.txt ./kde/kioslave/kio_recoll/CMakeLists.txt + ''; + + dontWrapQtApps = true; + + nativeBuildInputs = [ cmake ]; + + cmakeDir = "../kde/kioslave/kio_recoll"; + + __structuredAttrs = true; + meta = { + homepage = recoll.meta.homepage; + description = "Plasma KIO worker for recoll"; + license = recoll.meta.license; + maintainers = with lib.maintainers; [ numkem ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/re/rectangle/package.nix b/pkgs/by-name/re/rectangle/package.nix index 2726452ff546..0fdec5ef846d 100644 --- a/pkgs/by-name/re/rectangle/package.nix +++ b/pkgs/by-name/re/rectangle/package.nix @@ -136,13 +136,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rectangle"; - version = "0.96"; + version = "0.98"; src = fetchFromGitHub { owner = "rxhanson"; repo = "Rectangle"; tag = "v${finalAttrs.version}"; - hash = "sha256-3FDCptlNztmexfFDRD/XX9fVuEHVG+EzcrqksJeI+fo="; + hash = "sha256-GGK9mMxllVg0rfcrTg5aUYaECwV7mNCPLwXM+tKazN8="; }; nativeBuildInputs = [ @@ -199,10 +199,11 @@ stdenv.mkDerivation (finalAttrs: { ) masShortcutSources} nixLog "linking MASShortcut dylib" + # `-fuse-ld=lld`: fix for ld64 hardening issue + # TODO: Clean up on `staging` clang -dynamiclib "''${masObjFiles[@]}" \ -framework AppKit -framework Carbon -framework Foundation \ -install_name "@rpath/MASShortcut.framework/MASShortcut" \ - # TODO: Clean up on `staging` -fuse-ld=lld \ -o "$buildDir/libMASShortcut.dylib" diff --git a/pkgs/by-name/re/recyclarr/deps.json b/pkgs/by-name/re/recyclarr/deps.json index 660bd6c13477..ea9da7b3bb89 100644 --- a/pkgs/by-name/re/recyclarr/deps.json +++ b/pkgs/by-name/re/recyclarr/deps.json @@ -11,18 +11,13 @@ }, { "pname": "Autofac", - "version": "9.1.0", - "hash": "sha256-TygJLo8rvWC/KCExg+Hy3eYc0sP+AdhpdlU6fOj11f0=" + "version": "9.3.1", + "hash": "sha256-Nty0y69xfIVu1m09eRDxqo2FA57Koflt0VUxVyMdHT4=" }, { "pname": "Autofac.Extensions.DependencyInjection", - "version": "11.0.0", - "hash": "sha256-GjvG67HWkyam/GWtdU4Wh3pXY1cJ1i3loPVG9lga7vk=" - }, - { - "pname": "Autofac.Extras.AggregateService", - "version": "6.1.2", - "hash": "sha256-n0oHD3nD6apZfuAfZDKjH59LN7QOkoowm9BPeFDK5lw=" + "version": "11.0.2", + "hash": "sha256-zpt49C03lFimNqr2G18guXS7rO4TFp/zMWiAN+hgE1U=" }, { "pname": "Autofac.Extras.Ordering", @@ -64,11 +59,6 @@ "version": "2.6.2", "hash": "sha256-Yjk2+x/RcVeccGOQOQcRKCiYzyx1mlFnhS5auCII+Ms=" }, - { - "pname": "Castle.Core", - "version": "4.4.1", - "hash": "sha256-J4NS8p9KqbuLl6JMmNwptsfccH37TfhAhPwX2mVQso0=" - }, { "pname": "Castle.Core", "version": "5.1.1", @@ -76,23 +66,48 @@ }, { "pname": "CliWrap", - "version": "3.10.1", - "hash": "sha256-uH4SXiMkUIPw5RRyKtDTTCSkkr3BhBAPrxnC4O4ES4c=" + "version": "3.10.2", + "hash": "sha256-PtRWN6tfZ/uT6o1JrLDj624feJgD5iDS4ywsYwEhQ6c=" }, { "pname": "coverlet.collector", - "version": "10.0.0", - "hash": "sha256-0cU5wHZfwQFJFXugC19kiRo9XU1jV4ApbDKuRaL72Vc=" + "version": "10.0.1", + "hash": "sha256-6nZ5qWvy1SPYM9SfYbZEdGGrErdnOPluZXgJJ/hiarw=" }, { "pname": "Docker.DotNet.Enhanced", - "version": "3.131.1", - "hash": "sha256-oZhgICe/Em7dJ97U8zn59jB2jtszdNssRF3EWLXipDc=" + "version": "4.2.0", + "hash": "sha256-e+poxFu+FJwPWuZ1JiiDJjZK+3inIDlIl7obZNGYcB8=" + }, + { + "pname": "Docker.DotNet.Enhanced.Handler.Abstractions", + "version": "4.2.0", + "hash": "sha256-EsFRWrwvnv8JOK9N3W/kDjzrO1Jh8St8wn2W9UDvh0Y=" + }, + { + "pname": "Docker.DotNet.Enhanced.LegacyHttp", + "version": "4.2.0", + "hash": "sha256-MptmUR15Soy74NWJC+ZCWTqJxZP/BEHjfZPYTUq5IeE=" + }, + { + "pname": "Docker.DotNet.Enhanced.NativeHttp", + "version": "4.2.0", + "hash": "sha256-9wMMHwBcSI+pJuB9R1QrtQ1VZOGbASeC1Ouu6nxXum8=" + }, + { + "pname": "Docker.DotNet.Enhanced.NPipe", + "version": "4.2.0", + "hash": "sha256-MOzo8ySnMneRV+KaeqUC2Hq8NuY2oDqginK6DeI7Zf4=" + }, + { + "pname": "Docker.DotNet.Enhanced.Unix", + "version": "4.2.0", + "hash": "sha256-zT4wLE8ZtandcwDZcq/VHhwxKAIPKF02EnigW+h/80U=" }, { "pname": "Docker.DotNet.Enhanced.X509", - "version": "3.131.1", - "hash": "sha256-/PBsQkdJS6R5fVS+OG9ujlIoUa3puRTvu0SMSF7VENQ=" + "version": "4.2.0", + "hash": "sha256-zqimuvpFBmLh1TUUyVvZmjgCHIQbyb6T1suYArQMaFE=" }, { "pname": "Fare", @@ -111,8 +126,8 @@ }, { "pname": "JetBrains.Annotations", - "version": "2025.2.4", - "hash": "sha256-YJpS77UH9tTETCKHr5M+bQOax1BLPFqIr/i+KLN9tEI=" + "version": "2026.2.0", + "hash": "sha256-409CskrdaICXUplGs9sNplfTJfYElllVwIQwoDWfdmk=" }, { "pname": "Microsoft.ApplicationInsights", @@ -121,38 +136,33 @@ }, { "pname": "Microsoft.CodeCoverage", - "version": "18.4.0", - "hash": "sha256-px8qchiuY5rkujAZ1wGEjuuhZdZmsRSp+FCiTmRUA1A=" + "version": "18.7.0", + "hash": "sha256-QonDzKnOwcYkkVP0T3PT9/QySgUILc/L/bcp6+l+tA8=" }, { "pname": "Microsoft.Extensions.Configuration", - "version": "10.0.6", - "hash": "sha256-CSd5RC5pMsmglpnE6Vm3JabMnbmziqtUGrZE5Rg7uF4=" + "version": "10.0.9", + "hash": "sha256-4d8r6Vyune1Qb0kwqzfGPA7BK2nvaiOenTiJedzq6sU=" }, { "pname": "Microsoft.Extensions.Configuration.Abstractions", - "version": "10.0.6", - "hash": "sha256-jxtne26QF7bASCRmLNwYsKruY3QhsnuzN9Us11WUdSQ=" + "version": "10.0.9", + "hash": "sha256-pliaksEAQdxyPURUVSlXpfF3LzJB93zHaeEDsaF5QJE=" }, { "pname": "Microsoft.Extensions.Configuration.Binder", - "version": "10.0.6", - "hash": "sha256-34blBlrQ3FRS7iCS7/gxPZMa9xgDW0p3iEERqwgXFMA=" + "version": "10.0.9", + "hash": "sha256-ouJa+84H/bfMi67v25hjEWhTIyBHaWTJAoEvArwbrGA=" }, { "pname": "Microsoft.Extensions.DependencyInjection", - "version": "10.0.6", - "hash": "sha256-K3ODZC+Bwd3Tze5wF7BQvJJGlNObdf2PNA35F41jHTE=" + "version": "10.0.9", + "hash": "sha256-YIqgDknwTq48X88Imdrfav3tmQ6tZwIOYsLt6dT40M8=" }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "10.0.4", - "hash": "sha256-0QhVYjk9Cxy6NFef9VKftGmscTZnvcD1bhBQoXz3mwA=" - }, - { - "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "10.0.6", - "hash": "sha256-lFiZb81kfBJK7J0b0A2UIpydPRT73Xcs57Gzf/+1xXc=" + "version": "10.0.9", + "hash": "sha256-YzQpGAsrjLU18s016LmM7DMJKml0MzKl1bPPYJ/erEk=" }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", @@ -166,28 +176,28 @@ }, { "pname": "Microsoft.Extensions.Diagnostics", - "version": "10.0.6", - "hash": "sha256-TGJjvsztoajNzOe0KeuOvtb2ZuNDbjq2NfPs15zo3kA=" + "version": "10.0.9", + "hash": "sha256-nnhs4+Z8gNL89Dttjqt0FR6uWY5U6bQ1dIa0wwMiUno=" }, { "pname": "Microsoft.Extensions.Diagnostics.Abstractions", - "version": "10.0.6", - "hash": "sha256-9AbUvHuHhDPjtf6vsci2r6VfSg0BlmkJkMYmIqAQ2QA=" + "version": "10.0.9", + "hash": "sha256-OoBCatkSA+QWbMfyFxeuEOIHb04ukPH32gNfCUsar2M=" }, { "pname": "Microsoft.Extensions.Http", - "version": "10.0.6", - "hash": "sha256-3REMteQjA7j5LDJ7wDnlWkJlVHHXx0+dgbiVlZQAi/c=" + "version": "10.0.9", + "hash": "sha256-caid7Mp5UjoLLjpwfKuJq24mVWp+lLm7/l8DezPyNKw=" }, { "pname": "Microsoft.Extensions.Logging", - "version": "10.0.6", - "hash": "sha256-tskLj/WXLK35gkuJAWaAhPjMW92N1JKOTzTLupR30pE=" + "version": "10.0.9", + "hash": "sha256-644xYxPB+PtwGUTAKJV9wByXHWFkR5Ol0p08wFQwMm4=" }, { "pname": "Microsoft.Extensions.Logging.Abstractions", - "version": "10.0.6", - "hash": "sha256-4ijpXt4PoTNcmF5dl/rEZkRWBAjukB229lXtBtJhxn4=" + "version": "10.0.9", + "hash": "sha256-su2q/OZuG7nB3wnUTVcimy3oHSdetFh4hhmjI3f/ym8=" }, { "pname": "Microsoft.Extensions.Logging.Abstractions", @@ -196,23 +206,23 @@ }, { "pname": "Microsoft.Extensions.Options", - "version": "10.0.6", - "hash": "sha256-GJCULaUcN2FxCA9fKOLe5EDEtkKLrEuP2Kw0jRqospA=" + "version": "10.0.9", + "hash": "sha256-/fc1g1SDJI81nOZRS7W4LZIAC0ssmasqaWhgJK+9rRs=" }, { "pname": "Microsoft.Extensions.Options.ConfigurationExtensions", - "version": "10.0.6", - "hash": "sha256-T0HNAYrIsm1xzfBD1qLqziI5qwSsGXGmXSDdOgpC5s0=" + "version": "10.0.9", + "hash": "sha256-XVKJrNjPo0hojY5V4xoLxedpvkqtr4GJqkCUhLKSTcQ=" }, { "pname": "Microsoft.Extensions.Primitives", - "version": "10.0.6", - "hash": "sha256-/iSFDryQIl8rl+TtrzunT5LcbPsQCeC2V+9CnS1P4Cc=" + "version": "10.0.9", + "hash": "sha256-WEPtmlEexm6QSFR4ITlBHuUD5/bqMfecOxFe5hkbAPU=" }, { "pname": "Microsoft.NET.Test.Sdk", - "version": "18.4.0", - "hash": "sha256-ak/emX4C4KQVzc0bSNK4bChS+dvb3FvxZbJNrmf/2+w=" + "version": "18.7.0", + "hash": "sha256-m2cPE5Y7lQz1nmyjlaf4bf9LpABQa24wiga7HPN4LgQ=" }, { "pname": "Microsoft.NETCore.Platforms", @@ -251,13 +261,13 @@ }, { "pname": "Microsoft.TestPlatform.ObjectModel", - "version": "18.4.0", - "hash": "sha256-ERL2goDaM0vUElW25DM/5lI2WplE5E6g9mhTegY0bC8=" + "version": "18.7.0", + "hash": "sha256-OJYJt3EhJ60HobDzET31dESe29BtqDd35Xjt8/2BQCQ=" }, { "pname": "Microsoft.TestPlatform.TestHost", - "version": "18.4.0", - "hash": "sha256-S4T/6xHvov8jDcbcuZAOoutMAEudUb3dMP7MyxVa8Fo=" + "version": "18.7.0", + "hash": "sha256-i5XpKR5rgazQ5ZLPGE/F71h0Sp6Ko/ff1NzLo+lsE5M=" }, { "pname": "NETStandard.Library", @@ -281,38 +291,53 @@ }, { "pname": "NUnit", - "version": "4.5.1", - "hash": "sha256-+BO4kpkiPEvC4R2wyqV/QMjpKc6jcGwARyc3Bk9skPU=" + "version": "4.6.1", + "hash": "sha256-MLciW0cj9OO3gJ6FjqD/Kpp0S5yPYsTpSWtRTYG0Pvo=" }, { "pname": "NUnit.Analyzers", - "version": "4.12.0", - "hash": "sha256-OCEqlVwNNWfenzKnp7ECeF5ekASRzNZmv251bS2xGYo=" + "version": "4.14.0", + "hash": "sha256-WULxpvd/t9VKLwhe4+rRJdS5B3j5xqK1AUxmhkg4SLY=" }, { "pname": "NUnit3TestAdapter", "version": "6.2.0", "hash": "sha256-sKQjvF/qlEgfrCKHt1OzT+QZdtPt4RBBZd2f0oD1ldg=" }, + { + "pname": "ReactiveUI.Disposables", + "version": "6.0.0", + "hash": "sha256-WK2rt1PZFW2MAnQpnwjJgt0sC9lGp8UazxGbJLSBSfs=" + }, + { + "pname": "ReactiveUI.Primitives", + "version": "6.0.0", + "hash": "sha256-b6ByzvvvWhV+BIGRDb9u5t9b9mvRz3memmumQbqtH/A=" + }, + { + "pname": "ReactiveUI.Primitives.Core", + "version": "6.0.0", + "hash": "sha256-bWM5Cp/rIuF9CglPo0dse+9a76lPHhjElO4W/3U4MJI=" + }, { "pname": "ReferenceTrimmer", - "version": "3.4.7", - "hash": "sha256-LgRvN1CYOZGj9Cx5SrOghx3KTJVPZZ22T8EgyKMyDJc=" + "version": "3.5.7", + "hash": "sha256-31Mhd4PseBmf6wqmIvgtTEuGcQQR80wtsqg3YMTFp50=" }, { "pname": "Refit", - "version": "10.1.6", - "hash": "sha256-KC0PVsbqx5RHZxItYgJaBeUQBlPLQbTx643BzEhXIc0=" + "version": "13.1.0", + "hash": "sha256-usU/SXfobVSWqku+J2KnRv3Zl662j+7BeBPFkIs/Mm0=" }, { "pname": "Refit.HttpClientFactory", - "version": "10.1.6", - "hash": "sha256-/fkHB7cFXIRVUDnznQVJBgpwLS8KdhtiASF78xp4C8Q=" + "version": "13.1.0", + "hash": "sha256-n07aKFVFSa/dHm/WQuuEsRsBtkCes8APP7aw9MUgQ1k=" }, { "pname": "Refitter.MSBuild", - "version": "1.7.3", - "hash": "sha256-S7L3kPkBRO1rfsNKn2FDhB5qalG0UrRCmPcoCmeOF7w=" + "version": "2.0.0", + "hash": "sha256-4ysnoFGZh1Hlsst/yfCrVx7MbD0O0cHOaY3fiYNHWTw=" }, { "pname": "Riok.Mapperly", @@ -451,12 +476,12 @@ }, { "pname": "Testcontainers", - "version": "4.11.0", - "hash": "sha256-SbrnISUOL0sQntC/z9/jOutewfLHQVT6vqjl2MfIjmw=" + "version": "4.12.0", + "hash": "sha256-NM+zFlgQIo0BP5V/WW8gLJ/tcSTZelbbklOZ3llzZ4g=" }, { "pname": "YamlDotNet", - "version": "17.0.1", - "hash": "sha256-z23qb/L7DcjLgVsvROjyD7gr342u3QKjcPA2mZ0xz2g=" + "version": "18.1.0", + "hash": "sha256-Wf/mWt5nrZ2IYmf4d7Y0pFA2PLgblOGducpMNkYUFvY=" } ] diff --git a/pkgs/by-name/re/recyclarr/package.nix b/pkgs/by-name/re/recyclarr/package.nix index 455bdff775ff..a9a82b004c50 100644 --- a/pkgs/by-name/re/recyclarr/package.nix +++ b/pkgs/by-name/re/recyclarr/package.nix @@ -9,13 +9,13 @@ }: buildDotnetModule (finalAttrs: { pname = "recyclarr"; - version = "8.6.0"; + version = "8.7.0"; src = fetchFromGitHub { owner = "recyclarr"; repo = "recyclarr"; tag = "v${finalAttrs.version}"; - hash = "sha256-Uu6fBKODzKGYA6vSJPw0OV/+bi3y2F/SHfrdd5pdyzs="; + hash = "sha256-tH76rFsQNPMq5aVJJOrjGAOueTc/jhIE8taUe4aBhg8="; }; projectFile = "Recyclarr.slnx"; diff --git a/pkgs/by-name/re/red-trul/package.nix b/pkgs/by-name/re/red-trul/package.nix index 0d47ee9a7074..9fbe34d9d9f0 100644 --- a/pkgs/by-name/re/red-trul/package.nix +++ b/pkgs/by-name/re/red-trul/package.nix @@ -49,7 +49,7 @@ buildNpmPackage (finalAttrs: { description = "Lightweight utility to transcode FLAC releases"; homepage = "https://github.com/lfence/red-trul"; changelog = "https://github.com/lfence/red-trul/releases/tag/${finalAttrs.version}"; - license = with lib.licenses; [ isc ]; + license = lib.licenses.isc; maintainers = with lib.maintainers; [ lilahummel ]; }; }) diff --git a/pkgs/by-name/re/reddsaver/package.nix b/pkgs/by-name/re/reddsaver/package.nix index c3536d8a9c7a..e37100aafe6d 100644 --- a/pkgs/by-name/re/reddsaver/package.nix +++ b/pkgs/by-name/re/reddsaver/package.nix @@ -22,9 +22,6 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; - # package does not contain tests as of v0.3.3 - docCheck = false; - meta = { description = "CLI tool to download saved media from Reddit"; homepage = "https://github.com/manojkarthick/reddsaver"; diff --git a/pkgs/by-name/re/redlist/package.nix b/pkgs/by-name/re/redlist/package.nix index 4a81f6dea55d..19881cb7e1c4 100644 --- a/pkgs/by-name/re/redlist/package.nix +++ b/pkgs/by-name/re/redlist/package.nix @@ -42,7 +42,7 @@ python3Packages.buildPythonApplication (finalAttrs: { description = "Convert Spotify playlists to local m3u's and fill the gaps"; mainProgram = "redlist"; homepage = "https://github.com/Laharah/redlist"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ lilahummel ]; }; }) diff --git a/pkgs/by-name/re/redpanda-client/package.nix b/pkgs/by-name/re/redpanda-client/package.nix index a5cdd62417a7..05b95b243c72 100644 --- a/pkgs/by-name/re/redpanda-client/package.nix +++ b/pkgs/by-name/re/redpanda-client/package.nix @@ -7,12 +7,12 @@ stdenv, }: let - version = "26.1.12"; + version = "26.1.13"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-ZF9YzRW1b40syRCV+a5NOsS/SDwstVs1mI++dTDcpWc="; + sha256 = "sha256-vYAicA6tUJt4fz2HBvu+T5rKuVjUWP1QN9ViThkMrpA="; }; in buildGoModule rec { diff --git a/pkgs/by-name/re/refine/package.nix b/pkgs/by-name/re/refine/package.nix index 41d622f59b8d..e2402c0740b8 100644 --- a/pkgs/by-name/re/refine/package.nix +++ b/pkgs/by-name/re/refine/package.nix @@ -80,7 +80,7 @@ python3Packages.buildPythonApplication (finalAttrs: { homepage = "https://gitlab.gnome.org/TheEvilSkeleton/Refine"; mainProgram = "refine"; platforms = lib.platforms.linux; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ getchoo ]; }; }) diff --git a/pkgs/by-name/re/reflex-app/package.nix b/pkgs/by-name/re/reflex-app/package.nix index 2a166e14e9cb..2a3519f751d0 100644 --- a/pkgs/by-name/re/reflex-app/package.nix +++ b/pkgs/by-name/re/reflex-app/package.nix @@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "Media key forwarder for Music and Spotify"; homepage = "https://stuntsoftware.com/reflex/"; license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ iniw ]; + maintainers = with lib.maintainers; [ wini ]; platforms = lib.platforms.darwin; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; diff --git a/pkgs/by-name/re/refurb/package.nix b/pkgs/by-name/re/refurb/package.nix index f5d25cc688c5..494969c9dfd1 100644 --- a/pkgs/by-name/re/refurb/package.nix +++ b/pkgs/by-name/re/refurb/package.nix @@ -56,7 +56,7 @@ python3Packages.buildPythonApplication (finalAttrs: { description = "Tool for refurbishing and modernizing Python codebases"; mainProgram = "refurb"; homepage = "https://github.com/dosisod/refurb"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = [ ]; }; }) diff --git a/pkgs/by-name/re/regal/package.nix b/pkgs/by-name/re/regal/package.nix index a1740942f85c..c87b71545d1b 100644 --- a/pkgs/by-name/re/regal/package.nix +++ b/pkgs/by-name/re/regal/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "regal"; - version = "0.41.1"; + version = "0.42.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "regal"; tag = "v${finalAttrs.version}"; - hash = "sha256-mrNdzzwgLmP3PNnoVI4vC05rq9vGCnlWHquwXh1HDX0="; + hash = "sha256-52kYnkOEhNk491vaoCSgR47frmN/mFCKyHqWnIBcEE8="; }; - vendorHash = "sha256-kp0EkieTIzC+nO9fFnUQMP4COCY9wxe4Nb2kSUgnInA="; + vendorHash = "sha256-Vl6u/dwtG8RBpSQUrS5rAQ0Hag2R5X6rVQe9PHb/4U8="; # Only build the main binary, exclude build/lsp/main.go subPackages = [ "." ]; diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix index 3e31ee1375d6..a0de1bc728d9 100644 --- a/pkgs/by-name/re/reindeer/package.nix +++ b/pkgs/by-name/re/reindeer/package.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Generate Buck build rules from Rust Cargo dependencies"; mainProgram = "reindeer"; homepage = "https://github.com/facebookincubator/reindeer"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ amaanq ]; }; }) diff --git a/pkgs/by-name/re/release-plz/package.nix b/pkgs/by-name/re/release-plz/package.nix index dd33a852967a..d9d333fa1e36 100644 --- a/pkgs/by-name/re/release-plz/package.nix +++ b/pkgs/by-name/re/release-plz/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "release-plz"; - version = "0.3.159"; + version = "0.3.160"; src = fetchFromGitHub { owner = "MarcoIeni"; repo = "release-plz"; rev = "release-plz-v${finalAttrs.version}"; - hash = "sha256-p0KzeGM1erpdD3akoUHCnIw6lPzjfxBcESTB0bHwWoo="; + hash = "sha256-rPYRYAp5grTgASFHKGBdOcO0TvbP7iD+GgL0ZLmHhos="; }; - cargoHash = "sha256-tiDDniYO7nXeXMLCT2EJhP6Ii9SUJ3cRJZHZTo0rtak="; + cargoHash = "sha256-m6gX/Tu3WCMzkXhWZ19bM9PL7lQ6Xg1R90/ptuswI1s="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/re/remark42/package.nix b/pkgs/by-name/re/remark42/package.nix index c461a9aae6d5..56db00447ff8 100644 --- a/pkgs/by-name/re/remark42/package.nix +++ b/pkgs/by-name/re/remark42/package.nix @@ -4,21 +4,21 @@ fetchFromGitHub, buildGoModule, nodejs-slim_22, - pnpm_9, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, testers, }: let - pnpm = pnpm_9.override { nodejs-slim = nodejs-slim_22; }; - version = "1.15.0"; + pnpm = pnpm_10.override { nodejs-slim = nodejs-slim_22; }; + version = "1.16.4"; src = fetchFromGitHub { owner = "umputun"; repo = "remark42"; tag = "v${version}"; - hash = "sha256-yd/qTRSZj0nZpgK77xP+XHyHcVXlNpyMzdfj6EbVcXQ="; + hash = "sha256-VCFpN/8GRziD7sKVw7jK33llo0AGqygW4ghHZxrluJc="; }; remark42-web = stdenv.mkDerivation (finalAttrs: { @@ -41,21 +41,12 @@ let version src sourceRoot - postPatch ; inherit pnpm; fetcherVersion = 4; - hash = "sha256-wFrMoSeD87H1yfMD0jBcw60DKDeh4yjka5aWyHuQssA="; + hash = "sha256-PInNiI8hcXzQoYWtHUy6BTQKgII7rHzlbSGFc+ixz7k="; }; - postPatch = '' - substituteInPlace "package.json" "apps/remark42/package.json" \ - --replace-fail "pnpm@8.15.9" "pnpm@${pnpm.version}" - - substituteInPlace "apps/remark42/package.json" \ - --replace-fail '"pnpm": "8.*"' '"pnpm": "9.*"' - ''; - buildPhase = '' runHook preBuild diff --git a/pkgs/by-name/re/rename/package.nix b/pkgs/by-name/re/rename/package.nix index be43b399c644..a0d518280557 100644 --- a/pkgs/by-name/re/rename/package.nix +++ b/pkgs/by-name/re/rename/package.nix @@ -22,7 +22,7 @@ perlPackages.buildPerlPackage rec { cyplo cfouche ]; - license = with lib.licenses; [ gpl1Plus ]; + license = lib.licenses.gpl1Plus; mainProgram = "rename"; }; } diff --git a/pkgs/by-name/re/reproxy/package.nix b/pkgs/by-name/re/reproxy/package.nix index 23850ea81c48..404a75ea7903 100644 --- a/pkgs/by-name/re/reproxy/package.nix +++ b/pkgs/by-name/re/reproxy/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "reproxy"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "umputun"; repo = "reproxy"; tag = "v${finalAttrs.version}"; - hash = "sha256-eAxksLPCQrmKRKNlFhDb5dfXSaa9o/rexM1n+CiPZvw="; + hash = "sha256-dxQWuONVYidNtppLd5S1tBEPXM64JdnAhdFWzOsaG6U="; }; vendorHash = null; diff --git a/pkgs/by-name/re/resnap/package.nix b/pkgs/by-name/re/resnap/package.nix index a276cc4bca2a..5b635a0a5878 100644 --- a/pkgs/by-name/re/resnap/package.nix +++ b/pkgs/by-name/re/resnap/package.nix @@ -47,7 +47,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { description = "Take screnshots of your reMarkable tablet over SSH"; homepage = "https://github.com/cloudsftp/reSnap"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ _404wolf ]; mainProgram = "reSnap"; }; diff --git a/pkgs/by-name/re/resorter/package.nix b/pkgs/by-name/re/resorter/package.nix index 73d53d950b26..702a1cc0c78e 100644 --- a/pkgs/by-name/re/resorter/package.nix +++ b/pkgs/by-name/re/resorter/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Tool to sort a list of items based on pairwise comparisons"; homepage = "https://github.com/hiAndrewQuinn/resorter"; - license = with lib.licenses; [ cc0 ]; + license = lib.licenses.cc0; mainProgram = "resorter"; maintainers = [ ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/re/resterm/package.nix b/pkgs/by-name/re/resterm/package.nix index fb04e282b187..f71c28a0c679 100644 --- a/pkgs/by-name/re/resterm/package.nix +++ b/pkgs/by-name/re/resterm/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "resterm"; - version = "0.44.6"; + version = "0.46.4"; src = fetchFromGitHub { owner = "unkn0wn-root"; repo = "resterm"; tag = "v${finalAttrs.version}"; - hash = "sha256-J8lvI5h3K7Ny8jkoBBLJX4qCSHkByDGWKHxDkVjAzUI="; + hash = "sha256-Fpt/ZYdLC4OVA9Aj8NXJ76TY1ofxifXfjqD6irVV6cM="; }; - vendorHash = "sha256-AjckKD6NScBa8w9nWMdVExuNadz3vHnK854XXg3nj84="; + vendorHash = "sha256-K6edyYLkVQwEZBAfRwgckUJI8dmo/ZxFRjEkExtyLxY="; # modernc.org/libc (via modernc.org/sqlite) tries to read /etc/protocols modPostBuild = '' diff --git a/pkgs/by-name/re/restic-integrity/package.nix b/pkgs/by-name/re/restic-integrity/package.nix index 04c82529582a..92775e51eda7 100644 --- a/pkgs/by-name/re/restic-integrity/package.nix +++ b/pkgs/by-name/re/restic-integrity/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "CLI tool to check the integrity of a restic repository without unlocking it"; homepage = "https://git.nwex.de/networkException/restic-integrity"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ networkexception ]; mainProgram = "restic-integrity"; }; diff --git a/pkgs/by-name/rg/rgrc/package.nix b/pkgs/by-name/rg/rgrc/package.nix index e95e47c58883..a2e6b0765a30 100644 --- a/pkgs/by-name/rg/rgrc/package.nix +++ b/pkgs/by-name/rg/rgrc/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rgrc"; - version = "0.6.13"; + version = "0.6.14"; src = fetchFromGitHub { owner = "lazywalker"; repo = "rgrc"; tag = "v${finalAttrs.version}"; - hash = "sha256-MZ3+dgq78QcroHJ0eL7kUuI+wZm6QaTCgA4CrcO5iCQ="; + hash = "sha256-DEsxdqX9kAK/TqmP8PMOLQE4ij0+8mkoK/QapbXikss="; }; - cargoHash = "sha256-DB3J3fTesC8Eg/GqWLYKIiE8FoNjGs9i1LgNx4klvsw="; + cargoHash = "sha256-OLDMaHwrDO4Q4V0hVIbXmkTiBowpGoZc/xOISwS25Nc="; buildFeatures = [ "embed-configs" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ri/ripgrep-all/package.nix b/pkgs/by-name/ri/ripgrep-all/package.nix index d6a8422641f3..75b7d7968344 100644 --- a/pkgs/by-name/ri/ripgrep-all/package.nix +++ b/pkgs/by-name/ri/ripgrep-all/package.nix @@ -62,7 +62,7 @@ rustPlatform.buildRustPackage (finalAttrs: { to search in pdf, docx, sqlite, jpg, movie subtitles (mkv, mp4), etc. ''; homepage = "https://github.com/phiresky/ripgrep-all"; - license = with lib.licenses; [ agpl3Plus ]; + license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ zaninime ma27 diff --git a/pkgs/by-name/ri/ripgrep/package.nix b/pkgs/by-name/ri/ripgrep/package.nix index fbfb4fc87bfc..6249e96438c3 100644 --- a/pkgs/by-name/ri/ripgrep/package.nix +++ b/pkgs/by-name/ri/ripgrep/package.nix @@ -17,7 +17,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "ripgrep"; - version = "15.1.0"; + version = "15.2.0"; __structuredAttrs = true; @@ -25,10 +25,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "BurntSushi"; repo = "ripgrep"; tag = finalAttrs.version; - hash = "sha256-0gjwYMUlXYnmIWQS1SVzF1yQw1lpveRLw5qp049lc3I="; + hash = "sha256-BsSIbZwB6s8i3dDTRYJ1EdVbJmiO0oxcLu6qiYlPkOI="; }; - cargoHash = "sha256-ry3pLuYNwX776Dpj9IE2+uc7eEa5+sQvdNNeG1eJecs="; + cargoHash = "sha256-AqizStE9ICd6mNDZWdeXg6dHuTiY+B0TNauQQYWUa84="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ro/roam-research/common.nix b/pkgs/by-name/ro/roam-research/common.nix index 97095a8eadea..d284c83ee5aa 100644 --- a/pkgs/by-name/ro/roam-research/common.nix +++ b/pkgs/by-name/ro/roam-research/common.nix @@ -6,10 +6,6 @@ in { inherit pname version; sources = { - x86_64-darwin = fetchurl { - url = "https://roam-electron-deploy.s3.us-east-2.amazonaws.com/Roam+Research-${version}.dmg"; - hash = "sha256-c7h+ZvR1LtHhOr63xQcRxXC00on2Ob0XfRyS2HU3Qkg="; - }; aarch64-darwin = fetchurl { url = "https://roam-electron-deploy.s3.us-east-2.amazonaws.com/Roam+Research-${version}-arm64.dmg"; hash = "sha256-fPtJAKfh65/dEryi0kdg+1hLfdvzBU87uS0y6eaaVy4="; diff --git a/pkgs/by-name/ro/roam-research/darwin.nix b/pkgs/by-name/ro/roam-research/darwin.nix index b11afb88e8f4..00603c518486 100644 --- a/pkgs/by-name/ro/roam-research/darwin.nix +++ b/pkgs/by-name/ro/roam-research/darwin.nix @@ -35,7 +35,6 @@ stdenv.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; platforms = [ - "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "roam-research"; diff --git a/pkgs/by-name/ro/rocketchat-desktop/package.nix b/pkgs/by-name/ro/rocketchat-desktop/package.nix index 0f86bea5a978..d76e20d83395 100644 --- a/pkgs/by-name/ro/rocketchat-desktop/package.nix +++ b/pkgs/by-name/ro/rocketchat-desktop/package.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "rocketchat-desktop"; - version = "4.15.2"; + version = "4.15.6"; src = fetchFromGitHub { owner = "RocketChat"; repo = "Rocket.Chat.Electron"; tag = finalAttrs.version; - hash = "sha256-wme3RKGaHuoOf7yyXH3PZ/0xL73LqS9rPqL8IcxyAkA="; + hash = "sha256-cCCE+d/YXUqTb5gMgcxsOjh2nDUZuuQ4L4QZYzIN4r0="; }; patches = [ diff --git a/pkgs/by-name/ro/rode-central/package.nix b/pkgs/by-name/ro/rode-central/package.nix index ce00b49fd866..8a33cb664e56 100644 --- a/pkgs/by-name/ro/rode-central/package.nix +++ b/pkgs/by-name/ro/rode-central/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Companion app for configuring compatible RØDE devices, unlocking advanced features, enabling or disabling functions and updating firmware"; homepage = "https://rode.com/en-us/apps/rode-central"; changelog = "https://rode.com/en-us/release-notes/rode-central"; - license = [ lib.licenses.unfree ]; + license = lib.licenses.unfree; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; maintainers = with lib.maintainers; [ ethancedwards8 ]; platforms = lib.platforms.darwin; diff --git a/pkgs/by-name/ro/ron-lsp/package.nix b/pkgs/by-name/ro/ron-lsp/package.nix index ebd02a7a790f..6574ebe385c2 100644 --- a/pkgs/by-name/ro/ron-lsp/package.nix +++ b/pkgs/by-name/ro/ron-lsp/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: { based on Rust type annotations ''; homepage = "https://github.com/jasonjmcghee/ron-lsp"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ Dietr1ch ]; diff --git a/pkgs/by-name/ro/roon-server/package.nix b/pkgs/by-name/ro/roon-server/package.nix index cf8da75d7d3e..7c92324111f7 100644 --- a/pkgs/by-name/ro/roon-server/package.nix +++ b/pkgs/by-name/ro/roon-server/package.nix @@ -16,7 +16,7 @@ stdenv, }: let - version = "2.67.1661"; + version = "2.70.1671"; urlVersion = builtins.replaceStrings [ "." ] [ "0" ] version; in stdenv.mkDerivation { @@ -25,7 +25,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2"; - hash = "sha256-5IvAJCTcWaIHTkWZYT7zPTPSjvLuQigF4BHH4l0wTR0="; + hash = "sha256-vYFhYMGFyu/eaQnVoRij9aUP9aZvxBj8N7yHmXD7904="; }; dontConfigure = true; diff --git a/pkgs/by-name/ro/rosenpass/package.nix b/pkgs/by-name/ro/rosenpass/package.nix index e0fe37b334f0..dbbb4cea5f77 100644 --- a/pkgs/by-name/ro/rosenpass/package.nix +++ b/pkgs/by-name/ro/rosenpass/package.nix @@ -59,7 +59,6 @@ rustPlatform.buildRustPackage (finalAttrs: { platforms = [ "aarch64-darwin" "aarch64-linux" - "x86_64-darwin" "x86_64-linux" ]; mainProgram = "rosenpass"; diff --git a/pkgs/by-name/ro/roslyn-ls/deps.json b/pkgs/by-name/ro/roslyn-ls/deps.json index f231b367b081..107bb2673f97 100644 --- a/pkgs/by-name/ro/roslyn-ls/deps.json +++ b/pkgs/by-name/ro/roslyn-ls/deps.json @@ -85,15 +85,15 @@ }, { "pname": "Microsoft.CodeAnalysis.Analyzers", - "version": "5.9.0-1.26306.2", - "hash": "sha256-GdxMDFLl+/+UaJHVKzchPi6Dy23WBPvvZW6Ez+XJc2w=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.analyzers/5.9.0-1.26306.2/microsoft.codeanalysis.analyzers.5.9.0-1.26306.2.nupkg" + "version": "5.9.0-1.26314.1", + "hash": "sha256-eIH9cgoG7C9Q/DgIz4u8YccZpvuV+0e/wNVhHBZJMZU=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.analyzers/5.9.0-1.26314.1/microsoft.codeanalysis.analyzers.5.9.0-1.26314.1.nupkg" }, { "pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers", - "version": "5.9.0-1.26312.114", - "hash": "sha256-vCAz49NzwPMKTrwF93rEyiLrtHyWvImhB/Upqeh3mBQ=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.bannedapianalyzers/5.9.0-1.26312.114/microsoft.codeanalysis.bannedapianalyzers.5.9.0-1.26312.114.nupkg" + "version": "5.9.0-1.26318.105", + "hash": "sha256-th/gB+lr8eukOvYS3mgqOH1xw/MZB92DGtvzxQ1dhCY=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.bannedapianalyzers/5.9.0-1.26318.105/microsoft.codeanalysis.bannedapianalyzers.5.9.0-1.26318.105.nupkg" }, { "pname": "Microsoft.CodeAnalysis.Common", @@ -115,9 +115,9 @@ }, { "pname": "Microsoft.CodeAnalysis.PublicApiAnalyzers", - "version": "5.9.0-1.26312.114", - "hash": "sha256-Eke4nmBnkDrCRILYpXoMzj/6wffm5twnbwkjX00JMsU=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.publicapianalyzers/5.9.0-1.26312.114/microsoft.codeanalysis.publicapianalyzers.5.9.0-1.26312.114.nupkg" + "version": "5.9.0-1.26318.105", + "hash": "sha256-tmvcJ968qvZO0IxSAqGWvRY/Cf3sVoE3lgLKjEKdwMU=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.publicapianalyzers/5.9.0-1.26318.105/microsoft.codeanalysis.publicapianalyzers.5.9.0-1.26318.105.nupkg" }, { "pname": "Microsoft.CSharp", @@ -481,9 +481,9 @@ }, { "pname": "Roslyn.Diagnostics.Analyzers", - "version": "5.9.0-1.26312.114", - "hash": "sha256-aUngqGTjpzYR2uPNHPfvhUApEqx3Sea50vpMU0yCVZ0=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/roslyn.diagnostics.analyzers/5.9.0-1.26312.114/roslyn.diagnostics.analyzers.5.9.0-1.26312.114.nupkg" + "version": "5.9.0-1.26318.105", + "hash": "sha256-OtO3MoCsN12zTiqc2a5kcSe8Gz3bYsLlrRztvMiWTRg=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/roslyn.diagnostics.analyzers/5.9.0-1.26318.105/roslyn.diagnostics.analyzers.5.9.0-1.26318.105.nupkg" }, { "pname": "SQLitePCLRaw.bundle_green", @@ -547,9 +547,9 @@ }, { "pname": "System.CommandLine", - "version": "3.0.0-preview.6.26312.114", - "hash": "sha256-0/D51nnC0jWdrqEUMIVj557NST8zSDwquxrVIRtyyN4=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/516521bf-6417-457e-9a9c-0a4bdfde03e7/nuget/v3/flat2/system.commandline/3.0.0-preview.6.26312.114/system.commandline.3.0.0-preview.6.26312.114.nupkg" + "version": "3.0.0-preview.6.26318.105", + "hash": "sha256-Tk8jtUmyXXdA/vbu4JvRits1TFmoFILzrVwv4ltyF68=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/516521bf-6417-457e-9a9c-0a4bdfde03e7/nuget/v3/flat2/system.commandline/3.0.0-preview.6.26318.105/system.commandline.3.0.0-preview.6.26318.105.nupkg" }, { "pname": "System.ComponentModel.Composition", diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix index c84bc8ad1068..febb9ba8e20b 100644 --- a/pkgs/by-name/ro/roslyn-ls/package.nix +++ b/pkgs/by-name/ro/roslyn-ls/package.nix @@ -38,18 +38,18 @@ in buildDotnetModule (finalAttrs: { inherit pname dotnet-sdk dotnet-runtime; - vsVersion = "2.144.9-prerelease"; + vsVersion = "2.145.15-prerelease"; src = fetchFromGitHub { owner = "dotnet"; repo = "roslyn"; rev = "VSCode-CSharp-${finalAttrs.vsVersion}"; - hash = "sha256-Cq1ynxtNaguLhVSSR04wUkqrn4/0YmwGxHfBZC4zMS8="; + hash = "sha256-lQWmk+NYx2dUsD97manGi9s5i9KNBocNrVok3j/6gIw="; }; # versioned independently from vscode-csharp # "roslyn" in here: # https://github.com/dotnet/vscode-csharp/blob/main/package.json - version = "5.9.0-1.26314.1"; + version = "5.9.0-1.26319.6"; projectFile = "src/LanguageServer/${project}/${project}.csproj"; useDotnetFromEnv = true; nugetDeps = ./deps.json; diff --git a/pkgs/by-name/ro/routedns/package.nix b/pkgs/by-name/ro/routedns/package.nix index e73c5624f540..f2f9791f11dc 100644 --- a/pkgs/by-name/ro/routedns/package.nix +++ b/pkgs/by-name/ro/routedns/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "routedns"; - version = "0.1.209"; + version = "0.1.223"; src = fetchFromGitHub { owner = "folbricht"; repo = "routedns"; rev = "v${finalAttrs.version}"; - hash = "sha256-fzBiF0xIArHchV2umdiO6Q2LPe/nZ7QUVKa2w7onO/0="; + hash = "sha256-RUGKdTtCIljqJlDOOSh0rEh7J+kF9m0dasAhlqpnkyw="; }; - vendorHash = "sha256-e19ZqeVA+WQOILZrju7xFDii/lxmZceXk30tWY74cmM="; + vendorHash = "sha256-WN94s9eRr+Um2WYPnUSDKXRDeNYVy6R920eaCTNd86w="; subPackages = [ "./cmd/routedns" ]; diff --git a/pkgs/by-name/ro/router/librusty_v8.nix b/pkgs/by-name/ro/router/librusty_v8.nix index 46c17dfd01c6..063fbb7f95a8 100644 --- a/pkgs/by-name/ro/router/librusty_v8.nix +++ b/pkgs/by-name/ro/router/librusty_v8.nix @@ -22,7 +22,6 @@ fetch_librusty_v8 { shas = { x86_64-linux = "sha256-8pa8nqA6rbOSBVnp2Q8/IQqh/rfYQU57hMgwU9+iz4A="; aarch64-linux = "sha256-3kXOV8rlCNbNBdXgOtd3S94qO+JIKyOByA4WGX+XVP0="; - x86_64-darwin = "sha256-iBBVKZiSoo08YEQ8J/Rt1/5b7a+2xjtuS6QL/Wod5nQ="; aarch64-darwin = "sha256-Djnuc3l/jQKvBf1aej8LG5Ot2wPT0m5Zo1B24l1UHsM="; }; } diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix index bc9d8f9bbde1..b4518e0a27b6 100644 --- a/pkgs/by-name/rp/rpcs3/package.nix +++ b/pkgs/by-name/rp/rpcs3/package.nix @@ -117,9 +117,7 @@ stdenv.mkDerivation (finalAttrs: { qtbase qtmultimedia openal - # RPCS3's X11 swap-interval path uses GLEW's GLXEW symbols, which - # are not provided in the default EGL-enabled GLEW build. - (glew.override { enableEGL = false; }) + glew vulkan-headers vulkan-loader libpng diff --git a/pkgs/by-name/rp/rpiboot/package.nix b/pkgs/by-name/rp/rpiboot/package.nix index 767cc479f12d..ab25daf1743a 100644 --- a/pkgs/by-name/rp/rpiboot/package.nix +++ b/pkgs/by-name/rp/rpiboot/package.nix @@ -46,7 +46,6 @@ stdenv.mkDerivation (finalAttrs: { "armv7l-linux" "armv6l-linux" "x86_64-linux" - "x86_64-darwin" ]; }; }) diff --git a/pkgs/by-name/rq/rq/package.nix b/pkgs/by-name/rq/rq/package.nix index 33c3be604056..b66846f7f4a3 100644 --- a/pkgs/by-name/rq/rq/package.nix +++ b/pkgs/by-name/rq/rq/package.nix @@ -45,6 +45,6 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Tool for doing record analysis and transformation"; mainProgram = "rq"; homepage = "https://github.com/dflemstr/rq"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; }; }) diff --git a/pkgs/by-name/rq/rqlite/package.nix b/pkgs/by-name/rq/rqlite/package.nix index 2a774b5903a5..9ba8dcdbae55 100644 --- a/pkgs/by-name/rq/rqlite/package.nix +++ b/pkgs/by-name/rq/rqlite/package.nix @@ -12,16 +12,16 @@ buildGoModule ( in { pname = "rqlite"; - version = "10.2.6"; + version = "10.2.7"; src = fetchFromGitHub { owner = "rqlite"; repo = "rqlite"; tag = "v${finalAttrs.version}"; - hash = "sha256-YFEvsEjpJSYoGEqYxVP9Qo6JRTD1peVP9a3Bf1hsdLU="; + hash = "sha256-T7ymv0nG5ZA4uUzT2Br6N2qFCggQYs28fAX6bTdUNKo="; }; - vendorHash = "sha256-rWyDyypKbettuwL8tfXmkvKtIg5fm5EzZud2/5RL0kY="; + vendorHash = "sha256-hfuVxcI1tGdkY1CWP1p5r1kMJfvNzqZlVI3Ge/gRNqo="; subPackages = [ "cmd/rqlite" diff --git a/pkgs/by-name/rs/rstudio/package.nix b/pkgs/by-name/rs/rstudio/package.nix index 712c82014729..853211adfe8b 100644 --- a/pkgs/by-name/rs/rstudio/package.nix +++ b/pkgs/by-name/rs/rstudio/package.nix @@ -73,7 +73,13 @@ let # -large versions in case of clashes largeDicts = lib.filter (d: lib.hasInfix "-large-wordlist" d.name) hunspellDictionaries; otherDicts = lib.filter ( - d: !(lib.hasAttr "dictFileName" d && lib.elem d.dictFileName (map (d: d.dictFileName) largeDicts)) + d: + !( + lib.hasInfix "ru-ru-libreoffice" d.name # conflits with ru-ru-mozilla + || ( + lib.hasAttr "dictFileName" d && lib.elem d.dictFileName (lib.map (d: d.dictFileName) largeDicts) + ) + ) ) hunspellDictionaries; dictionaries = largeDicts ++ otherDicts; diff --git a/pkgs/by-name/rt/rtklib-ex/package.nix b/pkgs/by-name/rt/rtklib-ex/package.nix index 4856f21706de..c8e9a04f9696 100644 --- a/pkgs/by-name/rt/rtklib-ex/package.nix +++ b/pkgs/by-name/rt/rtklib-ex/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rtklib-ex"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "rtklibexplorer"; repo = "RTKLIB"; tag = "v${finalAttrs.version}"; - hash = "sha256-j00VEQvxOiAc3EQX3x2b3RxYkbtvCZ17ugnW6b6ChWU="; + hash = "sha256-IGjrLuw3q0J6NXv2+Y3N22+nBu31W63QkmZpuHuvQnc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ru/ruler/package.nix b/pkgs/by-name/ru/ruler/package.nix index b3bcd2f9c188..2f0e593f5631 100644 --- a/pkgs/by-name/ru/ruler/package.nix +++ b/pkgs/by-name/ru/ruler/package.nix @@ -26,7 +26,7 @@ buildGoModule rec { description = "Tool to abuse Exchange services"; homepage = "https://github.com/sensepost/ruler"; changelog = "https://github.com/sensepost/ruler/releases/tag/${version}"; - license = with lib.licenses; [ cc-by-nc-40 ]; + license = lib.licenses.cc-by-nc-40; maintainers = with lib.maintainers; [ fab ]; mainProgram = "ruler"; }; diff --git a/pkgs/by-name/ru/rundeck/package.nix b/pkgs/by-name/ru/rundeck/package.nix index 4262070f1475..4f5849efa18c 100644 --- a/pkgs/by-name/ru/rundeck/package.nix +++ b/pkgs/by-name/ru/rundeck/package.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "rundeck"; - version = "6.0.0-20260629"; + version = "6.0.1-20260715"; src = fetchurl { url = "https://packagecloud.io/pagerduty/rundeck/packages/java/org.rundeck/rundeck-${finalAttrs.version}.war/artifacts/rundeck-${finalAttrs.version}.war/download?distro_version_id=167"; - hash = "sha256-3pB2mLme62jzJy5CxMhp77CqqEQ8FM6BpxHcX2q6Y1w="; + hash = "sha256-TuA09wAHLIkF5ynK1kihXGNHYb61TmKp/uX9dApBO7k="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ru/ruqola/package.nix b/pkgs/by-name/ru/ruqola/package.nix index ca6412a65467..5a29ac99dba5 100644 --- a/pkgs/by-name/ru/ruqola/package.nix +++ b/pkgs/by-name/ru/ruqola/package.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "ruqola"; - version = "2.7.2"; + version = "2.8.1"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "network"; repo = "ruqola"; tag = "v${finalAttrs.version}"; - hash = "sha256-6ModByNU47fWsUUp7TTqgStFViTZy5ZXPYcrj0Rwrpc="; + hash = "sha256-+Ry4Ns+QHhgFJpVkDsbyfLt/aVvp2AZk/1dyrbOIH0A="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ru/rura/package.nix b/pkgs/by-name/ru/rura/package.nix index 8d7752479584..9cbf3d462f21 100644 --- a/pkgs/by-name/ru/rura/package.nix +++ b/pkgs/by-name/ru/rura/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rura"; - version = "1.7.0"; + version = "1.9.0"; __structuredAttrs = true; src = fetchFromGitHub { owner = "tlipinski"; repo = "rura"; tag = "v${finalAttrs.version}"; - hash = "sha256-rz8Hmxse1THGH3inGP3K+7JY3Lh9qaGUdESSHkai82c="; + hash = "sha256-+XfJc9FH9El36AL7s7wMy9TNILKvtYflRDZjeW9J3fg="; }; - cargoHash = "sha256-Ytbo8fVf6oAHGQvicU3TFGQxoYh36CISuRaMwd1Ysf4="; + cargoHash = "sha256-HBcKuQjRqVBItgIVUyNQiqfZxNVtyQgwr+5mTrlV3eM="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ru/russ/package.nix b/pkgs/by-name/ru/russ/package.nix index 178ed2e6419d..08ca42aae459 100644 --- a/pkgs/by-name/ru/russ/package.nix +++ b/pkgs/by-name/ru/russ/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage { changelog = "https://github.com/ckampfe/russ/blob/master/CHANGELOG.md"; description = "TUI RSS reader with vim-like controls and a local-first, offline-first focus"; homepage = "https://github.com/ckampfe/russ"; - license = with lib.licenses; [ agpl3Only ]; + license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ blusk ]; mainProgram = "russ"; }; diff --git a/pkgs/by-name/ru/rustfs/package.nix b/pkgs/by-name/ru/rustfs/package.nix new file mode 100644 index 000000000000..bd1f974cf4f6 --- /dev/null +++ b/pkgs/by-name/ru/rustfs/package.nix @@ -0,0 +1,105 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchPnpmDeps, + pnpm, + pnpmConfigHook, + nodejs, + rustPlatform, + protobuf, + cacert, + nixosTests, +}: + +let + console = stdenv.mkDerivation (finalAttrs: { + pname = "rustfs-console"; + version = "0.1.13"; + __structuredAttrs = true; + __darwinAllowLocalNetworking = true; + + src = fetchFromGitHub { + owner = "rustfs"; + repo = "console"; + tag = "v${finalAttrs.version}"; + hash = "sha256-pxpT3kV30qA+Ob/RWi11rsapGyNc6h1EN79fcPi1e1E="; + }; + + pnpmDeps = fetchPnpmDeps { + inherit (finalAttrs) pname version src; + fetcherVersion = 4; + hash = "sha256-+U4HRaThEeC6jA6dA4UmhJLvANq0IMySOW5ua9m5Q6A="; + }; + + nativeBuildInputs = [ + nodejs + pnpm + pnpmConfigHook + ]; + + buildPhase = '' + pnpm run build + ''; + + installPhase = '' + runHook preInstall + cp -r out/. $out/ + runHook postInstall + ''; + }); +in +rustPlatform.buildRustPackage rec { + pname = "rustfs"; + version = "1.0.0-beta.9"; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "rustfs"; + repo = "rustfs"; + tag = version; + hash = "sha256-aNbicnNHaJn05k5EffgPEURf/Uj2A8PjOHiH2UGPz4M="; + }; + + postPatch = '' + rm -rf ./rustfs/static + cp -rL ${console} ./rustfs/static + ''; + + cargoHash = "sha256-abbsElP4dSSZnL4UfQEoHUtiEW8B/p6Y81UA7EbqbD4="; + + nativeBuildInputs = [ + protobuf + cacert + ]; + + env = { + RUSTFLAGS = "--cfg tokio_unstable"; + # reqwest loads CA certs even if not used during tests + SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + }; + + # Only build the main rustfs binary + cargoBuildFlags = "-p rustfs"; + cargoTestFlags = "-p rustfs"; + + checkFlags = [ + # failing since 1.0.0-beta.9, seem like upstream issues + "--skip=app::capacity_dirty_scope_test" + "--skip=app::delete_objects_stat_gating_test" + "--skip=app::put_prelookup_gating_test" + "--skip=two_embedded_servers_isolate_auth_and_data_planes" + ]; + + passthru.tests = { + inherit (nixosTests) rustfs; + }; + + meta = { + description = "S3-compatible high-performance object storage system supporting migration and coexistence with other S3-compatible platforms such as MinIO and Ceph"; + homepage = "https://github.com/rustfs/rustfs"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ marcel ]; + mainProgram = "rustfs"; + }; +} diff --git a/pkgs/by-name/ru/rusti-cal/package.nix b/pkgs/by-name/ru/rusti-cal/package.nix index 80021d927b1d..1321e9efee9d 100644 --- a/pkgs/by-name/ru/rusti-cal/package.nix +++ b/pkgs/by-name/ru/rusti-cal/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Minimal command line calendar, similar to cal"; mainProgram = "rusti-cal"; homepage = "https://github.com/arthurhenrique/rusti-cal"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.detegr ]; }; }) diff --git a/pkgs/by-name/ru/rutabaga_gfx/package.nix b/pkgs/by-name/ru/rutabaga_gfx/package.nix index 5caaa90d1ed4..3f02cfa6c39a 100644 --- a/pkgs/by-name/ru/rutabaga_gfx/package.nix +++ b/pkgs/by-name/ru/rutabaga_gfx/package.nix @@ -84,7 +84,6 @@ stdenv.mkDerivation (finalAttrs: { "armv6l-linux" "armv7a-linux" "armv7l-linux" - "x86_64-darwin" "x86_64-linux" ]; }; diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix index c480594bd0e0..25f8c5d4242e 100644 --- a/pkgs/by-name/s7/s7/package.nix +++ b/pkgs/by-name/s7/s7/package.nix @@ -26,14 +26,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "s7"; - version = "11.9-unstable-2026-06-27"; + version = "11.9-unstable-2026-07-10"; src = fetchFromGitLab { domain = "cm-gitlab.stanford.edu"; owner = "bil"; repo = "s7"; - rev = "1416ca232c9154e47235be2378151f9f2beea278"; - hash = "sha256-lA4nLtJ6+O5Cn7TQRzZCPhk3oB8qHdpewZE5yM8z4iw="; + rev = "2a631b545cbe66d9cf3f5343fbaab1449e3d8957"; + hash = "sha256-gYgwQDcWgugZemM2kNu09hwNtJqT49AmvXPlxj+/Ink="; }; buildInputs = diff --git a/pkgs/by-name/sa/saber/package.nix b/pkgs/by-name/sa/saber/package.nix index 59b748062ca6..595c0b1074b5 100644 --- a/pkgs/by-name/sa/saber/package.nix +++ b/pkgs/by-name/sa/saber/package.nix @@ -109,7 +109,7 @@ flutter341.buildFlutterApplication { description = "Cross-platform open-source app built for handwriting"; homepage = "https://github.com/saber-notes/saber"; mainProgram = "saber"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = [ ]; platforms = [ "aarch64-linux" diff --git a/pkgs/by-name/sa/sable-unwrapped/package.nix b/pkgs/by-name/sa/sable-unwrapped/package.nix new file mode 100644 index 000000000000..7a604c0ae930 --- /dev/null +++ b/pkgs/by-name/sa/sable-unwrapped/package.nix @@ -0,0 +1,80 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + fetchPnpmDeps, + pnpmConfigHook, + pnpm_10, + nodejs-slim_24, + nix-update-script, +}: + +let + nodejs-slim = nodejs-slim_24; + pnpm = pnpm_10.override { inherit nodejs-slim; }; +in + +stdenvNoCC.mkDerivation (finalAttrs: { + __darwinAllowLocalNetworking = true; + __structuredAttrs = true; + strictDeps = true; + + pname = "sable-unwrapped"; + version = "1.20.0"; + + src = fetchFromGitHub { + owner = "SableClient"; + repo = "Sable"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ams6Uwblo5mUzah9hlCPCUMXtrLtiUtRWwwKH4uabmk="; + }; + + pnpmDeps = fetchPnpmDeps { + inherit (finalAttrs) pname version src; + inherit pnpm; + fetcherVersion = 3; + hash = "sha256-iBvtMeYUHWhsz1DnKjTzydAt3cGPaisUhaagoaZRg1M="; + }; + + nativeBuildInputs = [ + nodejs-slim + pnpmConfigHook + pnpm + ]; + + # Controls how the application displays its version, e.g. "v1.14.0 (nix)". + # Also prevents some attempts to execute git during build. + env = { + VITE_IS_RELEASE_TAG = "true"; + VITE_BUILD_HASH = "nix"; + }; + + buildPhase = '' + runHook preBuild + + pnpm build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + cp -r dist $out + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "An almost stable Matrix client"; + homepage = "https://github.com/SableClient/Sable"; + changelog = "https://github.com/SableClient/Sable/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.agpl3Only; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ + fugi + ]; + }; +}) diff --git a/pkgs/by-name/sa/sage/patches/ipython-9_15-workaround.patch b/pkgs/by-name/sa/sage/patches/ipython-9_15-workaround.patch new file mode 100644 index 000000000000..ada5974798f7 --- /dev/null +++ b/pkgs/by-name/sa/sage/patches/ipython-9_15-workaround.patch @@ -0,0 +1,24 @@ +diff --git a/src/sage/doctest/test.py b/src/sage/doctest/test.py +index 812f8167c12..38e553ad5bd 100644 +--- a/src/sage/doctest/test.py ++++ b/src/sage/doctest/test.py +@@ -468,6 +468,7 @@ Test the ``--debug`` option:: + s...: b = 5 + s...: a + b + 8 ++ ... + sage: + + Returning to doctests... +diff --git a/src/sage/tests/cmdline.py b/src/sage/tests/cmdline.py +index 56fc16a205c..be2ae2a1b3d 100644 +--- a/src/sage/tests/cmdline.py ++++ b/src/sage/tests/cmdline.py +@@ -327,6 +327,7 @@ be ignored. In Pdb, we run the ``help`` command:: + ********************************************************************** + Previously executed commands: + s...: assert True is False ++ ... + sage: + + Returning to doctests... diff --git a/pkgs/by-name/sa/sage/patches/scipy-1_18-workaround.patch b/pkgs/by-name/sa/sage/patches/scipy-1_18-workaround.patch new file mode 100644 index 000000000000..5c4c4454c54d --- /dev/null +++ b/pkgs/by-name/sa/sage/patches/scipy-1_18-workaround.patch @@ -0,0 +1,13 @@ +diff --git a/src/sage/plot/plot3d/plot3d.py b/src/sage/plot/plot3d/plot3d.py +index bdf15a85e9d..36580eeab6b 100644 +--- a/src/sage/plot/plot3d/plot3d.py ++++ b/src/sage/plot/plot3d/plot3d.py +@@ -316,7 +316,7 @@ class _Coordinates: + ....: [ 0.16763356, 0.19993708, 0.31403568, 0.47359696, 0.55282422], + ....: [ 0.16763356, 0.25683223, 0.16649297, 0.10594339, 0.55282422]]) + sage: import scipy.interpolate +- sage: f=scipy.interpolate.RectBivariateSpline(v_phi,v_theta,m_r).ev ++ sage: f=lambda *x: scipy.interpolate.RectBivariateSpline(v_phi,v_theta,m_r).ev(*x).item() + sage: spherical_plot3d(f,(0,2*pi),(0,pi)) + Graphics3d Object + """ diff --git a/pkgs/by-name/sa/sage/sage-src.nix b/pkgs/by-name/sa/sage/sage-src.nix index 7362bf8f3897..035a899d6e6e 100644 --- a/pkgs/by-name/sa/sage/sage-src.nix +++ b/pkgs/by-name/sa/sage/sage-src.nix @@ -109,6 +109,35 @@ stdenv.mkDerivation rec { url = "https://raw.githubusercontent.com/void-linux/void-packages/f8951eacbdc6538af3330d17d5587a0c208ab349/srcpkgs/sagemath/patches/40679-Update_to_maxima_5.49.patch"; hash = "sha256-n6YSVNomLM7f5kRAGzhijag8QnlXxKJz9RHFLVtZpdk="; }) + + # https://github.com/sagemath/sage/pull/42384, landed in 10.10.beta4 + (fetchpatch2 { + name = "matplotlib-3.11-update.patch"; + url = "https://github.com/sagemath/sage/commit/3d3a04bbfb66dc1141afadbfaefa01dff8749761.patch?full_index=1"; + hash = "sha256-LlEblRKlPPmvSU26LmT6DTxFElvhA9SBkrU3xeIFZu4="; + }) + + # https://github.com/sagemath/sage/pull/42437, landed in 10.10.beta5 + (fetchpatch2 { + name = "numpy-2.5-update.patch"; + url = "https://github.com/sagemath/sage/commit/3e709448881442c133047f2993db39d855c70bd8.patch?full_index=1"; + hash = "sha256-8vxIYG6yhCBML9vioJhAjBgTeCCGmdfk7qAtEEQnK/g="; + }) + + # https://github.com/sagemath/sage/pull/42465, landed in 10.10.beta5 + (fetchpatch2 { + name = "scipy-1.18-update.patch"; + url = "https://github.com/sagemath/sage/commit/926f32aab22f81ddb9fda874a20fee84c7bfacc3.patch?full_index=1"; + hash = "sha256-EMn/fr5WlRQtFj5GHo02kczasmKaiqFfRSVZo2uvOPI="; + }) + + # work around https://github.com/ipython/ipython/issues/15207, which + # will likely be properly fixed in IPython 9.16. + ./patches/ipython-9_15-workaround.patch + + # work around https://github.com/scipy/scipy/issues/25471, which is + # fixed as part of SciPy 1.18.1. + ./patches/scipy-1_18-workaround.patch ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/by-name/sa/sauce-connect/package.nix b/pkgs/by-name/sa/sauce-connect/package.nix index d2b6114a21f3..c40048785f35 100644 --- a/pkgs/by-name/sa/sauce-connect/package.nix +++ b/pkgs/by-name/sa/sauce-connect/package.nix @@ -21,11 +21,10 @@ stdenv.mkDerivation rec { url = "https://saucelabs.com/downloads/sauce-connect/${version}/sauce-connect-${version}_linux.aarch64.tar.gz"; hash = "sha256-3fUB0KLFEmSzRlYSZhJ3VP4QJC/S1R2Iyk3+o82sNRg="; }; - x86_64-darwin = fetchurl { + aarch64-darwin = fetchurl { url = "https://saucelabs.com/downloads/sauce-connect/${version}/sauce-connect-${version}_darwin.all.zip"; hash = "sha256-nSmDenuel+L4HKhDEHMirGwKj0A7plIXAqf+T7Agc3A="; }; - aarch64-darwin = passthru.sources.x86_64-darwin; }; updateScript = ./update.sh; }; diff --git a/pkgs/by-name/sa/sauce-connect/update.sh b/pkgs/by-name/sa/sauce-connect/update.sh index 38ab992a3eb3..79a8afb7059d 100755 --- a/pkgs/by-name/sa/sauce-connect/update.sh +++ b/pkgs/by-name/sa/sauce-connect/update.sh @@ -19,7 +19,7 @@ all_versions=$(jq --exit-status --raw-output \ '.all_downloads | to_entries[] | select(.value | has("linux") and has("osx")) | .key' \ <<< "$response") latest_version=$(sort --version-sort <<< "$all_versions" | tail -n 1) -for platform in x86_64-linux aarch64-linux x86_64-darwin; do +for platform in x86_64-linux aarch64-linux aarch64-darwin; do update-source-version sauce-connect "$latest_version" \ --ignore-same-version \ --source-key="passthru.sources.$platform" diff --git a/pkgs/by-name/sa/saw-tools/sources.nix b/pkgs/by-name/sa/saw-tools/sources.nix index 5f17154d628c..41b753252c81 100644 --- a/pkgs/by-name/sa/saw-tools/sources.nix +++ b/pkgs/by-name/sa/saw-tools/sources.nix @@ -5,10 +5,6 @@ url = "https://github.com/GaloisInc/saw-script/releases/download/v1.5/saw-1.5-macos-15-ARM64-with-solvers.tar.gz"; hash = "sha256-1mURJfcnIRhuLrG1Gf4SRXmTzLbztBBRQGcXFFiAWWU="; }; - x86_64-darwin = { - url = "https://github.com/GaloisInc/saw-script/releases/download/v1.5/saw-1.5-macos-15-intel-X64-with-solvers.tar.gz"; - hash = "sha256-f3NofLPR6tarcZg/EjtCv1mSxz5O4nTKeOEoTPeGgf8="; - }; x86_64-linux = { url = "https://github.com/GaloisInc/saw-script/releases/download/v1.5/saw-1.5-ubuntu-22.04-X64-with-solvers.tar.gz"; hash = "sha256-k9Qo93d0IXBRe7P+wU20LjFjM+LdHf6Z2S0Nybmh/4E="; diff --git a/pkgs/by-name/sa/saw-tools/update.sh b/pkgs/by-name/sa/saw-tools/update.sh index 0baf5021543f..2d64cbbac007 100755 --- a/pkgs/by-name/sa/saw-tools/update.sh +++ b/pkgs/by-name/sa/saw-tools/update.sh @@ -8,15 +8,12 @@ cd "$(readlink -e "$(dirname "${BASH_SOURCE[0]}")")" version="1.5" aarch64_darwin_url="https://github.com/GaloisInc/saw-script/releases/download/v${version}/saw-${version}-macos-15-ARM64-with-solvers.tar.gz" -x86_64_darwin_url="https://github.com/GaloisInc/saw-script/releases/download/v${version}/saw-${version}-macos-15-intel-X64-with-solvers.tar.gz" x86_64_linux_url="https://github.com/GaloisInc/saw-script/releases/download/v${version}/saw-${version}-ubuntu-22.04-X64-with-solvers.tar.gz" aarch64_darwin_hash=$(nix-prefetch-url "$aarch64_darwin_url") -x86_64_darwin_hash=$(nix-prefetch-url "$x86_64_darwin_url") x86_64_linux_hash=$(nix-prefetch-url "$x86_64_linux_url") aarch64_darwin_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$aarch64_darwin_hash") -x86_64_darwin_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$x86_64_darwin_hash") x86_64_linux_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$x86_64_linux_hash") sed -i "s/version = \".*\"/version = \"${version}\"/" package.nix @@ -29,10 +26,6 @@ cat >sources.nix < /dev/null 2>&1' 'test -f /etc/gshadow' + + # Remove the backup entry for gshadow, since it's not being used in the tests running on NixOS + sed -i '/{"origin": "\/etc\/gshadow", "backup": "gshadow"}/d' framework/hosts/shadow.py + + # Replace the Debian-specific check in the useradd test with a NixOS-specific one + substituteInPlace tests/test_useradd.py \ + --replace-fail 'if "Debian" in shadow.host.distro_name:' 'if "NixOS" in shadow.host.distro_name:' + ''; + }; }; }) diff --git a/pkgs/by-name/sh/sharpsat-td/package.nix b/pkgs/by-name/sh/sharpsat-td/package.nix index 6004c73a541a..f883f5b8acbb 100644 --- a/pkgs/by-name/sh/sharpsat-td/package.nix +++ b/pkgs/by-name/sh/sharpsat-td/package.nix @@ -91,7 +91,6 @@ stdenv.mkDerivation { # uses clhash, which is non-portable platforms = [ "x86_64-linux" - "x86_64-darwin" ]; }; } diff --git a/pkgs/by-name/sh/sheldon/package.nix b/pkgs/by-name/sh/sheldon/package.nix index 88baf441cccc..15b850d6836a 100644 --- a/pkgs/by-name/sh/sheldon/package.nix +++ b/pkgs/by-name/sh/sheldon/package.nix @@ -67,7 +67,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Fast and configurable shell plugin manager"; homepage = "https://github.com/rossmacarthur/sheldon"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ seqizz ]; platforms = lib.platforms.unix; mainProgram = "sheldon"; diff --git a/pkgs/by-name/sh/shelldap/package.nix b/pkgs/by-name/sh/shelldap/package.nix index 4b222ed0e8b7..d6f435319c90 100644 --- a/pkgs/by-name/sh/shelldap/package.nix +++ b/pkgs/by-name/sh/shelldap/package.nix @@ -47,7 +47,7 @@ perlPackages.buildPerlPackage rec { homepage = "https://github.com/mahlonsmith/shelldap/"; description = "Handy shell-like interface for browsing LDAP servers and editing their content"; changelog = "https://github.com/mahlonsmith/shelldap/blob/v${version}/CHANGELOG"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ clerie tobiasBora diff --git a/pkgs/by-name/sh/shotgun/package.nix b/pkgs/by-name/sh/shotgun/package.nix index eb8a761a5c06..c3126dd8b418 100644 --- a/pkgs/by-name/sh/shotgun/package.nix +++ b/pkgs/by-name/sh/shotgun/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Minimal X screenshot utility"; homepage = "https://github.com/neXromancers/shotgun"; - license = with lib.licenses; [ mpl20 ]; + license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ lumi ]; diff --git a/pkgs/by-name/si/sidplayfp/package.nix b/pkgs/by-name/si/sidplayfp/package.nix index 391414fec8b8..44937c6d1ebe 100644 --- a/pkgs/by-name/si/sidplayfp/package.nix +++ b/pkgs/by-name/si/sidplayfp/package.nix @@ -6,29 +6,75 @@ runCommand, testers, alsaSupport ? stdenv.hostPlatform.isLinux, + coreaudioSupport ? stdenv.hostPlatform.isDarwin, + jackSupport ? stdenv.hostPlatform.isUnix, + pulseSupport ? stdenv.hostPlatform.isLinux, alsa-lib, autoreconfHook, - pulseSupport ? stdenv.hostPlatform.isLinux, + jack2, libpulseaudio, libsidplayfp, makeWrapper, - out123Support ? stdenv.hostPlatform.isDarwin, - mpg123, perl, pkg-config, }: +let + miniaudioBackends = [ + "NULL" + ] + ++ lib.optional alsaSupport "ALSA" + ++ lib.optional coreaudioSupport "COREAUDIO" + ++ lib.optional jackSupport "JACK" + ++ lib.optional pulseSupport "PULSEAUDIO"; + + miniaudioPkgconfigs = + lib.optional alsaSupport "alsa" + ++ lib.optional jackSupport "jack" + ++ lib.optional pulseSupport "libpulse"; + + miniaudioNeedsPkgconfigs = builtins.length miniaudioPkgconfigs > 0; +in stdenv.mkDerivation (finalAttrs: { pname = "sidplayfp"; - version = "2.16.2"; + version = "3.1.0"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "sidplayfp"; tag = "v${finalAttrs.version}"; - hash = "sha256-zvV1BIKkJF/UAZnSgHFqNSiioUH5iB8I7SDqnWQnGj0="; + hash = "sha256-wkZ/iJzz1QikNEaI00PFHaeewOrP+lYHF/iaws1aSro="; }; + postPatch = '' + substituteInPlace Makefile.am \ + --replace-fail \ + 'AM_CPPFLAGS =' \ + "AM_CPPFLAGS = ${ + toString ( + [ + # Don't use dlopen() for audio-related libraries + "-DMA_NO_RUNTIME_LINKING" + + # Only selected backends + "-DMA_ENABLE_ONLY_SPECIFIC_BACKENDS" + ] + ++ map (backend: "-DMA_ENABLE_" + backend) miniaudioBackends + ++ lib.optionals miniaudioNeedsPkgconfigs [ + "$(pkg-config --cflags ${toString miniaudioPkgconfigs})" + ] + ) + }" \ + --replace-fail 'src_sidplayfp_LDADD =' "src_sidplayfp_LDFLAGS = ${ + toString ( + lib.optionals miniaudioNeedsPkgconfigs [ + "$(pkg-config --libs ${toString miniaudioPkgconfigs})" + ] + ++ lib.optionals coreaudioSupport [ "-framework CoreAudio" ] + ) + }" + ''; + strictDeps = true; nativeBuildInputs = [ @@ -43,15 +89,11 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals alsaSupport [ alsa-lib ] + ++ lib.optionals jackSupport [ + jack2 + ] ++ lib.optionals pulseSupport [ libpulseaudio - ] - ++ lib.optionals out123Support [ - mpg123 - ]; - - configureFlags = [ - (lib.strings.withFeature out123Support "out123") ]; enableParallelBuilding = true; @@ -80,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: { description = "SID player using libsidplayfp"; homepage = "https://github.com/libsidplayfp/sidplayfp"; changelog = "https://github.com/libsidplayfp/sidplayfp/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "sidplayfp"; maintainers = with lib.maintainers; [ OPNA2608 diff --git a/pkgs/by-name/si/sigma-cli/package.nix b/pkgs/by-name/si/sigma-cli/package.nix index 29236e94a306..077e419ba548 100644 --- a/pkgs/by-name/si/sigma-cli/package.nix +++ b/pkgs/by-name/si/sigma-cli/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "sigma-cli"; - version = "3.0.3"; + version = "3.1.0"; pyproject = true; src = fetchFromGitHub { owner = "SigmaHQ"; repo = "sigma-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-7zPB2eb+PeJ0xKygf/oRGZfntHiHHkk9L5Pr7oUfvkY="; + hash = "sha256-cr9MFKot/A08q0fg4RnSU1Rl7YAOvfoyIC8Loas/+X8="; }; pythonRelaxDeps = [ "click" ]; diff --git a/pkgs/by-name/si/signal-cli/deps.json b/pkgs/by-name/si/signal-cli/deps.json index 135d933b7af8..05319b87b32d 100644 --- a/pkgs/by-name/si/signal-cli/deps.json +++ b/pkgs/by-name/si/signal-cli/deps.json @@ -2,10 +2,10 @@ "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", "!version": 1, "https://build-artifacts.signal.org": { - "libraries/maven/org/signal#libsignal-client/0.94.4": { - "jar": "sha256-dYt1xROjZUTd1T+9jqQKFSztuNFODwDnm+knIoeWNKs=", - "module": "sha256-rNxY6ygoNFYCvNGhHlEhQqTTBxYBjmScsbl0qkgMPsw=", - "pom": "sha256-3Xt0yJrLIJ93BbRJ5/huzjlPBuoTtX/g2ZW3NCXxuug=" + "libraries/maven/org/signal#libsignal-client/0.96.3": { + "jar": "sha256-Z9uYCI4uREB6XguuCv4dkOYzUX8iCZ/pvZYyax5g7e8=", + "module": "sha256-YRfX76VAxM76fJNya4AABAzKemh2fjCZFK+uP8NxIEc=", + "pom": "sha256-zgXDL0gNXa6zF1QyoFdUcAZ44UTTZiv+biEOqhH7gNQ=" } }, "https://plugins.gradle.org/m2": { @@ -27,23 +27,23 @@ "com/google/errorprone#error_prone_parent/2.27.0": { "pom": "sha256-+oGCnQSVWd9pJ/nJpv1rvQn4tQ5tRzaucsgwC2w9dlQ=" }, - "org/graalvm/buildtools#graalvm-reachability-metadata/1.1.2": { - "jar": "sha256-Oompk1nesyVXp5HxGoDoG/jmy+iyaL3G9ZoVPWzrMOk=", - "module": "sha256-ufhI62i4r+Ob8JLkxw3pQbST4Cy6jfpJs2HaS7psQFw=", - "pom": "sha256-cEP8FFEG37OTOP9EamEpAKIDm8/prnmSPWqaV/rHErs=" + "org/graalvm/buildtools#graalvm-reachability-metadata/1.1.4": { + "jar": "sha256-XpBnpBN2KBw1S0rKAeQca/LdXinwnNHRoxn7Bd/Lz7M=", + "module": "sha256-XJS9cV2yYZwZN7I7Z6LvX0yaP5+0HNyWaFuB0vkbEp4=", + "pom": "sha256-QQggaIBXhhCBLsrE9gAPdGSI+fDM/DS6+F5koXR5aG4=" }, - "org/graalvm/buildtools#native-gradle-plugin/1.1.2": { - "jar": "sha256-I57AfHtYli06pZ1xKhi8BIb1m5LAgT8FPXiyDERYWzM=", - "module": "sha256-jKQfcwvN/ok03+we8GLx62NXUpxSUzgg9KYl+GsZhE0=", - "pom": "sha256-G1+zTmhVvtwnqfiYWCxb5I2a1xF9cDydj/2bDTPfZI4=" + "org/graalvm/buildtools#native-gradle-plugin/1.1.4": { + "jar": "sha256-KahlTAhJJSmPoZmli+g5NXitajz/QSwM7Raii6cfSK4=", + "module": "sha256-4I887jCwORt5609RZp0PnHvhxrxd5btp52XmFkFPCaw=", + "pom": "sha256-+xTOUZ1sEzVn/f3wQRxVmxxDSq8QUeMqDETSSi2Ax1o=" }, - "org/graalvm/buildtools#utils/1.1.2": { - "jar": "sha256-zOlCsuhNGG8SjUxr5dSVv8ID+rxfcwDHUYZounAaozg=", - "module": "sha256-6OfFXvTVM/l2oZQF2hPVVm8i5liMvu/6nuogtfJ430g=", - "pom": "sha256-/qFY/QLJ6J9BqNIkVYS63810tzxiva9TwBGJzuEc3pI=" + "org/graalvm/buildtools#utils/1.1.4": { + "jar": "sha256-pCd1lX+eRCSKmUOEHbHl5OYr7Qx4Yg6Tvl3UPMlVrdg=", + "module": "sha256-MYABUNF78ObERX4EXTamANDzHh0BRkRegpw9xWzPTOU=", + "pom": "sha256-rt82QOjPhUY4hHVMuUWjzc4J8I2P8sujpdUs9z/ijSY=" }, - "org/graalvm/buildtools/native#org.graalvm.buildtools.native.gradle.plugin/1.1.2": { - "pom": "sha256-lpcCHJItfukS1MnDy6Z2GsynwLWczuEJ5VVhN2kOIAM=" + "org/graalvm/buildtools/native#org.graalvm.buildtools.native.gradle.plugin/1.1.4": { + "pom": "sha256-t+b6IIdqZaR/CkU4dt+4Y3SQm3M++ryIqdh/1wL9VcY=" }, "org/gradle/kotlin#gradle-kotlin-dsl-plugins/6.5.7": { "jar": "sha256-zIyqQQGjXQzwQzpj6K04kRpMhIBz/MlPQ64CUfM+Ta8=", @@ -191,40 +191,45 @@ "com/fasterxml/jackson#jackson-base/2.20.2": { "pom": "sha256-2h3M8cF7Sx/XPEiKaRH93ekBcrRvgbbdbUchrAgzDfQ=" }, + "com/fasterxml/jackson#jackson-base/2.21.5": { + "pom": "sha256-T04r6gD/5XX17AVMB6T7w0wZVdhjXAGj6IATvyxx3v8=" + }, "com/fasterxml/jackson#jackson-bom/2.20.2": { "pom": "sha256-izQ6yh3LT3KLlMxzgxmYMOPTorDQdzQ3h+7iIAkYtB4=" }, + "com/fasterxml/jackson#jackson-bom/2.21.5": { + "pom": "sha256-V/4i3sZZ3gZVNX+tBYLvfIsv5aiQam8f8by70eRVSEY=" + }, "com/fasterxml/jackson#jackson-parent/2.20": { "pom": "sha256-tDt/XGLoaxZPrnCuF9aRHF22B5mvAQVzYK/aguSEW+U=" }, "com/fasterxml/jackson#jackson-parent/2.21": { "pom": "sha256-OFHfYn+utGiHuVYQRjC3Sou7X33iLpdM8VmC4g4Dc94=" }, - "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-annotations/2.21": { "jar": "sha256-U8oIX0oVD3A/SeGqvZNb0DtD4eo9VdE1Q4KSryLO9Ws=", "module": "sha256-yuj/7OwzKLbsuxOOJ0IY8v4cdymg6CTaVZJogQCVrUQ=", "pom": "sha256-ccrFOSFR4qUozJoJF58KM0F58FxS+OWWz1jd8Suyfys=" }, - "com/fasterxml/jackson/core#jackson-core/2.20.2": { - "jar": "sha256-YbhaQbvDM+bbO3ck1an/UBHsX56xzuQeYiQgvG4OQTE=", - "module": "sha256-sYxSWUiGF4L+YKs7Z7fAYj8BCGZdSHPoXKCVwZBMRC4=", - "pom": "sha256-Hvbw4LWflUdfUMcGuUPw9AKZM8KUd1bfV2MVIIJ8n0k=" + "com/fasterxml/jackson/core#jackson-core/2.21.5": { + "jar": "sha256-tktYdBYrUDoOWKj3dYJm6N2fkb9J46Wa4LX0dYmiMbc=", + "module": "sha256-3hE/RTHe9Q/rEr4E5wdKj3b18+8pDPiGuQCGpOJ0Uw8=", + "pom": "sha256-N2IPWbeJFti+VjAcczhNFdVFwOIXQxvG0Seo2IDfQH0=" }, - "com/fasterxml/jackson/core#jackson-databind/2.20.2": { - "jar": "sha256-EZVz/GzrJbJrsDK7WIjn/YpOkzmHloo4glOgF9rLXlQ=", - "module": "sha256-AZgSiK3esDDuVzZeueuGxmW3QCStl/EhvgaSFV7s6Fw=", - "pom": "sha256-lENiw258gC/9Y7MgVi3skwEMhobnqzRddIGgxBJDdb4=" + "com/fasterxml/jackson/core#jackson-databind/2.21.5": { + "jar": "sha256-UHQYwPr9OLKyz7cEUhYw2mE6jkzIOBGVpvQYAXiD4sA=", + "module": "sha256-kg4qAhGjH1TS5+Tv/cWA0Cw0Eqb+/bYyqAVOYMR1g4E=", + "pom": "sha256-cu7sNq3UbNfRhf7YkmXNuXp/wFzzQTzipZRA7+GCOhI=" }, "com/fasterxml/jackson/module#jackson-module-kotlin/2.20.2": { - "jar": "sha256-u63iN5HvGjjwaWA7yD7YhncU21gkdC7779Hq9nxqPsY=", "module": "sha256-Vanis/UbE12fJ1AW8Sw+LgXpvJU0HK6xm0OdwgiQLeU=", "pom": "sha256-AMlp5rd3mENZlpq8S/xARCK4i5DNq9HAcxgcY/mJvaE=" }, + "com/fasterxml/jackson/module#jackson-module-kotlin/2.21.5": { + "jar": "sha256-b0W75DRFjSrR9eoWxqv2fnq+o3Syya5Wic9N0nwWyLk=", + "module": "sha256-Gp94BEdljdtH7J19zGCXmqsqWyXw6QKUaFPdKSvYhYE=", + "pom": "sha256-IYgSf4943/3K9k2pWd1VHksQeFrMFH7zPs8Upnnwp4w=" + }, "com/github/hypfvieh#dbus-java-core/5.0.0": { "jar": "sha256-rZddGhfTd43evWMePZ1TNylKqRW8Zf3m6Qh9kHKbu0U=", "pom": "sha256-kZVCUw1wZlye6aHC1WawY+UG8HX4PKS2WdJzgtRqmCw=" @@ -247,35 +252,35 @@ "jar": "sha256-972ddcZpd9iIiFH3XcAxOXJ05z+W5TUkcu3UzTpWp5A=", "pom": "sha256-4BVvMJm4gti9fjIKfcdET6b/RxDX5z8VATjAKn34xrU=" }, - "com/github/turasa#core-network/2.15.3_unofficial_148": { - "jar": "sha256-kG/++qSroP0gmgMstrDud5/8+aFY0qVC7cRzo5v0AQ8=", - "module": "sha256-VV9WzZ07/OvIx47enZ7C8tIzqFnADuoztLjcZUlmk9E=", - "pom": "sha256-iLVprHpnWzYRZcg5To8JvFHGYcveVmtnjzzDE2b3Nww=" + "com/github/turasa#core-network/2.15.3_unofficial_149": { + "jar": "sha256-GVPQRIGhzTYHRqEcaJXSARmNG2dwK7c+jZ8sEiNmSYM=", + "module": "sha256-3IoBIylLsNuZ3gQBfDOJLAjw//nJNdWuAkeBg+4DPus=", + "pom": "sha256-T3cziZ6ojUK0il3be2EtOOR9DU8oMo82ShskFwSY+WE=" }, - "com/github/turasa#models-jvm/2.15.3_unofficial_148": { - "jar": "sha256-pvMLhBCjLdxQLu2Qrb5jJksL9obxbBGSoWyGDp2lyQU=", - "module": "sha256-WTiMAglD704zGg5MJa9qpuIBtP8/bMC6uaVVX1SCq94=", - "pom": "sha256-zHT6v9tJkjleUGMRgy0fJj5pO7j5kTzSX1X3yqrfaJw=" + "com/github/turasa#models-jvm/2.15.3_unofficial_149": { + "jar": "sha256-yV3+jIv1k0OgOZC6aaNpyyCHky+9SjkFCkOzNyd59Sk=", + "module": "sha256-+RfD6IfyqLwwx4yiC3vPKvIOiFxVJ2dMHopXGCjEemo=", + "pom": "sha256-nAda2RUTEPd4TpPCycdR/yurrgzRMti2nJLYUnx1luU=" }, - "com/github/turasa#serialization/2.15.3_unofficial_148": { - "jar": "sha256-GBL2didnuADhwNl8Nd+EkHt3qIxNokatE075iH/5MTA=", - "module": "sha256-OK9RSVzL6aTz6KT2f1WkUFruIFm6iX+PtDJ4/NGGvLU=", - "pom": "sha256-GH0DT39/JIV4Vd1TbcmRY7yyn9VhQxJ71mtNWxVo4wA=" + "com/github/turasa#serialization/2.15.3_unofficial_149": { + "jar": "sha256-5VYS8h0X+L1msDFGToRfe3QysgDk/28ybOHiPvOLpSM=", + "module": "sha256-LZ++GNTTVHtkSQU+F1Yh74aWiDfxu4hX0BACHV/pfbU=", + "pom": "sha256-+6K9tLA0ZipVh4S2X2m3qzs8Mr52q4hr/FBqwwcZO3k=" }, - "com/github/turasa#signal-network/2.15.3_unofficial_148": { - "jar": "sha256-7s79fhwH+KnrKd7IwHkGE48qCwJM9zyKbD7wBOSIBuw=", - "module": "sha256-JRhHCJ6lNuExw+iiDXaVy2eFWz0HaTndQiH/U/hL1Xc=", - "pom": "sha256-zQK1ZB2AhjPNjtZ2jAX6h4LkQJVjJJAlZnAnl7Oj6YQ=" + "com/github/turasa#signal-network/2.15.3_unofficial_149": { + "jar": "sha256-iyDpWzrUxD9kCjvy9VaiY8ke4KpvEmcVvLbSowF9rrE=", + "module": "sha256-eac61/Ch79ZmYlUGEmIOp5hiQmyeZ374skjFi0ePiGQ=", + "pom": "sha256-lFMmHnKp5HNFchDoNPxMS9Rsm0CSSaiocNq3u2hKlIA=" }, - "com/github/turasa#signal-service-java/2.15.3_unofficial_148": { - "jar": "sha256-LDl6pQfdDFSrtr83lVS3qYffAaldl0cD7+Vo5S8T8/o=", - "module": "sha256-G0hNL61wL9/siUnIY4Yj5/4C7topI98YSUXzr/DSykU=", - "pom": "sha256-Cl9UR0TYl2bwZjiWqfiWg2nydWIxt3bT2uKS4jLLC18=" + "com/github/turasa#signal-service-java/2.15.3_unofficial_149": { + "jar": "sha256-QvbDo11PUhrjNSCtKUQqVY09E6GeYpu6WilT+sZ9L/U=", + "module": "sha256-2zEraXZG7IwGUZrXewbCSjyqzfbX6fKWByaIt4zF4rw=", + "pom": "sha256-OgvLg26yJT3roGS7C4drZtWsUAxsMPuwzKSQ11wmc8Q=" }, - "com/github/turasa#util-jvm/2.15.3_unofficial_148": { - "jar": "sha256-K88fOGdE9OeEKtJE7yrP6r5+xH+qqV9jXlgjpaeWvqw=", - "module": "sha256-arB+hobHhM3FLlDy1H7EsuA8cg63tQZOJHsuLpW+a0A=", - "pom": "sha256-/BslyKHB+7gHa8P6eKFVBrLBX6fAmNe2Sgi5y1NZNO0=" + "com/github/turasa#util-jvm/2.15.3_unofficial_149": { + "jar": "sha256-HTaxo8hwGL2Fs9lArKYyRwvwIVlbyulA/ZGWw04Muyk=", + "module": "sha256-8w78BIIXxZ8DXn/c+KzjD3BDltmozX/HIywBS6dg+iA=", + "pom": "sha256-IKLxLIQGAFLIj7Y95zkE2+Kc9Ve/NZlO5My/dMFNhFo=" }, "com/google/code/findbugs#jsr305/3.0.2": { "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", @@ -511,10 +516,10 @@ "org/eclipse/ee4j#project/1.0.7": { "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" }, - "org/graalvm/buildtools#junit-platform-native/1.1.2": { - "jar": "sha256-3ufXTMgG0c6k4Pq0XSQ3kpa6egbLl6XFw3FQBNJOZ/I=", - "module": "sha256-AD2sjuf4rDNoGyZ6TrhdxX8NoAAdmfv8i8tuQenYw5g=", - "pom": "sha256-Pfs+WOyowbpg6WlcPtmp91sRn71kXEf0PE2+jYhGjP8=" + "org/graalvm/buildtools#junit-platform-native/1.1.4": { + "jar": "sha256-awt9Zk7WMDhj4kgUEWWMZEuwRNqKypkWAPNjIZW9U2A=", + "module": "sha256-1cQqHZkROq4o/V8T9pRZAcaK493smv35dbZmU92iSYk=", + "pom": "sha256-lZyCqHco7Hxe4I/Co5dBfN34LmCO/rnjMoriPPWKNhI=" }, "org/jetbrains#annotations/13.0": { "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", @@ -570,9 +575,9 @@ "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=", "pom": "sha256-V5BVJCdKAK4CiqzMJyg/a8WSWpNKBGwcxdBsjuTW1ak=" }, - "org/jetbrains/kotlin#kotlin-reflect/2.0.21": { - "jar": "sha256-OtL8rQwJ3cCSLeurRETWEhRLe0Zbdai7dYfiDd+v15k=", - "pom": "sha256-Aqt66rA8aPQBAwJuXpwnc2DLw2CBilsuNrmjqdjosEk=" + "org/jetbrains/kotlin#kotlin-reflect/2.1.21": { + "jar": "sha256-vNdaNspK2OBhFyFO2Af43qL+YaceB/kcoU9DNQJLhGM=", + "pom": "sha256-7XngK/COxxXsvNHi16RTYteqfDP5LvZ15t+kpJMbzF8=" }, "org/jetbrains/kotlin#kotlin-reflect/2.2.20": { "jar": "sha256-ggkIOkp8TkdtmEKweDCPqWqW8Hpr2Z8F81hu4TKJqyY=", @@ -699,6 +704,10 @@ "module": "sha256-6Vkoj94bGwUNm8CC/HhniRKNpdKFMJFGj8pQQQS99AA=", "pom": "sha256-16CKmbJQLwu2jNTh+YTwv2kySqogi9D3M2bAP8NUikI=" }, + "org/junit#junit-bom/5.14.1": { + "module": "sha256-J4rLEczJmYaUIkOG+W+0lBoi7bQstEbJLg8fMwFLa0g=", + "pom": "sha256-AbAd+jZlULQKxXYFSKfXKLYQnRfEUeg4ZNHl4M6GLJQ=" + }, "org/junit#junit-bom/5.14.2": { "module": "sha256-XSb0RAOSMm3SSDz0kBQ+6hSV1QlUWaC5ZRp7GzjiTr8=", "pom": "sha256-7S3MeFW9RgvMyTob8Mli5jtWb/fY8d7Q8fJZO6gYOq8=" diff --git a/pkgs/by-name/si/signal-cli/libsignal-jni.nix b/pkgs/by-name/si/signal-cli/libsignal-jni.nix index b29734ca400f..a64a6a045f6e 100644 --- a/pkgs/by-name/si/signal-cli/libsignal-jni.nix +++ b/pkgs/by-name/si/signal-cli/libsignal-jni.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "libsignal-jni"; - version = "0.94.4"; + version = "0.96.3"; src = fetchFromGitHub { owner = "signalapp"; repo = "libsignal"; tag = "v${finalAttrs.version}"; - hash = "sha256-Uh/j8cXUWgWgSo9UBfYOFuC8i+2YdMwGHcXf55PkGgU="; + hash = "sha256-FOppsfocUvUfWa6AfBPOxAnntGJkzTbnPwqMzzbHnWQ="; }; - cargoHash = "sha256-st6zTKvxSsyMce22E8nFsJMGjQkk9sEAzSCmyZP8x20="; + cargoHash = "sha256-wsXlCpNwO+E6rVNaD2R51Mi0sZUv2lhllGxDxzyptYA="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/si/signal-cli/package.nix b/pkgs/by-name/si/signal-cli/package.nix index 2a000ed314bd..c375bdaf5de4 100644 --- a/pkgs/by-name/si/signal-cli/package.nix +++ b/pkgs/by-name/si/signal-cli/package.nix @@ -11,6 +11,9 @@ callPackage, versionCheckHook, signal-cli, + writeShellApplication, + curl, + nix-update, }: let @@ -19,13 +22,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "signal-cli"; - version = "0.14.5"; + version = "0.14.6"; src = fetchFromGitHub { owner = "AsamK"; repo = "signal-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-p669Gjn3HYdVNtAA1Bvgc4iL6U9KnG4SLX1/aUKulPY="; + hash = "sha256-VJ+/0CvfgtE6VHFeTLKAswTWrnyAL7AYrfCYVJpXDaE="; }; nativeBuildInputs = [ @@ -93,6 +96,21 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; + passthru = { + updateScript = lib.getExe (writeShellApplication { + name = "signal-cli-update"; + runtimeInputs = [ + curl + nix-update + ]; + text = '' + nix-update signal-cli + nix-update signal-cli.passthru.libsignal-jni --version "$(curl --silent --location https://github.com/AsamK/signal-cli/raw/v"$(nix-instantiate --raw --eval -A signal-cli.version)"/libsignal-version)" + ''; + }); + libsignal-jni = libsignal-jni; + }; + meta = { homepage = "https://github.com/AsamK/signal-cli"; description = "Command-line and dbus interface for communicating with the Signal messaging service"; diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix index 003cf64b05bf..7fa96cde9803 100644 --- a/pkgs/by-name/si/signal-desktop/package.nix +++ b/pkgs/by-name/si/signal-desktop/package.nix @@ -339,7 +339,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/si/silx/package.nix b/pkgs/by-name/si/silx/package.nix index 3680545dafe8..831d13db6fff 100644 --- a/pkgs/by-name/si/silx/package.nix +++ b/pkgs/by-name/si/silx/package.nix @@ -34,7 +34,7 @@ python3Packages.buildPythonApplication (finalAttrs: { changelog = "https://github.com/silx-kit/silx/blob/main/CHANGELOG.rst"; description = "Software to support data assessment, reduction and analysis at synchrotron radiation facilities"; homepage = "https://github.com/silx-kit/silx"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.pmiddend ]; mainProgram = "silx"; }; diff --git a/pkgs/by-name/si/simde/package.nix b/pkgs/by-name/si/simde/package.nix index 8aba1e37f2ef..dabe255eb73c 100644 --- a/pkgs/by-name/si/simde/package.nix +++ b/pkgs/by-name/si/simde/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://simd-everywhere.github.io"; description = "Implementations of SIMD instruction sets for systems which don't natively support them"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ whiteley ]; platforms = lib.flatten ( with lib.platforms; diff --git a/pkgs/by-name/si/simple-completion-language-server/package.nix b/pkgs/by-name/si/simple-completion-language-server/package.nix index f2cd825097f3..22602c56ae39 100644 --- a/pkgs/by-name/si/simple-completion-language-server/package.nix +++ b/pkgs/by-name/si/simple-completion-language-server/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage { meta = { description = "Language server to enable word completion and snippets for Helix editor"; homepage = "https://github.com/estin/simple-completion-language-server"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.kpbaks ]; mainProgram = "simple-completion-language-server"; platforms = lib.platforms.all; diff --git a/pkgs/by-name/si/simple-live-app/package.nix b/pkgs/by-name/si/simple-live-app/package.nix index 24959753cb62..1f1b4f0e81d3 100644 --- a/pkgs/by-name/si/simple-live-app/package.nix +++ b/pkgs/by-name/si/simple-live-app/package.nix @@ -57,7 +57,7 @@ flutter332.buildFlutterApplication rec { description = "Simply Watch Live"; homepage = "https://github.com/xiaoyaocz/dart_simple_live"; mainProgram = "simple_live_app"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = [ ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/si/simplotask/package.nix b/pkgs/by-name/si/simplotask/package.nix index 5e67109b2471..816baca71ed9 100644 --- a/pkgs/by-name/si/simplotask/package.nix +++ b/pkgs/by-name/si/simplotask/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "simplotask"; - version = "1.20.0"; + version = "1.20.1"; src = fetchFromGitHub { owner = "umputun"; repo = "spot"; tag = "v${finalAttrs.version}"; - hash = "sha256-iSUT5b0nL+6wiiMXFoXwe9r4WV68BXopCYRrswwFxyk="; + hash = "sha256-VZXtteRXzjxXtAOYXZHBXknOyegbaCAPPXyRtig3PIs="; }; vendorHash = null; diff --git a/pkgs/by-name/si/simulide/package.nix b/pkgs/by-name/si/simulide/package.nix index 6064a90e2e41..c111213f2356 100644 --- a/pkgs/by-name/si/simulide/package.nix +++ b/pkgs/by-name/si/simulide/package.nix @@ -177,7 +177,6 @@ stdenv.mkDerivation { ]; platforms = [ "x86_64-linux" - "x86_64-darwin" ]; }; } diff --git a/pkgs/by-name/si/singular/package.nix b/pkgs/by-name/si/singular/package.nix index 6c5afc5b4f00..630de742d1eb 100644 --- a/pkgs/by-name/si/singular/package.nix +++ b/pkgs/by-name/si/singular/package.nix @@ -55,11 +55,6 @@ stdenv.mkDerivation rec { "--with-ntl=${ntl}" "--with-flint=${flint}" ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ - # omalloc does not support pagesizes >= 16K - # https://github.com/Singular/Singular/blob/spielwiese/omalloc/configure.ac - "--disable-omalloc" - ] ++ lib.optionals enableDocs [ "--enable-doc-build" ]; @@ -76,8 +71,8 @@ stdenv.mkDerivation rec { patchShebangs . ''; - # Use fq_nmod_mat_entry instead of row pointer (removed in flint 3.3.0) patches = [ + # Use fq_nmod_mat_entry instead of row pointer (removed in flint 3.3.0) (fetchpatch { url = "https://github.com/Singular/Singular/commit/05f5116e13c8a4f5f820c78c35944dd6d197d442.patch"; hash = "sha256-4l7JaCCFzE+xINU+E92eBN5CJKIdtQHly4Ed3ZwbKTA="; @@ -86,6 +81,15 @@ stdenv.mkDerivation rec { url = "https://github.com/Singular/Singular/commit/595d7167e6e019d45d9a4f1e18ae741df1f3c41d.patch"; hash = "sha256-hpTZy/eAiHAaleasWPAenxM35aqeNAZ//o6OqqdGOJ4="; }) + # Fix omalloc on aarch64-darwin + (fetchpatch { + url = "https://github.com/Singular/Singular/commit/6a47eae152527e3147e3168989301b676576e9eb.patch"; + hash = "sha256-JW72CoDg0Pkmcg+uklkyV94F9qaT3cnHUhUG/6bStKY="; + }) + (fetchpatch { + url = "https://github.com/Singular/Singular/commit/935a043cac58180942ab753efbd576ba59eaab8e.patch"; + hash = "sha256-T9ml6SnXCKImnQDnBU4zrpYGRi2wlTYvjmln0r1AvPM="; + }) ]; # For reference (last checked on commit 75f460d): diff --git a/pkgs/by-name/si/sipvicious/package.nix b/pkgs/by-name/si/sipvicious/package.nix index 9be9e0a2d240..b3299e766e09 100644 --- a/pkgs/by-name/si/sipvicious/package.nix +++ b/pkgs/by-name/si/sipvicious/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "sipvicious"; - version = "0.3.7"; + version = "0.3.8"; pyproject = true; src = fetchFromGitHub { owner = "EnableSecurity"; repo = "sipvicious"; tag = "v${finalAttrs.version}"; - hash = "sha256-OQq1PP0qoETu+0qs2vhkgVU5FVZA5wnWMKU+lKJrvv4="; + hash = "sha256-qUdK8IbLnuQU3hv6+x3R84y83Ts8lNIGsOANFgkReE0="; }; build-system = [ @@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { description = "Set of tools to audit SIP based VoIP systems"; homepage = "https://github.com/EnableSecurity/sipvicious"; changelog = "https://github.com/EnableSecurity/sipvicious/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/si/sirikali/package.nix b/pkgs/by-name/si/sirikali/package.nix index e5515c04c595..a2ebb86b243a 100644 --- a/pkgs/by-name/si/sirikali/package.nix +++ b/pkgs/by-name/si/sirikali/package.nix @@ -8,7 +8,6 @@ pkg-config, qt6, kdePackages, - cryfs, fscrypt-experimental, gocryptfs, sshfs, @@ -47,7 +46,6 @@ stdenv.mkDerivation (finalAttrs: { qtWrapperArgs = [ "--prefix PATH : ${ lib.makeBinPath [ - cryfs fscrypt-experimental gocryptfs sshfs @@ -65,7 +63,8 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = { - description = "Qt/C++ GUI front end to sshfs, ecryptfs-simple, cryfs, gocryptfs and fscrypt"; + description = "Qt/C++ GUI front end to sshfs, ecryptfs-simple, gocryptfs and fscrypt"; + longDescription = "Sirikali also supports `cryfs`, but `cryfs` is no longer available in Nixpkgs."; homepage = "https://github.com/mhogomchungu/sirikali"; changelog = "https://github.com/mhogomchungu/sirikali/blob/${finalAttrs.src.rev}/changelog"; license = lib.licenses.gpl3Only; diff --git a/pkgs/by-name/si/sirula/package.nix b/pkgs/by-name/si/sirula/package.nix index 3497d5b3b4ec..b920a1d9400b 100644 --- a/pkgs/by-name/si/sirula/package.nix +++ b/pkgs/by-name/si/sirula/package.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Simple app launcher for wayland written in rust"; homepage = "https://github.com/DorianRudolph/sirula"; - license = [ lib.licenses.gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.atagen ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/si/sish/package.nix b/pkgs/by-name/si/sish/package.nix index 41bb1150570c..50f1c705cd4f 100644 --- a/pkgs/by-name/si/sish/package.nix +++ b/pkgs/by-name/si/sish/package.nix @@ -37,7 +37,7 @@ buildGoModule (finalAttrs: { description = "HTTP(S)/WS(S)/TCP Tunnels to localhost"; homepage = "https://github.com/antoniomika/sish"; changelog = "https://github.com/antoniomika/sish/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "sish"; }; diff --git a/pkgs/by-name/si/six-sines/package.nix b/pkgs/by-name/si/six-sines/package.nix index 14100abc6c98..1f03f2f282ce 100644 --- a/pkgs/by-name/si/six-sines/package.nix +++ b/pkgs/by-name/si/six-sines/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + nix-update-script, cmake, pkg-config, autoPatchelfHook, @@ -22,9 +23,6 @@ libxrandr, libxrender, libxscrnsaver, - # clap-wrapper's Linux standalone GUI host (auto-detected via pkg-config; - # if absent, the standalone still builds but can't show plugin windows) - gtkmm3, }: let @@ -34,18 +32,19 @@ let # `base_sdks.cmake` short-circuits the CPM path when *_SDK_ROOT is set. # # Revisions are pinned to whatever the clap-wrapper submodule at the - # six-sines v1.1.0 tag requests in cmake/base_sdks.cmake. When bumping + # six-sines v1.2.0 tag requests in cmake/base_sdks.cmake. When bumping # six-sines, re-check those tags here. vst3sdk = fetchFromGitHub { owner = "steinbergmedia"; repo = "vst3sdk"; - rev = "v3.7.6_build_18"; + rev = "v3.8.0_build_66"; fetchSubmodules = true; - hash = "sha256-MeMb09bM8D4FPHWvvRbmWbiyO9u8JVxyfgv4jmeogLI="; + hash = "sha256-9HnDOOiKT0ploNJukk4vcZjBLS5gL4SdvmfFqZJPIxA="; # The `doc` submodule is ~130 MB of PDFs we never reference. The # `vstgui4` submodule isn't touched by clap-wrapper's VST3 glue either, - # but it's small (~12 MB) and removing it would diverge further from - # upstream Steinberg, so leave it in. + # but it — like the `tutorials` submodule that appeared in 3.8.0 — is + # small, and removing more would diverge further from upstream + # Steinberg, so leave both in. postFetch = '' rm -rf $out/doc ''; @@ -68,7 +67,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "six-sines"; - version = "1.1.0"; + version = "1.2.0"; __structuredAttrs = true; strictDeps = true; @@ -77,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { repo = "six-sines"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-IQLGC86FqS3dptPzNpHEYKB59MWFDKsOPGM+FuzGcPo="; + hash = "sha256-6m3+IthBnBvRX8gB8JH3NVN7ot3jTn5zSl/HYUB5Zy4="; }; nativeBuildInputs = [ @@ -110,7 +109,6 @@ stdenv.mkDerivation (finalAttrs: { libxrandr libxrender libxscrnsaver - gtkmm3 ]; # JUCE loads several X11 libraries via dlopen() in juce_XSymbols_linux.h @@ -154,20 +152,16 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeFeature "VST3_SDK_ROOT" "${vst3sdk}") (lib.cmakeFeature "RTAUDIO_SDK_ROOT" "${rtaudio-src}") (lib.cmakeFeature "RTMIDI_SDK_ROOT" "${rtmidi-src}") - - # CMake 4 hard-removed support for cmake_minimum_required(VERSION < 3.5). - # The bundled libsamplerate submodule still declares `VERSION 3.1..3.18` - # at the top of its CMakeLists.txt and refuses to configure otherwise. - # 3.5 is the value CMake itself suggests in the error. - (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5") ]; - # The CMakeLists exposes a `six-sines_all` custom target that aggregates - # the `_clap`, `_vst3`, and `_standalone` sub-targets (`_auv2` is - # APPLE-gated and absent on Linux). The default ALL target would build - # the same outputs in practice — the test subdir is already EXCLUDE_FROM_ALL - # — but going through `six-sines_all` matches what upstream documents and - # keeps the surface narrow if extra default targets ever land later. + # clap-wrapper's make_clapfirst_plugins() defines a `six-sines_all` custom + # target that aggregates the `_clap`, `_vst3`, and `_standalone` + # sub-targets (`_auv2` is APPLE-gated and absent on Linux). The default + # ALL target would build the same outputs in practice — the test subdir + # is EXCLUDE_FROM_ALL and the installer helper target added in 1.2.0 is + # likewise outside it — but going through `six-sines_all` matches what + # upstream documents and keeps the surface narrow if extra default + # targets ever land later. buildPhase = '' runHook preBuild cmake --build . --config Release --parallel "$NIX_BUILD_CORES" --target six-sines_all @@ -193,6 +187,11 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + # nix-update bumps version + src hash, but knows nothing about the + # vst3sdk pin in the let-binding above — on every bump, re-check the + # tag requested by the clap-wrapper submodule's cmake/base_sdks.cmake. + passthru.updateScript = nix-update-script { }; + meta = { description = "Small synthesizer exploring audio-rate inter-modulation of sine waves (FM/PM/AM)"; longDescription = '' @@ -208,9 +207,11 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ magnetophon ]; mainProgram = "six-sines"; - # cmake/compile-options.cmake hard-codes `-march=nehalem` for non-Apple - # builds, and clap-wrapper hard-codes the VST3 bundle architecture path - # to `x86_64-linux`. aarch64-linux would require patching both. + # Since 1.2.0 upstream selects `-march=armv8-a` on aarch64 (`nehalem` + # only on x86), and clap-wrapper derives the VST3 bundle arch dir from + # CMAKE_SYSTEM_PROCESSOR instead of hard-coding x86_64-linux, so + # aarch64-linux should now be viable — add it once a build has been + # verified. platforms = [ "x86_64-linux" ]; }; }) diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index 50f578ed3205..88adb201f72a 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -27,7 +27,6 @@ let platformIds = { "x86_64-linux" = "linux"; "aarch64-linux" = "linux-arm64"; - "x86_64-darwin" = "darwin"; "aarch64-darwin" = "darwin-arm64"; }; diff --git a/pkgs/by-name/sk/sketchybar/package.nix b/pkgs/by-name/sk/sketchybar/package.nix index 4d615ad3b9a8..139b02922412 100644 --- a/pkgs/by-name/sk/sketchybar/package.nix +++ b/pkgs/by-name/sk/sketchybar/package.nix @@ -10,13 +10,6 @@ let inherit (stdenv.hostPlatform) system; - - target = - { - "aarch64-darwin" = "arm64"; - "x86_64-darwin" = "x86"; - } - .${system} or (throw "Unsupported system: ${system}"); in stdenv.mkDerivation (finalAttrs: { pname = "sketchybar"; @@ -38,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { apple-sdk_15 ]; - makeFlags = [ target ]; + makeFlags = [ "arm64" ]; # TODO: Remove once #536365 reaches this branch env.NIX_CFLAGS_LINK = "-fuse-ld=lld"; diff --git a/pkgs/by-name/sk/skrooge/package.nix b/pkgs/by-name/sk/skrooge/package.nix index 9bbdcffd80b0..29edd3944e1e 100644 --- a/pkgs/by-name/sk/skrooge/package.nix +++ b/pkgs/by-name/sk/skrooge/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Personal finances manager, powered by KDE"; - license = with lib.licenses; [ gpl3 ]; + license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ joko ]; homepage = "https://skrooge.org/"; }; diff --git a/pkgs/by-name/sk/skypilot/package.nix b/pkgs/by-name/sk/skypilot/package.nix index 7dca34a57abf..75fe6a325923 100644 --- a/pkgs/by-name/sk/skypilot/package.nix +++ b/pkgs/by-name/sk/skypilot/package.nix @@ -78,6 +78,7 @@ python3Packages.buildPythonApplication (finalAttrs: { jinja2 jsonschema networkx + orjson packaging pandas paramiko diff --git a/pkgs/by-name/sl/slack/package.nix b/pkgs/by-name/sl/slack/package.nix index cd229d837413..d347bd66ef14 100644 --- a/pkgs/by-name/sl/slack/package.nix +++ b/pkgs/by-name/sl/slack/package.nix @@ -26,7 +26,6 @@ let prince213 ]; platforms = [ - "x86_64-darwin" "x86_64-linux" "aarch64-darwin" ]; diff --git a/pkgs/by-name/sl/slack/sources.nix b/pkgs/by-name/sl/slack/sources.nix index f8a69186d6e8..52cc93c4d730 100644 --- a/pkgs/by-name/sl/slack/sources.nix +++ b/pkgs/by-name/sl/slack/sources.nix @@ -9,13 +9,6 @@ hash = "sha256-u5NppmmRyC+6HaPIcSSGOOdVRiZdT9GE1eHvad6rYdY="; }; }; - x86_64-darwin = { - version = "4.49.89"; - src = fetchurl { - url = "https://downloads.slack-edge.com/desktop-releases/mac/x64/4.49.89/Slack-4.49.89-macOS.dmg"; - hash = "sha256-eysKaQ1SXScsL0vji+32r/NgWN0eni62+LkB4svTHUE="; - }; - }; x86_64-linux = { version = "4.49.89"; src = fetchurl { diff --git a/pkgs/by-name/sl/slack/update.sh b/pkgs/by-name/sl/slack/update.sh index c54a9a5e7c29..1001f3e1c32a 100755 --- a/pkgs/by-name/sl/slack/update.sh +++ b/pkgs/by-name/sl/slack/update.sh @@ -6,25 +6,20 @@ set -euo pipefail cd $(readlink -e $(dirname "${BASH_SOURCE[0]}")) aarch64_darwin_data=$(curl -s 'https://slack.com/api/desktop.latestRelease?arch=arm64&variant=dmg') -x86_64_darwin_data=$(curl -s 'https://slack.com/api/desktop.latestRelease?arch=x64&variant=dmg') x86_64_linux_data=$(curl -s 'https://slack.com/api/desktop.latestRelease?arch=x64&variant=deb') aarch64_darwin_version=$(jq -r .version <<< "$aarch64_darwin_data") -x86_64_darwin_version=$(jq -r .version <<< "$x86_64_darwin_data") x86_64_linux_version=$(jq -r .version <<< "$x86_64_linux_data") aarch64_darwin_url=$(jq -r .download_url <<< "$aarch64_darwin_data") -x86_64_darwin_url=$(jq -r .download_url <<< "$x86_64_darwin_data") x86_64_linux_url=$(jq -r .download_url <<< "$x86_64_linux_data") aarch64_darwin_hash=$(nix-prefetch-url "$aarch64_darwin_url") -x86_64_darwin_hash=$(nix-prefetch-url "$x86_64_darwin_url") x86_64_linux_hash=$(nix-prefetch-url "$x86_64_linux_url") # use friendlier hashes aarch64_darwin_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$aarch64_darwin_hash") -x86_64_darwin_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$x86_64_darwin_hash") x86_64_linux_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$x86_64_linux_hash") cat >sources.nix <sources.nix <sources.nix <