diff --git a/.github/workflows/periodic-merge-6h.yml b/.github/workflows/periodic-merge-6h.yml
index 15a7da3db4e2..054ac713fe74 100644
--- a/.github/workflows/periodic-merge-6h.yml
+++ b/.github/workflows/periodic-merge-6h.yml
@@ -35,6 +35,8 @@ jobs:
into: staging-next
- from: staging-next
into: staging
+ - from: master
+ into: staging-nixos
uses: ./.github/workflows/periodic-merge.yml
with:
from: ${{ matrix.pairs.from }}
diff --git a/.github/workflows/periodic-merge.yml b/.github/workflows/periodic-merge.yml
index 1677b05c506c..04c80ae9735c 100644
--- a/.github/workflows/periodic-merge.yml
+++ b/.github/workflows/periodic-merge.yml
@@ -55,7 +55,7 @@ jobs:
github_token: ${{ steps.app-token.outputs.token }}
- name: Comment on failure
- uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
+ uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5.0.0
if: ${{ failure() }}
with:
issue-number: 105153
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a1426bb2a014..d7a59925f5b0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -430,20 +430,22 @@ gitGraph
Here's an overview of the different branches:
-| branch | `master` | `staging-next` | `staging` |
-| --- | --- | --- | --- |
-| Used for development | ✔️ | ❌ | ✔️ |
-| Built by Hydra | ✔️ | ✔️ | ❌ |
-| [Mass rebuilds][mass-rebuild] | ❌ | ⚠️ Only to fix Hydra builds | ✔️ |
-| Critical security fixes | ✔️ for non-mass-rebuilds | ✔️ for mass-rebuilds | ❌ |
-| Automatically merged into | `staging-next` | `staging` | - |
-| Manually merged into | - | `master` | `staging-next` |
+| branch | `master` | `staging-next` | `staging` | [`staging-nixos`](#test-driver-rebuild) |
+| --- | --- | --- | --- | --- |
+| Used for development | ✔️ | ❌ | ✔️ | ✔️ |
+| Built by Hydra | ✔️ | ✔️ | ❌ | ❌ |
+| [Mass rebuilds][mass-rebuild] | ❌ | ⚠️ Only to fix Hydra builds | ✔️ | ❌[^1] |
+| Critical security fixes | ✔️ for non-mass-rebuilds | ✔️ for mass-rebuilds | ❌ | ✔️ |
+| Automatically merged into | `staging-next` & `staging-nixos` | `staging` | - | - |
+| Manually merged into | - | `master` | `staging-next` | `master` |
The staging workflow is used for all stable branches with corresponding names:
- `master`/`release-YY.MM`
- `staging`/`staging-YY.MM`
- `staging-next`/`staging-next-YY.MM`
+[^1]: Except changes that cause no more rebuilds than kernel updates
+
# Conventions
## Branch conventions
@@ -495,6 +497,26 @@ In order to help the decision, CI automatically assigns [`rebuild` labels](https
As a rule of thumb, if the number of rebuilds is **500 or more**, consider targeting the `staging` branch instead of `master`; if the number is **1000 or more**, the pull request causes a mass rebuild, and should target the `staging` branch.
See [previously merged pull requests to the staging branches](https://github.com/NixOS/nixpkgs/issues?q=base%3Astaging+-base%3Astaging-next+is%3Amerged) to get a sense for what changes are considered mass rebuilds.
+Please note that changes to the Linux kernel are an exception to this rule.
+These PRs go to `staging-nixos`, see [the next section for more context](#changes-rebuilding-all-tests).
+
+### Changes rebuilding all NixOS tests
+[test-driver-rebuild]: #changes-rebuilding-all-tests
+
+Changes causing a rebuild of all NixOS tests get a special [`10.rebuild-nixos-tests`](https://github.com/NixOS/nixpkgs/issues?q=state%3Aopen%20label%3A10.rebuild-nixos-tests) label.
+These changes pose a significant impact on the build infrastructure.
+
+Hence, these PRs should either target a `staging`-branch or `staging-nixos`, provided one of following conditions applies:
+
+* The label `10.rebuild-nixos-tests` is set, or
+* The PR is a change affecting the Linux kernel.
+
+The branch gets merged whenever mainline kernel updates or critical security fixes land on the branch.
+This usually happens on a weekly basis.
+
+Backports are not handled by such a branch.
+The relevant PRs from this branch must be backported manually.
+
## Commit conventions
[commit-conventions]: #commit-conventions
diff --git a/README.md b/README.md
index 76c1c456d4ec..531af2643e5d 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
-
-
-
+
+
+
@@ -57,7 +57,7 @@ When successful build and test criteria are met, the Nixpkgs expressions are dis
# Contributing
Nixpkgs is among the most active projects on GitHub.
-While thousands of open issues and pull requests might seem a lot at first, it helps consider it in the context of the scope of the project.
+While thousands of open issues and pull requests might seem like a lot at first, it helps to consider it in the context of the scope of the project.
Nixpkgs describes how to build tens of thousands of pieces of software and implements a Linux distribution.
The [GitHub Insights](https://github.com/NixOS/nixpkgs/pulse) page gives a sense of the project activity.
diff --git a/ci/OWNERS b/ci/OWNERS
index 65fca06c3879..e63c5a6c5f9d 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -190,6 +190,9 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobeza
/pkgs/top-level/release-cuda.nix @NixOS/cuda-maintainers
/pkgs/development/cuda-modules @NixOS/cuda-maintainers
+# ROCm
+/pkgs/development/rocm-modules @NixOS/rocm
+
# Haskell
/doc/languages-frameworks/haskell.section.md @sternenseemann @maralorn @wolfgangwalther
/maintainers/scripts/haskell @sternenseemann @maralorn @wolfgangwalther
@@ -333,6 +336,13 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
/pkgs/development/dhall-modules @Gabriella439 @Profpatsch
/pkgs/development/interpreters/dhall @Gabriella439 @Profpatsch
+# Agda
+/pkgs/build-support/agda @NixOS/agda
+/pkgs/top-level/agda-packages.nix @NixOS/agda
+/pkgs/development/libraries/agda @NixOS/agda
+/doc/languages-frameworks/agda.section.md @NixOS/agda
+/nixos/tests/agda.nix @NixOS/agda
+
# Idris
/pkgs/development/idris-modules @Infinisil
/pkgs/development/compilers/idris2 @mattpolzin
diff --git a/ci/eval/README.md b/ci/eval/README.md
index d3eb252dab59..1cbb400552c7 100644
--- a/ci/eval/README.md
+++ b/ci/eval/README.md
@@ -8,7 +8,7 @@ Furthermore it also allows local evaluation using:
nix-build ci -A eval.baseline
```
-The most important two arguments are:
+The two most important arguments are:
- `--arg evalSystems`: The set of systems for which `nixpkgs` should be evaluated.
Defaults to the four official platforms (`x86_64-linux`, `aarch64-linux`, `x86_64-darwin` and `aarch64-darwin`).
Example: `--arg evalSystems '["x86_64-linux" "aarch64-darwin"]'`
diff --git a/ci/supportedBranches.js b/ci/supportedBranches.js
index 5bce128e52ff..003b437613f7 100755
--- a/ci/supportedBranches.js
+++ b/ci/supportedBranches.js
@@ -8,6 +8,7 @@ const typeConfig = {
release: ['development', 'primary'],
staging: ['development', 'secondary'],
'staging-next': ['development', 'secondary'],
+ 'staging-nixos': ['development', 'secondary'],
'haskell-updates': ['development', 'secondary'],
nixos: ['channel'],
nixpkgs: ['channel'],
@@ -19,6 +20,7 @@ const orderConfig = {
master: 0,
release: 1,
staging: 2,
+ 'staging-nixos': 2,
'haskell-updates': 3,
'staging-next': 4,
}
diff --git a/doc/README.md b/doc/README.md
index 23f59e580d05..889198bc9e35 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -408,7 +408,7 @@ Though this is not shown in the rendered documentation on nixos.org.
#### Footnotes
-To add a foonote explanation, use the following syntax:
+To add a footnote explanation, use the following syntax:
```markdown
Sometimes it's better to add context [^context] in a footnote.
@@ -443,7 +443,7 @@ This syntax is taken from [CommonMark](https://spec.commonmark.org/0.30/#link-re
#### Typographic replacements
Typographic replacements are enabled.
-Check the [list of possible replacement patterns check](https://github.com/executablebooks/markdown-it-py/blob/3613e8016ecafe21709471ee0032a90a4157c2d1/markdown_it/rules_core/replacements.py#L1-L15).
+Check the [list of possible replacement patterns](https://github.com/executablebooks/markdown-it-py/blob/3613e8016ecafe21709471ee0032a90a4157c2d1/markdown_it/rules_core/replacements.py#L1-L15).
## Getting help
diff --git a/doc/build-helpers.md b/doc/build-helpers.md
index a9df144bacbf..f11deafdc24d 100644
--- a/doc/build-helpers.md
+++ b/doc/build-helpers.md
@@ -3,13 +3,13 @@
A build helper is a function that produces derivations.
:::{.warning}
-This is not to be confused with the [`builder` argument of the Nix `derivation` primitive](https://nixos.org/manual/nix/unstable/language/derivations.html), which refers to the executable that produces the build result, or [remote builder](https://nixos.org/manual/nix/stable/advanced-topics/distributed-builds.html), which refers to a remote machine that could run such an executable.
+This is not to be confused with the [`builder` argument of the Nix `derivation` primitive](https://nixos.org/manual/nix/unstable/language/derivations.html), which refers to the executable that produces the build result, or [remote builder](https://nixos.org/manual/nix/stable/advanced-topics/distributed-builds.html), which refers to a remote machine that could run such an executable.
:::
Such a function is usually designed to abstract over a typical workflow for a given programming language or framework.
This allows declaring a build recipe by setting a limited number of options relevant to the particular use case instead of using the `derivation` function directly.
-[`stdenv.mkDerivation`](#part-stdenv) is the most widely used build helper, and serves as a basis for many others.
+[`stdenv.mkDerivation`](#part-stdenv) is the most widely used build helper and serves as a basis for many others.
In addition, it offers various options to customize parts of the builds.
There is no uniform interface for build helpers.
diff --git a/doc/build-helpers/fetchers.chapter.md b/doc/build-helpers/fetchers.chapter.md
index e70617de5611..62c38ec4c59e 100644
--- a/doc/build-helpers/fetchers.chapter.md
+++ b/doc/build-helpers/fetchers.chapter.md
@@ -416,7 +416,7 @@ fetchurl {
}
```
-After building the package, the file will be downloaded and place into the Nix store:
+After building the package, the file will be downloaded and placed into the Nix store:
```shell
$ nix-build
@@ -882,7 +882,17 @@ This is used with Gitiles repositories. The arguments expected are similar to `f
## `fetchFromBitbucket` {#fetchfrombitbucket}
-This is used with BitBucket repositories. The arguments expected are very similar to `fetchFromGitHub` above.
+Used for repositories hosted on Bitbucket (`"bitbucket.org"`) owned by the Australian-based Atlassian Corporation. It requires an `owner` and `repo` argument which are both strings that reference the workspace ID and repository name hosted on Bitbucket cloud as well as either a `tag` or `rev` argument.
+
+By default, `fetchFromBitbucket` will attempt to download a commit snapshot tarball at the specified `tag` or `rev` at `https://bitbucket.org///get/.tar.gz`
+
+However, `fetchFromBitbucket` will automatically switch to using `fetchgit` and fetch from `https://bitbucket.org//.git` in any of these cases:
+
+- `forceFetchGit`, `leaveDotGit`, `deepClone`, `fetchLFS`, or `fetchSubmodules` are set to `true`
+- `sparseCheckout` contains any entries (is a non-empty list)
+- `rootDir` is set to a non-empty string
+
+When `fetchgit` is used, refer to the `fetchgit` section for documentation of its available options.
## `fetchFromSavannah` {#fetchfromsavannah}
diff --git a/doc/build-helpers/fixed-point-arguments.chapter.md b/doc/build-helpers/fixed-point-arguments.chapter.md
index 4506d716b4c1..78fc2ac65a89 100644
--- a/doc/build-helpers/fixed-point-arguments.chapter.md
+++ b/doc/build-helpers/fixed-point-arguments.chapter.md
@@ -1,7 +1,6 @@
# Fixed-point arguments of build helpers {#chap-build-helpers-finalAttrs}
-As mentioned in the beginning of this part, `stdenv.mkDerivation` could alternatively accept a fixed-point function. The input of such function, typically named `finalAttrs`, is expected to be the final state of the attribute set.
-A build helper like this is said to accept **fixed-point arguments**.
+As mentioned in the beginning of this part, `stdenv.mkDerivation` could alternatively accept a fixed-point function. The input of this function, typically named `finalAttrs`, is expected to be the final state of the attribute set. A build helper like this is said to accept **fixed-point arguments**.
Build helpers don't always support fixed-point arguments yet, as support in [`stdenv.mkDerivation`](#mkderivation-recursive-attributes) was first included in Nixpkgs 22.05.
@@ -9,7 +8,7 @@ Build helpers don't always support fixed-point arguments yet, as support in [`st
Developers can use the Nixpkgs library function [`lib.customisation.extendMkDerivation`](#function-library-lib.customisation.extendMkDerivation) to define a build helper supporting fixed-point arguments from an existing one with such support, with an attribute overlay similar to the one taken by [`.overrideAttrs`](#sec-pkg-overrideAttrs).
-Beside overriding, `lib.extendMkDerivation` also supports `excludeDrvArgNames` to optionally exclude some arguments in the input fixed-point arguments from passing down the base build helper (specified as `constructDrv`).
+Besides overriding, `lib.extendMkDerivation` also supports `excludeDrvArgNames` to optionally exclude some arguments in the input fixed-point arguments from passing down the base build helper (specified as `constructDrv`).
:::{.example #ex-build-helpers-extendMkDerivation}
@@ -41,7 +40,7 @@ stdenv.mkDerivation (
)
```
-we could define with `lib.extendMkDerivation` an attribute overlay to make the result build helper also accepts the the attribute set's fixed point passing to the underlying `stdenv.mkDerivation`, named `finalAttrs` here:
+we could define with `lib.extendMkDerivation` an attribute overlay to make the result build helper also accept the attribute set's fixed point passing to the underlying `stdenv.mkDerivation`, named `finalAttrs` here:
```nix
lib.extendMkDerivation {
diff --git a/doc/build-helpers/special/fhs-environments.section.md b/doc/build-helpers/special/fhs-environments.section.md
index e81dbdfdc641..91c0931e0e4e 100644
--- a/doc/build-helpers/special/fhs-environments.section.md
+++ b/doc/build-helpers/special/fhs-environments.section.md
@@ -1,6 +1,6 @@
# buildFHSEnv {#sec-fhs-environments}
-`buildFHSEnv` provides a way to build and run FHS-compatible lightweight sandboxes. It creates an isolated root filesystem with the host's `/nix/store`, so its footprint in terms of disk space is quite small. This allows you to run software which is hard or unfeasible to patch for NixOS; 3rd-party source trees with FHS assumptions, games distributed as tarballs, software with integrity checking and/or external self-updated binaries for instance.
+`buildFHSEnv` provides a way to build and run an FHS-compatible, lightweight sandbox. It creates an isolated root filesystem with the host's `/nix/store`, so its footprint in terms of disk space is quite small. This allows you to run software which is hard or unfeasible to patch for NixOS; 3rd-party source trees with FHS assumptions, games distributed as tarballs, software with integrity checking and/or external self-updated binaries for instance.
It uses Linux' namespaces feature to create temporary lightweight environments which are destroyed after all child processes exit, without requiring elevated privileges. It works similar to containerisation technology such as Docker or FlatPak but provides no security-relevant separation from the host system.
Accepted arguments are:
diff --git a/doc/build-helpers/testers.chapter.md b/doc/build-helpers/testers.chapter.md
index 4805cb3efe75..e4e8ddbb2c17 100644
--- a/doc/build-helpers/testers.chapter.md
+++ b/doc/build-helpers/testers.chapter.md
@@ -98,7 +98,7 @@ It has two modes:
: The path to the files to check.
-`remap` (attribe set, optional) {#tester-lycheeLinkCheck-param-remap}
+`remap` (attribute set, optional) {#tester-lycheeLinkCheck-param-remap}
: An attribute set where the attribute names are regular expressions.
The values should be strings, derivations, or path values.
diff --git a/doc/build-helpers/trivial-build-helpers.chapter.md b/doc/build-helpers/trivial-build-helpers.chapter.md
index 6f1c4dfba278..25c49a79ee6b 100644
--- a/doc/build-helpers/trivial-build-helpers.chapter.md
+++ b/doc/build-helpers/trivial-build-helpers.chapter.md
@@ -651,7 +651,7 @@ Write a Bash script to a "bin" subdirectory of a directory in the Nix store.
: The contents of the file.
The file's contents will be put into `/nix/store//bin/`.
-The store path will include the the name, and it will be a directory.
+The store path will include the name, and it will be a directory.
This function is a combination of [](#trivial-builder-writeShellScript) and [](#trivial-builder-writeScriptBin).
diff --git a/doc/development.md b/doc/development.md
index 0c092befca24..651150420aee 100644
--- a/doc/development.md
+++ b/doc/development.md
@@ -1,6 +1,6 @@
# Development of Nixpkgs {#part-development}
-This section shows you how Nixpkgs is being developed and how you can interact with the contributors and the latest updates.
+This section shows you how Nixpkgs is developed and how you can interact with the contributors and the latest updates.
If you are interested in contributing yourself, see [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md).
diff --git a/doc/functions.md b/doc/functions.md
index 09033c9e3c19..5d4a58d50be2 100644
--- a/doc/functions.md
+++ b/doc/functions.md
@@ -1,6 +1,6 @@
# Functions reference {#chap-functions}
-The nixpkgs repository has several utility functions to manipulate Nix expressions.
+The Nixpkgs repository has several utility functions to manipulate Nix expressions.
```{=include=} sections
functions/library.md
diff --git a/doc/functions/debug.section.md b/doc/functions/debug.section.md
index b2d8589431ab..9bf7c7efc6c9 100644
--- a/doc/functions/debug.section.md
+++ b/doc/functions/debug.section.md
@@ -1,5 +1,5 @@
# Debugging Nix Expressions {#sec-debug}
-Nix is a unityped, dynamic language, this means every value can potentially appear anywhere. Since it is also non-strict, evaluation order and what ultimately is evaluated might surprise you. Therefore it is important to be able to debug nix expressions.
+Nix is a unityped, dynamic language, this means any value can potentially appear anywhere. Since it is also non-strict, evaluation order and what is ultimately evaluated might surprise you. Therefore, it is important to be able to debug Nix expressions.
In the `lib/debug.nix` file you will find a number of functions that help (pretty-)printing values while evaluation is running. You can even specify how deep these values should be printed recursively, and transform them on the fly. Please consult the docstrings in `lib/debug.nix` for usage information.
diff --git a/doc/functions/generators.section.md b/doc/functions/generators.section.md
index f636d00cc258..3113d19230f3 100644
--- a/doc/functions/generators.section.md
+++ b/doc/functions/generators.section.md
@@ -1,9 +1,9 @@
# Generators {#sec-generators}
-Generators are functions that create file formats from nix data structures, e. g. for configuration files. There are generators available for: `INI`, `JSON` and `YAML`
+Generators are functions that create file formats from Nix data structures, e.g. for configuration files. There are generators available for: `INI`, `JSON` and `YAML`.
-All generators follow a similar call interface: `generatorName configFunctions data`, where `configFunctions` is an attrset of user-defined functions that format nested parts of the content. They each have common defaults, so often they do not need to be set manually. An example is `mkSectionName ? (name: libStr.escape [ "[" "]" ] name)` from the `INI` generator. It receives the name of a section and sanitizes it. The default `mkSectionName` escapes `[` and `]` with a backslash.
+All generators follow a similar call interface: `generatorName configFunctions data`, where `configFunctions` is an attrset of user-defined functions that format nested parts of the content. They each have common defaults, so often they do not need to be set manually. An example is `mkSectionName` from the `INI` generator, which defaults to `(name: libStr.escape [ "[" "]" ] name)`. It receives the name of a section and sanitizes it. The default `mkSectionName` escapes `[` and `]` with a backslash.
-Generators can be fine-tuned to produce exactly the file format required by your application/service. One example is an INI-file format which uses `: ` as separator, the strings `"yes"`/`"no"` as boolean values and requires all string values to be quoted:
+Generators can be fine-tuned to produce exactly the file format required by your application/service. One example is an INI file format that uses `: ` as a separator, the strings `"yes"` and `"no"` as boolean values, and requires all string values to be quoted:
```nix
let
@@ -42,7 +42,7 @@ customToINI {
}
```
-This will produce the following INI file as nix string:
+This will produce the following INI file as a Nix string:
```INI
[main]
diff --git a/doc/interoperability/cyclonedx.md b/doc/interoperability/cyclonedx.md
index e49b77c2f92b..2614aa623fac 100644
--- a/doc/interoperability/cyclonedx.md
+++ b/doc/interoperability/cyclonedx.md
@@ -3,10 +3,10 @@
[OWASP](https://owasp.org/) [CycloneDX](https://cyclonedx.org/) is a Software [Bill of Materials](https://en.wikipedia.org/wiki/Bill_of_materials) (SBOM) standard.
The standards described here are for including Nix specific information within SBOMs in a way that is interoperable with external SBOM tooling.
-## `nix` Namespace Property Taxonomy {#sec-interop.cylonedx-nix}
+## `nix` Namespace Property Taxonomy {#sec-interop.cylonedx-nix}
-The following tables describe namespaces for [properties](https://cyclonedx.org/docs/1.6/json/#components_items_properties) that may be attached to components within SBOMs.
-Component properties are lists of name-value-pairs where values must be strings.
+The following tables describe namespaces for [properties](https://cyclonedx.org/docs/1.6/json/#components_items_properties) that can be attached to components within SBOMs.
+Component properties are lists of name-value-pairs where the values must be strings.
Properties with the same name may appear more than once.
Names and values are case-sensitive.
diff --git a/doc/languages-frameworks/chicken.section.md b/doc/languages-frameworks/chicken.section.md
index dd7aa83603db..450760979a38 100644
--- a/doc/languages-frameworks/chicken.section.md
+++ b/doc/languages-frameworks/chicken.section.md
@@ -6,7 +6,7 @@ compiler. It includes an interactive mode and a custom package format, "eggs".
## Using Eggs {#sec-chicken-using}
-Eggs described in nixpkgs are available inside the
+Eggs described in Nixpkgs are available inside the
`chickenPackages.chickenEggs` attrset. Including an egg as a build input is
done in the typical Nix fashion. For example, to include support for [SRFI
189](https://srfi.schemers.org/srfi-189/srfi-189.html) in a derivation, one
@@ -26,7 +26,7 @@ variables `CHICKEN_INCLUDE_PATH` and `CHICKEN_REPOSITORY_PATH`.
## Updating Eggs {#sec-chicken-updating-eggs}
-nixpkgs only knows about a subset of all published eggs. It uses
+Nixpkgs only knows about a subset of all published eggs. It uses
[egg2nix](https://github.com/the-kenny/egg2nix) to generate a
package set from a list of eggs to include.
diff --git a/doc/languages-frameworks/gnome.section.md b/doc/languages-frameworks/gnome.section.md
index 0b4d66a430f4..252f7ea3dea7 100644
--- a/doc/languages-frameworks/gnome.section.md
+++ b/doc/languages-frameworks/gnome.section.md
@@ -111,7 +111,7 @@ Fortunately, we have a [family of hooks]{#ssec-gnome-hooks-wrapgappshook} that a
- [`wrapGAppsHook4`]{#ssec-gnome-hooks-wrapgappshook4} for GTK 4 apps. Same as `wrapGAppsHook3` but replaces `gtk3` with `gtk4`.
- [`wrapGAppsNoGuiHook`]{#ssec-gnome-hooks-wrapgappsnoguihook} for programs without a graphical interface. Same as the above but does not bring `gtk3` and `librsvg` into the closure.
-The hooks do the the following:
+The hooks do the following:
- `wrapGApps*` hook itself will add the package’s `share` directory to `XDG_DATA_DIRS`.
diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md
index 12507a5e5d5f..d19884154438 100644
--- a/doc/languages-frameworks/javascript.section.md
+++ b/doc/languages-frameworks/javascript.section.md
@@ -542,7 +542,7 @@ set `prePnpmInstall` to the right commands to run. For example:
```nix
{
prePnpmInstall = ''
- pnpm config set dedupe-peer-dependants false
+ pnpm config set dedupe-peer-dependents false
'';
pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) prePnpmInstall;
diff --git a/doc/languages-frameworks/ocaml.section.md b/doc/languages-frameworks/ocaml.section.md
index 9b20a8ab32f5..1f5aa96739e5 100644
--- a/doc/languages-frameworks/ocaml.section.md
+++ b/doc/languages-frameworks/ocaml.section.md
@@ -52,7 +52,7 @@ Here is a simple package example.
- It sets the optional `doCheck` attribute such that tests will be run with
`dune runtest -p angstrom` after the build (`dune build -p angstrom`) is
- complete, but only if the OCaml version is at at least `"4.05"`.
+ complete, but only if the OCaml version is at least `"4.05"`.
- It uses the package `ocaml-syntax-shims` as a build input, `alcotest` and
`ppx_let` as check inputs (because they are needed to run the tests), and
diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index 3a1d1d2e914b..487b7d4b3401 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -1018,7 +1018,7 @@ that we introduced with the `let` expression.
#### Handling dependencies {#handling-dependencies}
Our example, `toolz`, does not have any dependencies on other Python packages or system libraries.
-[`buildPythonPackage`](#buildpythonpackage-function) uses the the following arguments in the following circumstances:
+[`buildPythonPackage`](#buildpythonpackage-function) uses the following arguments in the following circumstances:
- `dependencies` - For Python runtime dependencies.
- `build-system` - For Python build-time requirements.
diff --git a/doc/module-system/module-system.chapter.md b/doc/module-system/module-system.chapter.md
index 8e95580522b2..703d832c7931 100644
--- a/doc/module-system/module-system.chapter.md
+++ b/doc/module-system/module-system.chapter.md
@@ -162,7 +162,7 @@ the last category is only available after the `imports` have been resolved.
It is exposed as a module argument due to how the module system is implemented, which cannot be avoided without breaking compatibility.
It is a good practice not to rely on `_prefix`. A module should not make assumptions about its location in the configuration tree.
- For example, the root of a NixOS configuration may have a non-empty prefix, for example when it is a specialisation, or when it is part of a larger, multi-host configuration such as a [NixOS test](https://nixos.org/manual/nixos/unstable/#sec-nixos-tests).
+ For example, the root of a NixOS configuration may have a non-empty prefix, for example when it is a specialisation, or when it is part of a larger, multi-host configuration, such as a [NixOS test](https://nixos.org/manual/nixos/unstable/#sec-nixos-tests).
Instead of depending on `_prefix` use explicit options, whose default definitions can be provided by the module that imports them.
diff --git a/doc/packages/linux.section.md b/doc/packages/linux.section.md
index 311613e411b3..8551c77d940d 100644
--- a/doc/packages/linux.section.md
+++ b/doc/packages/linux.section.md
@@ -105,3 +105,56 @@ $ make -C $dev/lib/modules/*/build M=$(pwd)/drivers/net/ethernet/mellanox module
```
:::
+
+## Maintainer information {#sec-linux-kernel-maintainer-information}
+
+### Updating kernels {#sec-linux-updates}
+
+Updating all kernels can be done with the following script:
+
+```ShellSession
+$ pkgs/os-specific/linux/kernel/update.sh
+```
+
+The change gets submitted like this:
+
+* File a PR against `staging-nixos`.
+ * Add a `backport release-XX.XX` label for an automated backport.
+ We don't expect many other changes on that branch to require a backport, hence there's no such branch for stable.
+ By using an additional PR, we get the automatic backport against stable without manual cherry-picks.
+* Merge into `staging-nixos`.
+* File as PR from `staging-nixos` against `master`.
+* When all status checks are green, merge.
+
+### Add a new (major) version of the Linux kernel {#sec-linux-add-new-kernel-version}
+
+* When running `./pkgs/os-specific/linux/kernel/update.sh`, new kernel majors get discovered automatically.
+* Prepare all Nix expressions for the new kernel
+ * Instantiate the new kernel in `pkgs/top-level/linux-kernels.nix` in the `kernels`-section.
+ ```nix
+ {
+ linux_X_Y = callPackage ../os-specific/linux/kernel/mainline.nix {
+ branch = "X.Y";
+ kernelPatches = [
+ # any new patches required (it makes to look which patches are used by its predecessor)
+ ];
+ };
+ }
+ ```
+ * Instantiate the package-set in `vanillaPackages`:
+ ```nix
+ {
+ linux_X_Y = recurseIntoAttrs (packagesFor kernels.linux_X_Y);
+ }
+ ```
+ * Update `linux_latest` to the new attribute.
+* __SQUASH__ the changes into the `linux: init at …` commit.
+* If a new hardened is available:
+ * Instantiate a `linux_X_Y_hardened = hardenedKernelsFor kernels.linux_X_Y { };` in `kernels` and
+ `linux_X_Y_hardened = hardenedKernelFor kernels.linux_X_Y { };` in the `packages`-section.
+ * Make sure to remove the hardened variant of the previous kernel version unless it's LTS.
+ We only support the latest and latest LTS version of hardened.
+* If no new hardened kernel is available:
+ * Keep the previously latest kernel until its mainline counterpart gets removed.
+ After that `linux_hardened` points to the latest LTS supported by hardened.
+* __SQUASH__ the changes into the `linux_X_Y_hardened: init at …` commit.
diff --git a/doc/preface.chapter.md b/doc/preface.chapter.md
index c68ab09c7f6c..5b4c54ef4cd6 100644
--- a/doc/preface.chapter.md
+++ b/doc/preface.chapter.md
@@ -19,7 +19,7 @@ To discover other kinds of documentation:
## Overview of Nixpkgs {#overview-of-nixpkgs}
Nix expressions describe how to build packages from source and are collected in
-the [nixpkgs repository](https://github.com/NixOS/nixpkgs). Also included in the
+the [Nixpkgs repository](https://github.com/NixOS/nixpkgs). Also included in the
collection are Nix expressions for
[NixOS modules](https://nixos.org/nixos/manual/index.html#sec-writing-modules).
With these expressions the Nix package manager can build binary packages.
@@ -34,7 +34,7 @@ security updates. More up-to-date packages and modules are available via the
`nixos-unstable` channel.
Both `nixos-unstable` and `nixpkgs-unstable` follow the `master` branch of the
-nixpkgs repository, although both do lag the `master` branch by generally
+Nixpkgs repository, although both do lag the `master` branch by generally
[a couple of days](https://status.nixos.org/). Updates to a channel are
distributed as soon as all tests for that channel pass, e.g.
[this table](https://hydra.nixos.org/job/nixpkgs/trunk/unstable#tabs-constituents)
@@ -46,5 +46,5 @@ which also builds binary packages from the Nix expressions in Nixpkgs for
The binaries are made available via a [binary cache](https://cache.nixos.org).
The current Nix expressions of the channels are available in the
-[nixpkgs repository](https://github.com/NixOS/nixpkgs) in branches
+[Nixpkgs repository](https://github.com/NixOS/nixpkgs) in branches
that correspond to the channel names (e.g. `nixos-22.11-small`).
diff --git a/doc/redirects.json b/doc/redirects.json
index b2aa1b321d5c..bb9f1188f88a 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -216,6 +216,12 @@
"sec-building-packages-with-llvm-using-clang-stdenv": [
"index.html#sec-building-packages-with-llvm-using-clang-stdenv"
],
+ "sec-darwin-libcxx-deployment-targets": [
+ "index.html#sec-darwin-libcxx-deployment-targets"
+ ],
+ "sec-darwin-libcxx-versions": [
+ "index.html#sec-darwin-libcxx-versions"
+ ],
"sec-functions-library-treefmt": [
"index.html#sec-functions-library-treefmt"
],
@@ -4288,6 +4294,15 @@
"sec-linux-kernel": [
"index.html#sec-linux-kernel"
],
+ "sec-linux-kernel-maintainer-information": [
+ "index.html#sec-linux-kernel-maintainer-information"
+ ],
+ "sec-linux-updates": [
+ "index.html#sec-linux-updates"
+ ],
+ "sec-linux-add-new-kernel-version": [
+ "index.html#sec-linux-add-new-kernel-version"
+ ],
"ex-overriding-kernel-derivation": [
"index.html#ex-overriding-kernel-derivation"
],
diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md
index fb7cfb164e4f..7147091f7fa4 100644
--- a/doc/release-notes/rl-2505.section.md
+++ b/doc/release-notes/rl-2505.section.md
@@ -230,7 +230,7 @@
- `buildGoModule` now supports a `goSum` attribute (`null` by default) to optionally provide a path to `go.sum` and correctly enabling rebuilds when the file changes.
-- The newly added aliases `go_latest` and `buildGoLatestModule` are now available and can be use to prevent packages like `gopls` from breaking whenever the default toolchain minor version is lagging behind.
+- The newly added aliases `go_latest` and `buildGoLatestModule` are now available and can be used to prevent packages like `gopls` from breaking whenever the default toolchain minor version is lagging behind.
It can also be used _outside of Nixpkgs_ to get fast access to new Go minor versions without having to wait for a staging cycle that will update the default builder/toolchain.
- A [policy documenting the details of Go toolchain and builder upgrades](https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/go/README.md#go-toolchainbuilder-upgrade-policy) in Nixpkgs, as well as rules related to using non-default builders like `buildGo1xxModule` and `buildGoLatestModule` has been added in-tree.
@@ -257,7 +257,7 @@
and `withGstreamer`/`withVlc` override options have been removed due to this.
- `nexusmods-app` has been upgraded from version 0.6.3. If you were running a version older than 0.7.0, then before upgrading, you **must reset all app state** (mods, games, settings, etc). Otherwise, NexusMods.App will crash due to app state files incompatibility.
- - Typically, you can can reset to a clean state by running `NexusMods.App uninstall-app`. See Nexus Mod's [how to uninstall the app](https://nexus-mods.github.io/NexusMods.App/users/Uninstall) documentation for more detail and alternative methods.
+ - Typically, you can reset to a clean state by running `NexusMods.App uninstall-app`. See Nexus Mod's [how to uninstall the app](https://nexus-mods.github.io/NexusMods.App/users/Uninstall) documentation for more detail and alternative methods.
- This should not be necessary going forward, because loading app state from 0.7.0 or newer is now supported. This is documented in the [0.7.1 changelog](https://github.com/Nexus-Mods/NexusMods.App/releases/tag/v0.7.1).
- `nezha` and its agent `nezha-agent` have been updated to v1, which contains breaking changes. See the [official wiki](https://nezha.wiki/en_US/) for more details.
@@ -369,7 +369,7 @@
- `nodePackages.expo-cli` has been removed, as it was deprecated by upstream. The suggested replacement is the `npx expo` command.
-- `open-policy-agent` has has been updated to 1.0.0+.
+- `open-policy-agent` has been updated to 1.0.0+.
This major release makes the `rego.v1` syntax the default.
This is a breaking change for those using v0 Rego.
See the [upgrade documentation](https://www.openpolicyagent.org/docs/v1.0.1/v0-upgrade/) for more details.
@@ -514,7 +514,7 @@
Note that all provided plugins must have versions/tags (string after `@`), even if upstream repo does not tag each release. For untagged plugins, you can either create an empty Go project and run `go get ` and see changes in `go.mod` to get the pseudo-version number, or provide a commit hash in place of version/tag for the first run, and update the plugin string based on the error output.
-- The `godot-export-templates` package now has its content at `share/godot/export_templates/$version` instead of the output root. This makes it more convenient for for symlinking into `~/.local`, but scripts expecting the old layout will need to be changed.
+- The `godot-export-templates` package now has its content at `share/godot/export_templates/$version` instead of the output root. This makes it more convenient for symlinking into `~/.local`, but scripts expecting the old layout will need to be changed.
- GOverlay has been updated to 1.2, please check the [upstream changelog](https://github.com/benjamimgois/goverlay/releases) for more details.
@@ -549,7 +549,7 @@
- `gerbera` now has wavpack support.
-- `signal-desktop` has been migrated to a from source build. No state migration is necessary. In case there's no working source build available (like on Darwin), the the binary build is still available at `signal-desktop-bin`.
+- `signal-desktop` has been migrated to a from source build. No state migration is necessary. In case there's no working source build available (like on Darwin), the binary build is still available at `signal-desktop-bin`.
- `ddclient` was updated from 3.11.2 to 4.0.0 [Release notes](https://github.com/ddclient/ddclient/releases/tag/v4.0.0)
diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index e845e74986e4..c9dade849d62 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -12,6 +12,12 @@
- The default GHC version has been updated from 9.8 to 9.10.
`haskellPackages` correspondingly uses Stackage LTS 24 (instead of LTS 23) as a baseline.
+- Darwin has switched to using the system libc++. This was done for improved compatibility and to avoid ODR violations.
+ If a newer C++ library feature is not available on the default deployment target, you will need to increase the deployment target.
+ See the Darwin platform documentation for more details.
+
+- LLVM has been updated from 19 to 21.
+
## Backward Incompatibilities {#sec-nixpkgs-release-25.11-incompatibilities}
@@ -62,7 +68,7 @@
- `buildGoModule` now warns if `.passthru.overrideModAttrs` is lost during the overriding of its result packages.
-- `gentium` package now provides `Gentium-*.ttf` files, and not `GentiumPlus-*.ttf` files like before. The font identifiers `Gentium Plus*` are available in the `gentium-plus` package, and if you want to use the more recently updated package `gentium` [by sil](https://software.sil.org/gentium/), you should update your configuration files to use the `Gentium` font identifier.
+- `gentium` package now provides `Gentium-*.ttf` files, and not `GentiumPlus-*.ttf` files like before. The font identifiers `Gentium Plus*` are available in the `gentium-plus` package, and if you want to use the more recently updated package `gentium` [by SIL](https://software.sil.org/gentium/), you should update your configuration files to use the `Gentium` font identifier.
- `space-orbit` package has been removed due to lack of upstream maintenance. Debian upstream stopped tracking it in 2011.
@@ -140,6 +146,8 @@
- `tooling-language-server` has been renamed to `deputy` (both the package and binary), following the rename of the upstream project.
+- `fetchFromBitBucket` has gained a `fetchgit` backend when passing in git-related arguments similar to `fetchFromGitHub`.
+
- `fetchtorrent`, when using the "rqbit" backend, erroneously started fetching files into a subdirectory in Nixpkgs 24.11. The original behaviour – which matches the behaviour using the "transmission" backend – has now been restored. Users reliant on the erroneous behaviour can temporarily maintain it by adding `flatten = false` to the `fetchtorrent` arguments; Nix will produce an evaluation warning for anyone using `backend = "rqbit"` without `flatten = true`.
- `steamcontroller` has been removed due to lack of upstream maintenance. Consider using `sc-controller` instead.
@@ -168,6 +176,8 @@
- `neovimUtils.makeNeovimConfig` now uses `customLuaRC` parameter instead of accepting `luaRcContent`. The old usage is deprecated but still works with a warning.
+- `python3Packages.pyocr` no longer supports `cuneiform` on Linux by default. It is still possible to enable it using `withCuneiformSupport` override.
+
- `telegram-desktop` packages now uses `Telegram` for its binary. The previous name was `telegram-desktop`. This is due to [an upstream decision](https://github.com/telegramdesktop/tdesktop/commit/56ff5808a3d766f892bc3c3305afb106b629ef6f) to make the name consistent with other platforms.
- `hsd` has been upgraded to version 8. See [their changelog](https://github.com/handshake-org/hsd/blob/v8.0.0/docs/release-notes/release-notes-8.x.md) for important instructions before upgrading.
@@ -219,6 +229,7 @@
- Added `rewriteURL` attribute to the nixpkgs `config`, to allow for rewriting the URLs downloaded by `fetchurl`.
+- Added `hashedMirrors` attribute to the nixpkgs `config`, to allow for customization of the hashed mirrors used by `fetchurl`.
- Added `gitConfig` and `gitConfigFile` option to the nixpkgs `config`, to allow for setting a default `gitConfigFile` for all `fetchgit` invocations.
@@ -228,6 +239,8 @@
- [`homebox` 0.20.0](https://github.com/sysadminsmedia/homebox/releases/tag/v0.20.0) changed how assets are stored and hashed. It is recommended to back up your database before this update.
+- GIMP now defaults to version 3. Use `gimp2` for the old version.
+
- `installShellCompletion`: now supports Nushell completion files
- New hardening flags, `strictflexarrays1` and `strictflexarrays3` were made available, corresponding to the gcc/clang options `-fstrict-flex-arrays=1` and `-fstrict-flex-arrays=3` respectively.
@@ -271,6 +284,8 @@
recommendation](https://clickhouse.com/docs/faq/operations/production). Users
can continue to use the `clickhouse-lts` package if desired.
+- `emacs` now disables the GC mark trace buffer by default. This improves GC performance by 5%, but can make GC issues harder to debug. This is configurable with `withGcMarkTrace`.
+
- `buildPythonPackage` and `buildPythonApplication` now default to `nix-update-script` as their default `updateScript`. This should improve automated updates, since nix-update is better maintained than the in-tree update script and has more robust fetcher support.
## Nixpkgs Library {#sec-nixpkgs-release-25.11-lib}
@@ -284,6 +299,8 @@
- `reaction` has been updated to version 2, which includes some breaking changes.
For more information, [check the release article](https://blog.ppom.me/en-reaction-v2).
+- `lib.options.mkPackageOptionMD` has been removed, following its deprecation in NixOS 24.11. Use `lib.options.mkPackageOption` instead.
+
- The `buildPythonPackage` and `buildPythonApplication` functions now require
an explicit `format` attribute. Previously the default format used setuptools
and called `setup.py` from the source tree, which is deprecated.
diff --git a/doc/stdenv/platform-notes.chapter.md b/doc/stdenv/platform-notes.chapter.md
index f7e9b4fcc351..06662bbc76fa 100644
--- a/doc/stdenv/platform-notes.chapter.md
+++ b/doc/stdenv/platform-notes.chapter.md
@@ -12,6 +12,9 @@ If it does, you’re done; skip the rest of this.
- Darwin uses Clang by default instead of GCC. Packages that refer to `$CC` or `cc` should just work in most cases.
Some packages may hardcode `gcc` or `g++`. You can usually fix that by setting `makeFlags = [ "CC=cc" "CXX=C++" ]`.
If that does not work, you will have to patch the build scripts yourself to use the correct compiler for Darwin.
+- Darwin uses the system libc++ by default to avoid ODR violations and potential compatibility issues from mixing LLVM libc++ with the system libc++.
+ While mixing the two usually worked, the two implementations are not guaranteed to be ABI compatible and are considered distinct by upstream.
+ See the troubleshooting guide below if you need to use newer C++ library features than those supported by the default deployment target.
- Darwin needs an SDK to build software.
The SDK provides a default set of frameworks and libraries to build software, most of which are specific to Darwin.
There are multiple versions of the SDK packages in Nixpkgs, but one is included by default in the `stdenv`.
@@ -30,6 +33,20 @@ If you run into issues or failures, continue reading below for how to deal with
### Darwin Issue Troubleshooting {#sec-darwin-troubleshooting}
+#### Building a C++ package or library says that certain APIs are unavailable {#sec-darwin-libcxx-versions}
+
+While some newer APIs may be available via headers only, some require using a system libc++ with the required API support.
+When that happens, your build will fail because libc++ makes failure to use the correct deployment target an error.
+To make the newer API available, increase the deployment target to the required version.
+Note that it is possible to use libc++ from LLVM instead of increasing the deployment target, but it is not recommended.
+Doing so can cause problems when multiple libc++ implementations are linked into a binary (e.g., from dependencies).
+
+##### Using a newer deployment target {#sec-darwin-libcxx-deployment-targets}
+
+See below for how to use a newer deployment target.
+For example, `std::print` depends on features that are only available on macOS 13.3 or newer.
+To make them available, set the deployment target to 13.3 using `darwinMinVersionHook`.
+
#### Package requires a non-default SDK or fails to build due to missing frameworks or symbols {#sec-darwin-troubleshooting-using-sdks}
In some cases, you may have to use a non-default SDK.
diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index de7859921c8c..59e4518b0ddc 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -44,7 +44,7 @@ rec {
;
/**
- Return an attribute from nested attribute sets.
+ Returns an attribute from nested attribute sets.
Nix has an [attribute selection operator `.`](https://nixos.org/manual/nix/stable/language/operators#attribute-selection) which is sufficient for such queries, as long as the number of attributes is static. For example:
@@ -111,7 +111,7 @@ rec {
attrByPath' 0 set;
/**
- Return if an attribute from nested attribute set exists.
+ Returns if an attribute from nested attribute set exists.
Nix has a [has attribute operator `?`](https://nixos.org/manual/nix/stable/language/operators#has-attribute), which is sufficient for such queries, as long as the number of attributes is static. For example:
@@ -177,7 +177,7 @@ rec {
hasAttrByPath' 0 e;
/**
- Return the longest prefix of an attribute path that refers to an existing attribute in a nesting of attribute sets.
+ Returns the longest prefix of an attribute path that refers to an existing attribute in a nesting of attribute sets.
Can be used after [`mapAttrsRecursiveCond`](#function-library-lib.attrsets.mapAttrsRecursiveCond) to apply a condition,
although this will evaluate the predicate function on sibling attributes as well.
@@ -504,7 +504,7 @@ rec {
updates: value: go 0 true value updates;
/**
- Return the specified attributes from a set.
+ Returns the specified attributes from a set.
# Inputs
@@ -536,7 +536,7 @@ rec {
attrVals = nameList: set: map (x: set.${x}) nameList;
/**
- Return the values of all attributes in the given set, sorted by
+ Returns the values of all attributes in the given set, sorted by
attribute name.
# Type
diff --git a/lib/default.nix b/lib/default.nix
index de38409b8c67..3e8fdd1c762d 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -505,7 +505,6 @@ let
unknownModule
mkOption
mkPackageOption
- mkPackageOptionMD
literalMD
;
inherit (self.types)
diff --git a/lib/deprecated/misc.nix b/lib/deprecated/misc.nix
index b5511e949a41..0abf4e0d080c 100644
--- a/lib/deprecated/misc.nix
+++ b/lib/deprecated/misc.nix
@@ -73,7 +73,7 @@ let
name: default: attrs:
attrs.${name} or default;
- # Return the second argument if the first one is true or the empty version
+ # Returns the second argument if the first one is true or the empty version
# of the second argument.
ifEnable =
cond: val:
@@ -89,7 +89,7 @@ let
else
null;
- # Return true only if there is an attribute and it is true.
+ # Returns true only if there is an attribute and it is true.
checkFlag =
attrSet: name:
if name == "true" then
diff --git a/lib/fixed-points.nix b/lib/fixed-points.nix
index e73cc7ec3dac..f4e06473e5ea 100644
--- a/lib/fixed-points.nix
+++ b/lib/fixed-points.nix
@@ -119,7 +119,7 @@ rec {
x;
/**
- Return the fixpoint that `f` converges to when called iteratively, starting
+ Returns the fixpoint that `f` converges to when called iteratively, starting
with the input `x`.
```
diff --git a/lib/licenses.nix b/lib/licenses.nix
index 3b2c368b9ba5..09d708b570d2 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -481,6 +481,11 @@ lib.mapAttrs mkLicense (
fullName = "Common Public License 1.0";
};
+ cnri-python = {
+ spdxId = "CNRI-Python";
+ fullName = "CNRI Python License";
+ };
+
cronyx = {
spdxId = "Cronyx";
fullName = "Cronyx License";
diff --git a/lib/lists.nix b/lib/lists.nix
index 3d324e545dd4..d42ce4079779 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -642,7 +642,7 @@ rec {
if index == null then default else elemAt list index;
/**
- Return true if function `pred` returns true for at least one
+ Returns true if function `pred` returns true for at least one
element of `list`.
# Inputs
@@ -677,7 +677,7 @@ rec {
any = builtins.any;
/**
- Return true if function `pred` returns true for all elements of
+ Returns true if function `pred` returns true for all elements of
`list`.
# Inputs
@@ -777,7 +777,7 @@ rec {
optional = cond: elem: if cond then [ elem ] else [ ];
/**
- Return a list or an empty list, depending on a boolean value.
+ Returns a list or an empty list, depending on a boolean value.
# Inputs
@@ -837,7 +837,7 @@ rec {
toList = x: if isList x then x else [ x ];
/**
- Return a list of integers from `first` up to and including `last`.
+ Returns a list of integers from `first` up to and including `last`.
# Inputs
@@ -871,7 +871,7 @@ rec {
range = first: last: if first > last then [ ] else genList (n: first + n) (last - first + 1);
/**
- Return a list with `n` copies of an element.
+ Returns a list with `n` copies of an element.
# Inputs
@@ -1429,7 +1429,7 @@ rec {
map (x: elemAt x 1) (sort less prepared);
/**
- Return the first (at most) N elements of a list.
+ Returns the first (at most) N elements of a list.
# Inputs
@@ -1463,7 +1463,7 @@ rec {
take = count: sublist 0 count;
/**
- Return the last (at most) N elements of a list.
+ Returns the last (at most) N elements of a list.
# Inputs
@@ -1639,7 +1639,7 @@ rec {
throw "lib.lists.removePrefix: First argument is not a list prefix of the second argument";
/**
- Return a list consisting of at most `count` elements of `list`,
+ Returns a list consisting of at most `count` elements of `list`,
starting at index `start`.
# Inputs
@@ -1737,7 +1737,7 @@ rec {
take commonPrefixLength list1;
/**
- Return the last element of a list.
+ Returns the last element of a list.
This function throws an error if the list is empty.
@@ -1770,7 +1770,7 @@ rec {
elemAt list (length list - 1);
/**
- Return all elements but the last.
+ Returns all elements but the last.
This function throws an error if the list is empty.
@@ -1803,7 +1803,7 @@ rec {
take (length list - 1) list;
/**
- Return the image of the cross product of some lists by a function.
+ Returns the image of the cross product of some lists by a function.
# Examples
:::{.example}
diff --git a/lib/modules.nix b/lib/modules.nix
index e91a4d2afb92..5fc00e2acee8 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -1452,7 +1452,7 @@ let
};
/**
- Return a definition with file location information.
+ Returns a definition with file location information.
*/
mkDefinition = args@{ file, value, ... }: args // { _type = "definition"; };
@@ -1541,7 +1541,7 @@ let
};
/**
- Return a module that causes a warning to be shown if the
+ Returns a module that causes a warning to be shown if the
specified option is defined. For example,
mkRemovedOptionModule [ "boot" "loader" "grub" "bootDevice" ] ""
@@ -1589,7 +1589,7 @@ let
};
/**
- Return a module that causes a warning to be shown if the
+ Returns a module that causes a warning to be shown if the
specified "from" option is defined; the defined value is however
forwarded to the "to" option. This can be used to rename options
while providing backward compatibility. For example,
@@ -1645,7 +1645,7 @@ let
};
/**
- Return a module that causes a warning to be shown if any of the "from"
+ Returns a module that causes a warning to be shown if any of the "from"
option is defined; the defined values can be used in the "mergeFn" to set
the "to" value.
This function can be used to merge multiple options into one that has a
@@ -1724,7 +1724,7 @@ let
/**
Single "from" version of mkMergedOptionModule.
- Return a module that causes a warning to be shown if the "from" option is
+ Returns a module that causes a warning to be shown if the "from" option is
defined; the defined value can be used in the "mergeFn" to set the "to"
value.
This function can be used to change an option into another that has a
@@ -1822,7 +1822,7 @@ let
mkDerivedConfig = opt: f: mkOverride (opt.highestPrio or defaultOverridePriority) (f opt.value);
/**
- Return a module that help declares an option that has been renamed.
+ Returns a module that help declares an option that has been renamed.
When a value is defined for the old option, it is forwarded to the `to` option.
*/
doRename =
diff --git a/lib/options.nix b/lib/options.nix
index 40fcca647385..75f8bfa2535c 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -344,13 +344,6 @@ rec {
}
);
- /**
- Deprecated alias of mkPackageOption, to be removed in 25.05.
-
- Previously used to create options with markdown documentation, which is no longer required.
- */
- mkPackageOptionMD = lib.warn "mkPackageOptionMD is deprecated and will be removed in 25.05; please use mkPackageOption." mkPackageOption;
-
/**
This option accepts arbitrary definitions, but it does not produce an option value.
@@ -503,7 +496,7 @@ rec {
loc: defs:
if defs == [ ] then
abort "This case should never happen."
- # Return early if we only have one element
+ # Returns early if we only have one element
# This also makes it work for functions, because the foldl' below would try
# to compare the first element with itself, which is false for functions
else if length defs == 1 then
diff --git a/lib/path/default.nix b/lib/path/default.nix
index a03f6a04cafd..6736e7ab5beb 100644
--- a/lib/path/default.nix
+++ b/lib/path/default.nix
@@ -40,7 +40,7 @@ let
isValid
;
- # Return the reason why a subpath is invalid, or `null` if it's valid
+ # Returns the reason why a subpath is invalid, or `null` if it's valid
subpathInvalidReason =
value:
if !isString value then
diff --git a/lib/strings.nix b/lib/strings.nix
index da2b43ae6d20..77d7bb939eb5 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -1806,7 +1806,7 @@ rec {
if len == 0 then [ (addContextFrom str "") ] else map (addContextFrom str) (go 0 "" [ ]);
/**
- Return a string without the specified prefix, if the prefix matches.
+ Returns a string without the specified prefix, if the prefix matches.
# Inputs
@@ -1857,7 +1857,7 @@ rec {
);
/**
- Return a string without the specified suffix, if the suffix matches.
+ Returns a string without the specified suffix, if the suffix matches.
# Inputs
@@ -1908,7 +1908,7 @@ rec {
);
/**
- Return true if string `v1` denotes a version older than `v2`.
+ Returns true if string `v1` denotes a version older than `v2`.
# Inputs
@@ -1940,7 +1940,7 @@ rec {
versionOlder = v1: v2: compareVersions v2 v1 == 1;
/**
- Return true if string v1 denotes a version equal to or newer than v2.
+ Returns true if string v1 denotes a version equal to or newer than v2.
# Inputs
diff --git a/lib/trivial.nix b/lib/trivial.nix
index 6a0fb87dc03b..e940a67d778d 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -327,7 +327,7 @@ in
f b a;
/**
- Return `maybeValue` if not null, otherwise return `default`.
+ Returns `maybeValue` if not null, otherwise return `default`.
# Inputs
@@ -529,7 +529,7 @@ in
## Integer operations
/**
- Return minimum of two numbers.
+ Returns minimum of two numbers.
# Inputs
@@ -544,7 +544,7 @@ in
min = x: y: if x < y then x else y;
/**
- Return maximum of two numbers.
+ Returns maximum of two numbers.
# Inputs
diff --git a/lib/types.nix b/lib/types.nix
index c23581c5281c..d1220e18828d 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -289,7 +289,7 @@ let
# `optionType`: The option type to parenthesize or not.
# The option whose description we're returning.
#
- # Return value
+ # Returns value
#
# The description of the `optionType`, with parentheses if there may be an
# ambiguity.
diff --git a/maintainers/README.md b/maintainers/README.md
index 2cc71698939f..1bcaaea1a5c3 100644
--- a/maintainers/README.md
+++ b/maintainers/README.md
@@ -8,7 +8,7 @@ This more fluid approach is one reason why we scale to so many packages.
The main responsibility of a maintainer is to keep the packages they maintain in a functioning state, and keep up with updates.
In order to do that, they are empowered to make decisions over the packages they maintain.
-That being said, the maintainer is not alone proposing changes to the packages.
+That being said, the maintainer is not alone in proposing changes to the packages.
Anybody (both bots and humans) can send PRs to bump or tweak the package.
We also allow other non-maintainer committers to merge changes to the package, provided enough time and priority has been given to the maintainer.
@@ -143,7 +143,7 @@ When adding users to [`maintainer-list.nix`](./maintainer-list.nix), the followi
### Maintainer teams
Feel free to create a new maintainer team in [`team-list.nix`](./team-list.nix) when a group is collectively responsible for a collection of packages.
-Use taste and personal judgement when deciding if a team is warranted.
+Use taste and personal judgment when deciding if a team is warranted.
Teams are allowed to define their own rules about membership.
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0c25896509a2..e0eb9d8ca1ee 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1738,7 +1738,7 @@
};
annaaurora = {
email = "anna@annaaurora.eu";
- matrix = "@papojari:artemislena.eu";
+ matrix = "@anna:annaaurora.eu";
github = "auroraanna";
githubId = 81317317;
name = "Anna Aurora";
@@ -6905,12 +6905,6 @@
githubId = 187309685;
name = "Drew Council";
};
- drewrisinger = {
- email = "drisinger+nixpkgs@gmail.com";
- github = "drewrisinger";
- githubId = 10198051;
- name = "Drew Risinger";
- };
dritter = {
email = "dritter03@googlemail.com";
github = "dritter";
@@ -8051,13 +8045,6 @@
githubId = 6803717;
name = "Ilya Elenskiy";
};
- evils = {
- email = "evils.devils@protonmail.com";
- matrix = "@evils:nixos.dev";
- github = "evils";
- githubId = 30512529;
- name = "Evils";
- };
evris99 = {
name = "Evrymachos Koukoumakas";
github = "evris99";
@@ -10347,6 +10334,11 @@
github = "higebu";
githubId = 733288;
};
+ higherorderlogic = {
+ name = "Hol";
+ github = "HigherOrderLogic";
+ githubId = 73709188;
+ };
hirenashah = {
email = "hiren@hiren.io";
github = "hirenashah";
@@ -11082,6 +11074,13 @@
githubId = 54999;
name = "Ariel Nunez";
};
+ insipx = {
+ email = "github@andrewplaza.dev";
+ github = "insipx";
+ githubId = 6452260;
+ name = "Andrew Plaza";
+ keys = [ { fingerprint = "843D 72A9 EB79 A869 2C58 5B3A E773 8A7A 0F5C DB89"; } ];
+ };
Intuinewin = {
email = "antoinelabarussias@gmail.com";
github = "Intuinewin";
@@ -14160,14 +14159,6 @@
keys = [ { fingerprint = "5A9A 1C9B 2369 8049 3B48 CF5B 81A1 5409 4816 2372"; } ];
};
- l-as = {
- email = "las@protonmail.ch";
- matrix = "@Las:matrix.org";
- github = "L-as";
- githubId = 22075344;
- keys = [ { fingerprint = "A093 EA17 F450 D4D1 60A0 1194 AC45 8A7D 1087 D025"; } ];
- name = "Las Safin";
- };
l0b0 = {
email = "victor@engmark.name";
github = "l0b0";
@@ -15899,6 +15890,12 @@
githubId = 33522919;
name = "Marshall Arruda";
};
+ mart-mihkel = {
+ email = "mart.mihkel.aun@gmail.com";
+ github = "mart-mihkel";
+ githubId = 73405010;
+ name = "Mart-Mihkel Aun";
+ };
martijnvermaat = {
email = "martijn@vermaat.name";
github = "martijnvermaat";
@@ -21661,6 +21658,11 @@
githubId = 77415970;
name = "Redhawk";
};
+ redianthus = {
+ github = "redianthus";
+ githubId = 16472988;
+ name = "redianthus";
+ };
redlonghead = {
email = "git@beardit.net";
github = "Redlonghead";
@@ -26255,6 +26257,12 @@
githubId = 74688871;
name = "Tochukwu Ahanonu";
};
+ tom94 = {
+ email = "nix@94.me";
+ github = "Tom94";
+ githubId = 4923655;
+ name = "Thomas Müller";
+ };
tomahna = {
email = "kevin.rauscher@tomahna.fr";
github = "Tomahna";
diff --git a/maintainers/scripts/README.md b/maintainers/scripts/README.md
index 81b2873788a4..6ae6cb851bc4 100644
--- a/maintainers/scripts/README.md
+++ b/maintainers/scripts/README.md
@@ -1,7 +1,7 @@
# Maintainer scripts
This folder contains various executable scripts for nixpkgs maintainers, and supporting data or nixlang files as needed.
-These scripts generally aren't a stable interface and may changed or be removed.
+These scripts generally aren't a stable interface and may be changed or be removed.
What follows is a (very incomplete) overview of available scripts.
diff --git a/maintainers/scripts/bootstrap-files/README.md b/maintainers/scripts/bootstrap-files/README.md
index af8181c2c3ac..9abc4402a414 100644
--- a/maintainers/scripts/bootstrap-files/README.md
+++ b/maintainers/scripts/bootstrap-files/README.md
@@ -1,6 +1,6 @@
# Bootstrap files
-Currently `nixpkgs` builds most of it's packages using bootstrap seed binaries (without the reliance on external inputs):
+Currently `nixpkgs` builds most of its packages using bootstrap seed binaries (without the reliance on external inputs):
- `bootstrap-tools`: an archive with the compiler toolchain and other helper tools enough to build the rest of the `nixpkgs`.
- initial binaries needed to unpack `bootstrap-tools.*`.
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 9315a5de7c33..fc76f5cd9ffa 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -45,6 +45,17 @@ with lib.maintainers;
enableFeatureFreezePing = true;
};
+ agda = {
+ members = [
+ alexarice
+ ncfavier
+ phijor
+ turion
+ ];
+ scope = "Maintain Agda-related packages and modules.";
+ shortName = "Agda";
+ };
+
android = {
members = [
adrian-gierakowski
@@ -1125,7 +1136,7 @@ with lib.maintainers;
LunNova
mschwaig
];
- githubTeams = [ "rocm-maintainers" ];
+ githubTeams = [ "rocm" ];
scope = "Maintain ROCm and related packages.";
shortName = "ROCm";
};
diff --git a/nixos/doc/manual/development/freeform-modules.section.md b/nixos/doc/manual/development/freeform-modules.section.md
index 17c37dae7e51..2df444b3e2bd 100644
--- a/nixos/doc/manual/development/freeform-modules.section.md
+++ b/nixos/doc/manual/development/freeform-modules.section.md
@@ -50,7 +50,7 @@ And the following shows what such a module then allows
# Not a declared option, but the freeform type allows this
settings.logLevel = "debug";
- # Not allowed because the the freeform type only allows strings
+ # Not allowed because the freeform type only allows strings
# settings.enable = true;
# Allowed because there is a port option declared
diff --git a/nixos/doc/manual/installation/installing.chapter.md b/nixos/doc/manual/installation/installing.chapter.md
index 4ae8bf494848..402c285d4456 100644
--- a/nixos/doc/manual/installation/installing.chapter.md
+++ b/nixos/doc/manual/installation/installing.chapter.md
@@ -254,7 +254,7 @@ update /etc/fstab.
# parted /dev/sda -- mklabel msdos
```
-2. Add the *root* partition. This will fill the the disk except for the
+2. Add the *root* partition. This will fill the disk except for the
end part, where the swap will live.
```ShellSession
diff --git a/nixos/doc/manual/manual.md b/nixos/doc/manual/manual.md
index 8cb766eeccf6..4fc39ffc785b 100644
--- a/nixos/doc/manual/manual.md
+++ b/nixos/doc/manual/manual.md
@@ -7,11 +7,11 @@
the manual structure extends the nixpkgs commonmark further with include
blocks to allow better organization of input text. there are six types of
include blocks: preface, parts, chapters, sections, appendix, and options.
- each type except `options`` corresponds to the docbook elements of (roughly)
+ each type except `options` corresponds to the docbook elements of (roughly)
the same name, and can itself can further include blocks to denote its
substructure.
- non-`options`` include blocks are fenced code blocks that list a number of
+ non-`options` include blocks are fenced code blocks that list a number of
files to include, in the form
```{=include=}
diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json
index e2303ad270a7..3ddfa1b1c385 100644
--- a/nixos/doc/manual/redirects.json
+++ b/nixos/doc/manual/redirects.json
@@ -1,4 +1,28 @@
{
+ "module-security-tpm2": [
+ "index.html#module-security-tpm2"
+ ],
+ "module-security-tpm2-introduction": [
+ "index.html#module-security-tpm2-introduction"
+ ],
+ "module-security-tpm2-introduction-hli": [
+ "index.html#module-security-tpm2-introduction-hli"
+ ],
+ "module-security-tpm2-introduction-resourcemanagers": [
+ "index.html#module-security-tpm2-introduction-resourcemanagers"
+ ],
+ "module-security-tpm2-introduction-softwarearchitecture": [
+ "index.html#module-security-tpm2-introduction-softwarearchitecture"
+ ],
+ "module-security-tpm2-introduction-softwarearchitecture-tcti": [
+ "index.html#module-security-tpm2-introduction-softwarearchitecture-tcti"
+ ],
+ "module-security-tpm2-nixosmodule": [
+ "index.html#module-security-tpm2-nixosmodule"
+ ],
+ "module-security-tpm2-nixosmodule-fapiconfiguration": [
+ "index.html#module-security-tpm2-nixosmodule-fapiconfiguration"
+ ],
"module-boot-plymouth-tpm2-totp": [
"index.html#module-boot-plymouth-tpm2-totp"
],
diff --git a/nixos/doc/manual/release-notes/rl-1603.section.md b/nixos/doc/manual/release-notes/rl-1603.section.md
index ffc08fc96241..cb0da1f8aec9 100644
--- a/nixos/doc/manual/release-notes/rl-1603.section.md
+++ b/nixos/doc/manual/release-notes/rl-1603.section.md
@@ -217,7 +217,7 @@ When upgrading from a previous release, please be aware of the following incompa
- `services.udev.extraRules` option now writes rules to `99-local.rules` instead of `10-local.rules`. This makes all the user rules apply after others, so their results wouldn't be overridden by anything else.
-- Large parts of the `services.gitlab` module has been been rewritten. There are new configuration options available. The `stateDir` option was renamned to `statePath` and the `satellitesDir` option was removed. Please review the currently available options.
+- Large parts of the `services.gitlab` module have been rewritten. There are new configuration options available. The `stateDir` option was renamed to `statePath` and the `satellitesDir` option was removed. Please review the currently available options.
- The option `services.nsd.zones..data` no longer interpret the dollar sign (\$) as a shell variable, as such it should not be escaped anymore. Thus the following zone data:
diff --git a/nixos/doc/manual/release-notes/rl-1709.section.md b/nixos/doc/manual/release-notes/rl-1709.section.md
index 5895af018982..bbbb675a8e5a 100644
--- a/nixos/doc/manual/release-notes/rl-1709.section.md
+++ b/nixos/doc/manual/release-notes/rl-1709.section.md
@@ -33,7 +33,7 @@ In addition to numerous new and upgraded packages, this release has the followin
Options to configure `resolver` options and `upstream` blocks have been introduced. See their information for further details.
- The `port` option has been replaced by a more generic `listen` option which makes it possible to specify multiple addresses, ports and SSL configs dependant on the new SSL handling mentioned above.
+ The `port` option has been replaced by a more generic `listen` option which makes it possible to specify multiple addresses, ports and SSL configs dependent on the new SSL handling mentioned above.
## New Services {#sec-release-17.09-new-services}
diff --git a/nixos/doc/manual/release-notes/rl-2003.section.md b/nixos/doc/manual/release-notes/rl-2003.section.md
index f9dee1b50f10..65d03c39f21e 100644
--- a/nixos/doc/manual/release-notes/rl-2003.section.md
+++ b/nixos/doc/manual/release-notes/rl-2003.section.md
@@ -59,7 +59,7 @@ In addition to numerous new and upgraded packages, this release has the followin
{ services.xserver.displayManager.defaultSession = "xfce+icewm"; }
```
-- The testing driver implementation in NixOS is now in Python `make-test-python.nix`. This was done by Jacek Galowicz ([\@tfc](https://github.com/tfc)), and with the collaboration of Julian Stecklina ([\@blitz](https://github.com/blitz)) and Jana Traue ([\@jtraue](https://github.com/jtraue)). All documentation has been updated to use this testing driver, and a vast majority of the 286 tests in NixOS were ported to python driver. In 20.09 the Perl driver implementation, `make-test.nix`, is slated for removal. This should give users of the NixOS integration framework a transitory period to rewrite their tests to use the Python implementation. Users of the Perl driver will see this warning everytime they use it:
+- The testing driver implementation in NixOS is now in Python `make-test-python.nix`. This was done by Jacek Galowicz ([\@tfc](https://github.com/tfc)), and with the collaboration of Julian Stecklina ([\@blitz](https://github.com/blitz)) and Jana Traue ([\@jtraue](https://github.com/jtraue)). All documentation has been updated to use this testing driver, and a vast majority of the 286 tests in NixOS were ported to python driver. In 20.09 the Perl driver implementation, `make-test.nix`, is slated for removal. This should give users of the NixOS integration framework a transitory period to rewrite their tests to use the Python implementation. Users of the Perl driver will see this warning every time they use it:
```ShellSession
$ warning: Perl VM tests are deprecated and will be removed for 20.09.
diff --git a/nixos/doc/manual/release-notes/rl-2009.section.md b/nixos/doc/manual/release-notes/rl-2009.section.md
index cfcaaed390c0..1515c313258b 100644
--- a/nixos/doc/manual/release-notes/rl-2009.section.md
+++ b/nixos/doc/manual/release-notes/rl-2009.section.md
@@ -580,7 +580,7 @@ When upgrading from a previous release, please be aware of the following incompa
Please note that Rust packages utilizing a custom build/install procedure (e.g. by using a `Makefile`) or test suites that rely on the structure of the `target/` directory may break due to those assumptions. For further information, please read the Rust section in the Nixpkgs manual.
-- The cc- and binutils-wrapper's "infix salt" and `_BUILD_` and `_TARGET_` user infixes have been replaced with with a "suffix salt" and suffixes and `_FOR_BUILD` and `_FOR_TARGET`. This matches the autotools convention for env vars which standard for these things, making interfacing with other tools easier.
+- The cc- and binutils-wrapper's "infix salt" and `_BUILD_` and `_TARGET_` user infixes have been replaced with a "suffix salt" and suffixes and `_FOR_BUILD` and `_FOR_TARGET`. This matches the autotools convention for env vars which standard for these things, making interfacing with other tools easier.
- Additional Git documentation (HTML and text files) is now available via the `git-doc` package.
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index 52f05ce45403..0cecbad5a4af 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -754,7 +754,7 @@ In addition to numerous new and upgraded packages, this release has the followin
Similarly [virtualisation.vmVariantWithBootloader](#opt-virtualisation.vmVariantWithBootLoader) was added.
- The configuration portion of the `nix-daemon` module has been reworked and exposed as [nix.settings](options.html#opt-nix-settings):
- * Legacy options have been mapped to the corresponding options under under [nix.settings](options.html#opt-nix.settings) and will be deprecated when NixOS 21.11 reaches end of life.
+ * Legacy options have been mapped to the corresponding options under [nix.settings](options.html#opt-nix.settings) and will be deprecated when NixOS 21.11 reaches end of life.
* [nix.buildMachines.publicHostKey](options.html#opt-nix.buildMachines.publicHostKey) has been added.
- [`kops`](https://kops.sigs.k8s.io) defaults to 1.23.2, which will enable [Instance Metadata Service Version 2](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-service.html) and require tokens on new clusters with Kubernetes >= 1.22. This will increase security by default, but may break some types of workloads. The default behaviour for `spec.kubeDNS.nodeLocalDNS.forwardToKubeDNS` has changed from `true` to `false`. Cilium now has `disable-cnp-status-updates: true` by default. Set this to false if you rely on the CiliumNetworkPolicy status fields. Support for Kubernetes 1.17, the Lyft CNI, Weave CNI on Kubernetes >= 1.23, CentOS 7 and 8, Debian 9, RHEL 7, and Ubuntu 16.05 (Xenial) has been removed. See the [1.22 release notes](https://kops.sigs.k8s.io/releases/1.22-notes/) and [1.23 release notes](https://kops.sigs.k8s.io/releases/1.23-notes/) for more details, including other significant changes.
diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md
index db63fd1ce2bf..4e7004dd0155 100644
--- a/nixos/doc/manual/release-notes/rl-2211.section.md
+++ b/nixos/doc/manual/release-notes/rl-2211.section.md
@@ -106,7 +106,7 @@ In addition to numerous new and upgraded packages, this release includes the fol
been removed. Please convert any uses to
[services.logrotate.settings](#opt-services.logrotate.settings) instead.
-- The `isPowerPC` predicate, found on `platform` attrsets (`hostPlatform`, `buildPlatform`, `targetPlatform`, etc) has been removed in order to reduce confusion. The predicate was was defined such that it matches only the 32-bit big-endian members of the POWER/PowerPC family, despite having a name which would imply a broader set of systems. If you were using this predicate, you can replace `foo.isPowerPC` with `(with foo; isPower && is32bit && isBigEndian)`.
+- The `isPowerPC` predicate, found on `platform` attrsets (`hostPlatform`, `buildPlatform`, `targetPlatform`, etc) has been removed in order to reduce confusion. The predicate was defined such that it matches only the 32-bit big-endian members of the POWER/PowerPC family, despite having a name which would imply a broader set of systems. If you were using this predicate, you can replace `foo.isPowerPC` with `(with foo; isPower && is32bit && isBigEndian)`.
- The `fetchgit` fetcher now uses [cone mode](https://www.git-scm.com/docs/git-sparse-checkout/2.37.0#_internalscone_mode_handling) by default for sparse checkouts. [Non-cone mode](https://www.git-scm.com/docs/git-sparse-checkout/2.37.0#_internalsnon_cone_problems) can be enabled by passing `nonConeMode = true`, but note that non-cone mode is deprecated and this option may be removed alongside a future Git update without notice.
diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md
index 006170c2ee53..b88399ba8da4 100644
--- a/nixos/doc/manual/release-notes/rl-2311.section.md
+++ b/nixos/doc/manual/release-notes/rl-2311.section.md
@@ -248,7 +248,7 @@ Make sure to also check the many updates in the [Nixpkgs library](#sec-release-2
attribute values of `phpOptions` are still defaults, these can be overridden
as shown here.
- To override all of the options (including including `upload_max_filesize`,
+ To override all of the options (including `upload_max_filesize`,
`post_max_size` and `memory_limit` which all point to
[`services.nextcloud.maxUploadSize`](#opt-services.nextcloud.maxUploadSize)
by default) can be done like this:
diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index f0fac1194f2f..76b414a871ca 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -1066,7 +1066,7 @@ Module System:
### Deprecations {#sec-release-24.11-lib-deprecations}
-- [`lib.options.mkPackageOptionMD`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.options.mkPackageOptionMD) is now obsolete; use the identical [`lib.options.mkPackageOption`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.options.mkPackageOption) instead.
+- `lib.options.mkPackageOptionMD` is now obsolete; use the identical [`lib.options.mkPackageOption`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.options.mkPackageOption) instead.
- `lib.misc.mapAttrsFlatten` is now formally deprecated and will be removed in future releases; use the identical [`lib.attrsets.mapAttrsToList`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.attrsets.mapAttrsToList) instead.
- `lib.isInOldestRelease`: Renamed to [`oldestSupportedReleaseIsAtLeast`](https://nixos.org/manual/nixpkgs/unstable/#function-library-lib.trivial.oldestSupportedReleaseIsAtLeast) and deprecated.
diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index cf835d34fba9..feed83cfc142 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -76,6 +76,8 @@
- [yubikey-manager](https://github.com/Yubico/yubikey-manager), a tool for configuring YubiKey devices. Available as [programs.yubikey-manager](#opt-programs.yubikey-manager.enable).
+- [Linkwarden](https://linkwarden.app/) a self-hosted collaborative bookmark manager to collect, read, annotate, and fully preserve what matters, all in one place. Available as [services.linkwarden](#opt-services.linkwarden.enable).
+
- [Draupnir](https://github.com/the-draupnir-project/draupnir), a Matrix moderation bot. Available as [services.draupnir](#opt-services.draupnir.enable).
- [Pangolin](https://github.com/fosrl/pangolin), a tunneled reverse proxy server with access control. Available as [services.pangolin](#opt-services.pangolin.enable).
@@ -140,6 +142,8 @@
- [Sshwifty](https://github.com/nirui/sshwifty), a Telnet and SSH client for your browser. Available as [services.sshwifty](#opt-services.sshwifty.enable).
+- Added `nixos-init`, a Rust-based bashless initialization system for systemd initrd. This allows to build NixOS systems without any interpreter. Enable via `system.nixos-init.enable = true;`.
+
- [nvme-rs](https://github.com/liberodark/nvme-rs), NVMe monitoring [services.nvme-rs](#opt-services.nvme-rs.enable).
- [ringboard](https://github.com/SUPERCILEX/clipboard-history), a fast, efficient, and composable clipboard manager for Linux. Available for x11 as [services.ringboard](#opt-services.ringboard.x11.enable) and for wayland as [services.ringboard](#opt-services.ringboard.wayland.enable).
@@ -222,6 +226,8 @@
- The `services.mysql` module now restarts the database `on-abnormal`, which means that it now will be restarted in certain situations, it wasn't before. For example an OOM-kill.
+- The `services.tt-rss` module and package have been removed as upstream development ceased on 2025-11-01, and the source is no longer available officially.
+
- The `services.siproxd` module has been removed as `siproxd` is unmaintained and broken with libosip 5.x.
- `services.tor.torsocks.enable` no longer defaults to true if Tor and Tor client functionality is enabled.
@@ -253,6 +259,8 @@
- `i18n.inputMethod.fcitx5.plasma6Support` has been removed because qt6 is the only one used for fcitx5-configtool now.
+- `firezone` has changed how the `Everyone` group behaves. Service Accounts are no longer considered part of `Everyone`.
+
- The `boot.readOnlyNixStore` has been removed. Control over bind mount options on `/nix/store` is now offered by the `boot.nixStoreMountOpts` option.
- The Postfix module has been updated and likely requires configuration changes:
diff --git a/nixos/lib/systemd-lib.nix b/nixos/lib/systemd-lib.nix
index 63b965f21d69..2d5dbdfcbf36 100644
--- a/nixos/lib/systemd-lib.nix
+++ b/nixos/lib/systemd-lib.nix
@@ -349,6 +349,15 @@ rec {
)
);
+ settingsToSections =
+ settings:
+ concatStringsSep "\n" (
+ mapAttrsToList (section_name: section_attrs: ''
+ [${section_name}]
+ ${attrsToSection section_attrs}
+ '') settings
+ );
+
generateUnits =
{
allowCollisions ? true,
@@ -724,10 +733,7 @@ rec {
commonUnitText =
def: lines:
- ''
- [Unit]
- ${attrsToSection def.unitConfig}
- ''
+ (settingsToSections { Unit = def.unitConfig; })
+ lines
+ optionalString (def.wantedBy != [ ]) ''
@@ -745,10 +751,7 @@ rec {
enable
overrideStrategy
;
- text = ''
- [Unit]
- ${attrsToSection def.unitConfig}
- '';
+ text = (settingsToSections { Unit = def.unitConfig; });
};
serviceToUnit = def: {
@@ -832,10 +835,9 @@ rec {
enable
overrideStrategy
;
- text = commonUnitText def ''
- [Timer]
- ${attrsToSection def.timerConfig}
- '';
+ text = commonUnitText def (settingsToSections {
+ Timer = def.timerConfig;
+ });
};
pathToUnit = def: {
@@ -848,10 +850,9 @@ rec {
enable
overrideStrategy
;
- text = commonUnitText def ''
- [Path]
- ${attrsToSection def.pathConfig}
- '';
+ text = commonUnitText def (settingsToSections {
+ Path = def.pathConfig;
+ });
};
mountToUnit = def: {
@@ -864,10 +865,9 @@ rec {
enable
overrideStrategy
;
- text = commonUnitText def ''
- [Mount]
- ${attrsToSection def.mountConfig}
- '';
+ text = commonUnitText def (settingsToSections {
+ Mount = def.mountConfig;
+ });
};
automountToUnit = def: {
@@ -880,10 +880,9 @@ rec {
enable
overrideStrategy
;
- text = commonUnitText def ''
- [Automount]
- ${attrsToSection def.automountConfig}
- '';
+ text = commonUnitText def (settingsToSections {
+ Automount = def.automountConfig;
+ });
};
sliceToUnit = def: {
@@ -896,10 +895,9 @@ rec {
enable
overrideStrategy
;
- text = commonUnitText def ''
- [Slice]
- ${attrsToSection def.sliceConfig}
- '';
+ text = commonUnitText def (settingsToSections {
+ Slice = def.sliceConfig;
+ });
};
# Create a directory that contains systemd definition files from an attrset
diff --git a/nixos/lib/test-driver/src/test_driver/machine/__init__.py b/nixos/lib/test-driver/src/test_driver/machine/__init__.py
index 6f0985479803..5f17006f90da 100644
--- a/nixos/lib/test-driver/src/test_driver/machine/__init__.py
+++ b/nixos/lib/test-driver/src/test_driver/machine/__init__.py
@@ -822,9 +822,8 @@ class Machine:
while True:
chunk = self.shell.recv(1024)
- # No need to print empty strings, it means we are waiting.
if len(chunk) == 0:
- continue
+ raise RuntimeError("Shell disconnected")
self.log(f"Guest shell says: {chunk!r}")
# NOTE: for this to work, nothing must be printed after this line!
if b"Spawning backdoor root shell..." in chunk:
diff --git a/nixos/modules/config/malloc.nix b/nixos/modules/config/malloc.nix
index bc02fa5010d3..8959a99f7b7b 100644
--- a/nixos/modules/config/malloc.nix
+++ b/nixos/modules/config/malloc.nix
@@ -52,7 +52,7 @@ let
or (throw "scudo not supported on ${pkgs.stdenv.hostPlatform.system}");
in
{
- libPath = "${pkgs.llvmPackages.compiler-rt}/lib/linux/libclang_rt.scudo-${systemPlatform}.so";
+ libPath = "${pkgs.llvmPackages.compiler-rt}/lib/linux/libclang_rt.scudo_standalone-${systemPlatform}.so";
description = ''
A user-mode allocator based on LLVM Sanitizer’s CombinedAllocator,
which aims at providing additional mitigations against heap based
diff --git a/nixos/modules/installer/netboot/netboot.nix b/nixos/modules/installer/netboot/netboot.nix
index 052d3ea50fc0..a4d9664a5531 100644
--- a/nixos/modules/installer/netboot/netboot.nix
+++ b/nixos/modules/installer/netboot/netboot.nix
@@ -96,7 +96,7 @@ with lib;
# Create the initrd
system.build.netbootRamdisk = pkgs.makeInitrdNG {
- inherit (config.boot.initrd) compressor;
+ inherit (config.boot.initrd) compressor compressorArgs;
prepend = [ "${config.system.build.initialRamdisk}/initrd" ];
contents = [
diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix
index d4caef1a09ab..f6f99b6218d2 100644
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,8 +1,8 @@
{
- x86_64-linux = "/nix/store/0bvxg6fr61zrlhi93azhp8yfhb5rcrs9-nix-2.28.5";
- i686-linux = "/nix/store/m5na49mxl4xpcs3xh086s5v08jqjhbmb-nix-2.28.5";
- aarch64-linux = "/nix/store/95rhdhjfwbi7ilwy5j0knj1852p7x6c6-nix-2.28.5";
- riscv64-linux = "/nix/store/cqiiv36c773023p6lp9h4ff57fjlzisk-nix-riscv64-unknown-linux-gnu-2.28.5";
- x86_64-darwin = "/nix/store/xiw5636h616yi3balx96pmdk6b052rhk-nix-2.28.5";
- aarch64-darwin = "/nix/store/sax8chv80d9fy4s0y3ahsr9y4kc2f0ib-nix-2.28.5";
+ x86_64-linux = "/nix/store/x30lnlgk1s16rynrfslbf8phr6h6rqf2-nix-2.31.2";
+ i686-linux = "/nix/store/ix94q6rrdg6cr4893cjpzdbmibhlm0dv-nix-2.31.2";
+ aarch64-linux = "/nix/store/xnybj9lk0kwvmr2va253avanq7m3cpyg-nix-2.31.2";
+ riscv64-linux = "/nix/store/33as1vqp8mq36nr5bb5gr7ziw1nf4q1v-nix-riscv64-unknown-linux-gnu-2.31.2";
+ x86_64-darwin = "/nix/store/b9dvary8rcljj7ajv1x64hwwch4cvyvp-nix-2.31.2";
+ aarch64-darwin = "/nix/store/lvv1j8qbrvlnl3aagcjrhf42d458zgb5-nix-2.31.2";
}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 3fcad7ff745d..5b285ee24580 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1628,6 +1628,7 @@
./services/web-apps/lemmy.nix
./services/web-apps/libretranslate.nix
./services/web-apps/limesurvey.nix
+ ./services/web-apps/linkwarden.nix
./services/web-apps/mainsail.nix
./services/web-apps/mastodon.nix
./services/web-apps/matomo.nix
@@ -1705,7 +1706,6 @@
./services/web-apps/suwayomi-server.nix
./services/web-apps/szurubooru.nix
./services/web-apps/trilium.nix
- ./services/web-apps/tt-rss.nix
./services/web-apps/umami.nix
./services/web-apps/vikunja.nix
./services/web-apps/wakapi.nix
diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix
index 06e5644f76e9..e12eb19b13d8 100644
--- a/nixos/modules/profiles/hardened.nix
+++ b/nixos/modules/profiles/hardened.nix
@@ -39,7 +39,7 @@ in
nix.settings.allowed-users = mkDefault [ "@users" ];
environment.memoryAllocator.provider = mkDefault "scudo";
- environment.variables.SCUDO_OPTIONS = mkDefault "ZeroContents=1";
+ environment.variables.SCUDO_OPTIONS = mkDefault "zero_contents=true";
security.lockKernelModules = mkDefault true;
diff --git a/nixos/modules/programs/gpu-screen-recorder.nix b/nixos/modules/programs/gpu-screen-recorder.nix
index 156123de7a38..3b54d5d2ec08 100644
--- a/nixos/modules/programs/gpu-screen-recorder.nix
+++ b/nixos/modules/programs/gpu-screen-recorder.nix
@@ -32,13 +32,7 @@ in
owner = "root";
group = "root";
capabilities = "cap_sys_admin+ep";
- source = "${package}/bin/gsr-kms-server";
- };
- security.wrappers."gpu-screen-recorder" = {
- owner = "root";
- group = "root";
- capabilities = "cap_sys_nice+ep";
- source = "${package}/bin/gpu-screen-recorder";
+ source = lib.getExe' package "gsr-kms-server";
};
};
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index e67c2a3726a7..a4ed680bd552 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -266,6 +266,9 @@ in
(mkRemovedOptionModule [ "services" "sourcehut" ] ''
The sourcehut packages and the corresponding module have been removed due to being broken and unmaintained.
'')
+ (mkRemovedOptionModule [ "services" "tt-rss" ] ''
+ The tt-rss package and module have been removed, since upstream development ceased 2025-11-01 and the source is no longer available officially.
+ '')
(mkRemovedOptionModule [ "services" "tvheadend" ]
"The tvheadend package and the corresponding module have been removed as nobody was willing to maintain them and they were stuck on an unmaintained version that required FFmpeg 4; please see https://github.com/NixOS/nixpkgs/pull/332259 if you are interested in maintaining a newer version."
)
diff --git a/nixos/modules/security/audit.nix b/nixos/modules/security/audit.nix
index f50c465fde5b..849ff57c662c 100644
--- a/nixos/modules/security/audit.nix
+++ b/nixos/modules/security/audit.nix
@@ -95,7 +95,10 @@ in
environment.systemPackages = [ pkgs.audit ];
- systemd.services.audit-rules = {
+ # upstream contains a audit-rules.service, which uses augenrules.
+ # That script does not handle cleanup correctly and insists on loading from /etc/audit.
+ # So, instead we have our own service for loading rules.
+ systemd.services.audit-rules-nixos = {
description = "Load Audit Rules";
wantedBy = [ "sysinit.target" ];
before = [
diff --git a/nixos/modules/security/auditd.nix b/nixos/modules/security/auditd.nix
index 036ce9c01cae..bbe22fa6a5bc 100644
--- a/nixos/modules/security/auditd.nix
+++ b/nixos/modules/security/auditd.nix
@@ -229,7 +229,7 @@ in
path = lib.getExe' pkgs.audit "audisp-af_unix";
args = [
"0640"
- "/var/run/audispd_events"
+ "/run/audit/audispd_events"
"string"
];
format = "binary";
@@ -256,41 +256,23 @@ in
};
};
- systemd.services.auditd = {
- description = "Security Audit Logging Service";
- documentation = [ "man:auditd(8)" ];
- wantedBy = [ "sysinit.target" ];
- after = [
- "local-fs.target"
- "systemd-tmpfiles-setup.service"
- ];
- before = [
- "sysinit.target"
- "shutdown.target"
- ];
- conflicts = [ "shutdown.target" ];
+ systemd.packages = [ pkgs.audit.out ];
- unitConfig = {
- DefaultDependencies = false;
- RefuseManualStop = true;
- ConditionVirtualization = "!container";
- ConditionKernelCommandLine = [
- "!audit=0"
- "!audit=off"
- ];
- };
+ systemd.services.auditd = {
+ wantedBy = [ "multi-user.target" ];
serviceConfig = {
+ # https://github.com/linux-audit/audit-userspace/pull/501
+ # set up audit directories using systemd service instead of tmpfiles
LogsDirectory = "audit";
- ExecStart = "${pkgs.audit}/bin/auditd -l -n -s nochange";
- Restart = "on-failure";
- # Do not restart for intentional exits. See EXIT CODES section in auditd(8).
- RestartPreventExitStatus = "2 4 6";
-
- # Upstream hardening settings
- MemoryDenyWriteExecute = true;
- LockPersonality = true;
- RestrictRealtime = true;
+ LogsDirectoryMode = "0700";
+ RuntimeDirectory = "audit";
+ RuntimeDirectoryMode = "0755";
+ ExecStart = [
+ # the upstream unit does not allow symlinks, so clear and rewrite the ExecStart
+ ""
+ "${lib.getExe' pkgs.audit "auditd"} -l -s nochange"
+ ];
};
};
};
diff --git a/nixos/modules/security/tpm2.md b/nixos/modules/security/tpm2.md
new file mode 100644
index 000000000000..4fff715ab039
--- /dev/null
+++ b/nixos/modules/security/tpm2.md
@@ -0,0 +1,116 @@
+# TPM2 {#module-security-tpm2}
+
+## Introduction {#module-security-tpm2-introduction}
+
+The `tpm2` module allows configuration of a number of programs and services associated with the use of a Trusted Platform Module (TPM).
+A TPM is a hardware or firmware device that can be useful for security purposes.
+One thing you can do with a TPM is to instruct it to create cryptographic keys which reside inside the TPM hardware, and which cannot be exported, not even to the computer hosting the TPM.
+To make those keys useful, the TPM also exposes operations that you can perform using the keys.
+So for instance, you can instruct the TPM to encrypt a piece of data using a cryptographic key protected by the TPM, or cryptographically sign a piece of data using a cryptographic key protected by the TPM.
+
+A key stored directly on the TPM is called a resident key.
+Because the TPM has very limited storage, it's common to work with another kind of key, called a wrapped key.
+When you instruct the TPM to create a wrapped key, it creates a new key, encrypts the secret material using a key stored directly on the TPM, and returns the encrypted secret material along with some metadata to the user, in a file called the key context.
+The TPM also supports operations where you provide it with the key context along with whatever you want to encrypt or sign, and it will unwrap the key and do the operation.
+
+Another important concept is attestation.
+The idea is that the user of a TPM may want to prove to a third party that a particular key is protected by the TPM hardware.
+This is typically done by the manufacturer or distributor of the TPM hardware prior to distribution to the end user, and involves creating a resident key on the TPM, along with a certificate for that key signed by the manufacturer's or distributor's key.
+The user can then provide the certificate to the third party along with the public portion of the resident key to prove that the key is protected by the TPM.
+
+Most physical TPMs come with one resident key that also has a certificate.
+This key is known as the Endorsement Key, or EK, and the certificate is known as the EK Certificate.
+For applications where you want to be able to prove properties of a key to third parties, you will want a key that is wrapped by the EK.
+Such keys are described as residing in the Endorsement Hierarchy.
+If you do not require attestation, you will generally wrap your keys with the storage root key (SRK).
+Such keys are described as residing in the Storage Hierarchy, or the Owners Hierarchy.
+
+### Software Architecture {#module-security-tpm2-introduction-softwarearchitecture}
+
+#### TCTI {#module-security-tpm2-introduction-softwarearchitecture-tcti}
+
+TPM hardware uses a binary protocol called the TPM Command Transmission Interface, or TCTI, to communicate with the host computer.
+The TPM kernel driver exposes a character device, typically `/dev/tpm0`, and one way of interacting with the TPM is to read and write the TCTI protocol to that device.
+Of course doing that directly in your own code would be quite laborious, and there are a number of software libraries and programs that can help you do it.
+The lowest level of these is C library called ESAPI, located inside the `tpm2-tss` package.
+
+#### Resource Managers {#module-security-tpm2-introduction-resourcemanagers}
+
+Another thing you need to know is that the TPM is a stateful device: operations can affect its state, and it's common to perform a sequence of operations where early operations modify the state, and later operations depend on that state to do other operations.
+For instance, you may load a wrapped key to a particular storage location, then do an encryption operation using that loaded key.
+This makes multi-user access challenging, as two users may modify the state in incompatible ways.
+The solution to this is to use a resource manager.
+The resource manager can handle multiple different sessions, keep track of the accumulated state of each session, and load and unload state as necessary to interleave multiple different sessions.
+There are two resource managers available in the software stack surrounding the TPM: a kernel-space resource manager, and a user-space resource manager.
+
+The kernel-space resource manager is exposed via the tpmrm subsystem.
+You can see more info about that subsystem in the sysfs at `/sys/class/tpmrm`.
+In a typical system you will also see a `/dev/tpmrm0` device, but it is possible to give it a different name.
+
+The user-space resource manager is contained in the `tpm2-abrmd` package.
+It is also frequently referred to as `tabrmd`.
+
+Both resource managers are designed so that they use the same TCTI protocol as a raw tpm device.
+For the kernel RM, you access it via a character device (typically `/dev/tpmrm0`).
+For the userspace RM, you access it over DBUS.
+It is common to refer to a component that is on the "receiving" or "server" side of the TCTI protocol as "a TCTI".
+So the raw tpm character device, the kernel RM, and `tabrmd` are all "TCTIs".
+
+The ESAPI library speaks the client side of the TCTI protocol, and can be connected to any server TCTI.
+All of the other libraries or programs that work with TPM all use ESAPI under the hood, and so a common characteristic among all these libraries is that you will find you need to configure them in some way as to which TCTI they should be talking to.
+
+#### Higher Level Interfaces {#module-security-tpm2-introduction-hli}
+
+As alluded to previously, there are a number of ways of speaking the client side TCTI that all amount to wrappers around ESAPI. They include:
+* FAPI - a C library with an easier API for managing cryptographic algorithms and keys, contained in the `tpm2-tss` package.
+* pytss - a python library that wraps ESAPI and FAPI. Contained in the `tpm2-pytss` package.
+* tpm2 tools - a command line interface exposed through the programs `tpm2`, which roughly corresponds to the ESAPI, and `tss2` which roughly corresponds to FAPI. Contained in the `tpm2-tools` package.
+* pkcs11 - libraries that wrap TPM functionality into a pkcs11 interface. There are variants for the ESAPI, and the FAPI. See the `tpm2-pkcs11`, `tpm2-pkcs11-esapi` and `tpm2-pkcs11-fapi` packages.
+* TPM2 OpenSSL - an OpenSSL provider allowing openssl to use the TPM as its cryptographic engine.
+
+
+## Using the tpm2 NixOS module {#module-security-tpm2-nixosmodule}
+
+A typical configuration is:
+```
+security.tpm2 = {
+ enable = true;
+ abrmd.enable = true;
+ pkcs11.enable = true;
+
+ tctiEnvironment.enable = true;
+ tctiEnvironment.interface = "tabrmd";
+}
+```
+`enable = true;` is required for any tpm functionality other than the raw character device and kernel resource manager to be available.
+
+`abrmd.enable = true;` causes the tpm2-abrmd program (the user-space resource manager) to run as a systemd service.
+Generally you want this because the user-space resource manager gets more frequent updates than the kernel-space RM, and there aren't any kernel RM features that are unavailable in the user-space RM.
+
+`pkcs11.enable = true;` makes the PKCS11 tool and libraries available in the system path.
+Generally you want this because it's unlikely to cause problems and it's required by one of the more common TPM use cases, which is protecting an ssh key using the TPM.
+
+`tctiEnvironment.enable = true;` and `tctiEnvironment.interface = "tabrmd";` causes the TPM2TOOLS_TCTI and TPM2_PKCS11_TCTI environment variables to be set properly to use the user-space resource manager.
+In other words, it configures all users to use the user-space resource manager for tpm2 tools and tpm2 pkcs11 by default.
+
+### FAPI Configuration {#module-security-tpm2-nixosmodule-fapiconfiguration}
+
+A reasonable FAPI config file is shipped by default and available in `/etc/tpm2-tss/fapi-config.json`.
+The `tss2` command line utility in `tpm2-tools` will use this file by default.
+If you wish to customize it, you can do so like this:
+
+```
+security.tpm2.fapi = {
+ profileName = "P_RSA2048SHA256";
+};
+```
+
+This example changes the cryptographic profile from the default P_ECCP256SHA256 to P_RSA2048SHA256.
+The profiles specify a number of algorithmic details, but the short version is that P_ECCP256SHA256 uses elliptic curve cryptography over the NIST P256 curve and SHA256 for hashes, while P_RSA2048SHA256 uses RSA 2048 bit keys and SHA256 for hashes.
+
+Probably the most likely option you may want to use in the FAPI config would be `ekCertLess`.
+If set to `null` (the default) or `false`, then FAPI calls will fail if the TPM does not have an EK certificate.
+Most TPMs that come with physical computers will have an EK cert, so the default setting would not be a problem.
+However, virtual TPMs may not have an EK certificate.
+For instance, the Nitro TPM provided on some Amazon Web Services virtual machines does not come with an EK Cert.
+In such cases, you may wish to set `ekCertLess = true;` so that FAPI is usable without an EK cert.
diff --git a/nixos/modules/security/tpm2.nix b/nixos/modules/security/tpm2.nix
index dba46dbd1cf4..1fefc8f38adc 100644
--- a/nixos/modules/security/tpm2.nix
+++ b/nixos/modules/security/tpm2.nix
@@ -12,14 +12,39 @@ let
# the tssGroup is only allowed to access the kernel resource manager
# Therefore, if either of the two are null, the respective part isn't generated
udevRules = tssUser: tssGroup: ''
- ${lib.optionalString (tssUser != null) ''KERNEL=="tpm[0-9]*", MODE="0660", OWNER="${tssUser}"''}
+ ${lib.optionalString (
+ tssUser != null
+ ) ''KERNEL=="tpm[0-9]*", TAG+="systemd", MODE="0660", OWNER="${tssUser}"''}
${
- lib.optionalString (tssUser != null || tssGroup != null) ''KERNEL=="tpmrm[0-9]*", MODE="0660"''
+ lib.optionalString (
+ tssUser != null || tssGroup != null
+ ) ''KERNEL=="tpmrm[0-9]*", TAG+="systemd", MODE="0660"''
+ lib.optionalString (tssUser != null) '', OWNER="${tssUser}"''
+ lib.optionalString (tssGroup != null) '', GROUP="${tssGroup}"''
}
'';
+ fapiConfig = (
+ pkgs.writeText "fapi-config.json" (
+ builtins.toJSON (
+ {
+ profile_name = cfg.fapi.profileName;
+ profile_dir = cfg.fapi.profileDir;
+ user_dir = cfg.fapi.userDir;
+ system_dir = cfg.fapi.systemDir;
+ tcti = cfg.fapi.tcti;
+ system_pcrs = cfg.fapi.systemPcrs;
+ log_dir = cfg.fapi.logDir;
+ firmware_log_file = cfg.fapi.firmwareLogFile;
+ ima_log_file = cfg.fapi.imaLogFile;
+ }
+ // lib.optionalAttrs (cfg.fapi.ekCertLess != null) {
+ ek_cert_less = if cfg.fapi.ekCertLess then "yes" else "no";
+ }
+ // lib.optionalAttrs (cfg.fapi.ekFingerprint != null) { ek_fingerprint = cfg.fapi.ekFingerprint; }
+ )
+ )
+ );
in
{
options.security.tpm2 = {
@@ -123,6 +148,120 @@ in
default = "bus_name=com.intel.tss2.Tabrmd";
};
};
+
+ fapi = {
+ profileName = lib.mkOption {
+ description = ''
+ Name of the default cryptographic profile chosen from the profile_dir directory.
+ '';
+ type = lib.types.str;
+ default = "P_ECCP256SHA256";
+ };
+
+ profileDir = lib.mkOption {
+ description = ''
+ Directory that contains all cryptographic profiles known to FAPI.
+ '';
+ type = lib.types.str;
+ default = "${pkgs.tpm2-tss}/etc/tpm2-tss/fapi-profiles/";
+ defaultText = lib.literalExpression "\${pkgs.tpm2-tss}/etc/fapi-profiles/";
+ };
+
+ userDir = lib.mkOption {
+ description = ''
+ The directory where user objects are stored.
+ '';
+ type = lib.types.str;
+ default = "~/.local/share/tpm2-tss/user/keystore/";
+ };
+
+ systemDir = lib.mkOption {
+ description = ''
+ The directory where system objects, policies, and imported objects are stored.
+ '';
+ type = lib.types.str;
+ default = "/var/lib/tpm2-tss/keystore";
+ };
+
+ tcti = lib.mkOption {
+ description = ''
+ The TCTI which will be used.
+
+ An empty string indicates no TCTI is specified by the FAPI config.
+
+ If not specified in the FAPI config it can be specified by environment
+ variable (TPM2TOOLS_TCTI, TPM2_PKCS11_TCTI, etc) or a TCTI will be chosen
+ by the FAPI library by searching for tabrmd, device, and mssim TCTIs in
+ that order.
+ '';
+ type = lib.types.str;
+ default = "";
+ example = "device:/dev/tpmrm0";
+ };
+
+ systemPcrs = lib.mkOption {
+ description = ''
+ The PCR registers which are used by the system.
+ '';
+ type = lib.types.listOf lib.types.int;
+ default = [ ];
+ };
+
+ logDir = lib.mkOption {
+ description = ''
+ The directory for the event log.
+ '';
+ type = lib.types.str;
+ default = "/var/log/tpm2-tss/eventlog/";
+ };
+
+ ekCertLess = lib.mkOption {
+ description = ''
+ A switch to disable Endorsement Key (EK) certificate verification.
+
+ A value of null indicates that the generated fapi config file does not
+ contain a ek_cert_less key. The effect of not having that key at all is
+ the same as setting its value to false.
+
+ A value of false means that the tss2 cli will not work if there is no
+ EK Cert installed, or if the installed EK Cert can't be validated.
+
+ A value of true means that the tss2 cli will work even if there's no EK
+ cert installed.
+ '';
+ type = lib.types.nullOr lib.types.bool;
+ default = null;
+ };
+
+ ekFingerprint = lib.mkOption {
+ description = ''
+ The fingerprint of the endorsement key.
+
+ A value of null means that you have chosen not to specify the expected
+ fingerprint of the EK. You can still have an endorsement key, it just
+ won't get checked to see if it's fingerprint matches a particular value
+ before being used.
+ '';
+ type = lib.types.nullOr lib.types.str;
+ default = null;
+ };
+
+ firmwareLogFile = lib.mkOption {
+ description = ''
+ The binary bios measurements.
+ '';
+ type = lib.types.str;
+ default = "/sys/kernel/security/tpm0/binary_bios_measurements";
+ };
+
+ imaLogFile = lib.mkOption {
+ description = ''
+ The binary IMA measurements (Integrity Measurement Architecture).
+ '';
+ type = lib.types.str;
+ default = "/sys/kernel/security/ima/binary_runtime_measurements";
+ };
+ };
};
config = lib.mkIf cfg.enable (
@@ -161,8 +300,68 @@ in
);
}
+ {
+ # This script has the hash of the udev rules in it,
+ # and also writes that hash to
+ # /var/lib/tpm2-udev-trigger/hash.txt at the end.
+ # On each run, it checks to see if the hash embedded in the script
+ # matches the hash on disk. If they are different, that
+ # indicates that the udev rules created by this module
+ # have changed. In that case, a udev change is triggered
+ # for tpm and tpmrm devices so that the new rules are
+ # applied at the end of a nixos-rebuild switch or activate
+ systemd.services."tpm2-udev-trigger" =
+ let
+ udevHash =
+ if cfg.applyUdevRules then (builtins.hashString "md5" (udevRules cfg.tssUser cfg.tssGroup)) else "";
+ in
+ {
+ description = "Trigger udev change for TPM devices";
+ wants = [ "systemd-udevd.service" ];
+ after = [
+ "tpm2.target"
+ "systemd-udevd.service"
+ ];
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ Type = "oneshot";
+ RemainAfterExit = true;
+ ExecStart = pkgs.writeShellScript "tpm2-udev-trigger.sh" ''
+ stateDir=/var/lib/tpm2-udev-trigger
+ mkdir -p $stateDir
+ newHash=${udevHash}
+ hashFile=$stateDir/hash.txt
+
+ # if file exists, read old hash
+ if [ -f $hashFile ]; then
+ oldHash="$(< $hashFile)"
+ else
+ oldHash=""
+ fi
+
+ if [ "$oldHash" != "$newHash" ]; then
+ echo "TPM udev rules changed, triggering udev"
+ ${config.systemd.package}/bin/udevadm trigger --subsystem-match=tpm --action=change
+ ${config.systemd.package}/bin/udevadm trigger --subsystem-match=tpmrm --action=change
+ echo "$newHash" > $hashFile
+ else
+ echo "TPM udev rules unchanged, not triggering udev"
+ fi
+ '';
+ };
+ };
+ }
+
(lib.mkIf cfg.abrmd.enable {
systemd.services."tpm2-abrmd" = {
+ wants = [
+ "tpm2-udev-trigger.service"
+ "dev-tpm0.device"
+ ];
+ after = [
+ "tpm2-udev-trigger.service"
+ "dev-tpm0.device"
+ ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
Type = "dbus";
@@ -177,8 +376,17 @@ in
services.dbus.packages = lib.singleton cfg.abrmd.package;
})
+
+ {
+ environment.etc."tpm2-tss/fapi-config.json".source = fapiConfig;
+ systemd.tmpfiles.rules = [
+ "d ${cfg.fapi.logDir} 2750 tss ${cfg.tssGroup} -"
+ "d ${cfg.fapi.systemDir} 2750 root ${cfg.tssGroup} -"
+ ];
+ }
]
);
+ meta.doc = ./tpm2.md;
meta.maintainers = with lib.maintainers; [ lschuermann ];
}
diff --git a/nixos/modules/services/audio/music-assistant.nix b/nixos/modules/services/audio/music-assistant.nix
index dadab7aa906f..b38e77ce9f4e 100644
--- a/nixos/modules/services/audio/music-assistant.nix
+++ b/nixos/modules/services/audio/music-assistant.nix
@@ -85,7 +85,7 @@ in
lsof
]
++ lib.optionals (lib.elem "spotify" cfg.providers) [
- librespot
+ librespot-ma
]
++ lib.optionals (lib.elem "snapcast" cfg.providers) [
snapcast
diff --git a/nixos/modules/services/desktops/linyaps.nix b/nixos/modules/services/desktops/linyaps.nix
index 993a29167e89..ebbf57e0fcb0 100644
--- a/nixos/modules/services/desktops/linyaps.nix
+++ b/nixos/modules/services/desktops/linyaps.nix
@@ -22,6 +22,8 @@ in
package = lib.mkPackageOption pkgs "linyaps" { };
boxPackage = lib.mkPackageOption pkgs "linyaps-box" { };
+
+ webStoreInstallerPackage = lib.mkPackageOption pkgs "linyaps-web-store-installer" { };
};
};
@@ -33,6 +35,7 @@ in
systemPackages = [
cfg.package
cfg.boxPackage
+ cfg.webStoreInstallerPackage
];
};
diff --git a/nixos/modules/services/hardware/fancontrol.nix b/nixos/modules/services/hardware/fancontrol.nix
index 882eea001b39..3d550aa8d78f 100644
--- a/nixos/modules/services/hardware/fancontrol.nix
+++ b/nixos/modules/services/hardware/fancontrol.nix
@@ -52,6 +52,4 @@ in
'';
};
-
- meta.maintainers = [ lib.maintainers.evils ];
}
diff --git a/nixos/modules/services/hardware/rasdaemon.nix b/nixos/modules/services/hardware/rasdaemon.nix
index b86e8b04d5ff..cc1723793b9e 100644
--- a/nixos/modules/services/hardware/rasdaemon.nix
+++ b/nixos/modules/services/hardware/rasdaemon.nix
@@ -176,7 +176,4 @@ in
};
};
};
-
- meta.maintainers = [ lib.maintainers.evils ];
-
}
diff --git a/nixos/modules/services/matrix/maubot.md b/nixos/modules/services/matrix/maubot.md
index d7c02a0ca19c..b2633f793e23 100644
--- a/nixos/modules/services/matrix/maubot.md
+++ b/nixos/modules/services/matrix/maubot.md
@@ -100,7 +100,7 @@ framework for Matrix.
url: https://matrix.example.org
secret: your-very-secret-key
```
-10. Restart Maubot after editing `/var/lib/maubot/config.yaml`,and
+10. Restart Maubot after editing `/var/lib/maubot/config.yaml`, and
Maubot will be available at
`https://matrix.example.org/_matrix/maubot`. If you want to use the
`mbc` CLI, it's available using the `maubot` package (`nix-shell -p
diff --git a/nixos/modules/services/matrix/mautrix-whatsapp.md b/nixos/modules/services/matrix/mautrix-whatsapp.md
index a2ef973f4e60..7a589a372996 100644
--- a/nixos/modules/services/matrix/mautrix-whatsapp.md
+++ b/nixos/modules/services/matrix/mautrix-whatsapp.md
@@ -13,7 +13,7 @@
::: {.warning}
Mautrix-Whatsapp allows for some options like `encryption.pickle_key`,
-`provisioning.shared_secret`, allow the value `generate` to be set.
+`provisioning.shared_secret`, to allow the value `generate` to be set.
Since the configuration file is regenerated on every start of the
service, the generated values would be discarded and might break your
installation. Instead, set those values via
diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix
index 30d0278f45e7..1253bae48a6d 100644
--- a/nixos/modules/services/misc/redmine.nix
+++ b/nixos/modules/services/misc/redmine.nix
@@ -461,19 +461,21 @@ in
CapabilityBoundingSet = "";
LockPersonality = true;
MemoryDenyWriteExecute = true;
+ MountAPIVFS = true;
NoNewPrivileges = true;
PrivateDevices = true;
PrivateMounts = true;
PrivateTmp = true;
+ PrivateUsers = true;
ProcSubset = "pid";
ProtectClock = true;
- ProtectControlGroups = true;
+ ProtectControlGroups = "strict";
ProtectHome = true;
ProtectHostname = true;
ProtectKernelLogs = true;
ProtectKernelModules = true;
ProtectKernelTunables = true;
- ProtectProc = "noaccess";
+ ProtectProc = "invisible";
ProtectSystem = "strict";
ReadWritePaths = [
cfg.stateDir
diff --git a/nixos/modules/services/monitoring/tuptime.nix b/nixos/modules/services/monitoring/tuptime.nix
index 58094a185182..67706e63f289 100644
--- a/nixos/modules/services/monitoring/tuptime.nix
+++ b/nixos/modules/services/monitoring/tuptime.nix
@@ -89,7 +89,4 @@ in
};
};
};
-
- meta.maintainers = [ lib.maintainers.evils ];
-
}
diff --git a/nixos/modules/services/monitoring/vnstat.nix b/nixos/modules/services/monitoring/vnstat.nix
index 958a46e81730..baae16394edd 100644
--- a/nixos/modules/services/monitoring/vnstat.nix
+++ b/nixos/modules/services/monitoring/vnstat.nix
@@ -58,6 +58,4 @@ in
};
};
};
-
- meta.maintainers = [ lib.maintainers.evils ];
}
diff --git a/nixos/modules/services/networking/firezone/provision.exs b/nixos/modules/services/networking/firezone/provision.exs
index d8e60d32cf32..9651140525e2 100644
--- a/nixos/modules/services/networking/firezone/provision.exs
+++ b/nixos/modules/services/networking/firezone/provision.exs
@@ -343,7 +343,7 @@ defmodule Provision do
case Map.get(changes, {:account, slug}) do
{:new, account} ->
Logger.info("Creating everyone group for new account")
- {:ok, actor_group} = Actors.create_managed_group(account, %{name: "Everyone", membership_rules: [%{operator: true}]})
+ {:ok, actor_group} = Actors.create_managed_group(account, %{name: "Everyone"})
UuidMapping.update_entities(slug, "actor_groups", %{"everyone" => actor_group.id})
{:ok, actor_group}
{:existing, _account} ->
diff --git a/nixos/modules/services/networking/firezone/server.nix b/nixos/modules/services/networking/firezone/server.nix
index b83b8b5da94c..49ffbb02c232 100644
--- a/nixos/modules/services/networking/firezone/server.nix
+++ b/nixos/modules/services/networking/firezone/server.nix
@@ -546,7 +546,6 @@ in
};
in
{
- flow_activities = mkFeatureOption "flow_activities" true;
policy_conditions = mkFeatureOption "policy_conditions" true;
multi_site_resources = mkFeatureOption "multi_site_resources" true;
traffic_filters = mkFeatureOption "traffic_filters" true;
@@ -923,9 +922,13 @@ in
{
name = "firezone";
ensureDBOwnership = true;
+ ensureClauses.superuser = true;
}
];
ensureDatabases = [ "firezone" ];
+ # Firezone uses an internal replication strategy
+ # that depends on a logical wal
+ settings.wal_level = "logical";
};
services.firezone.server.settings = {
diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix
index 692868c8a790..87c309e6a2e9 100644
--- a/nixos/modules/services/networking/murmur.nix
+++ b/nixos/modules/services/networking/murmur.nix
@@ -347,9 +347,10 @@ in
MemoryDenyWriteExecute = true;
NoNewPrivileges = true;
PrivateDevices = true;
+ PrivateMounts = true;
PrivateTmp = true;
ProtectClock = true;
- ProtectControlGroups = true;
+ ProtectControlGroups = "strict";
ProtectHome = true;
ProtectHostname = true;
ProtectKernelLogs = true;
diff --git a/nixos/modules/services/security/opensnitch.nix b/nixos/modules/services/security/opensnitch.nix
index 12643b20bd6a..d8c4d53b78c5 100644
--- a/nixos/modules/services/security/opensnitch.nix
+++ b/nixos/modules/services/security/opensnitch.nix
@@ -161,6 +161,15 @@ in
'';
};
+ Audit.AudispSocketPath = lib.mkOption {
+ type = lib.types.path;
+ default = "/run/audit/audispd_events";
+ description = ''
+ Configure audit socket path. Used when
+ `settings.ProcMonitorMethod` is set to `audit`.
+ '';
+ };
+
Rules.Path = lib.mkOption {
type = lib.types.path;
default = "/var/lib/opensnitch/rules";
diff --git a/nixos/modules/services/web-apps/gerrit.nix b/nixos/modules/services/web-apps/gerrit.nix
index 82bce5ae545d..92464bb49a75 100644
--- a/nixos/modules/services/web-apps/gerrit.nix
+++ b/nixos/modules/services/web-apps/gerrit.nix
@@ -219,28 +219,33 @@ in
'';
serviceConfig = {
- CacheDirectory = "gerrit";
DynamicUser = true;
ExecStart = "${gerrit-cli}/bin/gerrit daemon --console-log";
LimitNOFILE = 4096;
StandardInput = "socket";
StandardOutput = "journal";
StateDirectory = "gerrit";
+ StateDirectoryMode = "750";
+ CacheDirectory = "gerrit";
+ CacheDirectoryMode = "750";
WorkingDirectory = "%S/gerrit";
AmbientCapabilities = "";
CapabilityBoundingSet = "";
LockPersonality = true;
+ MountAPIVFS = true;
NoNewPrivileges = true;
PrivateDevices = true;
+ PrivateMounts = true;
PrivateTmp = true;
+ PrivateUsers = true;
ProtectClock = true;
- ProtectControlGroups = true;
+ ProtectControlGroups = "strict";
ProtectHome = true;
ProtectHostname = true;
ProtectKernelLogs = true;
ProtectKernelModules = true;
ProtectKernelTunables = true;
- ProtectProc = "noaccess";
+ ProtectProc = "invisible";
ProtectSystem = "full";
RestrictAddressFamilies = [
"AF_UNIX"
diff --git a/nixos/modules/services/web-apps/glance.md b/nixos/modules/services/web-apps/glance.md
index f65b32b3ba91..c42cd833bef3 100644
--- a/nixos/modules/services/web-apps/glance.md
+++ b/nixos/modules/services/web-apps/glance.md
@@ -7,7 +7,7 @@ more about it.
## Quickstart {#module-services-glance-quickstart}
-Checkout the [configuration docs](https://github.com/glanceapp/glance/blob/main/docs/configuration.md) to learn more.
+Check out the [configuration docs](https://github.com/glanceapp/glance/blob/main/docs/configuration.md) to learn more.
Use the following configuration to start a public instance of Glance locally:
```nix
diff --git a/nixos/modules/services/web-apps/hatsu.md b/nixos/modules/services/web-apps/hatsu.md
index e2c61d00f121..776b80dddc11 100644
--- a/nixos/modules/services/web-apps/hatsu.md
+++ b/nixos/modules/services/web-apps/hatsu.md
@@ -4,7 +4,7 @@
## Quickstart {#module-services-hatsu-quickstart}
-the minimum configuration to start hatsu server would look like this:
+The minimum configuration to start hatsu server would look like this:
```nix
{
diff --git a/nixos/modules/services/web-apps/immich.nix b/nixos/modules/services/web-apps/immich.nix
index a68066c30df0..5d89a2757863 100644
--- a/nixos/modules/services/web-apps/immich.nix
+++ b/nixos/modules/services/web-apps/immich.nix
@@ -10,6 +10,10 @@ let
isPostgresUnixSocket = lib.hasPrefix "/" cfg.database.host;
isRedisUnixSocket = lib.hasPrefix "/" cfg.redis.host;
+ # convert a Nix attribute path to jq object identifier-index:
+ # https://jqlang.org/manual/#object-identifier-index
+ attrPathToIndex = attrPath: "." + lib.concatStringsSep "." attrPath;
+
commonServiceConfig = {
Type = "simple";
Restart = "on-failure";
@@ -147,6 +151,27 @@ in
);
};
+ secretSettings = mkOption {
+ default = { };
+ description = ''
+ Secrets to to be added to the JSON file generated from {option}`settings`, read from files.
+ '';
+ example = lib.literalExpression ''
+ {
+ notifications.smtp.transport.password = "/path/to/secret";
+ oauth.clientSecret = "/path/to/other/secret";
+ }
+ '';
+ type =
+ let
+ inherit (types) attrsOf either path;
+ recursiveType = either (attrsOf recursiveType) path // {
+ description = "nested " + (attrsOf path).description;
+ };
+ in
+ recursiveType;
+ };
+
machine-learning = {
enable =
mkEnableOption "immich's machine-learning functionality to detect faces and search for objects"
@@ -353,7 +378,7 @@ in
IMMICH_MACHINE_LEARNING_URL = "http://localhost:3003";
}
// lib.optionalAttrs (cfg.settings != null) {
- IMMICH_CONFIG_FILE = "${format.generate "immich.json" cfg.settings}";
+ IMMICH_CONFIG_FILE = "/run/immich/config.json";
};
services.immich.machine-learning.environment = {
@@ -382,7 +407,24 @@ in
postgresqlPackage
];
+ preStart = mkIf (cfg.settings != null) (
+ ''
+ cat '${format.generate "immich-config.json" cfg.settings}' > /run/immich/config.json
+ ''
+ + lib.concatStrings (
+ lib.mapAttrsToListRecursive (attrPath: _: ''
+ tmp="$(mktemp)"
+ ${lib.getExe pkgs.jq} --rawfile secret "$CREDENTIALS_DIRECTORY/${attrPathToIndex attrPath}" \
+ '${attrPathToIndex attrPath} = $secret' /run/immich/config.json > "$tmp"
+ mv "$tmp" /run/immich/config.json
+ '') cfg.secretSettings
+ )
+ );
+
serviceConfig = commonServiceConfig // {
+ LoadCredential = lib.mapAttrsToListRecursive (
+ attrPath: file: "${attrPathToIndex attrPath}:${file}"
+ ) cfg.secretSettings;
ExecStart = lib.getExe cfg.package;
EnvironmentFile = mkIf (cfg.secretsFile != null) cfg.secretsFile;
Slice = "system-immich.slice";
diff --git a/nixos/modules/services/web-apps/lemmy.md b/nixos/modules/services/web-apps/lemmy.md
index 0ed23607d00b..a3924448ceb5 100644
--- a/nixos/modules/services/web-apps/lemmy.md
+++ b/nixos/modules/services/web-apps/lemmy.md
@@ -4,7 +4,7 @@ Lemmy is a federated alternative to reddit in rust.
## Quickstart {#module-services-lemmy-quickstart}
-the minimum to start lemmy is
+The minimum to start lemmy is
```nix
{
@@ -19,7 +19,7 @@ the minimum to start lemmy is
}
```
-this will start the backend on port 8536 and the frontend on port 1234.
+This will start the backend on port 8536 and the frontend on port 1234.
It will expose your instance with a caddy reverse proxy to the hostname you've provided.
Postgres will be initialized on that same instance automatically.
diff --git a/nixos/modules/services/web-apps/limesurvey.nix b/nixos/modules/services/web-apps/limesurvey.nix
index f33191419768..cb1b1ed7d2ff 100644
--- a/nixos/modules/services/web-apps/limesurvey.nix
+++ b/nixos/modules/services/web-apps/limesurvey.nix
@@ -45,7 +45,7 @@ let
limesurveyConfig = pkgs.writeText "config.php" ''
[
@@ -304,6 +304,7 @@ in
config = {
tempdir = "${stateDir}/tmp";
uploaddir = "${stateDir}/upload";
+ userquestionthemerootdir = "${stateDir}/upload/themes/question";
force_ssl = mkIf (
cfg.virtualHost.addSSL || cfg.virtualHost.forceSSL || cfg.virtualHost.onlySSL
) "on";
diff --git a/nixos/modules/services/web-apps/linkwarden.nix b/nixos/modules/services/web-apps/linkwarden.nix
new file mode 100644
index 000000000000..a7aa3cb1ee0b
--- /dev/null
+++ b/nixos/modules/services/web-apps/linkwarden.nix
@@ -0,0 +1,293 @@
+{
+ lib,
+ config,
+ pkgs,
+ ...
+}:
+
+let
+ cfg = config.services.linkwarden;
+ isPostgresUnixSocket = lib.hasPrefix "/" cfg.database.host;
+
+ inherit (lib)
+ types
+ mkIf
+ mkOption
+ mkEnableOption
+ ;
+
+ commonServiceConfig = {
+ Type = "simple";
+ Restart = "on-failure";
+ RestartSec = 3;
+
+ EnvironmentFile = cfg.environmentFile;
+ StateDirectory = "linkwarden";
+ CacheDirectory = "linkwarden";
+ User = cfg.user;
+ Group = cfg.group;
+
+ # Hardening
+ CapabilityBoundingSet = "";
+ NoNewPrivileges = true;
+ PrivateUsers = true;
+ PrivateTmp = true;
+ PrivateDevices = true;
+ PrivateMounts = true;
+ ProtectClock = true;
+ ProtectControlGroups = true;
+ ProtectHome = true;
+ ProtectHostname = true;
+ ProtectKernelLogs = true;
+ ProtectKernelModules = true;
+ ProtectKernelTunables = true;
+ RestrictAddressFamilies = [
+ "AF_INET"
+ "AF_INET6"
+ "AF_UNIX"
+ ];
+ RestrictNamespaces = true;
+ RestrictRealtime = true;
+ RestrictSUIDSGID = true;
+ };
+
+ secret = types.nullOr (
+ types.str
+ // {
+ # We don't want users to be able to pass a path literal here but
+ # it should look like a path.
+ check = it: lib.isString it && lib.types.path.check it;
+ }
+ );
+
+ startupScript =
+ arg:
+ if cfg.secretFiles == { } then
+ "${lib.getExe cfg.package}" + arg
+ else
+ pkgs.writeShellScript "linkwarden-env" ''
+ ${lib.strings.concatStringsSep "\n" (
+ lib.attrsets.mapAttrsToList (key: path: "export ${key}=$(< \"${path}\")") cfg.secretFiles
+ )}
+ ${lib.getExe cfg.package}${arg}
+ '';
+in
+{
+ options.services.linkwarden = {
+ enable = mkEnableOption "Linkwarden";
+ package = lib.mkPackageOption pkgs "linkwarden" { };
+
+ storageLocation = mkOption {
+ type = types.path;
+ default = "/var/lib/linkwarden";
+ description = "Directory used to store media files. If it is not the default, the directory has to be created manually such that the linkwarden user is able to read and write to it.";
+ };
+ cacheLocation = mkOption {
+ type = types.path;
+ default = "/var/cache/linkwarden";
+ description = "Directory used as cache. If it is not the default, the directory has to be created manually such that the linkwarden user is able to read and write to it.";
+ };
+
+ enableRegistration = mkEnableOption "registration for new users";
+
+ environment = mkOption {
+ type = types.attrsOf types.str;
+ default = { };
+ example = {
+ PAGINATION_TAKE_COUNT = "50";
+ };
+ description = ''
+ Extra configuration environment variables. Refer to the [documentation](https://docs.linkwarden.app/self-hosting/environment-variables) for options.
+ '';
+ };
+
+ environmentFile = mkOption {
+ type = secret;
+ example = "/run/secrets/linkwarden";
+ default = null;
+ description = ''
+ Path of a file with extra environment variables to be loaded from disk.
+ This file is not added to the nix store, so it can be used to pass secrets to linkwarden.
+ Refer to the [documentation](https://docs.linkwarden.app/self-hosting/environment-variables) for options.
+
+ Linkwarden needs at least a nextauth secret. To set a database password use POSTGRES_PASSWORD:
+ ```
+ NEXTAUTH_SECRET=
+ POSTGRES_PASSWORD=
+ ```
+ '';
+ };
+
+ secretFiles = mkOption {
+ type = types.attrsOf secret;
+ example = {
+ POSTGRES_PASSWORD = "/run/secrets/linkwarden_postgres_passwd";
+ NEXTAUTH_SECRET = "/run/secrets/linkwarden_secret";
+ };
+ default = { };
+ description = ''
+ Attribute set containing paths to files to add to the environment of linkwarden.
+ The files are not added to the nix store, so they can be used to pass secrets to linkwarden.
+ Refer to the [documentation](https://docs.linkwarden.app/self-hosting/environment-variables) for options.
+
+ Linkwarden needs at least a nextauth secret. To set a database password use POSTGRES_PASSWORD:
+ ```
+ NEXTAUTH_SECRET=
+ POSTGRES_PASSWORD=
+ ```
+ '';
+ };
+
+ host = mkOption {
+ type = types.str;
+ default = "localhost";
+ description = "The host that Linkwarden will listen on.";
+ };
+ port = mkOption {
+ type = types.port;
+ default = 3000;
+ description = "The port that Linkwarden will listen on.";
+ };
+ openFirewall = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Whether to open the Linkwarden port in the firewall";
+ };
+ user = mkOption {
+ type = types.str;
+ default = "linkwarden";
+ description = "The user Linkwarden should run as.";
+ };
+ group = mkOption {
+ type = types.str;
+ default = "linkwarden";
+ description = "The group Linkwarden should run as.";
+ };
+
+ database = {
+ createLocally = mkEnableOption "the automatic creation of the database for Linkwarden." // {
+ default = true;
+ };
+ name = mkOption {
+ type = types.str;
+ default = "linkwarden";
+ description = "The name of the Linkwarden database.";
+ };
+ host = mkOption {
+ type = types.str;
+ default = "/run/postgresql";
+ example = "localhost";
+ description = "Hostname or address of the postgresql server. If an absolute path is given here, it will be interpreted as a unix socket path.";
+ };
+ port = mkOption {
+ type = types.port;
+ default = 5432;
+ description = "Port of the postgresql server.";
+ };
+ user = mkOption {
+ type = types.str;
+ default = "linkwarden";
+ description = "The database user for Linkwarden.";
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ assertions = [
+ {
+ assertion = cfg.database.createLocally -> cfg.database.name == cfg.database.user;
+ message = "The postgres module requires the database name and the database user name to be the same.";
+ }
+ {
+ assertion = cfg.environmentFile == null -> cfg.secretFiles ? "NEXTAUTH_SECRET";
+ message = ''
+ Linkwarden needs at least a nextauth secret to run.
+ Use either the environmentFile or secretFiles.NEXTAUTH_SECRET to provide one.
+ '';
+ }
+ ];
+
+ services.postgresql = mkIf cfg.database.createLocally {
+ enable = true;
+ ensureDatabases = [ cfg.database.name ];
+ ensureUsers = [
+ {
+ name = cfg.database.user;
+ ensureDBOwnership = true;
+ ensureClauses.login = true;
+ }
+ ];
+ };
+
+ networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ];
+
+ services.linkwarden.environment = {
+ LINKWARDEN_HOST = cfg.host;
+ LINKWARDEN_PORT = toString cfg.port;
+ LINKWARDEN_CACHE_DIR = cfg.cacheLocation;
+ STORAGE_FOLDER = cfg.storageLocation;
+ NEXT_PUBLIC_DISABLE_REGISTRATION = mkIf (!cfg.enableRegistration) "true";
+ NEXT_TELEMETRY_DISABLED = "1";
+ DATABASE_URL = mkIf isPostgresUnixSocket "postgresql://${lib.strings.escapeURL cfg.database.user}@localhost/${lib.strings.escapeURL cfg.database.name}?host=${cfg.database.host}";
+ DATABASE_PORT = toString cfg.database.port;
+ DATABASE_HOST = mkIf (!isPostgresUnixSocket) cfg.database.host;
+ DATABASE_NAME = cfg.database.name;
+ DATABASE_USER = cfg.database.user;
+ };
+
+ systemd.services.linkwarden = {
+ description = "Linkwarden (Self-hosted collaborative bookmark manager to collect, organize, and preserve webpages, articles, and more...)";
+ requires = [
+ "network-online.target"
+ ]
+ ++ lib.optionals cfg.database.createLocally [ "postgresql.service" ];
+ after = [
+ "network-online.target"
+ ]
+ ++ lib.optionals cfg.database.createLocally [ "postgresql.service" ];
+ wantedBy = [ "multi-user.target" ];
+ environment = cfg.environment // {
+ # Required, otherwise chrome dumps core
+ CHROME_CONFIG_HOME = cfg.cacheLocation;
+ };
+
+ serviceConfig = commonServiceConfig // {
+ ExecStart = startupScript "";
+ };
+ };
+
+ systemd.services.linkwarden-worker = {
+ description = "Linkwarden (worker process)";
+ requires = [
+ "network-online.target"
+ "linkwarden.service"
+ ]
+ ++ lib.optionals cfg.database.createLocally [ "postgresql.service" ];
+ after = [
+ "network-online.target"
+ "linkwarden.service"
+ ]
+ ++ lib.optionals cfg.database.createLocally [ "postgresql.service" ];
+ wantedBy = [ "multi-user.target" ];
+ environment = cfg.environment // {
+ # Required, otherwise chrome dumps core
+ CHROME_CONFIG_HOME = cfg.cacheLocation;
+ };
+
+ serviceConfig = commonServiceConfig // {
+ ExecStart = startupScript " worker";
+ };
+ };
+
+ users.users = mkIf (cfg.user == "linkwarden") {
+ linkwarden = {
+ name = "linkwarden";
+ group = cfg.group;
+ isSystemUser = true;
+ };
+ };
+ users.groups = mkIf (cfg.group == "linkwarden") { linkwarden = { }; };
+
+ meta.maintainers = with lib.maintainers; [ jvanbruegge ];
+ };
+}
diff --git a/nixos/modules/services/web-apps/ocis.md b/nixos/modules/services/web-apps/ocis.md
index 43ddd3175c7d..9414567604b0 100644
--- a/nixos/modules/services/web-apps/ocis.md
+++ b/nixos/modules/services/web-apps/ocis.md
@@ -33,7 +33,7 @@ A very basic configuration may look like this:
This will start the oCIS server and make it available at `https://localhost:9200`
-However to make this configuration work you will need generate a configuration.
+However, to make this configuration work, you will need to generate a configuration.
You can do this with:
```console
diff --git a/nixos/modules/services/web-apps/pixelfed.nix b/nixos/modules/services/web-apps/pixelfed.nix
index 95661ff3852e..885116eebc34 100644
--- a/nixos/modules/services/web-apps/pixelfed.nix
+++ b/nixos/modules/services/web-apps/pixelfed.nix
@@ -524,7 +524,6 @@ in
'';
extraConfig = ''
add_header X-Frame-Options "SAMEORIGIN";
- add_header X-XSS-Protection "1; mode=block";
add_header X-Content-Type-Options "nosniff";
index index.html index.htm index.php;
error_page 404 /index.php;
diff --git a/nixos/modules/services/web-apps/szurubooru.md b/nixos/modules/services/web-apps/szurubooru.md
index 29c5caf42895..c27dd2b0e169 100644
--- a/nixos/modules/services/web-apps/szurubooru.md
+++ b/nixos/modules/services/web-apps/szurubooru.md
@@ -31,7 +31,7 @@ Here is a basic configuration:
## Reverse proxy configuration {#module-services-szurubooru-reverse-proxy-configuration}
-The prefered method to run this service is behind a reverse proxy not to expose an open port. For example, here is a minimal Nginx configuration:
+The preferred method to run this service is behind a reverse proxy not to expose an open port. For example, here is a minimal Nginx configuration:
```nix
{
diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix
deleted file mode 100644
index c937e69b9c76..000000000000
--- a/nixos/modules/services/web-apps/tt-rss.nix
+++ /dev/null
@@ -1,712 +0,0 @@
-{
- config,
- lib,
- pkgs,
- ...
-}:
-
-with lib;
-let
- cfg = config.services.tt-rss;
-
- inherit (cfg) phpPackage;
-
- configVersion = 26;
-
- dbPort =
- if cfg.database.port == null then
- (if cfg.database.type == "pgsql" then 5432 else 3306)
- else
- cfg.database.port;
-
- poolName = "tt-rss";
-
- mysqlLocal = cfg.database.createLocally && cfg.database.type == "mysql";
- pgsqlLocal = cfg.database.createLocally && cfg.database.type == "pgsql";
-
- tt-rss-config =
- let
- password =
- if (cfg.database.password != null) then
- "'${(escape [ "'" "\\" ] cfg.database.password)}'"
- else if (cfg.database.passwordFile != null) then
- "file_get_contents('${cfg.database.passwordFile}')"
- else
- null;
- in
- pkgs.writeText "config.php" ''
-
- '';
- };
-
- forceArticlePurge = mkOption {
- type = types.int;
- default = 0;
- description = ''
- When this option is not 0, users ability to control feed purging
- intervals is disabled and all articles (which are not starred)
- older than this amount of days are purged.
- '';
- };
-
- enableGZipOutput = mkOption {
- type = types.bool;
- default = true;
- description = ''
- Selectively gzip output to improve wire performance. This requires
- PHP Zlib extension on the server.
- Enabling this can break tt-rss in several httpd/php configurations,
- if you experience weird errors and tt-rss failing to start, blank pages
- after login, or content encoding errors, disable it.
- '';
- };
-
- phpPackage = lib.mkOption {
- type = lib.types.package;
- default = pkgs.php;
- defaultText = "pkgs.php";
- description = ''
- php package to use for php fpm and update daemon.
- '';
- };
-
- plugins = mkOption {
- type = types.listOf types.str;
- default = [
- "auth_internal"
- "note"
- ];
- description = ''
- List of plugins to load automatically for all users.
- System plugins have to be specified here. Please enable at least one
- authentication plugin here (auth_*).
- Users may enable other user plugins from Preferences/Plugins but may not
- disable plugins specified in this list.
- Disabling auth_internal in this list would automatically disable
- reset password link on the login form.
- '';
- };
-
- pluginPackages = mkOption {
- type = types.listOf types.package;
- default = [ ];
- description = ''
- List of plugins to install. The list elements are expected to
- be derivations. All elements in this derivation are automatically
- copied to the `plugins.local` directory.
- '';
- };
-
- themePackages = mkOption {
- type = types.listOf types.package;
- default = [ ];
- description = ''
- List of themes to install. The list elements are expected to
- be derivations. All elements in this derivation are automatically
- copied to the `themes.local` directory.
- '';
- };
-
- logDestination = mkOption {
- type = types.enum [
- ""
- "sql"
- "syslog"
- ];
- default = "sql";
- description = ''
- Log destination to use. Possible values: sql (uses internal logging
- you can read in Preferences -> System), syslog - logs to system log.
- Setting this to blank uses PHP logging (usually to http server
- error.log).
- '';
- };
-
- updateDaemon = {
- commandFlags = mkOption {
- type = types.str;
- default = "--quiet";
- description = ''
- Command-line flags passed to the update daemon.
- The default --quiet flag mutes all logging, including errors.
- '';
- };
- };
-
- extraConfig = mkOption {
- type = types.lines;
- default = "";
- description = ''
- Additional lines to append to `config.php`.
- '';
- };
- };
- };
-
- imports = [
- (mkRemovedOptionModule [ "services" "tt-rss" "checkForUpdates" ] ''
- This option was removed because setting this to true will cause TT-RSS
- to be unable to start if an automatic update of the code in
- services.tt-rss.root leads to a database schema upgrade that is not
- supported by the code active in the Nix store.
- '')
- ];
-
- ###### implementation
-
- config = mkIf cfg.enable {
-
- assertions = [
- {
- assertion = cfg.database.password != null -> cfg.database.passwordFile == null;
- message = "Cannot set both password and passwordFile";
- }
- {
- assertion =
- cfg.database.createLocally -> cfg.database.name == cfg.user && cfg.database.user == cfg.user;
- message = ''
- When creating a database via NixOS, the db user and db name must be equal!
- If you already have an existing DB+user and this assertion is new, you can safely set
- `services.tt-rss.database.createLocally` to `false` because removal of `ensureUsers`
- and `ensureDatabases` doesn't have any effect.
- '';
- }
- ];
-
- services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") {
- ${poolName} = {
- inherit (cfg) user;
- inherit phpPackage;
- settings = mapAttrs (name: mkDefault) {
- "listen.owner" = "nginx";
- "listen.group" = "nginx";
- "listen.mode" = "0600";
- "pm" = "dynamic";
- "pm.max_children" = 75;
- "pm.start_servers" = 10;
- "pm.min_spare_servers" = 5;
- "pm.max_spare_servers" = 20;
- "pm.max_requests" = 500;
- "catch_workers_output" = 1;
- };
- };
- };
-
- # NOTE: No configuration is done if not using virtual host
- services.nginx = mkIf (cfg.virtualHost != null) {
- enable = true;
- virtualHosts = {
- ${cfg.virtualHost} = {
- root = "${cfg.root}/www";
-
- locations."/" = {
- index = "index.php";
- };
-
- locations."^~ /feed-icons" = {
- root = "${cfg.root}";
- };
-
- locations."~ \\.php$" = {
- extraConfig = ''
- fastcgi_split_path_info ^(.+\.php)(/.+)$;
- fastcgi_pass unix:${config.services.phpfpm.pools.${cfg.pool}.socket};
- fastcgi_index index.php;
- '';
- };
- };
- };
- };
-
- systemd.tmpfiles.rules = [
- "d '${cfg.root}' 0555 ${cfg.user} tt_rss - -"
- "d '${cfg.root}/lock' 0755 ${cfg.user} tt_rss - -"
- "d '${cfg.root}/cache' 0755 ${cfg.user} tt_rss - -"
- "d '${cfg.root}/cache/upload' 0755 ${cfg.user} tt_rss - -"
- "d '${cfg.root}/cache/images' 0755 ${cfg.user} tt_rss - -"
- "d '${cfg.root}/cache/export' 0755 ${cfg.user} tt_rss - -"
- "d '${cfg.root}/feed-icons' 0755 ${cfg.user} tt_rss - -"
- "L+ '${cfg.root}/www' - - - - ${servedRoot}"
- ];
-
- systemd.services = {
- phpfpm-tt-rss = mkIf (cfg.pool == "${poolName}") {
- restartTriggers = [ servedRoot ];
- };
-
- tt-rss = {
- description = "Tiny Tiny RSS feeds update daemon";
-
- preStart = ''
- ${phpPackage}/bin/php ${cfg.root}/www/update.php --update-schema --force-yes
- '';
-
- serviceConfig = {
- User = "${cfg.user}";
- Group = "tt_rss";
- ExecStart = "${phpPackage}/bin/php ${cfg.root}/www/update.php --daemon ${cfg.updateDaemon.commandFlags}";
- Restart = "on-failure";
- RestartSec = "60";
- SyslogIdentifier = "tt-rss";
- };
-
- wantedBy = [ "multi-user.target" ];
- requires = optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.target";
- after = [
- "network.target"
- ]
- ++ optional mysqlLocal "mysql.service"
- ++ optional pgsqlLocal "postgresql.target";
- };
- };
-
- services.mysql = mkIf mysqlLocal {
- enable = true;
- package = mkDefault pkgs.mariadb;
- ensureDatabases = [ cfg.database.name ];
- ensureUsers = [
- {
- name = cfg.user;
- ensurePermissions = {
- "${cfg.database.name}.*" = "ALL PRIVILEGES";
- };
- }
- ];
- };
-
- services.postgresql = mkIf pgsqlLocal {
- enable = mkDefault true;
- ensureDatabases = [ cfg.database.name ];
- ensureUsers = [
- {
- name = cfg.database.user;
- ensureDBOwnership = true;
- }
- ];
- };
-
- users.users.tt_rss = optionalAttrs (cfg.user == "tt_rss") {
- description = "tt-rss service user";
- isSystemUser = true;
- group = "tt_rss";
- };
-
- users.groups.tt_rss = { };
- };
-}
diff --git a/nixos/modules/system/boot/loader/limine/limine-install.py b/nixos/modules/system/boot/loader/limine/limine-install.py
index 8cbb55c6a762..f4a4245f141c 100644
--- a/nixos/modules/system/boot/loader/limine/limine-install.py
+++ b/nixos/modules/system/boot/loader/limine/limine-install.py
@@ -630,15 +630,15 @@ def install_bootloader() -> None:
if config('partitionIndex'):
limine_deploy_args.append(str(config('partitionIndex')))
- if config('forceMbr'):
- limine_deploy_args.append('--force-mbr')
+ if config('force'):
+ limine_deploy_args.append('--force')
try:
subprocess.run(limine_deploy_args)
except:
raise Exception(
'Failed to deploy BIOS stage 1 Limine bootloader!\n' +
- 'You might want to try enabling the `boot.loader.limine.forceMbr` option.')
+ 'You might want to try enabling the `boot.loader.limine.force` option.')
print("removing unused boot files...")
for path in paths:
diff --git a/nixos/modules/system/boot/loader/limine/limine.nix b/nixos/modules/system/boot/loader/limine/limine.nix
index 4bd7bb2ece0c..0c38e92f96a7 100644
--- a/nixos/modules/system/boot/loader/limine/limine.nix
+++ b/nixos/modules/system/boot/loader/limine/limine.nix
@@ -22,7 +22,7 @@ let
biosSupport = cfg.biosSupport;
biosDevice = cfg.biosDevice;
partitionIndex = cfg.partitionIndex;
- forceMbr = cfg.forceMbr;
+ force = cfg.force;
enrollConfig = cfg.enrollConfig;
style = cfg.style;
maxGenerations = if cfg.maxGenerations == null then 0 else cfg.maxGenerations;
@@ -43,6 +43,13 @@ in
inherit (pkgs.limine.meta) maintainers;
};
+ imports = [
+ (lib.mkRenamedOptionModule
+ [ "boot" "loader" "limine" "forceMbr" ]
+ [ "boot" "loader" "limine" "force" ]
+ )
+ ];
+
options.boot.loader.limine = {
enable = lib.mkEnableOption "the Limine Bootloader";
package = lib.mkPackageOption pkgs "limine" { };
@@ -169,9 +176,9 @@ in
'';
};
- forceMbr = lib.mkEnableOption null // {
+ force = lib.mkEnableOption null // {
description = ''
- Force MBR detection to work even if the safety checks fail, use absolutely only if necessary!
+ Force installation even if the safety checks fail, use absolutely only if necessary!
'';
};
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 9c12a21b3f25..c7e81bb44335 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -24,7 +24,7 @@ let
mountToUnit
automountToUnit
sliceToUnit
- attrsToSection
+ settingsToSections
;
upstreamSystemUnits = [
@@ -603,10 +603,7 @@ in
upstreamWants = upstreamSystemWants;
};
- "systemd/system.conf".text = ''
- [Manager]
- ${attrsToSection cfg.settings.Manager}
- '';
+ "systemd/system.conf".text = settingsToSections cfg.settings;
"systemd/sleep.conf".text = ''
[Sleep]
diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix
index e378dcf830bb..761d05fc873e 100644
--- a/nixos/modules/system/boot/systemd/initrd.nix
+++ b/nixos/modules/system/boot/systemd/initrd.nix
@@ -22,7 +22,7 @@ let
timerToUnit
mountToUnit
automountToUnit
- attrsToSection
+ settingsToSections
;
cfg = config.boot.initrd.systemd;
@@ -484,10 +484,7 @@ in
"/init".source = "${cfg.package}/lib/systemd/systemd";
"/etc/systemd/system".source = stage1Units;
- "/etc/systemd/system.conf".text = ''
- [Manager]
- ${attrsToSection cfg.settings.Manager}
- '';
+ "/etc/systemd/system.conf".text = settingsToSections cfg.settings;
# We can use either ! or * to lock the root account in the
# console, but some software like OpenSSH won't even allow you
diff --git a/nixos/modules/system/boot/systemd/logind.nix b/nixos/modules/system/boot/systemd/logind.nix
index 2eff86008e65..d0878542514d 100644
--- a/nixos/modules/system/boot/systemd/logind.nix
+++ b/nixos/modules/system/boot/systemd/logind.nix
@@ -1,7 +1,6 @@
{
config,
lib,
- pkgs,
utils,
...
}:
@@ -62,10 +61,8 @@
"user-runtime-dir@.service"
];
- environment.etc."systemd/logind.conf".text = ''
- [Login]
- ${utils.systemdUtils.lib.attrsToSection config.services.logind.settings.Login}
- '';
+ environment.etc."systemd/logind.conf".text =
+ utils.systemdUtils.lib.settingsToSections config.services.logind.settings;
# Restarting systemd-logind breaks X11
# - upstream commit: https://cgit.freedesktop.org/xorg/xserver/commit/?id=dc48bd653c7e101
diff --git a/nixos/modules/system/boot/systemd/oomd.nix b/nixos/modules/system/boot/systemd/oomd.nix
index 252758c6bcf6..82a87f00e97b 100644
--- a/nixos/modules/system/boot/systemd/oomd.nix
+++ b/nixos/modules/system/boot/systemd/oomd.nix
@@ -1,4 +1,9 @@
-{ config, lib, ... }:
+{
+ config,
+ lib,
+ utils,
+ ...
+}:
let
cfg = config.systemd.oomd;
@@ -10,6 +15,7 @@ in
[ "systemd" "oomd" "enableUserServices" ]
[ "systemd" "oomd" "enableUserSlices" ]
)
+ (lib.mkRenamedOptionModule [ "systemd" "oomd" "extraConfig" ] [ "systemd" "oomd" "settings" "OOM" ])
];
options.systemd.oomd = {
@@ -23,20 +29,18 @@ in
enableSystemSlice = lib.mkEnableOption "oomd on the system slice (`system.slice`)";
enableUserSlices = lib.mkEnableOption "oomd on all user slices (`user@.slice`) and all user owned slices";
- extraConfig = lib.mkOption {
- type =
- with lib.types;
- attrsOf (oneOf [
- str
- int
- bool
- ]);
- default = { };
- example = lib.literalExpression ''{ DefaultMemoryPressureDurationSec = "20s"; }'';
+ settings.OOM = lib.mkOption {
description = ''
- Extra config options for `systemd-oomd`. See {command}`man oomd.conf`
- for available options.
+ Settings option for systemd-oomd.
+ See {manpage}`oomd.conf(5)` for available options.
'';
+ type = lib.types.submodule {
+ freeformType = lib.types.attrsOf utils.systemdUtils.unitOptions.unitOption;
+ };
+ default = { };
+ example = {
+ DefaultMemoryPressureLimit = "60%";
+ };
};
};
@@ -52,11 +56,7 @@ in
];
systemd.services.systemd-oomd.wantedBy = [ "multi-user.target" ];
- environment.etc."systemd/oomd.conf".text = lib.generators.toINI { } {
- OOM = cfg.extraConfig;
- };
-
- systemd.oomd.extraConfig.DefaultMemoryPressureDurationSec = lib.mkDefault "20s"; # Fedora default
+ environment.etc."systemd/oomd.conf".text = utils.systemdUtils.lib.settingsToSections cfg.settings;
users.users.systemd-oom = {
description = "systemd-oomd service user";
diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix
index d5b2949b762f..56ba741dc2e4 100644
--- a/nixos/modules/virtualisation/virtualbox-host.nix
+++ b/nixos/modules/virtualisation/virtualbox-host.nix
@@ -164,6 +164,16 @@ in
"vboxnetflt"
];
boot.extraModulePackages = [ kernelModules ];
+ # See https://github.com/VirtualBox/virtualbox/issues/188
+ boot.kernelParams =
+ lib.mkIf
+ (
+ lib.versionAtLeast config.boot.kernelPackages.kernel.version "6.12"
+ && lib.versionOlder config.boot.kernelPackages.kernel.version "6.16"
+ )
+ [
+ "kvm.enable_virt_at_load=0"
+ ];
services.udev.extraRules = ''
KERNEL=="vboxdrv", OWNER="root", GROUP="vboxusers", MODE="0660", TAG+="systemd"
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 55d1f2e788e3..e471baaf7849 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -831,6 +831,7 @@ in
lighttpd = runTest ./lighttpd.nix;
limesurvey = runTest ./limesurvey.nix;
limine = import ./limine { inherit runTest; };
+ linkwarden = runTest ./web-apps/linkwarden.nix;
listmonk = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./listmonk.nix { };
litellm = runTest ./litellm.nix;
litestream = runTest ./litestream.nix;
@@ -1519,6 +1520,7 @@ in
tomcat = runTest ./tomcat.nix;
tor = runTest ./tor.nix;
tpm-ek = handleTest ./tpm-ek { };
+ tpm2 = runTest ./tpm2.nix;
# tracee requires bpf
tracee = handleTestOn [ "x86_64-linux" ] ./tracee.nix { };
traefik = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./traefik.nix;
@@ -1530,7 +1532,6 @@ in
trickster = runTest ./trickster.nix;
trilium-server = runTestOn [ "x86_64-linux" ] ./trilium-server.nix;
tsm-client-gui = runTest ./tsm-client-gui.nix;
- tt-rss = runTest ./web-apps/tt-rss.nix;
ttyd = runTest ./web-servers/ttyd.nix;
tuned = runTest ./tuned.nix;
tuptime = runTest ./tuptime.nix;
diff --git a/nixos/tests/audit.nix b/nixos/tests/audit.nix
index 0d732442ef4b..d3fc558aeec8 100644
--- a/nixos/tests/audit.nix
+++ b/nixos/tests/audit.nix
@@ -31,7 +31,7 @@
};
testScript = ''
- machine.wait_for_unit("audit-rules.service")
+ machine.wait_for_unit("audit-rules-nixos.service")
machine.wait_for_unit("auditd.service")
with subtest("Audit subsystem gets enabled"):
@@ -40,14 +40,14 @@
t.assertIn("backlog_limit 512", audit_status)
with subtest("unix socket plugin activated"):
- machine.succeed("stat /var/run/audispd_events")
+ machine.succeed("stat /run/audit/audispd_events")
with subtest("Custom rule produces audit traces"):
machine.succeed("hello")
print(machine.succeed("ausearch -k nixos-test -sc exit_group"))
- with subtest("Stopping audit-rules.service disables the audit subsystem"):
- machine.succeed("systemctl stop audit-rules.service")
+ with subtest("Stopping audit-rules-nixos.service disables the audit subsystem"):
+ machine.succeed("systemctl stop audit-rules-nixos.service")
t.assertIn("enabled 0", machine.succeed("auditctl -s"))
'';
diff --git a/nixos/tests/common/acme/server/README.md b/nixos/tests/common/acme/server/README.md
index 9de2b2c71029..5be95a9a599c 100644
--- a/nixos/tests/common/acme/server/README.md
+++ b/nixos/tests/common/acme/server/README.md
@@ -5,7 +5,7 @@ to serve ACME certificate requests.
## "Snake oil" certs
-The snake oil certs are hard coded into the repo for reasons explained [here](https://github.com/NixOS/nixpkgs/pull/91121#discussion_r505410235).
+The snake oil certs are hard-coded into the repo for reasons explained [here](https://github.com/NixOS/nixpkgs/pull/91121#discussion_r505410235).
The root of the issue is that Nix will hash the derivation based on the arguments
to mkDerivation, not the output. [Minica](https://github.com/jsha/minica) will
always generate a random certificate even if the arguments are unchanged. As a
diff --git a/nixos/tests/fancontrol.nix b/nixos/tests/fancontrol.nix
index 5bfd4b2bd37e..cc61985639a8 100644
--- a/nixos/tests/fancontrol.nix
+++ b/nixos/tests/fancontrol.nix
@@ -1,8 +1,8 @@
-{ pkgs, ... }:
+{ ... }:
{
name = "fancontrol";
- meta = with pkgs.lib.maintainers; {
- maintainers = [ evils ];
+ meta = {
+ maintainers = [ ];
};
nodes.machine =
diff --git a/nixos/tests/firezone/firezone.nix b/nixos/tests/firezone/firezone.nix
index 82b05b47086c..37612395e468 100644
--- a/nixos/tests/firezone/firezone.nix
+++ b/nixos/tests/firezone/firezone.nix
@@ -5,7 +5,10 @@ let
in
{
name = "firezone";
- meta.maintainers = with pkgs.lib.maintainers; [ oddlama ];
+ meta.maintainers = with pkgs.lib.maintainers; [
+ oddlama
+ patrickdag
+ ];
nodes = {
server =
@@ -18,6 +21,21 @@ in
{
security.pki.certificateFiles = [ certs.ca.cert ];
+ # To debug problems:
+ # 1. comment this in
+ # 2. cat '127.0.0.1 acme.test` >> /etc/hosts
+ # 3. socat TCP-LISTEN:443,fork TCP:127.0.0.1:12345
+ # 4. Firezone has to succeed when sending mail
+ # - Get opensmtpd to work
+ # - add an actual mailaccount to the test
+ # virtualisation.forwardPorts = [
+ # {
+ # from = "host";
+ # host.port = 12345;
+ # guest.port = 443;
+ # }
+ # ];
+
networking.extraHosts = ''
${config.networking.primaryIPAddress} ${domain}
${config.networking.primaryIPv6Address} ${domain}
@@ -36,6 +54,20 @@ in
};
};
+ # This doesn't actually work firezone/Swoosh seems to send 2 `EHLO`
+ # which opensmtpd does not allow
+ # https://github.com/OpenSMTPD/OpenSMTPD/issues/1284
+ # Would be nice for debbuging
+ # services.opensmtpd = {
+ # enable = true;
+ # extraServerArgs = [ "-v" ];
+ # serverConfiguration = ''
+ # listen on 0.0.0.0
+ # action "local" maildir "/tmp/maildir"
+ # match for domain "localhost.localdomain" action "local"
+ # '';
+ # };
+
services.firezone.server = {
enable = true;
enableLocalDB = true;
@@ -44,12 +76,12 @@ in
# Doesn't need to work for this test, but needs to be configured
# otherwise the server will not start.
smtp = {
- from = "firezone@example.com";
- host = "mail.localhost";
- port = 465;
- implicitTls = true;
- username = "firezone@example.com";
- passwordFile = pkgs.writeText "tmpmailpasswd" "supermailpassword";
+ from = "firezone@localhost.localdomain";
+ host = "localhost";
+ port = 25;
+ implicitTls = false;
+ username = "firezone@localhost.localdomain";
+ passwordFile = pkgs.writeText "tmpmailpasswd" "verysecurepassword";
};
provision = {
@@ -62,7 +94,7 @@ in
admin = {
type = "account_admin_user";
name = "Admin";
- email = "admin@example.com";
+ email = "admin@localhost.localdomain";
};
client = {
type = "service_account";
@@ -70,6 +102,14 @@ in
email = "client@example.com";
};
};
+ # service accounts aren't members of 'Everyone' so we need to add a separate group
+ groups.main = {
+ name = "main";
+ members = [
+ "client"
+ "admin"
+ ];
+ };
resources.res1 = {
type = "dns";
name = "Dns Resource";
@@ -97,17 +137,17 @@ in
};
policies.pol1 = {
description = "Allow anyone res1 access";
- group = "everyone";
+ group = "main";
resource = "res1";
};
policies.pol2 = {
description = "Allow anyone res2 access";
- group = "everyone";
+ group = "main";
resource = "res2";
};
policies.pol3 = {
description = "Allow anyone res3 access";
- group = "everyone";
+ group = "main";
resource = "res3";
};
};
@@ -334,7 +374,6 @@ in
with subtest("Check DNS based access"):
# Check that we can access the resource through the VPN via DNS
client.wait_until_succeeds("curl -4 -Lsf http://resource.example.com | grep 'greetings from the resource'")
- client.wait_until_succeeds("curl -6 -Lsf http://resource.example.com | grep 'greetings from the resource'")
with subtest("Check CIDR based access"):
# Check that we can access the resource through the VPN via CIDR
diff --git a/nixos/tests/hadoop/hadoop.nix b/nixos/tests/hadoop/hadoop.nix
index 3f2b41bbd2c8..165faf97a0bc 100644
--- a/nixos/tests/hadoop/hadoop.nix
+++ b/nixos/tests/hadoop/hadoop.nix
@@ -238,7 +238,7 @@ import ../make-test-python.nix (
nn2.wait_for_open_port(9870)
nn2.wait_for_open_port(8022)
nn2.wait_for_open_port(8020)
- nn1.succeed("systemd-cat netstat -tulpne")
+ nn1.succeed("systemd-cat ss -tulpne")
# Start failover controllers
nn1.succeed("systemctl start hdfs-zkfc")
diff --git a/nixos/tests/haproxy.nix b/nixos/tests/haproxy.nix
index bd8b9b288a22..4b7f26765752 100644
--- a/nixos/tests/haproxy.nix
+++ b/nixos/tests/haproxy.nix
@@ -68,7 +68,7 @@
client =
{ pkgs, ... }:
{
- environment.systemPackages = [ pkgs.curlHTTP3 ];
+ environment.systemPackages = [ pkgs.curl ];
};
};
testScript = ''
diff --git a/nixos/tests/kafka/base.nix b/nixos/tests/kafka/base.nix
index 9591cc42d40a..6ff5c604e78f 100644
--- a/nixos/tests/kafka/base.nix
+++ b/nixos/tests/kafka/base.nix
@@ -118,14 +118,6 @@ let
in
with pkgs;
{
- kafka_3_7 = makeKafkaTest "kafka_3_7" {
- kafkaPackage = apacheKafka_3_7;
- mode = "zookeeper";
- };
- kafka_3_8 = makeKafkaTest "kafka_3_8" {
- kafkaPackage = apacheKafka_3_8;
- mode = "zookeeper";
- };
kafka_3_9 = makeKafkaTest "kafka_3_9" {
kafkaPackage = apacheKafka_3_9;
mode = "zookeeper";
diff --git a/nixos/tests/musescore.nix b/nixos/tests/musescore.nix
index 832fac93e7cb..a0497bd81f5d 100644
--- a/nixos/tests/musescore.nix
+++ b/nixos/tests/musescore.nix
@@ -5,9 +5,15 @@ let
customMuseScoreConfig = hostPkgs.writeText "MuseScore4.ini" ''
[application]
hasCompletedFirstLaunchSetup=true
+ welcomeDialogLastShownIndex=0
+ welcomeDialogLastShownVersion=${hostPkgs.musescore.version}
+ welcomeDialogShowOnStartup=false
[project]
preferredScoreCreationMode=1
+
+ [tours]
+ lastShownTours=",project_opened/input-by-duration"
'';
in
{
@@ -66,7 +72,7 @@ in
machine.sleep(2)
- machine.send_key("tab")
+ machine.send_key("right")
# Type the beginning of https://de.wikipedia.org/wiki/Alle_meine_Entchen
machine.send_chars("cdef6gg5aaaa7g")
machine.sleep(1)
@@ -79,15 +85,14 @@ in
# Wait until the Print dialogue appears.
machine.wait_for_window("Print")
- machine.screenshot("MuseScore4")
+ machine.screenshot("MuseScore3")
machine.send_key("alt-p")
- machine.sleep(1)
-
- machine.screenshot("MuseScore5")
# Wait until PDF is exported
machine.wait_for_file('"/root/Untitled score.pdf"')
+ machine.screenshot("MuseScore4")
+
## Check that it contains the title of the score
machine.succeed('pdfgrep "Untitled score" "/root/Untitled score.pdf"')
machine.copy_from_vm("/root/Untitled score.pdf")
diff --git a/nixos/tests/nginx-http3.nix b/nixos/tests/nginx-http3.nix
index 1c0326d0f0f6..cd321d43d2e1 100644
--- a/nixos/tests/nginx-http3.nix
+++ b/nixos/tests/nginx-http3.nix
@@ -66,7 +66,7 @@ builtins.listToAttrs (
client =
{ pkgs, ... }:
{
- environment.systemPackages = [ pkgs.curlHTTP3 ];
+ environment.systemPackages = [ pkgs.curl ];
networking = {
interfaces.eth1 = {
ipv4.addresses = [
diff --git a/nixos/tests/rasdaemon.nix b/nixos/tests/rasdaemon.nix
index cc7b3fc3c670..d8fcc3c39f05 100644
--- a/nixos/tests/rasdaemon.nix
+++ b/nixos/tests/rasdaemon.nix
@@ -1,8 +1,8 @@
-{ pkgs, ... }:
+{ ... }:
{
name = "rasdaemon";
- meta = with pkgs.lib.maintainers; {
- maintainers = [ evils ];
+ meta = {
+ maintainers = [ ];
};
nodes.machine =
diff --git a/nixos/tests/rustls-libssl.nix b/nixos/tests/rustls-libssl.nix
index 165edb76a5d4..da1c15c8cb27 100644
--- a/nixos/tests/rustls-libssl.nix
+++ b/nixos/tests/rustls-libssl.nix
@@ -64,7 +64,7 @@ in
client =
{ pkgs, ... }:
{
- environment.systemPackages = [ pkgs.curlHTTP3 ];
+ environment.systemPackages = [ pkgs.curl ];
networking = {
interfaces.eth1 = {
ipv4.addresses = [
diff --git a/nixos/tests/sing-box.nix b/nixos/tests/sing-box.nix
index 0825684e0bed..239114924537 100644
--- a/nixos/tests/sing-box.nix
+++ b/nixos/tests/sing-box.nix
@@ -249,7 +249,7 @@ in
];
environment.systemPackages = [
- pkgs.curlHTTP3
+ pkgs.curl
pkgs.iproute2
];
@@ -308,7 +308,7 @@ in
];
environment.systemPackages = [
- pkgs.curlHTTP3
+ pkgs.curl
pkgs.iproute2
];
@@ -369,7 +369,7 @@ in
(builtins.readFile ./common/acme/server/ca.cert.pem)
];
- environment.systemPackages = [ pkgs.curlHTTP3 ];
+ environment.systemPackages = [ pkgs.curl ];
systemd.services.sing-box.serviceConfig.ExecStartPost = [
"+${tproxyPost}/bin/exe"
diff --git a/nixos/tests/systemd-initrd-luks-fido2.nix b/nixos/tests/systemd-initrd-luks-fido2.nix
index e822c811cec5..002281585064 100644
--- a/nixos/tests/systemd-initrd-luks-fido2.nix
+++ b/nixos/tests/systemd-initrd-luks-fido2.nix
@@ -2,6 +2,11 @@
{
name = "systemd-initrd-luks-fido2";
+ meta = {
+ # `canokey-qemu` is marked broken.
+ broken = true;
+ };
+
nodes.machine =
{ pkgs, config, ... }:
{
diff --git a/nixos/tests/tpm2.nix b/nixos/tests/tpm2.nix
new file mode 100644
index 000000000000..e38020f6e5ba
--- /dev/null
+++ b/nixos/tests/tpm2.nix
@@ -0,0 +1,74 @@
+{ lib, pkgs, ... }:
+{
+ name = "tpm2";
+
+ nodes.machine =
+ { config, pkgs, ... }:
+ {
+ virtualisation = {
+ mountHostNixStore = true;
+ useEFIBoot = true;
+ tpm.enable = true;
+ };
+
+ users.users = {
+ tss-user = {
+ isNormalUser = true;
+ extraGroups = [ "tss" ];
+ };
+ };
+
+ security.sudo.wheelNeedsPassword = false;
+
+ security.tpm2 = {
+ enable = true;
+ pkcs11.enable = true;
+ abrmd.enable = true;
+ tctiEnvironment.enable = true;
+ tctiEnvironment.interface = "tabrmd";
+ fapi.ekCertLess = true;
+ };
+
+ environment.systemPackages = [
+ pkgs.tpm2-tools
+ pkgs.openssl
+ ];
+ };
+
+ testScript = ''
+ machine.start()
+ machine.wait_for_unit("multi-user.target")
+
+ with subtest("tabrmd service started properly"):
+ machine.succeed('[ `systemctl show tpm2-abrmd.service --property=Result` = "Result=success" ]')
+ machine.succeed('[ `journalctl -b -u tpm2-abrmd.service | grep -c "Starting"` = "1" ]')
+
+ with subtest("tpm2 cli works"):
+ machine.succeed('tpm2 createprimary --hierarchy=o --key-algorithm=aes256 --attributes="fixedtpm|fixedparent|sensitivedataorigin|userwithauth|restricted|decrypt" --key-context=owner_root_key.ctx')
+ machine.succeed('tpm2 create --parent-context=owner_root_key.ctx --key-algorithm=ecc256:ecdsa-sha256:null --attributes="fixedtpm|fixedparent|sensitivedataorigin|userwithauth|restricted|sign" --key-context=ecc_sign_key.ctx --creation-ticket=ecc_sign_key-creation_ticket.bin -f pem --output=ecc_sign_key_public.pem')
+ machine.succeed('echo "A very important message." > message.txt')
+ machine.succeed('tpm2 sign --key-context=ecc_sign_key.ctx --hash-algorithm=sha256 -f plain --signature message_signature.bin message.txt')
+ machine.succeed('openssl dgst -verify ecc_sign_key_public.pem -signature message_signature.bin message.txt')
+ machine.succeed('echo "evil addition!" >> message.txt')
+ machine.fail('openssl dgst -verify ecc_sign_key_public.pem -signature message_signature.bin message.txt')
+
+ def format_command(command, user):
+ return f"runuser -u {user} -- bash -c '{command}'"
+ def succeedu(command,user):
+ return machine.succeed(format_command(command,user))
+ def failu(command,user):
+ return machine.fail(format_command(command,user))
+
+ with subtest("tss2 cli works"):
+ machine.succeed('tss2 provision')
+ succeedu('tss2 createkey --path=HS/SRK/sign --type=sign --authValue=""',"tss-user")
+ succeedu('tss2 gettpmblobs --path=HS/SRK/sign --tpm2bPublic=$HOME/sign_key_public.bin',"tss-user")
+ succeedu('tpm2 print -t TPM2B_PUBLIC -f pem $HOME/sign_key_public.bin > $HOME/sign_key_public.pem',"tss-user")
+ succeedu('echo "A very important message." > $HOME/message.txt',"tss-user")
+ succeedu('tpm2 hash --hash-algorithm=sha256 --output=$HOME/message_hash.bin $HOME/message.txt',"tss-user")
+ succeedu('tss2 sign --keyPath=HS/SRK/sign --digest=$HOME/message_hash.bin --signature=$HOME/message_signature.bin',"tss-user")
+ succeedu('openssl dgst -verify $HOME/sign_key_public.pem -signature $HOME/message_signature.bin $HOME/message.txt',"tss-user")
+ succeedu('echo "evil addition!" >> $HOME/message.txt',"tss-user")
+ failu('openssl dgst -verify $HOME/sign_key_public.pem -signature $HOME/message_signature.bin $HOME/message.txt',"tss-user")
+ '';
+}
diff --git a/nixos/tests/tuptime.nix b/nixos/tests/tuptime.nix
index b5bde1280e89..cf10211c45a9 100644
--- a/nixos/tests/tuptime.nix
+++ b/nixos/tests/tuptime.nix
@@ -1,8 +1,8 @@
-{ pkgs, ... }:
+{ ... }:
{
name = "tuptime";
- meta = with pkgs.lib.maintainers; {
- maintainers = [ evils ];
+ meta = {
+ maintainers = [ ];
};
nodes.machine =
diff --git a/nixos/tests/web-apps/immich.nix b/nixos/tests/web-apps/immich.nix
index 550a1630bda8..e9b3c38961fd 100644
--- a/nixos/tests/web-apps/immich.nix
+++ b/nixos/tests/web-apps/immich.nix
@@ -17,6 +17,15 @@
services.immich = {
enable = true;
environment.IMMICH_LOG_LEVEL = "verbose";
+ settings.backup.database = {
+ enabled = true;
+ cronExpression = "invalid";
+ };
+ secretSettings = {
+ backup.database.cronExpression = "${pkgs.writeText "cron" "0 02 * * *"}";
+ # thanks to LoadCredential files only readable by root should work
+ notifications.smtp.transport.password = "/etc/shadow";
+ };
};
};
@@ -25,6 +34,8 @@
machine.wait_for_unit("immich-server.service")
+ machine.succeed("stat -L -c '%a %U %G' /run/immich/config.json | grep '600 immich immich'")
+
machine.wait_for_open_port(2283) # Server
machine.wait_for_open_port(3003) # Machine learning
machine.succeed("curl --fail http://localhost:2283/")
diff --git a/nixos/tests/web-apps/linkwarden.nix b/nixos/tests/web-apps/linkwarden.nix
new file mode 100644
index 000000000000..153c7e437599
--- /dev/null
+++ b/nixos/tests/web-apps/linkwarden.nix
@@ -0,0 +1,60 @@
+{ ... }:
+{
+ name = "linkwarden-nixos";
+
+ nodes.machine =
+ { pkgs, ... }:
+ let
+ secretsFile = pkgs.writeText "linkwarden-secret-env" ''
+ VERY_SENSITIVE_SECRET
+ '';
+ webroot = pkgs.runCommand "webroot" { } ''
+ mkdir $out
+ cd $out
+ echo 'HELLO LINKWARDEN ' > index.html
+ '';
+ in
+ {
+ services.linkwarden = {
+ enable = true;
+ enableRegistration = true;
+ secretFiles = {
+ NEXTAUTH_SECRET = toString secretsFile;
+ };
+ environment = {
+ NEXTAUTH_URL = "http://localhost:3000/api/v1/auth";
+ };
+ };
+
+ services.nginx = {
+ enable = true;
+ virtualHosts.localhost.root = webroot;
+ };
+ };
+
+ testScript = ''
+ import json
+
+ machine.wait_for_unit("linkwarden.service")
+ machine.wait_for_unit("linkwarden-worker.service")
+
+ machine.wait_for_open_port(3000)
+ machine.succeed("curl --fail -s http://localhost:3000/")
+
+ machine.succeed("curl -L --fail -s --data '{\"name\":\"Admin\",\"username\":\"admin\",\"password\":\"adminadmin\"}' -H 'Content-Type: application/json' -X POST http://localhost:3000/api/v1/users")
+
+ response = machine.succeed("curl -L --fail -s -c next_cookies.txt -H 'Content-Type: application/json' -X GET http://localhost:3000/api/v1/auth/csrf")
+ csrfToken = json.loads(response)['csrfToken']
+
+ machine.succeed("curl -L --fail -s -b next_cookies.txt -c next_cookies.txt -H 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'username=admin' --data-urlencode 'password=adminadmin' --data-urlencode 'csrfToken=%s' http://localhost:3000/api/v1/auth/callback/credentials" % csrfToken)
+
+ curlCmd = "curl -L --fail -s -b next_cookies.txt -H 'Content-Type: application/json' "
+
+ machine.succeed(curlCmd + "--data '{\"url\":\"http://localhost/\"}' -X POST http://localhost:3000/api/v1/links")
+
+ machine.succeed(curlCmd + "-X GET http://localhost:3000/api/v1/links")
+
+ machine.wait_for_file("/var/lib/linkwarden/archives/1/1.html")
+ machine.succeed("grep -q 'HELLO LINKWARDEN ' = 1.85
- (fetchpatch {
- url = "https://github.com/Ardour/ardour/commit/f94bde59d740d65e67c5cd13af4d7ea51453aeaa.patch";
- hash = "sha256-dGRjkdF3REkANytDR17wIh8J2+AcLFmV4tKZied/OZg=";
- })
- ];
-
- # Ardour's wscript requires git revision and date to be available.
- # Since they are not, let's generate the file manually.
- postPatch = ''
- printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = "${version}"; const char* date = ""; }\n' > libs/ardour/revision.cc
- sed 's|/usr/include/libintl.h|${glibc.dev}/include/libintl.h|' -i wscript
- patchShebangs ./tools/
- substituteInPlace libs/ardour/video_tools_paths.cc \
- --replace-fail 'ffmpeg_exe = X_("")' "ffmpeg_exe = X_(\"${lib.getExe ffmpeg}\");" \
- --replace-fail 'ffprobe_exe = X_("");' "ffprobe_exe = X_(\"${lib.getExe' ffmpeg "ffprobe"}\");"
- '';
-
- nativeBuildInputs = [
- doxygen
- graphviz # for dot
- itstool
- makeWrapper
- perl
- pkg-config
- python3
- wafHook
- ];
-
- buildInputs = [
- alsa-lib
- aubio
- boost186
- cairomm
- cppunit
- curl
- dbus
- ffmpeg
- fftw
- fftwSinglePrec
- flac
- glibmm
- gtkmm2
- itstool
- libarchive
- libjack2
- liblo
- libogg
- libpulseaudio
- librdf_rasqal
- libsamplerate
- libsigcxx
- libsndfile
- libusb1
- libuv
- libwebsockets
- libxml2
- libxslt
- lilv
- lrdf
- lv2
- pango
- perl
- python3
- readline
- rubberband
- serd
- sord
- soundtouch
- sratom
- suil
- taglib_1
- vamp-plugin-sdk
- ]
- ++ lib.optionals videoSupport [
- harvid
- xjadeo
- ];
-
- wafConfigureFlags = [
- "--cxx11"
- "--docs"
- "--freedesktop"
- "--no-phone-home"
- "--optimize"
- "--ptformat"
- "--run-tests"
- "--test"
- ];
- # removed because it fixes https://tracker.ardour.org/view.php?id=8161 and https://tracker.ardour.org/view.php?id=8437
- # "--use-external-libs"
-
- postInstall = ''
- # wscript does not install these for some reason
- install -vDm 644 "build/gtk2_ardour/ardour.xml" \
- -t "$out/share/mime/packages"
- install -vDm 644 "build/gtk2_ardour/ardour${lib.versions.major version}.desktop" \
- -t "$out/share/applications"
- for size in 16 22 32 48 256 512; do
- install -vDm 644 "gtk2_ardour/resources/Ardour-icon_''${size}px.png" \
- "$out/share/icons/hicolor/''${size}x''${size}/apps/ardour${lib.versions.major version}.png"
- done
- install -vDm 644 "ardour.1"* -t "$out/share/man/man1"
-
- # install additional bundled beats, chords and progressions
- cp -rp "${bundledContent}"/* "$out/share/ardour${lib.versions.major version}/media"
- ''
- + lib.optionalString videoSupport ''
- # `harvid` and `xjadeo` must be accessible in `PATH` for video to work.
- wrapProgram "$out/bin/ardour${lib.versions.major version}" \
- --prefix PATH : "${
- lib.makeBinPath [
- harvid
- xjadeo
- ]
- }"
- '';
-
- LINKFLAGS = "-lpthread";
-
- meta = with lib; {
- description = "Multi-track hard disk recording software";
- longDescription = ''
- Ardour is a digital audio workstation (DAW), You can use it to
- record, edit and mix multi-track audio and midi. Produce your
- own CDs. Mix video soundtracks. Experiment with new ideas about
- music and sound.
-
- Please consider supporting the ardour project financially:
- https://community.ardour.org/donate
- '';
- homepage = "https://ardour.org/";
- license = licenses.gpl2Plus;
- mainProgram = "ardour7";
- platforms = platforms.linux;
- maintainers = with maintainers; [
- magnetophon
- mitchmindtree
- ];
- };
-}
diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index 5ec4504270ea..393986b7cb87 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -19,7 +19,6 @@
glibc,
glibmm,
graphviz,
- gtkmm2,
harvid,
hidapi,
itstool,
@@ -44,6 +43,7 @@
lv2,
makeWrapper,
pango,
+ pangomm,
perl,
pkg-config,
python3,
@@ -59,6 +59,7 @@
vamp-plugin-sdk,
wafHook,
xjadeo,
+ xorg,
optimize ? true, # disable to print Lua DSP script output to stdout
videoSupport ? true,
}:
@@ -128,7 +129,6 @@ stdenv.mkDerivation (
flac
fluidsynth
glibmm
- gtkmm2
hidapi
itstool
kissfft
@@ -151,6 +151,7 @@ stdenv.mkDerivation (
lrdf
lv2
pango
+ pangomm
perl
python3
qm-dsp
@@ -163,6 +164,8 @@ stdenv.mkDerivation (
suil
taglib
vamp-plugin-sdk
+ xorg.libXinerama
+ xorg.libXrandr
]
++ lib.optionals videoSupport [
harvid
diff --git a/pkgs/applications/audio/bucklespring/default.nix b/pkgs/applications/audio/bucklespring/default.nix
index 846ded340e16..a20e15feb87c 100644
--- a/pkgs/applications/audio/bucklespring/default.nix
+++ b/pkgs/applications/audio/bucklespring/default.nix
@@ -69,6 +69,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/zevv/bucklespring";
license = licenses.gpl2Only;
platforms = platforms.unix;
- maintainers = [ maintainers.evils ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix
index 71aa235bd663..0afba656b601 100644
--- a/pkgs/applications/audio/espeak-ng/default.nix
+++ b/pkgs/applications/audio/espeak-ng/default.nix
@@ -47,6 +47,11 @@ let
sourceRoot = "${src.name}/src/ucd-tools";
+ # fix compatibility with CMake (https://cmake.org/cmake/help/v4.0/policy/CMP0000.html)
+ postPatch = ''
+ echo 'cmake_minimum_required(VERSION 4.0)' >> CMakeLists.txt
+ '';
+
nativeBuildInputs = [ cmake ];
installPhase = ''
diff --git a/pkgs/applications/audio/munt/libmt32emu.nix b/pkgs/applications/audio/munt/libmt32emu.nix
index 7015d978d394..6d42712f4c8c 100644
--- a/pkgs/applications/audio/munt/libmt32emu.nix
+++ b/pkgs/applications/audio/munt/libmt32emu.nix
@@ -25,8 +25,6 @@ stdenv.mkDerivation rec {
cmake
];
- dontFixCmake = true;
-
cmakeFlags = [
"-Dmunt_WITH_MT32EMU_SMF2WAV=OFF"
"-Dmunt_WITH_MT32EMU_QT=OFF"
diff --git a/pkgs/applications/audio/munt/mt32emu-qt.nix b/pkgs/applications/audio/munt/mt32emu-qt.nix
index eb6e9aabd7d4..ca2d22cc8071 100644
--- a/pkgs/applications/audio/munt/mt32emu-qt.nix
+++ b/pkgs/applications/audio/munt/mt32emu-qt.nix
@@ -50,8 +50,6 @@ mkDerivation rec {
]
++ lib.optional withJack libjack2;
- dontFixCmake = true;
-
cmakeFlags = [
"-Dmt32emu-qt_USE_PULSEAUDIO_DYNAMIC_LOADING=OFF"
"-Dmunt_WITH_MT32EMU_QT=ON"
diff --git a/pkgs/applications/audio/munt/mt32emu-smf2wav.nix b/pkgs/applications/audio/munt/mt32emu-smf2wav.nix
index 0b1010be1893..a32c76f77ba2 100644
--- a/pkgs/applications/audio/munt/mt32emu-smf2wav.nix
+++ b/pkgs/applications/audio/munt/mt32emu-smf2wav.nix
@@ -26,8 +26,6 @@ stdenv.mkDerivation rec {
sed -i -e '/add_subdirectory(mt32emu)/d' CMakeLists.txt
'';
- dontFixCmake = true;
-
nativeBuildInputs = [
cmake
pkg-config
diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index d0dc6f529558..ad4de2c9c7d3 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -36,13 +36,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "musescore";
- version = "4.5.2-unstable-2025-07-03";
+ version = "4.6.0";
src = fetchFromGitHub {
owner = "musescore";
repo = "MuseScore";
- rev = "0ff2476af4e16286ee9f7cf2322715273a0117e0";
- sha256 = "sha256-0ixQfAyAyRmuIrlPosCV/VucKJYYvxjL2o4pkVb5Sd8=";
+ rev = "v${finalAttrs.version}";
+ sha256 = "sha256-+Kmx+jMbBaIzXdulj5tsusF0x9b6tZ6jOTjI+sLP1jU=";
};
cmakeFlags = [
diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/applications/audio/qpwgraph/default.nix
index 0487894564a8..361db3c008ad 100644
--- a/pkgs/applications/audio/qpwgraph/default.nix
+++ b/pkgs/applications/audio/qpwgraph/default.nix
@@ -14,14 +14,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "qpwgraph";
- version = "0.9.5";
+ version = "0.9.6";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "rncbc";
repo = "qpwgraph";
rev = "v${finalAttrs.version}";
- sha256 = "sha256-0cFsRMcQtzOM0tApmBRMhTR5J3Ohvm+ykChCvygpOQM=";
+ sha256 = "sha256-zhp6Mkb8iQF8tGXkYu+lgbMUNN/fk/gWBhzeDS4myJ0=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix
index cf40ea7d9552..bd4f11a3da37 100644
--- a/pkgs/applications/audio/snapcast/default.nix
+++ b/pkgs/applications/audio/snapcast/default.nix
@@ -26,13 +26,13 @@
stdenv.mkDerivation rec {
pname = "snapcast";
- version = "0.33.0";
+ version = "0.34.0";
src = fetchFromGitHub {
owner = "badaix";
repo = "snapcast";
rev = "v${version}";
- hash = "sha256-YJwRY9OLoRiRRJVFnXw9AEsDo2W8elpH4LIUScKjpT0=";
+ hash = "sha256-BPsAGFLWUfONuyQ1pzsJzGV/Jlxv+4TkVT1KG7j8H0s=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/blockchains/bitcoin-knots/default.nix b/pkgs/applications/blockchains/bitcoin-knots/default.nix
index 0cbc0ed2934b..dfee589502a3 100644
--- a/pkgs/applications/blockchains/bitcoin-knots/default.nix
+++ b/pkgs/applications/blockchains/bitcoin-knots/default.nix
@@ -3,26 +3,30 @@
stdenv,
fetchurl,
fetchFromGitHub,
+ cmake,
pkg-config,
- util-linux,
- hexdump,
+ installShellFiles,
autoSignDarwinBinariesHook,
wrapQtAppsHook ? null,
boost,
libevent,
- miniupnpc,
zeromq,
zlib,
db48,
sqlite,
qrencode,
+ libsystemtap,
qtbase ? null,
qttools ? null,
python3,
+ versionCheckHook,
withGui,
withWallet ? true,
+ enableTracing ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isStatic,
gnupg,
- cmake,
+ imagemagick,
+ librsvg,
+ libicns,
# Signatures from the following GPG public keys checked during verification of the source code.
# The list can be found at https://github.com/bitcoinknots/guix.sigs/tree/knots/builder-keys
builderKeys ? [
@@ -43,25 +47,32 @@ stdenv.mkDerivation (finalAttrs: {
};
nativeBuildInputs = [
- pkg-config
- gnupg
cmake
+ pkg-config
+ installShellFiles
+ gnupg
]
- ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux ]
- ++ lib.optionals stdenv.hostPlatform.isDarwin [ hexdump ]
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
autoSignDarwinBinariesHook
]
- ++ lib.optionals withGui [ wrapQtAppsHook ];
+ ++ lib.optionals withGui [
+ imagemagick # for convert
+ librsvg # for rsvg-convert
+ wrapQtAppsHook
+ ]
+ ++ lib.optionals (stdenv.hostPlatform.isDarwin && withGui) [
+ libicns # for png2icns
+ ];
buildInputs = [
boost
libevent
- miniupnpc
zeromq
zlib
]
+ ++ lib.optionals enableTracing [ libsystemtap ]
++ lib.optionals withWallet [ sqlite ]
+ # building with db48 (for legacy descriptor wallet support) is broken on Darwin
++ lib.optionals (withWallet && !stdenv.hostPlatform.isDarwin) [ db48 ]
++ lib.optionals withGui [
qrencode
@@ -110,17 +121,39 @@ stdenv.mkDerivation (finalAttrs: {
ln -s $src ./bitcoin-${finalAttrs.version}.tar.gz
gpg --no-autostart --batch --verify --status-fd 1 SHA256SUMS.asc SHA256SUMS > verify.log
${verifyBuilderKeys}
+ echo "Checking ${checksums} for bitcoin-${finalAttrs.version}.tar.gz..."
grep bitcoin-${finalAttrs.version}.tar.gz SHA256SUMS > SHA256SUMS.filtered
echo "Verifying the checksum of bitcoin-${finalAttrs.version}.tar.gz..."
sha256sum -c SHA256SUMS.filtered
popd
'';
- configureFlags = [
+ postInstall = ''
+ cd ..
+ installShellCompletion --bash contrib/completions/bash/bitcoin-cli.bash
+ installShellCompletion --bash contrib/completions/bash/bitcoind.bash
+ installShellCompletion --bash contrib/completions/bash/bitcoin-tx.bash
+
+ installShellCompletion --fish contrib/completions/fish/bitcoin-cli.fish
+ installShellCompletion --fish contrib/completions/fish/bitcoind.fish
+ installShellCompletion --fish contrib/completions/fish/bitcoin-tx.fish
+ installShellCompletion --fish contrib/completions/fish/bitcoin-util.fish
+ installShellCompletion --fish contrib/completions/fish/bitcoin-wallet.fish
+ ''
+ + lib.optionalString withGui ''
+ installShellCompletion --fish contrib/completions/fish/bitcoin-qt.fish
+ '';
+
+ cmakeFlags = [
(lib.cmakeBool "BUILD_BENCH" false)
+ (lib.cmakeBool "WITH_ZMQ" true)
+ # building with db48 (for legacy wallet support) is broken on Darwin
+ (lib.cmakeBool "WITH_BDB" (withWallet && !stdenv.hostPlatform.isDarwin))
+ (lib.cmakeBool "WITH_USDT" enableTracing)
]
++ lib.optionals (!finalAttrs.doCheck) [
(lib.cmakeBool "BUILD_TESTS" false)
+ (lib.cmakeBool "BUILD_FUZZ_BINARY" false)
(lib.cmakeBool "BUILD_GUI_TESTS" false)
]
++ lib.optionals (!withWallet) [
@@ -128,9 +161,12 @@ stdenv.mkDerivation (finalAttrs: {
]
++ lib.optionals withGui [
(lib.cmakeBool "BUILD_GUI" true)
- (lib.cmakeFeature "WITH_QT_VERSION" "5")
];
+ NIX_LDFLAGS = lib.optionals (
+ stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isStatic
+ ) "-levent_core";
+
nativeCheckInputs = [ python3 ];
doCheck = true;
@@ -144,8 +180,17 @@ stdenv.mkDerivation (finalAttrs: {
enableParallelBuilding = true;
+ __darwinAllowLocalNetworking = true;
+
+ nativeInstallCheckInputs = [
+ versionCheckHook
+ ];
+ versionCheckProgram = "${placeholder "out"}/bin/bitcoin-cli";
+ versionCheckProgramArg = "--version";
+ doInstallCheck = true;
+
meta = {
- description = "Derivative of Bitcoin Core with a collection of improvements";
+ description = "Derivative of Bitcoin Core";
homepage = "https://bitcoinknots.org/";
changelog = "https://github.com/bitcoinknots/bitcoin/blob/v${finalAttrs.version}/doc/release-notes.md";
maintainers = with lib.maintainers; [
diff --git a/pkgs/applications/display-managers/sddm/unwrapped.nix b/pkgs/applications/display-managers/sddm/unwrapped.nix
index 15378ed16949..e3b2389f2f10 100644
--- a/pkgs/applications/display-managers/sddm/unwrapped.nix
+++ b/pkgs/applications/display-managers/sddm/unwrapped.nix
@@ -2,6 +2,7 @@
stdenv,
lib,
fetchFromGitHub,
+ fetchpatch,
cmake,
pkg-config,
qttools,
@@ -39,6 +40,12 @@ stdenv.mkDerivation (finalAttrs: {
./greeter-path.patch
./sddm-ignore-config-mtime.patch
./sddm-default-session.patch
+
+ (fetchpatch {
+ name = "sddm-fix-cmake-4.patch";
+ url = "https://github.com/sddm/sddm/commit/228778c2b4b7e26db1e1d69fe484ed75c5791c3a.patch";
+ hash = "sha256-Okt9LeZBhTDhP7NKBexWAZhkK6N6j9dFkAEgpidSnzE=";
+ })
];
postPatch = ''
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-airshare/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-airshare/package.nix
index 9160cf770e39..5a5012750cf5 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-airshare/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-airshare/package.nix
@@ -33,7 +33,6 @@ melpaBuild {
qrcode
]
++ ps.qrcode.optional-dependencies.pil;
- eafOtherDeps = [ ];
};
meta = {
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-browser/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-browser/default.nix
index e3053b614a4c..f804b2a65d32 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-browser/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-browser/default.nix
@@ -36,6 +36,12 @@ melpaBuild (finalAttrs: {
npmHooks.npmConfigHook
];
+ postPatch = ''
+ substituteInPlace buffer.py \
+ --replace-fail "aria2_args = [\"aria2c\"]" \
+ "aria2_args = [\"${lib.getExe aria2}\"]"
+ '';
+
files = ''
("*.el"
"*.py"
@@ -55,9 +61,6 @@ melpaBuild (finalAttrs: {
ps: with ps; [
pysocks
];
- eafOtherDeps = [
- aria2
- ];
};
meta = {
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-camera/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-camera/package.nix
index 13bc0a7706cc..2f4fbba74e83 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-camera/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-camera/package.nix
@@ -55,7 +55,6 @@ melpaBuild (finalAttrs: {
passthru = {
updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
eafPythonDeps = ps: [ ];
- eafOtherDeps = [ ];
};
meta = {
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-file-manager/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-file-manager/package.nix
index a338e66c610e..8d0c4ef415fc 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-file-manager/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-file-manager/package.nix
@@ -36,6 +36,14 @@ melpaBuild (finalAttrs: {
npmHooks.npmConfigHook
];
+ postPatch = ''
+ substituteInPlace buffer.py \
+ --replace-fail "shutil.which(\"fd\")" \
+ "shutil.which(\"${lib.getExe fd}\")" \
+ --replace-fail "return \"fd\"" \
+ "return \"${lib.getExe fd}\""
+ '';
+
postBuild = ''
npm run build
'';
@@ -62,9 +70,6 @@ melpaBuild (finalAttrs: {
pygments
exif
];
- eafOtherDeps = [
- fd
- ];
};
meta = {
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-git/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-git/default.nix
index 5b134cfc2f28..2295c988bbcb 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-git/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-git/default.nix
@@ -37,6 +37,16 @@ melpaBuild (finalAttrs: {
npmHooks.npmConfigHook
];
+ postPatch = ''
+ substituteInPlace eaf-git.el \
+ --replace-fail "(defcustom eaf-git-delta-executable \"delta\"" \
+ "(defcustom eaf-git-delta-executable \"${lib.getExe delta}\""
+
+ substituteInPlace buffer.py \
+ --replace-fail "command = \"rg '{}' {}" \
+ "command = \"${lib.getExe ripgrep} '{}' {}"
+ '';
+
postBuild = ''
npm run build
'';
@@ -65,10 +75,6 @@ melpaBuild (finalAttrs: {
pygments
unidiff
];
- eafOtherDeps = [
- delta
- ripgrep
- ];
};
meta = {
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-image-viewer/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-image-viewer/package.nix
index 836e25dcbc2e..cb1f1ab14bff 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-image-viewer/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-image-viewer/package.nix
@@ -49,7 +49,6 @@ melpaBuild (finalAttrs: {
passthru = {
updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
eafPythonDeps = ps: [ ];
- eafOtherDeps = [ ];
};
meta = {
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-js-video-player/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-js-video-player/package.nix
index cfc740a74d25..519afd342d06 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-js-video-player/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-js-video-player/package.nix
@@ -55,7 +55,6 @@ melpaBuild (finalAttrs: {
passthru = {
updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
eafPythonDeps = ps: [ ];
- eafOtherDeps = [ ];
};
meta = {
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-map/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-map/package.nix
index 682f622a3ffd..e0f38b15c604 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-map/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-map/package.nix
@@ -60,7 +60,6 @@ melpaBuild (finalAttrs: {
pycurl
python-tsp
];
- eafOtherDeps = [ ];
};
meta = {
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-pdf-viewer/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-pdf-viewer/package.nix
index 152a573fef87..35dc987dbaae 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-pdf-viewer/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-pdf-viewer/package.nix
@@ -31,7 +31,6 @@ melpaBuild {
packaging
pymupdf
];
- eafOtherDeps = [ ];
};
meta = {
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-pyqterminal/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-pyqterminal/package.nix
index 0a2c88784518..d60787854748 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-pyqterminal/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-pyqterminal/package.nix
@@ -31,7 +31,6 @@ melpaBuild {
pyte
psutil
];
- eafOtherDeps = [ ];
};
meta = {
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-application-framework/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-application-framework/package.nix
index 6630a5e6b6ac..09acf5c1c472 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-application-framework/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-application-framework/package.nix
@@ -10,7 +10,6 @@
# Emacs dependencies
all-the-icons,
# Other dependencies
- nodejs,
wmctrl,
xdotool,
# Updater
@@ -22,7 +21,6 @@
let
appPythonDeps = map (item: item.eafPythonDeps) enabledApps;
- appOtherDeps = map (item: item.eafOtherDeps) enabledApps;
pythonPackageLists = [
(
@@ -41,26 +39,15 @@ let
pythonPkgs = ps: builtins.concatLists (map (f: f ps) pythonPackageLists);
pythonEnv = python3.withPackages pythonPkgs;
- otherPackageLists = [
- (
- [
- nodejs
- wmctrl
- ]
- ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform xdotool) [ xdotool ]
- )
- ]
- ++ appOtherDeps;
- otherPkgs = builtins.concatLists otherPackageLists;
+ wmctrlExe = lib.getExe wmctrl;
+ xdotoolExe = lib.optionalString (lib.meta.availableOn stdenv.hostPlatform xdotool) (
+ lib.getExe xdotool
+ );
appsDrv = symlinkJoin {
name = "emacs-application-framework-apps";
paths = enabledApps;
};
- depsBin = symlinkJoin {
- name = "emacs-application-framework-deps-bin";
- paths = otherPkgs;
- };
in
@@ -84,6 +71,20 @@ melpaBuild (finalAttrs: {
substituteInPlace eaf.el \
--replace-fail "\"python.exe\" \"python3\"" \
"\"python.exe\" \"${pythonEnv.interpreter}\""
+
+ substituteInPlace eaf.el \
+ --replace-fail "(executable-find \"wmctrl\")" \
+ "(executable-find \"${wmctrlExe}\")" \
+ --replace-fail "(shell-command-to-string \"wmctrl -m\")" \
+ "(shell-command-to-string \"${wmctrlExe} -m\")" \
+ --replace-fail "\"wmctrl -i -a \$(wmctrl -lp | awk -vpid=\$PID '\$3==%s {print \$1; exit}')\"" \
+ "\"${wmctrlExe} -i -a \$(${wmctrlExe} -lp | awk -vpid=\$PID '\$3==%s {print \$1; exit}')\""
+
+ substituteInPlace eaf.el \
+ --replace-fail "(executable-find \"xdotool\")" \
+ "(executable-find \"${xdotoolExe}\")" \
+ --replace-fail "(shell-command-to-string \"xdotool getactivewindow getwindowname\")" \
+ "(shell-command-to-string \"${xdotoolExe} getactivewindow getwindowname\")"
'';
files = ''
@@ -112,13 +113,6 @@ melpaBuild (finalAttrs: {
cp -r $APPNATDIR/. \
$NATDIR/
fi
-
- mkdir -p $out/bin/
- for item in ${depsBin}/bin/*; do
- # Some symbolic links point to another symbolic link
- ln -s $(readlink -f $item) \
- $out/bin/$(basename $item)
- done
'';
passthru.updateScript = unstableGitUpdater { };
diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix
index e74e21254b71..8a4ed7645b1c 100644
--- a/pkgs/applications/editors/emacs/make-emacs.nix
+++ b/pkgs/applications/editors/emacs/make-emacs.nix
@@ -74,6 +74,8 @@
withCairo ? withX,
withCsrc ? true,
withDbus ? stdenv.hostPlatform.isLinux,
+ # https://github.com/emacs-mirror/emacs/blob/emacs-30.2/etc/NEWS#L52-L56
+ withGcMarkTrace ? false,
withGTK3 ? withPgtk && !noGui,
withGlibNetworking ? withPgtk || withGTK3 || (withX && withXwidgets),
withGpm ? stdenv.hostPlatform.isLinux,
@@ -408,6 +410,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.withFeature withNS "ns")
]
++ [
+ (lib.enableFeature withGcMarkTrace "gc-mark-trace")
(lib.withFeature withCompressInstall "compress-install")
(lib.withFeature withToolkitScrollBars "toolkit-scroll-bars")
(lib.withFeature withNativeCompilation "native-compilation")
diff --git a/pkgs/applications/editors/jetbrains/source/build.nix b/pkgs/applications/editors/jetbrains/source/build.nix
index 90f412953372..2052025ba3a9 100644
--- a/pkgs/applications/editors/jetbrains/source/build.nix
+++ b/pkgs/applications/editors/jetbrains/source/build.nix
@@ -102,7 +102,12 @@ let
inherit src;
sourceRoot = "${src.name}/native/LinuxGlobalMenu";
patches = [ ../patches/libdbm-headers.patch ];
- postPatch = "cp ${libdbusmenu-jb}/lib/libdbusmenu-glib.a libdbusmenu-glib.a";
+ postPatch = ''
+ # Fix the build with CMake 4.
+ substituteInPlace CMakeLists.txt \
+ --replace-fail 'cmake_minimum_required(VERSION 2.6.0)' 'cmake_minimum_required(VERSION 3.10)'
+ cp ${libdbusmenu-jb}/lib/libdbusmenu-glib.a libdbusmenu-glib.a
+ '';
passthru.patched-libdbusmenu = libdbusmenu-jb;
installPhase = ''
runHook preInstall
diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index fdec78c8acd4..11875eaac7e1 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -1,6 +1,6 @@
{ lib, fetchFromGitHub }:
rec {
- version = "9.1.1623";
+ version = "9.1.1765";
outputs = [
"out"
@@ -11,7 +11,7 @@ rec {
owner = "vim";
repo = "vim";
rev = "v${version}";
- hash = "sha256-T7epi6ex9AU4iV/ClSeKlK3T0V0WajiVxnDVevkqaw8=";
+ hash = "sha256-bL6mqnke0uE0Bk7oYjJPiPtl/9Qk8fvCXrQVqAb7pPM=";
};
enableParallelBuilding = true;
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 66d1b08b4b25..92d27e322f65 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -3781,6 +3781,19 @@ final: prev: {
meta.hydraPlatforms = [ ];
};
+ cybu-nvim = buildVimPlugin {
+ pname = "cybu.nvim";
+ version = "2025-07-24";
+ src = fetchFromGitHub {
+ owner = "ghillb";
+ repo = "cybu.nvim";
+ rev = "c8a8c71cd0e38d4165b02819dfdc32dedc35a6b6";
+ sha256 = "0bxgil5vb6lpq420xw404qbxd92by6qjxilba36h9dd87js97by1";
+ };
+ meta.homepage = "https://github.com/ghillb/cybu.nvim/";
+ meta.hydraPlatforms = [ ];
+ };
+
dailies-nvim = buildVimPlugin {
pname = "dailies.nvim";
version = "2025-04-21";
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
index 2f41b843c3f5..3306f40022b8 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
@@ -12,12 +12,12 @@
pkgs,
}:
let
- version = "0.0.27-unstable-2025-09-18";
+ version = "0.0.27-unstable-2025-10-06";
src = fetchFromGitHub {
owner = "yetone";
repo = "avante.nvim";
- rev = "44db8eba870f6c123da5efa70384b2889f3e3495";
- hash = "sha256-x2lb7k/qfERXYMdM+Upf6kmsYS3Qp9iz2KEvzvgb8P4=";
+ rev = "a7052aca0bdfb93e524f0536ac80e6c542962f47";
+ hash = "sha256-crtzBzRcpuqQdqymUJMAxky1Lfk+6YY0YifThHXz7Rw=";
};
avante-nvim-lib = rustPlatform.buildRustPackage {
pname = "avante-nvim-lib";
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/rainbow-delimiters-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/rainbow-delimiters-nvim/default.nix
index 7664e921c96f..500386290c92 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/rainbow-delimiters-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/rainbow-delimiters-nvim/default.nix
@@ -6,13 +6,13 @@
}:
vimUtils.buildVimPlugin rec {
pname = "rainbow-delimiters.nvim";
- version = "0.9.1";
+ version = "0.10.0";
src = fetchFromGitLab {
owner = "HiPhish";
repo = "rainbow-delimiters.nvim";
tag = "v${version}";
- hash = "sha256-FGM9QWpveaICACDEVc6jpJNAfJ93gFxz0VHxCrzDaYs=";
+ hash = "sha256-E0ZPi9Vzc3TwhNHsGyABY+sgn/vO6Oyun6eRd7/RFgU=";
};
nvimSkipModules = [
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/sonarlint-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/sonarlint-nvim/default.nix
index a7ba9dfc6e1a..29a21b5c326e 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/sonarlint-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/sonarlint-nvim/default.nix
@@ -6,13 +6,13 @@
}:
vimUtils.buildVimPlugin {
pname = "sonarlint.nvim";
- version = "0-unstable-2025-09-18";
+ version = "0-unstable-2025-10-04";
src = fetchFromGitLab {
owner = "schrieveslaach";
repo = "sonarlint.nvim";
- rev = "dc5702556f90eedce587233f3c1a0ae671ea3648";
- hash = "sha256-IBXQ9ijAG8TdnwkSTNbBtzziQC5bbCbkAmC8gM7G5E4=";
+ rev = "1d49a469265e271f02b6efcf09c215e4560bd5fa";
+ hash = "sha256-1eUwgHvegULo33xVjvV3b90fSlJ8Ax10iDCZE4IPo58=";
};
passthru.updateScript = nix-update-script {
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 4f4b8c7d5fdb..18a8c539374b 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -289,6 +289,7 @@ https://github.com/amiorin/ctrlp-z/,,
https://github.com/ctrlpvim/ctrlp.vim/,,
https://github.com/gbprod/cutlass.nvim/,HEAD,
https://github.com/scottmckendry/cyberdream.nvim/,,
+https://github.com/ghillb/cybu.nvim/,,
https://github.com/JachymPutta/dailies.nvim/,HEAD,
https://github.com/Koalhack/darcubox-nvim/,HEAD,
https://github.com/ptdewey/darkearth-nvim/,HEAD,
diff --git a/pkgs/applications/editors/vscode/extensions/Google.gemini-cli-vscode-ide-companion/default.nix b/pkgs/applications/editors/vscode/extensions/Google.gemini-cli-vscode-ide-companion/default.nix
index c51b510a7a81..cc8fbb270ddd 100644
--- a/pkgs/applications/editors/vscode/extensions/Google.gemini-cli-vscode-ide-companion/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/Google.gemini-cli-vscode-ide-companion/default.nix
@@ -2,7 +2,6 @@
lib,
vscode-utils,
gemini-cli,
- vsce,
}:
vscode-utils.buildVscodeExtension (finalAttrs: {
pname = "gemini-cli-vscode-ide-companion";
@@ -15,8 +14,6 @@ vscode-utils.buildVscodeExtension (finalAttrs: {
src = gemini-cli.overrideAttrs (oldAttrs: {
pname = "gemini-cli-vscode-ide-companion-vsix";
- nativeBuildInputs = gemini-cli.nativeBuildInputs ++ [ vsce ];
-
installPhase = ''
runHook preInstall
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 14004e4e89f2..2ada2cc21ddb 100644
--- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "claude-code";
publisher = "anthropic";
- version = "2.0.5";
- hash = "sha256-3+VrFM1aB26AfF8vkrFJXOfg07EGkwNa+nh1vvy6MFw=";
+ version = "2.0.9";
+ hash = "sha256-uVCdFSpitKU0YPbhl1kbogrQ+bckhH6GYTd7GPjrMRA=";
};
meta = {
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index cf9385c81345..289f0f72293c 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1182,8 +1182,8 @@ let
mktplcRef = {
name = "dart-code";
publisher = "dart-code";
- version = "3.118.2";
- hash = "sha256-AHT5QP8aNhuMOyyV7Nig8UnoG4dkQhN2XKw0eh+Rfbg=";
+ version = "3.120.0";
+ hash = "sha256-YXQhdn9bOpVGeG0mKPazMvsZecx4sd1ZpSdHfH3eNOY=";
};
meta.license = lib.licenses.mit;
@@ -1324,8 +1324,8 @@ let
mktplcRef = {
publisher = "discloud";
name = "discloud";
- version = "2.27.2";
- hash = "sha256-NkOYn0ZNRqgi8HHowZSYmRKeOfqcxXfKIXUQNsJ0BtM=";
+ version = "2.27.9";
+ hash = "sha256-6+sAbjpwWTLGZ7uH6rl7LZcNmOnAftiYGithbBlvIak=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/discloud.discloud/changelog";
@@ -1707,8 +1707,8 @@ let
mktplcRef = {
name = "vscode-jest-runner";
publisher = "firsttris";
- version = "0.4.82";
- hash = "sha256-8sKMxatSaibMESktDJdQ84jINsE05ZVSjLMGjHFw7VI=";
+ version = "0.4.84";
+ hash = "sha256-x4CaSa/CRZgs7vGthFcn8UXYrbQhQXkULPBbGnj3zpw=";
};
meta = {
description = "Simple way to run or debug a single (or multiple) tests from context-menu";
@@ -1949,8 +1949,8 @@ let
mktplcRef = {
publisher = "github";
name = "vscode-pull-request-github";
- version = "0.118.1";
- hash = "sha256-k3fz2PPXS85Xb0emVPyiQ4yGf1hmBZSU8LQ7lgLQ4JU=";
+ version = "0.118.2";
+ hash = "sha256-DB1O6Rpwo1VfwddgiUFFbOoOpxxTOLJ/JEQExBpK5fU=";
};
meta = {
license = lib.licenses.mit;
@@ -4508,8 +4508,8 @@ let
mktplcRef = {
name = "tabnine-vscode";
publisher = "tabnine";
- version = "3.315.0";
- hash = "sha256-y6nTUDMQtJWZA30/jWTu0Kj9EMYkLGUAq7xvBvwGpeY=";
+ version = "3.317.0";
+ hash = "sha256-xXZfuZ9ZqACzoTpRkSAXHczJ06A0CC5WIic/I1uoLuI=";
};
meta = {
license = lib.licenses.mit;
@@ -5104,28 +5104,14 @@ let
};
};
- vscode-icons-team.vscode-icons = buildVscodeMarketplaceExtension {
- mktplcRef = {
- name = "vscode-icons";
- publisher = "vscode-icons-team";
- version = "12.14.0";
- hash = "sha256-ZoyH5jWbLURTfRApgJT0/c/ZbgGzt/Yn4WmUVO9HPSk=";
- };
- meta = {
- description = "Bring real icons to your Visual Studio Code";
- downloadPage = "https://marketplace.visualstudio.com/items?itemName=vscode-icons-team.vscode-icons";
- homepage = "https://github.com/vscode-icons/vscode-icons";
- license = lib.licenses.mit;
- maintainers = [ lib.maintainers.bastaynav ];
- };
- };
+ vscode-icons-team.vscode-icons = callPackage ./vscode-icons-team.vscode-icons { };
vscodevim.vim = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vim";
publisher = "vscodevim";
- version = "1.30.1";
- hash = "sha256-cKdVQTGj7R37YefQAaTspF1RVul/9wv7u9b5TpGZN5k=";
+ version = "1.31.0";
+ hash = "sha256-97dQeCFm2i5uRF45k1tVMWiXNh5xBw3MVYM8MSIeDFE=";
};
meta = {
license = lib.licenses.mit;
@@ -5482,8 +5468,8 @@ let
mktplcRef = {
name = "vscode-zig";
publisher = "ziglang";
- version = "0.6.13";
- hash = "sha256-4DYsSGqWa+jbD8tguULFQLdhKluXK8skj9nSst9UX8U=";
+ version = "0.6.14";
+ hash = "sha256-Bp0WdHTew+AZVtlHY/BBngtWJ9F4MjPx5tcR4HgXBio=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/ziglang.vscode-zig/changelog";
diff --git a/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix b/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix
index 7c82d89ee4a4..75c742aef34c 100644
--- a/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
publisher = "github";
name = "copilot-chat";
- version = "0.31.3";
- hash = "sha256-Kvg5gmvAcz+K6mWBzWoNnkqEWAPRgC+w0idUC6RzM0g=";
+ version = "0.31.5";
+ hash = "sha256-D7k+hA786w7IZHVI+Og6vHGAAohpfpuOmmCcDUU0WsY=";
};
meta = {
diff --git a/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-bicep/default.nix b/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-bicep/default.nix
index eda3e894cd86..af57b462dcd7 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-bicep/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-bicep/default.nix
@@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
publisher = "ms-azuretools";
name = "vscode-bicep";
- version = "0.37.4";
- hash = "sha256-RBoScMaYWKfA9SONCLkFEcGwj8ffQ3ZlAOiyQY9LtVw=";
+ version = "0.38.33";
+ hash = "sha256-gmSUPHdbxXu5jUASsbu+yVO2ZdVBo5+uQNeLdTsvQVU=";
};
buildInputs = [
diff --git a/pkgs/applications/editors/vscode/extensions/vscode-icons-team.vscode-icons/default.nix b/pkgs/applications/editors/vscode/extensions/vscode-icons-team.vscode-icons/default.nix
new file mode 100644
index 000000000000..c03eb816f3bb
--- /dev/null
+++ b/pkgs/applications/editors/vscode/extensions/vscode-icons-team.vscode-icons/default.nix
@@ -0,0 +1,81 @@
+{
+ lib,
+ stdenvNoCC,
+ fetchFromGitHub,
+ fetchNpmDeps,
+ nodejs,
+ npmHooks,
+ vsce,
+ vscode-utils,
+ nix-update-script,
+}:
+
+let
+ vsix = stdenvNoCC.mkDerivation (finalAttrs: {
+ name = "vscode-icons-${finalAttrs.version}.zip";
+ pname = "vscode-icons-vsix";
+ version = "12.14.0";
+
+ src = fetchFromGitHub {
+ owner = "vscode-icons";
+ repo = "vscode-icons";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-uxGKgqAllwW3MG89mvZ/M6So+vtpHVUDLCnVHKYfMOA=";
+ };
+
+ npmDeps = fetchNpmDeps {
+ name = "${finalAttrs.pname}-npm-deps";
+ inherit (finalAttrs) src;
+ hash = "sha256-QLla/7hBIi7REhix+cXscdDHy+wzVXItQypeU+NUHQo=";
+ };
+
+ nativeBuildInputs = [
+ nodejs
+ npmHooks.npmConfigHook
+ vsce
+ ];
+
+ env.PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "true";
+
+ buildPhase = ''
+ runHook preBuild
+ vsce package
+ runHook postBuild
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ cp ./vscode-icons-$version.vsix $out
+ runHook postInstall
+ '';
+ });
+in
+vscode-utils.buildVscodeExtension (finalAttrs: {
+ pname = "vscode-icons";
+ inherit (finalAttrs.src) version;
+
+ vscodeExtPublisher = "vscode-icons-team";
+ vscodeExtName = "vscode-icons";
+ vscodeExtUniqueId = "${finalAttrs.vscodeExtPublisher}.${finalAttrs.vscodeExtName}";
+
+ src = vsix;
+
+ passthru = {
+ vsix = finalAttrs.src;
+ updateScript = nix-update-script {
+ attrPath = "vscode-extensions.kilocode.kilo-kode.vsix";
+ };
+ };
+
+ meta = {
+ description = "Bring real icons to your Visual Studio Code";
+ downloadPage = "https://marketplace.visualstudio.com/items?itemName=vscode-icons-team.vscode-icons";
+ homepage = "https://github.com/vscode-icons/vscode-icons";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [
+ bastaynav
+ xiaoxiangmoe
+ ];
+ sourceProvenance = with lib.sourceTypes; [ fromSource ];
+ };
+})
diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix
index a66f84ecac2b..2b4927b21eba 100644
--- a/pkgs/applications/editors/vscode/generic.nix
+++ b/pkgs/applications/editors/vscode/generic.nix
@@ -128,6 +128,7 @@ stdenv.mkDerivation (
extraBwrapArgs = [
"--bind-try /etc/nixos/ /etc/nixos/"
+ "--ro-bind-try /etc/xdg/ /etc/xdg/"
];
# symlink shared assets, including icons and desktop entries
diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index 25663ca9e60c..783c4d7d2f85 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -36,20 +36,20 @@ let
hash =
{
- x86_64-linux = "sha256-0zgsR0nk9zsOeEcKhrmAFbAhvKKFNsC8fXjCnxFcndE=";
- x86_64-darwin = "sha256-4+3T3axXNfePEkevhLwRPeqoxKs2OTL7B7TiV2BxZWc=";
- aarch64-linux = "sha256-iGLtuVFA5NphiF1PU9Pus/nZ8PyCNNzDOpcQ+utYE2I=";
- aarch64-darwin = "sha256-E4BopxbqH1lg1Q2NlyWjH8jytabiv5y4hG5ZJW4nqzs=";
- armv7l-linux = "sha256-YIidKSsqK3DSAfPd7O1pbft1C/ny/iB+CFbR/T9u7L8=";
+ x86_64-linux = "sha256-S9H1IZGV3BZe2kjSdkt8S+ShE1EQA0yiKEl65tNNtJw=";
+ x86_64-darwin = "sha256-Wi21LByNSjaTKdpJJM9d/5yspaoplJ1pDxGBMxAxLT0=";
+ aarch64-linux = "sha256-m1AkCRiVJbUPArvK/QyG+Y/7qCLHY20vv40suFXK1fk=";
+ aarch64-darwin = "sha256-iwUegTexE0Iroh+VN9/cQ/s1f2SjLSePjIJanjMDzHU=";
+ armv7l-linux = "sha256-06LY6PrWg1VBjUjoLNIrbuKu9YzJS4MM38wlx8JQdvw=";
}
.${system} or throwSystem;
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
- version = "1.104.2";
+ version = "1.104.3";
# This is used for VS Code - Remote SSH test
- rev = "e3a5acfb517a443235981655413d566533107e92";
+ rev = "385651c938df8a906869babee516bffd0ddb9829";
in
callPackage ./generic.nix {
pname = "vscode" + lib.optionalString isInsiders "-insiders";
@@ -82,7 +82,7 @@ callPackage ./generic.nix {
src = fetchurl {
name = "vscode-server-${rev}.tar.gz";
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
- hash = "sha256-Tz1P8eGokG+8thao9dRllAdTxvllhfOEDKH9lC2QwB0=";
+ hash = "sha256-0tGqGDMmLURqdQwqFWCO10d/RkVha8iC0Uv/JFp9nNQ=";
};
stdenv = stdenvNoCC;
};
diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix
index 0804eef36bd9..97bfe3e762f0 100644
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@@ -26,11 +26,11 @@ let
hash =
{
- x86_64-linux = "sha256-v6cGOKA4wewHfhVjXWXkQBmv56iSMCaxco2G9EQy1jI=";
- x86_64-darwin = "sha256-WDqm2f88q55Yfff0R/0+FxzbR5QkIKKGNnj5+QQXbDw=";
- aarch64-linux = "sha256-m9JIqloo0evYIPeXtGGX8mFXRnlZS2wegvo38uHT9SA=";
- aarch64-darwin = "sha256-obvl+uV+vaGioPUf3/KU4GYkMWly2xGfOzZQxrHYIIk=";
- armv7l-linux = "sha256-Q2raRw3St3vnZawy5vO9b3+DCvnMIMFEMEKxGOSXkz8=";
+ x86_64-linux = "sha256-OWJqNm08Uy7Wr5pbucS0eWUyN3xU6/qLYM8wL/hg2dY=";
+ x86_64-darwin = "sha256-Cq+JfzSTYJ85OWW9QjDSGU6yBqvoEniaqlwA/eT/+c0=";
+ aarch64-linux = "sha256-u5IRp1qoPN2A5T9iPDPrZjhw/UAHcBrRanWPJMeFD0k=";
+ aarch64-darwin = "sha256-KDqNpsLi+EXoAAY0TZFkbHT8WBy1f4hU1ag7Fp24MKY=";
+ armv7l-linux = "sha256-9R4FBxyIx7+jMNrUDfMrvIMNqggJ97mTSTXIjG5ccLI=";
}
.${system} or throwSystem;
@@ -41,7 +41,7 @@ callPackage ./generic.nix rec {
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
- version = "1.104.26450";
+ version = "1.104.36664";
pname = "vscodium";
executableName = "codium";
diff --git a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix
index 06afaea0bda9..f897e38fba5d 100644
--- a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix
+++ b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix
@@ -8,13 +8,13 @@
}:
mkLibretroCore {
core = "mednafen-psx" + lib.optionalString withHw "-hw";
- version = "0-unstable-2025-08-29";
+ version = "0-unstable-2025-10-03";
src = fetchFromGitHub {
owner = "libretro";
repo = "beetle-psx-libretro";
- rev = "fe380f78ca0796fbe58901d80b125afaa8a2670b";
- hash = "sha256-MG8hrLkqTgMI/JQ0WZ68iI22xD/Qs2jWL+tle0brZ6g=";
+ rev = "4968db4255bd8853137132c5d0809becd7638026";
+ hash = "sha256-MVcz+c5ExZZuda5ene4nhidd/zZNvXcAg+wCinQisME=";
};
extraBuildInputs = lib.optionals withHw [
diff --git a/pkgs/applications/emulators/libretro/cores/bluemsx.nix b/pkgs/applications/emulators/libretro/cores/bluemsx.nix
index 35ed4938c6cd..21d55863beb9 100644
--- a/pkgs/applications/emulators/libretro/cores/bluemsx.nix
+++ b/pkgs/applications/emulators/libretro/cores/bluemsx.nix
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "bluemsx";
- version = "0-unstable-2025-09-19";
+ version = "0-unstable-2025-09-27";
src = fetchFromGitHub {
owner = "libretro";
repo = "bluemsx-libretro";
- rev = "ffd387036881d2e6c13fdc04b113534b10da7806";
- hash = "sha256-0JVBlhn/BftGHMMGo6kYyvuigQtY7FaI81Lk+h41m8A=";
+ rev = "7074551cf50ebdae78c8cce4e77560f9fc4575ca";
+ hash = "sha256-kmG0LCvWG+4wM+hwZ8TYQid12nZuQpNbaljym+glbz4=";
};
meta = {
diff --git a/pkgs/applications/emulators/libretro/cores/bsnes.nix b/pkgs/applications/emulators/libretro/cores/bsnes.nix
index da11c307f260..cdb25e403ac5 100644
--- a/pkgs/applications/emulators/libretro/cores/bsnes.nix
+++ b/pkgs/applications/emulators/libretro/cores/bsnes.nix
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "bsnes";
- version = "0-unstable-2025-09-19";
+ version = "0-unstable-2025-10-03";
src = fetchFromGitHub {
owner = "libretro";
repo = "bsnes-libretro";
- rev = "aeb76d7dc33c1f136db43d65ba9622c14e81b0fa";
- hash = "sha256-DpCG+DyeSCMdAF+TGB6zSRp/fttoyw9eCXy8PLvRjaY=";
+ rev = "e0e6cef46582a436e8b08a339f4751411dc5bd63";
+ hash = "sha256-fIlTIF1042oWIHxqD7h7MdUfb6QDfIP0jqVlBNOTBmY=";
};
makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/citra.nix b/pkgs/applications/emulators/libretro/cores/citra.nix
index 420a7bc2c1d4..2b65552f8e2a 100644
--- a/pkgs/applications/emulators/libretro/cores/citra.nix
+++ b/pkgs/applications/emulators/libretro/cores/citra.nix
@@ -29,10 +29,6 @@ mkLibretroCore {
extraNativeBuildInputs = [ cmake ];
- # This changes `ir/opt` to `ir/var/empty` in `externals/dynarmic/src/dynarmic/CMakeLists.txt`
- # making the build fail, as that path does not exist
- dontFixCmake = true;
-
# https://github.com/libretro/citra/blob/a31aff7e1a3a66f525b9ea61633d2c5e5b0c8b31/.gitlab-ci.yml#L6
cmakeFlags = [
(lib.cmakeBool "ENABLE_TESTS" false)
diff --git a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix
index aa1fffc8daf4..1d52812f13a1 100644
--- a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix
+++ b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "dosbox-pure";
- version = "0-unstable-2025-09-27";
+ version = "0-unstable-2025-09-28";
src = fetchFromGitHub {
owner = "schellingb";
repo = "dosbox-pure";
- rev = "92d9fbb8111bbb9e8be491315f0e50075036cf0b";
- hash = "sha256-9MAche3fVHXiUQzhspHTConwkyJCAuRIRaWfEmo8Fko=";
+ rev = "150a8e02ec53bfd5fc571587dab902c075f9e291";
+ hash = "sha256-3l566sa5sCjeppUD06chpTZ21CnfEzdRpZKM7jxkS2M=";
};
hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/emulators/libretro/cores/fbneo.nix b/pkgs/applications/emulators/libretro/cores/fbneo.nix
index 98a958f3dee2..67b9bf9d928d 100644
--- a/pkgs/applications/emulators/libretro/cores/fbneo.nix
+++ b/pkgs/applications/emulators/libretro/cores/fbneo.nix
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "fbneo";
- version = "0-unstable-2025-09-23";
+ version = "0-unstable-2025-09-30";
src = fetchFromGitHub {
owner = "libretro";
repo = "fbneo";
- rev = "2d05f6cd665d6a2f0a876e2f50192c3fce53ed65";
- hash = "sha256-FQI8LPNYQDB1Jo04EGJGbgTncmwfzuTXj1GK9QsT8uQ=";
+ rev = "9726100ba22a558290860a2648e1e6a8b8719478";
+ hash = "sha256-mhXuHPwXtvuA8ltaLF3uOsBwLE0evJ2RiCrNX5hnRXM=";
};
makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/flycast.nix b/pkgs/applications/emulators/libretro/cores/flycast.nix
index bccad05c701d..f08e15ac8948 100644
--- a/pkgs/applications/emulators/libretro/cores/flycast.nix
+++ b/pkgs/applications/emulators/libretro/cores/flycast.nix
@@ -8,13 +8,13 @@
}:
mkLibretroCore {
core = "flycast";
- version = "0-unstable-2025-09-19";
+ version = "0-unstable-2025-10-03";
src = fetchFromGitHub {
owner = "flyinghead";
repo = "flycast";
- rev = "851dd226648c3e2706cef99a02a5cddad3e2f4b1";
- hash = "sha256-bBIHmKViwC5+8bM3Tdb4DKxsWw988nGVdAwSHsFciNE=";
+ rev = "af5f67c15d52b16d35e95671a5b74502288c4397";
+ hash = "sha256-eMkyNwGdgyYDmwqYy3xzzSTYqUcoKpQkDYFP8bQdz58=";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
index e52003ee3f14..ab9d5f5c667f 100644
--- a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
+++ b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "genesis-plus-gx";
- version = "0-unstable-2025-09-26";
+ version = "0-unstable-2025-10-06";
src = fetchFromGitHub {
owner = "libretro";
repo = "Genesis-Plus-GX";
- rev = "6a635bd7cac75adb5af85cb3458ecf29f4baeeac";
- hash = "sha256-loLaqa9tmX3oYd/xXNVLAS1Xq+FDWsQ6gcEl/iP9M9E=";
+ rev = "252a94c0c40047b52d9ecced567846a9dd5b2020";
+ hash = "sha256-Eys3iDJfi3bRuPjWRK34CEAN5o5MC+of1ktT7z2DdAI=";
};
meta = {
diff --git a/pkgs/applications/emulators/libretro/cores/mame.nix b/pkgs/applications/emulators/libretro/cores/mame.nix
index 643afe13598c..f23616c03969 100644
--- a/pkgs/applications/emulators/libretro/cores/mame.nix
+++ b/pkgs/applications/emulators/libretro/cores/mame.nix
@@ -9,13 +9,13 @@
}:
mkLibretroCore {
core = "mame";
- version = "0-unstable-2025-09-04";
+ version = "0-unstable-2025-09-26";
src = fetchFromGitHub {
owner = "libretro";
repo = "mame";
- rev = "e42c983a90d3334bed659ecc12939ca935bef1c3";
- hash = "sha256-HfLxZ9OWX++hvT7ru8OOtYGFmfwVlLqne3n/vjdn7CY=";
+ rev = "61743c76180f1ad454227ed1be0261a071d37d67";
+ hash = "sha256-R7zBl8Y5tnG+CkFgyTdwlGlCLwG/9Svs3hsJJp12fOY=";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index c5056d2b5f81..50026a681614 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -85,13 +85,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "imagemagick";
- version = "7.1.2-3";
+ version = "7.1.2-5";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
tag = finalAttrs.version;
- hash = "sha256-L4apUdF1VJXSVqWAyjYFG/4qDJoJ0ObmSOpd90kqXsU=";
+ hash = "sha256-THStvhNWu4OYotzxksGJ6l6VeTVRNoJeKoRG1LaJhNI=";
};
outputs = [
diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix
index 8ecd6eb98a25..f5b4d5509a23 100644
--- a/pkgs/applications/graphics/hugin/default.nix
+++ b/pkgs/applications/graphics/hugin/default.nix
@@ -6,7 +6,6 @@
gnumake,
makeWrapper,
pkg-config,
- autopanosiftc,
boost,
cairo,
enblend-enfuse,
@@ -86,7 +85,6 @@ stdenv.mkDerivation rec {
postInstall = ''
for p in $out/bin/*; do
wrapProgram "$p" \
- --suffix PATH : ${autopanosiftc}/bin \
--suffix PATH : ${enblend-enfuse}/bin \
--suffix PATH : ${gnumake}/bin \
--suffix PATH : ${perlPackages.ImageExifTool}/bin
diff --git a/pkgs/applications/graphics/pymeshlab/default.nix b/pkgs/applications/graphics/pymeshlab/default.nix
index a44d4c4f5bee..b6d37dfc5649 100644
--- a/pkgs/applications/graphics/pymeshlab/default.nix
+++ b/pkgs/applications/graphics/pymeshlab/default.nix
@@ -19,7 +19,7 @@
boost,
mpfr,
xercesc,
- tbb,
+ onetbb,
embree,
vcg,
libigl,
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
boost
mpfr
xercesc
- tbb
+ onetbb
embree
vcg
libigl
diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix
index 4c3ffd097304..6dce5c9a6320 100644
--- a/pkgs/applications/misc/organicmaps/default.nix
+++ b/pkgs/applications/misc/organicmaps/default.nix
@@ -33,13 +33,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "organicmaps";
- version = "2025.09.25-5";
+ version = "2025.10.05-7";
src = fetchFromGitHub {
owner = "organicmaps";
repo = "organicmaps";
tag = "${finalAttrs.version}-android";
- hash = "sha256-WRr4zLlzGiFnTDuqr+gpnE92f/BZY/c0Ij6x40Rr1LM=";
+ hash = "sha256-U7CGXwClKByLVn2LAgEavZ96+AyvUlrZlB3HQLaQYH0=";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix
index e0e5a32ab5b9..da9d218a932b 100644
--- a/pkgs/applications/misc/prusa-slicer/default.nix
+++ b/pkgs/applications/misc/prusa-slicer/default.nix
@@ -28,7 +28,7 @@
opencascade-occt_7_6_1,
openvdb,
qhull,
- tbb_2022,
+ onetbb,
wxGTK32,
xorg,
libbgcode,
@@ -56,7 +56,6 @@ let
hash = "sha256-WNdAYu66ggpSYJ8Kt57yEA4mSTv+Rvzj9Rm1q765HpY=";
};
});
- openvdb_tbb_2022 = openvdb.override { tbb = tbb_2022; };
wxGTK-override' = if wxGTK-override == null then wxGTK32 else wxGTK-override;
opencascade-override' =
if opencascade-override == null then opencascade-occt_7_6_1 else opencascade-override;
@@ -124,9 +123,9 @@ stdenv.mkDerivation (finalAttrs: {
nanosvg-fltk
nlopt
opencascade-override'
- openvdb_tbb_2022
+ openvdb
qhull
- tbb_2022
+ onetbb
wxGTK-override'
xorg.libX11
libbgcode
@@ -188,6 +187,9 @@ stdenv.mkDerivation (finalAttrs: {
"-DSLIC3R_FHS=1"
"-DSLIC3R_GTK=3"
"-DCMAKE_CXX_FLAGS=-DBOOST_LOG_DYN_LINK"
+ # there is many different min versions set accross different
+ # Find*.cmake files, substituting them all is not viable
+ "-DCMAKE_POLICY_VERSION_MINIMUM=3.10"
];
postInstall = ''
diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer-fix-cereal-1.3.1.patch b/pkgs/applications/misc/prusa-slicer/super-slicer-fix-cereal-1.3.1.patch
new file mode 100644
index 000000000000..ce719360cce5
--- /dev/null
+++ b/pkgs/applications/misc/prusa-slicer/super-slicer-fix-cereal-1.3.1.patch
@@ -0,0 +1,80 @@
+From cbb17366904c97bb5db40644c277be41219261da Mon Sep 17 00:00:00 2001
+From: Emily
+Date: Tue, 9 Sep 2025 20:42:11 +0100
+Subject: [PATCH] =?UTF-8?q?Fix=20the=20build=20with=20cereal=20=E2=89=A5?=
+ =?UTF-8?q?=201.3.1?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Based on .
+
+Co-authored-by: Yuri D'Elia
+Co-authored-by: tamasmeszaros
+---
+ CMakeLists.txt | 6 ++++++
+ src/CMakeLists.txt | 3 +--
+ src/libslic3r/CMakeLists.txt | 2 +-
+ src/slic3r/CMakeLists.txt | 2 +-
+ 4 files changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a112949bba..81b0a4244f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -469,6 +469,12 @@ endif ()
+
+ # Find the Cereal serialization library
+ find_package(cereal REQUIRED)
++add_library(libcereal INTERFACE)
++if (NOT TARGET cereal::cereal)
++ target_link_libraries(libcereal INTERFACE cereal)
++else()
++ target_link_libraries(libcereal INTERFACE cereal::cereal)
++endif()
+
+ # l10n
+ set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization")
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index bf721a7635..71a62a9024 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -144,8 +144,7 @@ if (NOT WIN32)
+ set_target_properties(Slic3r PROPERTIES OUTPUT_NAME "${SLIC3R_APP_CMD}")
+ endif ()
+
+-target_link_libraries(Slic3r libslic3r cereal)
+-
++target_link_libraries(Slic3r libslic3r libcereal)
+ if (APPLE)
+ # add_compile_options(-stdlib=libc++)
+ # add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
+diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt
+index 84be9c12e5..4940549134 100644
+--- a/src/libslic3r/CMakeLists.txt
++++ b/src/libslic3r/CMakeLists.txt
+@@ -420,7 +420,7 @@ find_package(JPEG REQUIRED)
+ target_link_libraries(libslic3r
+ libnest2d
+ admesh
+- cereal
++ libcereal
+ libigl
+ miniz
+ boost_libs
+diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt
+index c11f860c59..c1eb966de1 100644
+--- a/src/slic3r/CMakeLists.txt
++++ b/src/slic3r/CMakeLists.txt
+@@ -302,7 +302,7 @@ target_compile_definitions(libslic3r_gui PRIVATE $<$:SLIC3
+
+ encoding_check(libslic3r_gui)
+
+-target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi exif angelscript libcurl ${wxWidgets_LIBRARIES})
++target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui GLEW::GLEW OpenGL::GL hidapi exif angelscript libcurl ${wxWidgets_LIBRARIES})
+
+ if (MSVC)
+ target_link_libraries(libslic3r_gui Setupapi.lib)
+--
+2.50.1
+
diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix
index 4eb3acc4e5fe..92cadda3e57f 100644
--- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix
+++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix
@@ -20,6 +20,7 @@ let
hash = "sha256-fh31qrqjQiRQL03pQl4KJAEtbKMwG8/nJroqIDOIePw=";
})
./super-slicer-use-boost186.patch
+ ./super-slicer-fix-cereal-1.3.1.patch
];
wxGTK31-prusa = wxGTK31.overrideAttrs (old: {
diff --git a/pkgs/applications/misc/sway-contrib/default.nix b/pkgs/applications/misc/sway-contrib/default.nix
index f9242ed5d20e..33c79b9b04e7 100644
--- a/pkgs/applications/misc/sway-contrib/default.nix
+++ b/pkgs/applications/misc/sway-contrib/default.nix
@@ -83,14 +83,11 @@ in
fi
'';
- meta =
- with lib;
- meta
- // {
- description = "Helper for screenshots within sway";
- maintainers = with maintainers; [ evils ];
- mainProgram = "grimshot";
- };
+ meta = meta // {
+ description = "Helper for screenshots within sway";
+ maintainers = [ ];
+ mainProgram = "grimshot";
+ };
};
inactive-windows-transparency =
@@ -114,14 +111,11 @@ in
'';
meta =
- with lib;
- meta
- // {
+
+ meta // {
description = "It makes inactive sway windows transparent";
mainProgram = "${lname}.py";
- maintainers = with maintainers; [
- evils # packaged this as a side-effect of grimshot but doesn't use it
- ];
+ maintainers = [ ];
};
};
diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix
index 0cd0d2ab33ba..64b4b4563509 100644
--- a/pkgs/applications/misc/syncthingtray/default.nix
+++ b/pkgs/applications/misc/syncthingtray/default.nix
@@ -38,14 +38,14 @@
}:
stdenv.mkDerivation (finalAttrs: {
- version = "2.0.1";
+ version = "2.0.2";
pname = "syncthingtray";
src = fetchFromGitHub {
owner = "Martchus";
repo = "syncthingtray";
rev = "v${finalAttrs.version}";
- hash = "sha256-57Mq6zdSqPIK88E/CQkfwQe+Rf4kFTZ2o2shtPBWgRE=";
+ hash = "sha256-FZruyQ3ckWp9nUmCet4uTeU7TKukmW1D73Rx8EUUsVI=";
};
buildInputs = [
diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix
index 3d5896aa623e..dc3759d31ea4 100644
--- a/pkgs/applications/networking/cluster/hadoop/default.nix
+++ b/pkgs/applications/networking/cluster/hadoop/default.nix
@@ -6,6 +6,7 @@
autoPatchelfHook,
jdk8_headless,
jdk11_headless,
+ jdk21_headless,
bash,
coreutils,
which,
@@ -39,11 +40,15 @@ let
tests,
}:
stdenv.mkDerivation (finalAttrs: {
- inherit pname jdk;
+ inherit pname;
+ jdk = platformAttrs.${stdenv.system}.jdk or jdk;
version = platformAttrs.${stdenv.system}.version or (throw "Unsupported system: ${stdenv.system}");
src = fetchurl {
url =
"mirror://apache/hadoop/common/hadoop-${finalAttrs.version}/hadoop-${finalAttrs.version}"
+ +
+ lib.optionalString (lib.hasAttr "variant" platformAttrs.${stdenv.system})
+ "-${platformAttrs.${stdenv.system}.variant}"
+ lib.optionalString stdenv.hostPlatform.isAarch64 "-aarch64"
+ ".tar.gz";
inherit (platformAttrs.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"))
@@ -170,19 +175,21 @@ in
pname = "hadoop";
platformAttrs = rec {
x86_64-linux = {
- version = "3.4.1";
- hash = "sha256-mtVIeDOZbf5VFOdW9DkQKckFKf0i6NAC/T3QwUwEukY=";
- srcHash = "sha256-lE9uSohy6GWXprFEYbEin2ITqTms2h6EWXe4nEd3U4Y=";
+ version = "3.4.2";
+ hash = "sha256-YySoP+EeUXiQQ2/G2AvIKVBu0lLL4kZXUrkSIJAN+4M=";
+ srcHash = "sha256-AkZjpHk57S3pYiZambxgRHR7PD51HSI4H1HHW9ICah4=";
+ variant = "lean";
};
x86_64-darwin = x86_64-linux;
- aarch64-linux = x86_64-linux // {
+ aarch64-linux = {
version = "3.4.0";
hash = "sha256-QWxzKtNyw/AzcHMv0v7kj91pw1HO7VAN9MHO84caFk8=";
srcHash = "sha256-viDF3LdRCZHqFycOYfN7nUQBPHiMCIjmu7jgIAaaK9E=";
+ jdk = jdk11_headless;
};
aarch64-darwin = aarch64-linux;
};
- jdk = jdk11_headless;
+ jdk = jdk21_headless;
# TODO: Package and add Intel Storage Acceleration Library
tests = nixosTests.hadoop;
};
diff --git a/pkgs/applications/networking/cluster/helm/plugins/default.nix b/pkgs/applications/networking/cluster/helm/plugins/default.nix
index a1ecfaa07c21..ebb1f42cedcf 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/default.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/default.nix
@@ -15,5 +15,7 @@
helm-secrets = callPackage ./helm-secrets.nix { };
+ helm-schema = callPackage ./helm-schema.nix { };
+
helm-unittest = callPackage ./helm-unittest.nix { };
}
diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-schema.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-schema.nix
new file mode 100644
index 000000000000..29bcb9a701a0
--- /dev/null
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-schema.nix
@@ -0,0 +1,66 @@
+{
+ buildGoModule,
+ fetchFromGitHub,
+ lib,
+ versionCheckHook,
+ nix-update-script,
+}:
+
+buildGoModule (finalAttrs: {
+ pname = "helm-schema";
+ version = "2.3.0";
+
+ src = fetchFromGitHub {
+ owner = "losisin";
+ repo = "helm-values-schema-json";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-q5A+tCnuHTtUyejP4flID7XhsoBfWGge2jCgsL0uEOc=";
+ };
+
+ vendorHash = "sha256-xmj2i1WNI/9ItbxRk8mPIygjq83xuvNu6THyPqZsysY=";
+
+ ldflags = [
+ "-s"
+ "-w"
+ "-X 'main.Version=v${finalAttrs.version}'"
+ ];
+
+ postPatch = ''
+ # Remove the install and upgrade hooks
+ sed -i '/^hooks:/,+2 d' plugin.yaml
+
+ substituteInPlace {plugin.yaml,plugin.complete} \
+ --replace-fail '$HELM_PLUGIN_DIR' '${placeholder "out"}/${finalAttrs.pname}/bin'
+ '';
+
+ postInstall = ''
+ install -D plugin.complete -t $out/helm-schema/
+ install -m644 plugin.yaml -t $out/helm-schema/
+ mv $out/bin/{helm-values-schema-json,schema}
+ mv $out/bin $out/helm-schema
+ '';
+
+ # Unit tests try to open web server on port 0
+ __darwinAllowLocalNetworking = true;
+
+ doInstallCheck = true;
+ nativeInstallCheckInputs = [ versionCheckHook ];
+ versionCheckProgram = "${placeholder "out"}/helm-schema/bin/schema";
+ versionCheckProgramArg = "--version";
+
+ passthru.updateScript = nix-update-script { };
+
+ meta = {
+ mainProgram = "schema";
+ description = "Helm plugin for generating values.schema.json from multiple values files";
+ longDescription = ''
+ Helm plugin for generating `values.schema.json` from single or
+ multiple values files. Schema can be enriched by reading
+ annotations from comments. Works only with Helm3 charts.
+ '';
+ homepage = "https://github.com/losisin/helm-values-schema-json";
+ changelog = "https://github.com/losisin/helm-values-schema-json/releases/tag/v${finalAttrs.version}";
+ maintainers = with lib.maintainers; [ applejag ];
+ license = lib.licenses.mit;
+ };
+})
diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index a861f464e45b..188fe76b500f 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -2,7 +2,6 @@
lib,
stdenv,
buildGoModule,
- buildGo125Module,
fetchFromGitHub,
fetchFromGitLab,
callPackage,
@@ -103,15 +102,11 @@ let
mkProviderFetcher = fetchFromGitLab;
owner = "gitlab-org";
};
- # actions update always fails but can't reproduce the failure.
- heroku = automated-providers.heroku.override { spdx = "MPL-2.0"; };
# mkisofs needed to create ISOs holding cloud-init data and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630
libvirt = automated-providers.libvirt.overrideAttrs (_: {
propagatedBuildInputs = [ cdrtools ];
});
minio = automated-providers.minio.override { spdx = "AGPL-3.0-only"; };
- # requires go >= 1.25.0
- talos = automated-providers.talos.override { mkProviderGoModule = buildGo125Module; };
};
# Put all the providers we not longer support in this list.
@@ -122,7 +117,13 @@ let
removed = name: date: throw "the ${name} terraform provider removed from nixpkgs on ${date}";
in
lib.optionalAttrs config.allowAliases {
- fly = archived "fly" "2023/10";
+ _assert = archived "_assert" "2025/10";
+ azurestack = archived "azurestack" "2025/10";
+ googleworkspace = archived "googleworkspace" "2025/10";
+ huaweicloudstack = archived "huaweicloudstack" "2025/10";
+ metal = archived "metal" "2025/10";
+ stackpath = archived "stackpath" "2025/10";
+ vra7 = archived "vra7" "2025/10";
};
# excluding aliases, used by terraform-full
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 81eda364f370..26993ae6894b 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1,13 +1,4 @@
{
- "_assert": {
- "hash": "sha256-ngHxzV7lRg6pOtyNTdCv3ToRK/vO016Vp2mlh7QT8Rc=",
- "homepage": "https://registry.terraform.io/providers/hashicorp/assert",
- "owner": "hashicorp",
- "repo": "terraform-provider-assert",
- "rev": "v0.16.0",
- "spdx": "MPL-2.0",
- "vendorHash": "sha256-nHaBNYCKfTvaDnz2SeexM2cyNVK5ThPYn4rnGEw7Wi0="
- },
"aci": {
"hash": "sha256-+aD4M07xXMTbvp69IuGlO3rSkVEi5NVe5fqEPkWNeM0=",
"homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci",
@@ -54,11 +45,11 @@
"vendorHash": "sha256-bS9fFfttu58a2S3CNLO3FOlLPuk/2h1D0bjO6nJbfP8="
},
"alicloud": {
- "hash": "sha256-XYCnAvW8vbNd7wd5Q8fYiT7OooXqGytZMA8ocgLt8zo=",
+ "hash": "sha256-QZaOnNCfVKBTkDSdNw8mQbF8NfJUhEeN2y3tVt1J1D0=",
"homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
"owner": "aliyun",
"repo": "terraform-provider-alicloud",
- "rev": "v1.260.0",
+ "rev": "v1.260.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-+Hc2NCCnJ0fB86fvgE4Kak8fwlsXIiv8avIhE/RoWeM="
},
@@ -126,13 +117,13 @@
"vendorHash": null
},
"aws": {
- "hash": "sha256-k2lbdaDt/jpkoF5jKll7ZxU+3zkspGvGx/kToqYipAo=",
+ "hash": "sha256-6ZBQ2AFZBwyEUylCqHn4pn6hmYLIpjMzv5L2pvmCT5Q=",
"homepage": "https://registry.terraform.io/providers/hashicorp/aws",
"owner": "hashicorp",
"repo": "terraform-provider-aws",
- "rev": "v6.14.1",
+ "rev": "v6.15.0",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-hG1XnJtN95+jW6AGnV4+EkKaVZwG0PPTMLyHFQ3nXtc="
+ "vendorHash": "sha256-j4tAFLBdQR35EvQNd12XwQ0kD5wSSVi9/f/N1YbI6IM="
},
"awscc": {
"hash": "sha256-wAQLtx+eVtKucdokQLfq1zTAOdMPI2Frio5ILxLGyt8=",
@@ -144,11 +135,11 @@
"vendorHash": "sha256-xIROXf39bvPjtiKpfn7bfL7SXwHOqUxNqlhrCmDLYGA="
},
"azuread": {
- "hash": "sha256-7dbBhQz0MDUAaz4U1ewM2RayWtp5gbo3FrrQ762Tb6A=",
+ "hash": "sha256-9vGXzFLRaQPXECcFtZMnbhHQvEm0FeGwYm4K9utpZf4=",
"homepage": "https://registry.terraform.io/providers/hashicorp/azuread",
"owner": "hashicorp",
"repo": "terraform-provider-azuread",
- "rev": "v3.5.0",
+ "rev": "v3.6.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -161,15 +152,6 @@
"spdx": "MPL-2.0",
"vendorHash": null
},
- "azurestack": {
- "hash": "sha256-aSwVa7y1AJ6sExx+bO/93oLBNgSBDJjuPYPY8i3C9T0=",
- "homepage": "https://registry.terraform.io/providers/hashicorp/azurestack",
- "owner": "hashicorp",
- "repo": "terraform-provider-azurestack",
- "rev": "v1.0.0",
- "spdx": "MPL-2.0",
- "vendorHash": null
- },
"baiducloud": {
"hash": "sha256-zKkXfSIVVW0QxQB/fJNowy1mQPfXlv6HFcNaNlBSIvY=",
"homepage": "https://registry.terraform.io/providers/baidubce/baiducloud",
@@ -225,13 +207,13 @@
"vendorHash": "sha256-pCBmeisWcyw/Box1yrWwYj+hSrsqmToiiom2jS8I1SU="
},
"buildkite": {
- "hash": "sha256-w+ljPDKyVlylr87tFhuu/7oCkY/fFeK+LPr7mY7rbP0=",
+ "hash": "sha256-WP1CcGYtyItpMzKvYFiv5q0jQfvB5nSv8suDmSB1tSs=",
"homepage": "https://registry.terraform.io/providers/buildkite/buildkite",
"owner": "buildkite",
"repo": "terraform-provider-buildkite",
- "rev": "v1.24.0",
+ "rev": "v1.26.0",
"spdx": "MIT",
- "vendorHash": "sha256-2xZ2//qMKfgqob39k++fX6vJEx9YE1NJpGCbDyM1L10="
+ "vendorHash": "sha256-nKXQsAu1tHOHnle7G0Bt+CCNU9AGvxIIv6LJ/INiU7g="
},
"ccloud": {
"hash": "sha256-Dpx0eugcHCJV8GNPqjxx4P9ohgJgB10DTnHr+CeN/iQ=",
@@ -298,13 +280,13 @@
"vendorHash": "sha256-bD8BHhP4jxBRnFjmZE1MMkBn2/sMqNEaxTlQRMj2Crw="
},
"cloudscale": {
- "hash": "sha256-4RU1CD0WwLMd3NsnJWl2Smc8XBYlP9K8Iev16uqsetE=",
+ "hash": "sha256-uqELnAcx72lIIUGEiO7y9lXhiyNgThmCiMtC/EKFpTA=",
"homepage": "https://registry.terraform.io/providers/cloudscale-ch/cloudscale",
"owner": "cloudscale-ch",
"repo": "terraform-provider-cloudscale",
- "rev": "v4.4.0",
+ "rev": "v5.0.0",
"spdx": "MIT",
- "vendorHash": null
+ "vendorHash": "sha256-elNXA2PH6mDolyuLhUsVBDCiL/ydZfi7LAVPjwnbMIw="
},
"constellix": {
"deleteVendor": true,
@@ -435,13 +417,13 @@
"vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw="
},
"equinix": {
- "hash": "sha256-1a5ooJvZqZGvFXcvp0abEOn6BTNkN6hcxUEl1dXYwPA=",
+ "hash": "sha256-QE8ukiQHZqhSsZyFnInIpnGvsSlFuFMun7paK/Z3HTM=",
"homepage": "https://registry.terraform.io/providers/equinix/equinix",
"owner": "equinix",
"repo": "terraform-provider-equinix",
- "rev": "v4.2.1",
+ "rev": "v4.3.0",
"spdx": "MIT",
- "vendorHash": "sha256-uRfbpNLBsll7lLuUBZ57StAhlP1eVEGBkTRDxJzjUd8="
+ "vendorHash": "sha256-BzlSPZ11K9wZXd66jh3CAL+5qco6m0Hb/QiVtAi1Ub8="
},
"exoscale": {
"hash": "sha256-tTFGYzDwx7VXzS287eNUUjsAuwY/Rh2zuOsGwLT6BRU=",
@@ -462,13 +444,13 @@
"vendorHash": "sha256-xIagZvWtlNpz5SQfxbA7r9ojAeS3CW2pwV337ObKOwU="
},
"fastly": {
- "hash": "sha256-4sOcbqaC9FV/Si8/A6wvdDREYt7v5z0iNQc5TXWyjSU=",
+ "hash": "sha256-nevSFpLx1N+rM6ps0jstLem/VdAPIhnTaJefLpfLG/A=",
"homepage": "https://registry.terraform.io/providers/fastly/fastly",
"owner": "fastly",
"repo": "terraform-provider-fastly",
- "rev": "v5.17.0",
+ "rev": "v8.3.0",
"spdx": "MPL-2.0",
- "vendorHash": null
+ "vendorHash": "sha256-5T6pwozD0RKDzdd2XAMuHY651jEvo6V6s1gvwYTHTRI="
},
"flexibleengine": {
"hash": "sha256-yEZ9JiUSqFFbfqzOOD59ZBv4yFCeUBBKlp6aiUqDqiM=",
@@ -525,11 +507,11 @@
"vendorHash": "sha256-29uvPCepGHRPohGY7viaPD9VQPPj9XB/plragACC4e4="
},
"google": {
- "hash": "sha256-xQW0UxGIcxD0Y4zdCBnGJhUWfWdMIERk0lkot96ztzI=",
+ "hash": "sha256-463G4/NtViaBH1B1XVzHT6KVQu+4HnqGWX7hw4CjgNA=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
"owner": "hashicorp",
"repo": "terraform-provider-google",
- "rev": "v7.4.0",
+ "rev": "v7.5.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-cQybnUaDLVmQrtFkiI5k3OwqN9Oks+J1H2kbkNjO4jc="
},
@@ -542,15 +524,6 @@
"spdx": "MPL-2.0",
"vendorHash": "sha256-Bii3UrY1WbhewgsURxq7gGVqT1WSszFkif0V88hiyZo="
},
- "googleworkspace": {
- "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=",
- "homepage": "https://registry.terraform.io/providers/hashicorp/googleworkspace",
- "owner": "hashicorp",
- "repo": "terraform-provider-googleworkspace",
- "rev": "v0.7.0",
- "spdx": "MPL-2.0",
- "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g="
- },
"grafana": {
"hash": "sha256-KVNwgn7swWXRNJNpXV8oy++s+CrDZhMPDDP40qIZIlY=",
"homepage": "https://registry.terraform.io/providers/grafana/grafana",
@@ -597,12 +570,12 @@
"vendorHash": "sha256-sPvX69R2BmlY/KhXZgxCunzseoOkz1h2b8yqekBBn0k="
},
"heroku": {
- "hash": "sha256-/2XfqyyoxwcFKgbLli1i7PX58OD0iczTPxVVz8Rkeoc=",
+ "hash": "sha256-VGx2J7huF05HU/59Hyo2rxwV3SR+kVJWtrfWoRmln2o=",
"homepage": "https://registry.terraform.io/providers/heroku/heroku",
"owner": "heroku",
"repo": "terraform-provider-heroku",
- "rev": "v5.2.13",
- "spdx": null,
+ "rev": "v5.3.1",
+ "spdx": "MPL-2.0",
"vendorHash": null
},
"hetznerdns": {
@@ -641,15 +614,6 @@
"spdx": "MPL-2.0",
"vendorHash": null
},
- "huaweicloudstack": {
- "hash": "sha256-WSJDp+LFjVPquQVMgib/YZV35kktLH2vMCIZJWqakXs=",
- "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloudstack",
- "owner": "huaweicloud",
- "repo": "terraform-provider-huaweicloudstack",
- "rev": "v1.3.0",
- "spdx": "MPL-2.0",
- "vendorHash": null
- },
"hydra": {
"hash": "sha256-A9BemEPLhvYzhksvYRfmhQXY3EEdTxQcmjE9+2+BKqg=",
"homepage": "https://registry.terraform.io/providers/DeterminateSystems/hydra",
@@ -821,15 +785,6 @@
"spdx": "Apache-2.0",
"vendorHash": "sha256-L1wufPa7LPPyOPTL+jFQgiWzJoJYS+fCdw3N0KZqKtc="
},
- "metal": {
- "hash": "sha256-1HTSDVMk2VhoYRLInrBK3bDuYU0SwyhBV1p5A2tlU/I=",
- "homepage": "https://registry.terraform.io/providers/equinix/metal",
- "owner": "equinix",
- "repo": "terraform-provider-metal",
- "rev": "v3.3.0",
- "spdx": "MPL-2.0",
- "vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI="
- },
"migadu": {
"hash": "sha256-XXtDXByaSnnUGLPiwUNTPTHqDOED7IJQsf8b9x0/R8E=",
"homepage": "https://registry.terraform.io/providers/metio/migadu",
@@ -849,13 +804,13 @@
"vendorHash": "sha256-QWBzQXx/dzWZr9dn3LHy8RIvZL1EA9xYqi7Ppzvju7g="
},
"mongodbatlas": {
- "hash": "sha256-yBccJeD25hQiwqjMpaYIJM2DhoKzehppjR8NG/IOrQo=",
+ "hash": "sha256-evMjL6I9q80olTkuigJLbAHTDU4nYXNaMVf8cq6yZsM=",
"homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas",
"owner": "mongodb",
"repo": "terraform-provider-mongodbatlas",
- "rev": "v2.0.0",
+ "rev": "v2.0.1",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-EvTuVhJfNrwAto9+6oi6iYQfgbCnHupkD+dk57vrT/c="
+ "vendorHash": "sha256-BWItAEI+ST5wN/CyTHljFJvutJiDHYjV4HEeLtmhC2o="
},
"namecheap": {
"hash": "sha256-fHH9sHI1mqQ9q9nX9DHJ0qfEfmDB4/2uzyVvUuIAF18=",
@@ -912,11 +867,11 @@
"vendorHash": "sha256-CIR59EIgC5kkwfITQYrzoU8quCx5iCDRNOdYphVVk6Y="
},
"ns1": {
- "hash": "sha256-xIl0jUYmXe2tom8HwXLQRbdSWWyZkRtdDc0XqkQ0RcQ=",
+ "hash": "sha256-JJ+Zcf7r8bB1a8l+DtHhjT4Ce2VqRIkD1fS+EWI6QtI=",
"homepage": "https://registry.terraform.io/providers/ns1-terraform/ns1",
"owner": "ns1-terraform",
"repo": "terraform-provider-ns1",
- "rev": "v2.7.0",
+ "rev": "v2.7.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-HC2MCVF3gS4nXKplC1pGrdjbhjRzr03ajqZ7pQIgSOc="
},
@@ -930,14 +885,13 @@
"vendorHash": "sha256-ssmAveYUVI8z/1UWNeaMX0qdUewowCHNufJIFMirdVg="
},
"nutanix": {
- "deleteVendor": true,
- "hash": "sha256-p1VhGSor/uxQYiSb9enAeu6dtLRuXMKk9m2DtPEj6vs=",
+ "hash": "sha256-nk5wdbAzgBJ6gyYSXZAiNdjx/XQ6XldAMsjb8yv+y7w=",
"homepage": "https://registry.terraform.io/providers/nutanix/nutanix",
"owner": "nutanix",
"repo": "terraform-provider-nutanix",
- "rev": "v1.9.5",
+ "rev": "v2.3.1",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
+ "vendorHash": "sha256-ByB1ztK2/1pTFeO34eXVyQSSbe35qqoCeWe6MPZN7vY="
},
"oci": {
"hash": "sha256-fEvo5R7HutlOmZ6DMvYKQiE0amwk/YPi1T2a55w70hQ=",
@@ -1030,11 +984,11 @@
"vendorHash": null
},
"pagerduty": {
- "hash": "sha256-PkDugN/y3WmsNdl8+3/3l2tEWilJSEnJPdfkTzCm5mE=",
+ "hash": "sha256-oVv0y+49hUOkEU4/N7RvepSYNlgwGz8M8/11tGemAV0=",
"homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty",
"owner": "PagerDuty",
"repo": "terraform-provider-pagerduty",
- "rev": "v3.29.0",
+ "rev": "v3.30.1",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -1111,11 +1065,11 @@
"vendorHash": "sha256-3o6YRDrq4rQhNAFyqiGJrAoxuAykWw85OExRGSE3kGI="
},
"rancher2": {
- "hash": "sha256-durRRgJmbGK0GBvlzzeq7stic8fzxBMmswYhMYnEL6E=",
+ "hash": "sha256-E1E7xrQUOGbGV1xNpZFrIql6zgfzr3jmCbIFREbJdwE=",
"homepage": "https://registry.terraform.io/providers/rancher/rancher2",
"owner": "rancher",
"repo": "terraform-provider-rancher2",
- "rev": "v8.1.0",
+ "rev": "v8.2.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-M2lJKmIR66lQKFkInjizn68ax2Gq4sim5Y3vZKyDhZ8="
},
@@ -1138,13 +1092,13 @@
"vendorHash": "sha256-vsnihN98O5RzMZk5YNycCnjpvxklQoLbZolCJXbJRMU="
},
"rootly": {
- "hash": "sha256-SRE1T9C3qggCwjl/PdehkabdnuRV8ZW58dc8zhSwPXo=",
+ "hash": "sha256-6m4jzzn5kTGUqY5bitPZI82v+/RA3BXqCYy5aWUCO4c=",
"homepage": "https://registry.terraform.io/providers/rootlyhq/rootly",
"owner": "rootlyhq",
"repo": "terraform-provider-rootly",
- "rev": "v4.1.0",
+ "rev": "v4.2.0",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-39OiEYntUmX2fJZh7G/LcCNFXFmHwdLgFGYz6BUEyOA="
+ "vendorHash": "sha256-auyQLDDQ+tfMQCqICDR5tfvaYrO89Eani7lAsfoPwwU="
},
"routeros": {
"hash": "sha256-k+q4n20bvYK7nn9ZGQEQH70xt6ugNKzK58XyzwrKh0Q=",
@@ -1264,13 +1218,13 @@
"vendorHash": "sha256-4gtM8U//RXpYc4klCgpZS/3ZRzAHfcbOPTnNqlX4H7M="
},
"spacelift": {
- "hash": "sha256-gcdbL2rJNTzyn/Nd1F+7Ru0fcrTg2kTWHU6g0haYR/k=",
+ "hash": "sha256-pYe8xmqudCkRvXNHJ4bSm9uitcDfpRlaGij7CrjQjd8=",
"homepage": "https://registry.terraform.io/providers/spacelift-io/spacelift",
"owner": "spacelift-io",
"repo": "terraform-provider-spacelift",
- "rev": "v1.33.0",
+ "rev": "v1.34.0",
"spdx": "MIT",
- "vendorHash": "sha256-D8VG9CWP4wo+cxb/ewP+b6qAeaBCu6lNwH2leoiBMAc="
+ "vendorHash": "sha256-DLiS2fqr/gNdZGkhvqjdgpICY0QTlE/Ejl3m29Vanm4="
},
"spotinst": {
"hash": "sha256-bbQ7WDizMnCF95E/iXOSSx0e5K2wMtUW39OxT/45Jn4=",
@@ -1290,15 +1244,6 @@
"spdx": "MIT",
"vendorHash": "sha256-vcuUt3WIo1TnLApch410JgtyCzliQRYMQQQ2Z9diDZ8="
},
- "stackpath": {
- "hash": "sha256-n1IPOJ1NlguNMJASCXjNNUK0b5wGYe29aTcw7fNwVcU=",
- "homepage": "https://registry.terraform.io/providers/stackpath/stackpath",
- "owner": "stackpath",
- "repo": "terraform-provider-stackpath",
- "rev": "v2.1.0",
- "spdx": "MPL-2.0",
- "vendorHash": "sha256-G+5vSXhxmt0Qsqt7vnecPZfIxAonNF3l7ygQZ0nemnU="
- },
"statuscake": {
"hash": "sha256-zXBZZA+2uRN2FeGrayq0a4EBk7T+PvlBIwbuxwM7yBc=",
"homepage": "https://registry.terraform.io/providers/StatusCakeDev/statuscake",
@@ -1318,11 +1263,11 @@
"vendorHash": "sha256-IR6KjFW5GbsOIm3EEFyx3ctwhbifZlcNaZeGhbeK/Wo="
},
"sysdig": {
- "hash": "sha256-C2jHcYSVdDyP42XyMleMmTYo5A+xDJuTVcE4LXHwFWk=",
+ "hash": "sha256-pSiygCYpPP0fXt0RKPmU5FTMpRDuclZlXIBvbQzb3lg=",
"homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig",
"owner": "sysdiglabs",
"repo": "terraform-provider-sysdig",
- "rev": "v1.60.0",
+ "rev": "v2.0.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-rWiafaFE1RolO9JUN1WoW4EWJjR7kpfeVEOTLf21j50="
},
@@ -1345,20 +1290,20 @@
"vendorHash": "sha256-J2fLyYvlnefFIaJ6UwRfJ5nas86JCuOHAdWalr9T9fw="
},
"temporalcloud": {
- "hash": "sha256-MnfGps/PeTjhLXXcy37JHy38R3zDqjdLv99SY/F+jGM=",
+ "hash": "sha256-hHHZ+5LF5AoDB2JZyPRce6oEtOZOGi8lYNgbTlAqTuA=",
"homepage": "https://registry.terraform.io/providers/temporalio/temporalcloud",
"owner": "temporalio",
"repo": "terraform-provider-temporalcloud",
- "rev": "v1.1.0",
+ "rev": "v1.1.1",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-M3wnvRxMyU0Yo733E9e8Q++xVTuSXD0W3fB2C14RDNU="
+ "vendorHash": "sha256-9GjhP/Oh2HlVuMcuXFhS7MUmF3eS4qlUsW5XhugaK14="
},
"tencentcloud": {
- "hash": "sha256-HKV6JhvwDEAnO0Q3lr/TKMEldj35dyKG0pLremx254Y=",
+ "hash": "sha256-IrZXw7Bf7bYZJDqyqZC7ereYTyDldo7s6kLE5yKVOms=",
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
"owner": "tencentcloudstack",
"repo": "terraform-provider-tencentcloud",
- "rev": "v1.82.25",
+ "rev": "v1.82.27",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -1498,15 +1443,6 @@
"spdx": "MPL-2.0",
"vendorHash": "sha256-rUYHapEVqRupLOPVbcAH8YP0cuXclMmYTQUkqeOwCN0="
},
- "vra7": {
- "hash": "sha256-KzxthTn3z0kZTUTKO8zq6DaNMTnfb7gFlbuWgxZtqwo=",
- "homepage": "https://registry.terraform.io/providers/vmware/vra7",
- "owner": "vmware",
- "repo": "terraform-provider-vra7",
- "rev": "v3.0.15",
- "spdx": "MPL-2.0",
- "vendorHash": null
- },
"vsphere": {
"hash": "sha256-vRO6vxzi4d0hNc0MmQLhN7roONnsjxPBtFt0fyvxWd8=",
"homepage": "https://registry.terraform.io/providers/hashicorp/vsphere",
@@ -1535,12 +1471,12 @@
"vendorHash": "sha256-GRnVhGpVgFI83Lg34Zv1xgV5Kp8ioKTFV5uaqS80ATg="
},
"yandex": {
- "hash": "sha256-cQqklICVFkeEIdRza6OIBOlDTbJGX+u0B/9kLkUB9Ds=",
+ "hash": "sha256-ez4HbBd2e3SRau7ejORKfZUbGySxSTTRt7kE9JRVVf0=",
"homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex",
"owner": "yandex-cloud",
"repo": "terraform-provider-yandex",
- "rev": "v0.159.0",
+ "rev": "v0.162.0",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-yR8M9fS7QBvf+UJUXdBNPMf/S0PSwJ/3/VTXo+Gcdvw="
+ "vendorHash": "sha256-iJvhrJVFC+O9f+gy/H2hif4ZQe9SxFdA2qGEIZwIv1Y="
}
}
diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/abseil-202508.patch b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/abseil-202508.patch
new file mode 100644
index 000000000000..0f8b5204dd13
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/abseil-202508.patch
@@ -0,0 +1,554 @@
+diff --git a/src/api/environment/environment.h b/src/api/environment/environment.h
+index d86b7ae78..cc2761f71 100644
+--- a/src/api/environment/environment.h
++++ b/src/api/environment/environment.h
+@@ -99,10 +99,10 @@ class RTC_EXPORT Environment final {
+ private:
+ friend class EnvironmentFactory;
+ Environment(scoped_refptr storage,
+- absl::Nonnull field_trials,
+- absl::Nonnull clock,
+- absl::Nonnull task_queue_factory,
+- absl::Nonnull event_log)
++ const FieldTrialsView* absl_nonnull field_trials,
++ Clock* absl_nonnull clock,
++ TaskQueueFactory* absl_nonnull task_queue_factory,
++ RtcEventLog* absl_nonnull event_log)
+ : storage_(std::move(storage)),
+ field_trials_(field_trials),
+ clock_(clock),
+@@ -117,10 +117,10 @@ class RTC_EXPORT Environment final {
+ // `storage_` is alive.
+ scoped_refptr storage_;
+
+- absl::Nonnull field_trials_;
+- absl::Nonnull clock_;
+- absl::Nonnull task_queue_factory_;
+- absl::Nonnull event_log_;
++ const FieldTrialsView* absl_nonnull field_trials_;
++ Clock* absl_nonnull clock_;
++ TaskQueueFactory* absl_nonnull task_queue_factory_;
++ RtcEventLog* absl_nonnull event_log_;
+ };
+
+ //------------------------------------------------------------------------------
+diff --git a/src/api/environment/environment_factory.cc b/src/api/environment/environment_factory.cc
+index c0b681aa0..ded3effe8 100644
+--- a/src/api/environment/environment_factory.cc
++++ b/src/api/environment/environment_factory.cc
+@@ -25,12 +25,12 @@ namespace webrtc {
+ namespace {
+
+ template
+-void Store(absl::Nonnull> value,
++void Store(std::unique_ptr absl_nonnull value,
+ scoped_refptr& leaf) {
+ class StorageNode : public rtc::RefCountedBase {
+ public:
+ StorageNode(scoped_refptr parent,
+- absl::Nonnull> value)
++ std::unique_ptr absl_nonnull value)
+ : parent_(std::move(parent)), value_(std::move(value)) {}
+
+ StorageNode(const StorageNode&) = delete;
+@@ -40,7 +40,7 @@ void Store(absl::Nonnull> value,
+
+ private:
+ scoped_refptr parent_;
+- absl::Nonnull> value_;
++ std::unique_ptr absl_nonnull value_;
+ };
+
+ // Utilities provided with ownership form a tree:
+@@ -63,14 +63,14 @@ EnvironmentFactory::EnvironmentFactory(const Environment& env)
+ event_log_(env.event_log_) {}
+
+ void EnvironmentFactory::Set(
+- absl::Nullable> utility) {
++ std::unique_ptr absl_nullable utility) {
+ if (utility != nullptr) {
+ field_trials_ = utility.get();
+ Store(std::move(utility), leaf_);
+ }
+ }
+
+-void EnvironmentFactory::Set(absl::Nullable> utility) {
++void EnvironmentFactory::Set(std::unique_ptr absl_nullable utility) {
+ if (utility != nullptr) {
+ clock_ = utility.get();
+ Store(std::move(utility), leaf_);
+@@ -78,7 +78,7 @@ void EnvironmentFactory::Set(absl::Nullable> utility) {
+ }
+
+ void EnvironmentFactory::Set(
+- absl::Nullable> utility) {
++ std::unique_ptr absl_nullable utility) {
+ if (utility != nullptr) {
+ task_queue_factory_ = utility.get();
+ Store(std::move(utility), leaf_);
+@@ -86,7 +86,7 @@ void EnvironmentFactory::Set(
+ }
+
+ void EnvironmentFactory::Set(
+- absl::Nullable> utility) {
++ std::unique_ptr absl_nullable utility) {
+ if (utility != nullptr) {
+ event_log_ = utility.get();
+ Store(std::move(utility), leaf_);
+diff --git a/src/api/environment/environment_factory.h b/src/api/environment/environment_factory.h
+index a0fc3effd..b6be04f6a 100644
+--- a/src/api/environment/environment_factory.h
++++ b/src/api/environment/environment_factory.h
+@@ -54,15 +54,15 @@ class RTC_EXPORT EnvironmentFactory final {
+
+ ~EnvironmentFactory() = default;
+
+- void Set(absl::Nullable> utility);
+- void Set(absl::Nullable> utility);
+- void Set(absl::Nullable> utility);
+- void Set(absl::Nullable> utility);
++ void Set(std::unique_ptr absl_nullable utility);
++ void Set(std::unique_ptr absl_nullable utility);
++ void Set(std::unique_ptr absl_nullable utility);
++ void Set(std::unique_ptr absl_nullable utility);
+
+- void Set(absl::Nullable utility);
+- void Set(absl::Nullable utility);
+- void Set(absl::Nullable utility);
+- void Set(absl::Nullable utility);
++ void Set(const FieldTrialsView* absl_nullable utility);
++ void Set(Clock* absl_nullable utility);
++ void Set(TaskQueueFactory* absl_nullable utility);
++ void Set(RtcEventLog* absl_nullable utility);
+
+ Environment Create() const;
+
+@@ -71,10 +71,10 @@ class RTC_EXPORT EnvironmentFactory final {
+
+ scoped_refptr leaf_;
+
+- absl::Nullable field_trials_ = nullptr;
+- absl::Nullable clock_ = nullptr;
+- absl::Nullable task_queue_factory_ = nullptr;
+- absl::Nullable event_log_ = nullptr;
++ const FieldTrialsView* absl_nullable field_trials_ = nullptr;
++ Clock* absl_nullable clock_ = nullptr;
++ TaskQueueFactory* absl_nullable task_queue_factory_ = nullptr;
++ RtcEventLog* absl_nullable event_log_ = nullptr;
+ };
+
+ // Helper for concise way to create an environment.
+@@ -97,25 +97,25 @@ Environment CreateEnvironment(Utilities&&... utilities);
+ //------------------------------------------------------------------------------
+
+ inline void EnvironmentFactory::Set(
+- absl::Nullable utility) {
++ const FieldTrialsView* absl_nullable utility) {
+ if (utility != nullptr) {
+ field_trials_ = utility;
+ }
+ }
+
+-inline void EnvironmentFactory::Set(absl::Nullable utility) {
++inline void EnvironmentFactory::Set(Clock* absl_nullable utility) {
+ if (utility != nullptr) {
+ clock_ = utility;
+ }
+ }
+
+-inline void EnvironmentFactory::Set(absl::Nullable utility) {
++inline void EnvironmentFactory::Set(TaskQueueFactory* absl_nullable utility) {
+ if (utility != nullptr) {
+ task_queue_factory_ = utility;
+ }
+ }
+
+-inline void EnvironmentFactory::Set(absl::Nullable utility) {
++inline void EnvironmentFactory::Set(RtcEventLog* absl_nullable utility) {
+ if (utility != nullptr) {
+ event_log_ = utility;
+ }
+diff --git a/src/api/rtc_event_log/rtc_event_log_factory.cc b/src/api/rtc_event_log/rtc_event_log_factory.cc
+index bfe272d2a..2196c31cd 100644
+--- a/src/api/rtc_event_log/rtc_event_log_factory.cc
++++ b/src/api/rtc_event_log/rtc_event_log_factory.cc
+@@ -23,7 +23,7 @@
+
+ namespace webrtc {
+
+-absl::Nonnull> RtcEventLogFactory::Create(
++std::unique_ptr absl_nonnull RtcEventLogFactory::Create(
+ const Environment& env) const {
+ #ifndef WEBRTC_ENABLE_RTC_EVENT_LOG
+ return std::make_unique();
+diff --git a/src/api/rtc_event_log/rtc_event_log_factory.h b/src/api/rtc_event_log/rtc_event_log_factory.h
+index 1deb0612b..7f868a552 100644
+--- a/src/api/rtc_event_log/rtc_event_log_factory.h
++++ b/src/api/rtc_event_log/rtc_event_log_factory.h
+@@ -31,7 +31,7 @@ class RTC_EXPORT RtcEventLogFactory : public RtcEventLogFactoryInterface {
+
+ ~RtcEventLogFactory() override = default;
+
+- absl::Nonnull> Create(
++ std::unique_ptr absl_nonnull Create(
+ const Environment& env) const override;
+ };
+
+diff --git a/src/api/rtc_event_log/rtc_event_log_factory_interface.h b/src/api/rtc_event_log/rtc_event_log_factory_interface.h
+index 313558496..d39766955 100644
+--- a/src/api/rtc_event_log/rtc_event_log_factory_interface.h
++++ b/src/api/rtc_event_log/rtc_event_log_factory_interface.h
+@@ -26,7 +26,7 @@ class RtcEventLogFactoryInterface {
+ public:
+ virtual ~RtcEventLogFactoryInterface() = default;
+
+- virtual absl::Nonnull> Create(
++ virtual std::unique_ptr absl_nonnull Create(
+ const Environment& env) const = 0;
+ };
+
+diff --git a/src/api/task_queue/pending_task_safety_flag.cc b/src/api/task_queue/pending_task_safety_flag.cc
+index 4d8fc2b9f..4b521ea04 100644
+--- a/src/api/task_queue/pending_task_safety_flag.cc
++++ b/src/api/task_queue/pending_task_safety_flag.cc
+@@ -37,7 +37,7 @@ PendingTaskSafetyFlag::CreateDetached() {
+ rtc::scoped_refptr
+ PendingTaskSafetyFlag::CreateAttachedToTaskQueue(
+ bool alive,
+- absl::Nonnull attached_queue) {
++ TaskQueueBase* absl_nonnull attached_queue) {
+ RTC_DCHECK(attached_queue) << "Null TaskQueue provided";
+ return rtc::scoped_refptr(
+ new PendingTaskSafetyFlag(alive, attached_queue));
+diff --git a/src/api/task_queue/pending_task_safety_flag.h b/src/api/task_queue/pending_task_safety_flag.h
+index 12b1e00ee..1a002e0ad 100644
+--- a/src/api/task_queue/pending_task_safety_flag.h
++++ b/src/api/task_queue/pending_task_safety_flag.h
+@@ -73,7 +73,7 @@ class RTC_EXPORT PendingTaskSafetyFlag final
+ // a given task queue and the `alive()` flag specified.
+ static rtc::scoped_refptr CreateAttachedToTaskQueue(
+ bool alive,
+- absl::Nonnull attached_queue);
++ TaskQueueBase* absl_nonnull attached_queue);
+
+ // Same as `CreateDetached()` except the initial state of the returned flag
+ // will be `!alive()`.
+@@ -103,7 +103,7 @@ class RTC_EXPORT PendingTaskSafetyFlag final
+ protected:
+ explicit PendingTaskSafetyFlag(bool alive) : alive_(alive) {}
+ PendingTaskSafetyFlag(bool alive,
+- absl::Nonnull attached_queue)
++ TaskQueueBase* absl_nonnull attached_queue)
+ : alive_(alive), main_sequence_(attached_queue) {}
+
+ private:
+diff --git a/src/api/test/create_time_controller.cc b/src/api/test/create_time_controller.cc
+index cbf1f09aa..049451bf5 100644
+--- a/src/api/test/create_time_controller.cc
++++ b/src/api/test/create_time_controller.cc
+@@ -44,8 +44,8 @@ void EnableMediaWithDefaultsAndTimeController(
+ class TimeControllerBasedFactory : public MediaFactory {
+ public:
+ TimeControllerBasedFactory(
+- absl::Nonnull clock,
+- absl::Nonnull> media_factory)
++ Clock* absl_nonnull clock,
++ std::unique_ptr absl_nonnull media_factory)
+ : clock_(clock), media_factory_(std::move(media_factory)) {}
+
+ std::unique_ptr CreateCall(const CallConfig& config) override {
+@@ -64,8 +64,8 @@ void EnableMediaWithDefaultsAndTimeController(
+ }
+
+ private:
+- absl::Nonnull clock_;
+- absl::Nonnull> media_factory_;
++ Clock* absl_nonnull clock_;
++ std::unique_ptr absl_nonnull media_factory_;
+ };
+
+ EnableMediaWithDefaults(deps);
+diff --git a/src/logging/rtc_event_log/fake_rtc_event_log_factory.cc b/src/logging/rtc_event_log/fake_rtc_event_log_factory.cc
+index bacc3cd1c..c5a43e7dd 100644
+--- a/src/logging/rtc_event_log/fake_rtc_event_log_factory.cc
++++ b/src/logging/rtc_event_log/fake_rtc_event_log_factory.cc
+@@ -17,7 +17,7 @@
+
+ namespace webrtc {
+
+-absl::Nonnull> FakeRtcEventLogFactory::Create(
++std::unique_ptr absl_nonnull FakeRtcEventLogFactory::Create(
+ const Environment& /*env*/) const {
+ auto fake_event_log = std::make_unique();
+ const_cast(last_log_created_) = fake_event_log.get();
+diff --git a/src/logging/rtc_event_log/fake_rtc_event_log_factory.h b/src/logging/rtc_event_log/fake_rtc_event_log_factory.h
+index 0d6d07603..08017432a 100644
+--- a/src/logging/rtc_event_log/fake_rtc_event_log_factory.h
++++ b/src/logging/rtc_event_log/fake_rtc_event_log_factory.h
+@@ -25,7 +25,7 @@ class FakeRtcEventLogFactory : public RtcEventLogFactoryInterface {
+ FakeRtcEventLogFactory() = default;
+ ~FakeRtcEventLogFactory() override = default;
+
+- absl::Nonnull> Create(
++ std::unique_ptr absl_nonnull Create(
+ const Environment& env) const override;
+
+ FakeRtcEventLog* last_log_created() { return last_log_created_; }
+diff --git a/src/modules/audio_processing/aec_dump/aec_dump_factory.h b/src/modules/audio_processing/aec_dump/aec_dump_factory.h
+index 0d258a9eb..89435d62c 100644
+--- a/src/modules/audio_processing/aec_dump/aec_dump_factory.h
++++ b/src/modules/audio_processing/aec_dump/aec_dump_factory.h
+@@ -29,18 +29,18 @@ class RTC_EXPORT AecDumpFactory {
+ // The AecDump takes responsibility for `handle` and closes it in the
+ // destructor. A non-null return value indicates that the file has been
+ // sucessfully opened.
+- static absl::Nullable> Create(
++ static std::unique_ptr absl_nullable Create(
+ FileWrapper file,
+ int64_t max_log_size_bytes,
+- absl::Nonnull worker_queue);
+- static absl::Nullable> Create(
++ TaskQueueBase* absl_nonnull worker_queue);
++ static std::unique_ptr absl_nullable Create(
+ absl::string_view file_name,
+ int64_t max_log_size_bytes,
+- absl::Nonnull worker_queue);
+- static absl::Nullable> Create(
+- absl::Nonnull handle,
++ TaskQueueBase* absl_nonnull worker_queue);
++ static std::unique_ptr absl_nullable Create(
++ FILE* absl_nonnull handle,
+ int64_t max_log_size_bytes,
+- absl::Nonnull worker_queue);
++ TaskQueueBase* absl_nonnull worker_queue);
+ };
+
+ } // namespace webrtc
+diff --git a/src/modules/audio_processing/aec_dump/aec_dump_impl.cc b/src/modules/audio_processing/aec_dump/aec_dump_impl.cc
+index 8484fcc6e..76b59d0e5 100644
+--- a/src/modules/audio_processing/aec_dump/aec_dump_impl.cc
++++ b/src/modules/audio_processing/aec_dump/aec_dump_impl.cc
+@@ -60,7 +60,7 @@ void CopyFromConfigToEvent(const webrtc::InternalAPMConfig& config,
+
+ AecDumpImpl::AecDumpImpl(FileWrapper debug_file,
+ int64_t max_log_size_bytes,
+- absl::Nonnull worker_queue)
++ TaskQueueBase* absl_nonnull worker_queue)
+ : debug_file_(std::move(debug_file)),
+ num_bytes_left_for_log_(max_log_size_bytes),
+ worker_queue_(worker_queue) {}
+@@ -255,10 +255,10 @@ void AecDumpImpl::PostWriteToFileTask(std::unique_ptr event) {
+ });
+ }
+
+-absl::Nullable> AecDumpFactory::Create(
++std::unique_ptr absl_nullable AecDumpFactory::Create(
+ FileWrapper file,
+ int64_t max_log_size_bytes,
+- absl::Nonnull worker_queue) {
++ TaskQueueBase* absl_nonnull worker_queue) {
+ RTC_DCHECK(worker_queue);
+ if (!file.is_open())
+ return nullptr;
+@@ -267,18 +267,18 @@ absl::Nullable> AecDumpFactory::Create(
+ worker_queue);
+ }
+
+-absl::Nullable> AecDumpFactory::Create(
++std::unique_ptr absl_nullable AecDumpFactory::Create(
+ absl::string_view file_name,
+ int64_t max_log_size_bytes,
+- absl::Nonnull worker_queue) {
++ TaskQueueBase* absl_nonnull worker_queue) {
+ return Create(FileWrapper::OpenWriteOnly(file_name), max_log_size_bytes,
+ worker_queue);
+ }
+
+-absl::Nullable> AecDumpFactory::Create(
+- absl::Nonnull handle,
++std::unique_ptr absl_nullable AecDumpFactory::Create(
++ FILE* absl_nonnull handle,
+ int64_t max_log_size_bytes,
+- absl::Nonnull worker_queue) {
++ TaskQueueBase* absl_nonnull worker_queue) {
+ return Create(FileWrapper(handle), max_log_size_bytes, worker_queue);
+ }
+
+diff --git a/src/modules/audio_processing/aec_dump/aec_dump_impl.h b/src/modules/audio_processing/aec_dump/aec_dump_impl.h
+index d5af31b01..e3fb25469 100644
+--- a/src/modules/audio_processing/aec_dump/aec_dump_impl.h
++++ b/src/modules/audio_processing/aec_dump/aec_dump_impl.h
+@@ -39,7 +39,7 @@ class AecDumpImpl : public AecDump {
+ // `max_log_size_bytes == -1` means the log size will be unlimited.
+ AecDumpImpl(FileWrapper debug_file,
+ int64_t max_log_size_bytes,
+- absl::Nonnull worker_queue);
++ TaskQueueBase* absl_nonnull worker_queue);
+ AecDumpImpl(const AecDumpImpl&) = delete;
+ AecDumpImpl& operator=(const AecDumpImpl&) = delete;
+ ~AecDumpImpl() override;
+@@ -74,7 +74,7 @@ class AecDumpImpl : public AecDump {
+ FileWrapper debug_file_;
+ int64_t num_bytes_left_for_log_ = 0;
+ rtc::RaceChecker race_checker_;
+- absl::Nonnull worker_queue_;
++ TaskQueueBase* absl_nonnull worker_queue_;
+ CaptureStreamInfo capture_stream_info_;
+ };
+ } // namespace webrtc
+diff --git a/src/modules/audio_processing/aec_dump/null_aec_dump_factory.cc b/src/modules/audio_processing/aec_dump/null_aec_dump_factory.cc
+index 63929afac..2902c1bbc 100644
+--- a/src/modules/audio_processing/aec_dump/null_aec_dump_factory.cc
++++ b/src/modules/audio_processing/aec_dump/null_aec_dump_factory.cc
+@@ -16,24 +16,24 @@
+
+ namespace webrtc {
+
+-absl::Nullable> AecDumpFactory::Create(
++std::unique_ptr absl_nullable AecDumpFactory::Create(
+ FileWrapper file,
+ int64_t max_log_size_bytes,
+- absl::Nonnull worker_queue) {
++ TaskQueueBase* absl_nonnull worker_queue) {
+ return nullptr;
+ }
+
+-absl::Nullable> AecDumpFactory::Create(
++std::unique_ptr absl_nullable AecDumpFactory::Create(
+ absl::string_view file_name,
+ int64_t max_log_size_bytes,
+- absl::Nonnull worker_queue) {
++ TaskQueueBase* absl_nonnull worker_queue) {
+ return nullptr;
+ }
+
+-absl::Nullable> AecDumpFactory::Create(
+- absl::Nonnull handle,
++std::unique_ptr absl_nullable AecDumpFactory::Create(
++ FILE* absl_nonnull handle,
+ int64_t max_log_size_bytes,
+- absl::Nonnull worker_queue) {
++ TaskQueueBase* absl_nonnull worker_queue) {
+ return nullptr;
+ }
+ } // namespace webrtc
+diff --git a/src/modules/audio_processing/audio_processing_impl.cc b/src/modules/audio_processing/audio_processing_impl.cc
+index 0d11e418e..0a579f7dd 100644
+--- a/src/modules/audio_processing/audio_processing_impl.cc
++++ b/src/modules/audio_processing/audio_processing_impl.cc
+@@ -2087,7 +2087,7 @@ void AudioProcessingImpl::UpdateRecommendedInputVolumeLocked() {
+ bool AudioProcessingImpl::CreateAndAttachAecDump(
+ absl::string_view file_name,
+ int64_t max_log_size_bytes,
+- absl::Nonnull worker_queue) {
++ TaskQueueBase* absl_nonnull worker_queue) {
+ std::unique_ptr aec_dump =
+ AecDumpFactory::Create(file_name, max_log_size_bytes, worker_queue);
+ if (!aec_dump) {
+@@ -2101,7 +2101,7 @@ bool AudioProcessingImpl::CreateAndAttachAecDump(
+ bool AudioProcessingImpl::CreateAndAttachAecDump(
+ FILE* handle,
+ int64_t max_log_size_bytes,
+- absl::Nonnull worker_queue) {
++ TaskQueueBase* absl_nonnull worker_queue) {
+ std::unique_ptr aec_dump =
+ AecDumpFactory::Create(handle, max_log_size_bytes, worker_queue);
+ if (!aec_dump) {
+diff --git a/src/modules/audio_processing/audio_processing_impl.h b/src/modules/audio_processing/audio_processing_impl.h
+index 2c0ab198d..4cea151cd 100644
+--- a/src/modules/audio_processing/audio_processing_impl.h
++++ b/src/modules/audio_processing/audio_processing_impl.h
+@@ -76,11 +76,11 @@ class AudioProcessingImpl : public AudioProcessing {
+ bool CreateAndAttachAecDump(
+ absl::string_view file_name,
+ int64_t max_log_size_bytes,
+- absl::Nonnull worker_queue) override;
++ TaskQueueBase* absl_nonnull worker_queue) override;
+ bool CreateAndAttachAecDump(
+ FILE* handle,
+ int64_t max_log_size_bytes,
+- absl::Nonnull worker_queue) override;
++ TaskQueueBase* absl_nonnull worker_queue) override;
+ // TODO(webrtc:5298) Deprecated variant.
+ void AttachAecDump(std::unique_ptr aec_dump) override;
+ void DetachAecDump() override;
+diff --git a/src/modules/audio_processing/include/audio_processing.h b/src/modules/audio_processing/include/audio_processing.h
+index dd484be4f..f7c115e58 100644
+--- a/src/modules/audio_processing/include/audio_processing.h
++++ b/src/modules/audio_processing/include/audio_processing.h
+@@ -633,11 +633,11 @@ class RTC_EXPORT AudioProcessing : public RefCountInterface {
+ virtual bool CreateAndAttachAecDump(
+ absl::string_view file_name,
+ int64_t max_log_size_bytes,
+- absl::Nonnull worker_queue) = 0;
++ TaskQueueBase* absl_nonnull worker_queue) = 0;
+ virtual bool CreateAndAttachAecDump(
+- absl::Nonnull handle,
++ FILE* absl_nonnull handle,
+ int64_t max_log_size_bytes,
+- absl::Nonnull worker_queue) = 0;
++ TaskQueueBase* absl_nonnull worker_queue) = 0;
+
+ // TODO(webrtc:5298) Deprecated variant.
+ // Attaches provided webrtc::AecDump for recording debugging
+diff --git a/src/modules/audio_processing/include/mock_audio_processing.h b/src/modules/audio_processing/include/mock_audio_processing.h
+index dfe7d84e0..fad0a5b83 100644
+--- a/src/modules/audio_processing/include/mock_audio_processing.h
++++ b/src/modules/audio_processing/include/mock_audio_processing.h
+@@ -157,13 +157,13 @@ class MockAudioProcessing : public AudioProcessing {
+ CreateAndAttachAecDump,
+ (absl::string_view file_name,
+ int64_t max_log_size_bytes,
+- absl::Nonnull worker_queue),
++ TaskQueueBase* absl_nonnull worker_queue),
+ (override));
+ MOCK_METHOD(bool,
+ CreateAndAttachAecDump,
+ (FILE * handle,
+ int64_t max_log_size_bytes,
+- absl::Nonnull worker_queue),
++ TaskQueueBase* absl_nonnull worker_queue),
+ (override));
+ MOCK_METHOD(void, AttachAecDump, (std::unique_ptr), (override));
+ MOCK_METHOD(void, DetachAecDump, (), (override));
+diff --git a/src/pc/test/enable_fake_media.cc b/src/pc/test/enable_fake_media.cc
+index 5497c6072..5c10fd8d5 100644
+--- a/src/pc/test/enable_fake_media.cc
++++ b/src/pc/test/enable_fake_media.cc
+@@ -29,11 +29,11 @@ using ::cricket::MediaEngineInterface;
+
+ void EnableFakeMedia(
+ PeerConnectionFactoryDependencies& deps,
+- absl::Nonnull> fake_media_engine) {
++ std::unique_ptr absl_nonnull fake_media_engine) {
+ class FakeMediaFactory : public MediaFactory {
+ public:
+ explicit FakeMediaFactory(
+- absl::Nonnull> fake)
++ std::unique_ptr absl_nonnull fake)
+ : fake_(std::move(fake)) {}
+
+ std::unique_ptr CreateCall(const CallConfig& config) override {
+@@ -49,7 +49,7 @@ void EnableFakeMedia(
+ }
+
+ private:
+- absl::Nullable> fake_;
++ std::unique_ptr absl_nullable fake_;
+ };
+
+ deps.media_factory =
+diff --git a/src/pc/test/enable_fake_media.h b/src/pc/test/enable_fake_media.h
+index 82c55ad08..5fc339d29 100644
+--- a/src/pc/test/enable_fake_media.h
++++ b/src/pc/test/enable_fake_media.h
+@@ -28,7 +28,7 @@ namespace webrtc {
+ // Enables media support backed by the 'fake_media_engine'.
+ void EnableFakeMedia(
+ PeerConnectionFactoryDependencies& deps,
+- absl::Nonnull> fake_media_engine);
++ std::unique_ptr absl_nonnull fake_media_engine);
+
+ // Enables media support backed by unspecified lightweight fake implementation.
+ void EnableFakeMedia(PeerConnectionFactoryDependencies& deps);
+
diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix
index 2a8509ac30b4..606260896580 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix
@@ -43,6 +43,12 @@ stdenv.mkDerivation {
fetchSubmodules = true;
};
+ patches = [
+ # fix build with abseil 202508
+ # upstream PR: https://github.com/desktop-app/tg_owt/pull/164
+ ./abseil-202508.patch
+ ];
+
postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
substituteInPlace src/modules/desktop_capture/linux/wayland/egl_dmabuf.cc \
--replace-fail '"libEGL.so.1"' '"${lib.getLib libGL}/lib/libEGL.so.1"' \
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 2da08bfa6c25..a030ed2c47fe 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -164,7 +164,6 @@ stdenv.mkDerivation rec {
# Avoid referencing -dev paths because of debug assertions.
env.NIX_CFLAGS_COMPILE = toString [ "-DQT_NO_DEBUG" ];
- dontFixCmake = true;
dontWrapGApps = true;
shellHook = ''
diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix
index dc36d5e933ca..bff2db1cff81 100644
--- a/pkgs/applications/networking/sync/backintime/common.nix
+++ b/pkgs/applications/networking/sync/backintime/common.nix
@@ -32,13 +32,13 @@ let
in
stdenv.mkDerivation rec {
pname = "backintime-common";
- version = "1.5.5";
+ version = "1.5.6";
src = fetchFromGitHub {
owner = "bit-team";
repo = "backintime";
rev = "v${version}";
- sha256 = "sha256-Xrls+FE41bcx0S/mO4z5Mm97+P5fmIJDSkS3puKmdig=";
+ sha256 = "sha256-y9uo/6R9OXK9hqUD0pCLJXF2B80lr2gXf6v8+Ca6u5M=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index feb66f6fdf25..c38d5913d2ea 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -1,6 +1,7 @@
{
lib,
stdenv,
+ fetchpatch,
fetchurl,
updateAutotoolsGnuConfigScriptsHook,
perl,
@@ -34,6 +35,11 @@ stdenv.mkDerivation rec {
patches = [
# See:
./fix-tests-in-darwin-sandbox.patch
+ # fix compilation with gcc15
+ (fetchpatch {
+ url = "https://github.com/RsyncProject/rsync/commit/a4b926dcdce96b0f2cc0dc7744e95747b233500a.patch";
+ hash = "sha256-UiEQJ+p2gtIDYNJqnxx4qKgItKIZzCpkHnvsgoxBmSE=";
+ })
];
nativeBuildInputs = [
diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix
index 4b28ee5cb398..b2c3592845fb 100644
--- a/pkgs/applications/radio/soapysdr/default.nix
+++ b/pkgs/applications/radio/soapysdr/default.nix
@@ -18,16 +18,15 @@
stdenv.mkDerivation (finalAttrs: {
pname = "soapysdr";
# Don't forget to change passthru.abiVersion
- version = "0.8.1-unstable-2025-03-30-03";
+ version = "0.8.1-unstable-2025-10-05-03";
src = fetchFromGitHub {
owner = "pothosware";
repo = "SoapySDR";
- # Instead of applying several patches for Python 3.12 compat, just take the latest, from:
- # use old get python lib for v2 (#437)
- rev = "fbf9f3c328868f46029284716df49095ab7b99a6";
- hash = "sha256-W4915c6hV/GR5PZRRXZJW3ERsZmQQQ08EA9wYp2tAVk=";
+ # update to include latest patch for newer cmake support
+ rev = "1667b4e6301d7ad47b340dcdcd6e9969bf57d843";
+ hash = "sha256-UCpYBUb2k1bHy1z2Mvmv+1ZX1BloSsPrTydFV3Ga3Os=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix
index 02da48dea1a1..1c267d792f2c 100644
--- a/pkgs/applications/science/electronics/kicad/default.nix
+++ b/pkgs/applications/science/electronics/kicad/default.nix
@@ -326,7 +326,7 @@ stdenv.mkDerivation rec {
The Programs handle Schematic Capture, and PCB Layout with Gerber output.
'';
license = lib.licenses.gpl3Plus;
- maintainers = with lib.maintainers; [ evils ];
+ maintainers = [ ];
platforms = lib.platforms.all;
broken = stdenv.hostPlatform.isDarwin;
mainProgram = "kicad";
diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix
index e77ae5eae714..501e6b61ef20 100644
--- a/pkgs/applications/science/electronics/kicad/versions.nix
+++ b/pkgs/applications/science/electronics/kicad/versions.nix
@@ -3,23 +3,23 @@
{
"kicad" = {
kicadVersion = {
- version = "9.0.4";
+ version = "9.0.5";
src = {
- rev = "aa7c96856b2c145cc83727304a0d86be6648efa0";
- sha256 = "0736hhf8rs4g8cyhy3xyamyr4iszlvf18a1hwfpcv6qxy0hcbdcv";
+ rev = "3e59813c21b4d0a00c08978e86b5f2189ec27864";
+ sha256 = "0wmnkiyqv32c5nz4nvz94dld3rk5ir49nh71cycig6clvjvy11r5";
};
};
libVersion = {
- version = "9.0.4";
+ version = "9.0.5";
libSources = {
- symbols.rev = "13ded2487d953fa9db16181eae38f890618296f7";
- symbols.sha256 = "0qm1zq8bq6r7l1pssb9isnm5a03kixf5p3x7670ap4xwligdn3wg";
- templates.rev = "c324e461b7e279eaaa3e15348fab15b6b36c02ba";
+ symbols.rev = "884133df0afba238567e2be6c31e7d3b4a9d90be";
+ symbols.sha256 = "0msgq8p3zlfc3glqr1h8n0a1agk4hjdqxqdiny5b4d0hgiy6hhmx";
+ templates.rev = "204b42307fc78cf0b3ebec4e19eba9d710e392f4";
templates.sha256 = "0zs29zn8qjgxv0w1vyr8yxmj02m8752zagn4vcraqgik46dwg2id";
- footprints.rev = "0037953aada2d21e595bd82a5c44fcb20164191f";
- footprints.sha256 = "15kdg661pq79npwb4j28hllqrvwygsz5rblzbdishiikysrba8wl";
- packages3d.rev = "1ca1b14c02301828b539d756cf6306e5f1e13b5e";
- packages3d.sha256 = "0ngf0k5f0a073k5v4q78zk6gj6xjjxzbb6551qf9k9wy8bsmgr2k";
+ footprints.rev = "873e3e9dbad8371d664e57261efa516d42328161";
+ footprints.sha256 = "179y7xmz7mwsfsv4dcw2dx689xfzqk8y38d21s69yiaalyxflhh1";
+ packages3d.rev = "c25dce5aadce68076ac035edb0c792608f5f597c";
+ packages3d.sha256 = "1y7yhynrr87q80gcb8qlkyrdccz1sllsxqymrnghhxbfk4wbwwn8";
};
};
};
diff --git a/pkgs/applications/science/physics/crystfel/default.nix b/pkgs/applications/science/physics/crystfel/default.nix
index 1b5d708e433f..9c3ffb16c186 100644
--- a/pkgs/applications/science/physics/crystfel/default.nix
+++ b/pkgs/applications/science/physics/crystfel/default.nix
@@ -25,7 +25,7 @@
doxygen,
opencl-headers,
ncurses,
- msgpack,
+ msgpack-c,
fftw,
zeromq,
ocl-icd,
@@ -235,7 +235,7 @@ stdenv.mkDerivation rec {
hdf5
gsl
ncurses
- msgpack
+ msgpack-c
fftw
fdip
zeromq
diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix
index 8be72836cf2d..0e3fd51885d6 100644
--- a/pkgs/applications/version-management/git/default.nix
+++ b/pkgs/applications/version-management/git/default.nix
@@ -526,7 +526,7 @@ stdenv.mkDerivation (finalAttrs: {
"lib"
"libexec"
"bin"
- "share/git/contrib/credential/libsecret"
+ "share/git/contrib/credential"
];
passthru = {
diff --git a/pkgs/applications/video/hyperion-ng/default.nix b/pkgs/applications/video/hyperion-ng/default.nix
index 0ba323dc5ef7..2d93d676e374 100644
--- a/pkgs/applications/video/hyperion-ng/default.nix
+++ b/pkgs/applications/video/hyperion-ng/default.nix
@@ -3,6 +3,7 @@
lib,
fetchFromGitHub,
cmake,
+ gitMinimal,
wrapQtAppsHook,
perl,
flatbuffers,
@@ -11,6 +12,7 @@
alsa-lib,
hidapi,
libcec,
+ libftdi1,
libusb1,
libX11,
libxcb,
@@ -20,19 +22,20 @@
qtserialport,
qtsvg,
qtx11extras,
+ qtwebsockets,
withRPiDispmanx ? false,
libraspberrypi,
}:
stdenv.mkDerivation rec {
pname = "hyperion.ng";
- version = "2.0.16";
+ version = "2.1.1";
src = fetchFromGitHub {
owner = "hyperion-project";
repo = "hyperion.ng";
rev = version;
- hash = "sha256-nQPtJw9DOKMPGI5trxZxpP+z2PYsbRKqOQEyaGzvmmA=";
+ hash = "sha256-lKLXgOrXp8DLmlpQe/33A30l4K9VX8P0q2LUA+lLYws=";
# needed for `dependencies/external/`:
# * rpi_ws281x` - not possible to use as a "system" lib
# * qmdnsengine - not in nixpkgs yet
@@ -42,6 +45,7 @@ stdenv.mkDerivation rec {
buildInputs = [
alsa-lib
hidapi
+ libftdi1
libusb1
libX11
libxcb
@@ -53,6 +57,7 @@ stdenv.mkDerivation rec {
qtbase
qtserialport
qtsvg
+ qtwebsockets
qtx11extras
]
++ lib.optional stdenv.hostPlatform.isLinux libcec
@@ -60,6 +65,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
+ gitMinimal
wrapQtAppsHook
]
++ lib.optional stdenv.hostPlatform.isDarwin perl; # for macos bundle
@@ -72,12 +78,16 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DENABLE_DEPLOY_DEPENDENCIES=OFF"
"-DUSE_SYSTEM_FLATBUFFERS_LIBS=ON"
- "-DUSE_SYSTEM_PROTO_LIBS=ON"
+ "-DUSE_SYSTEM_LIBFTDI_LIBS=ON"
"-DUSE_SYSTEM_MBEDTLS_LIBS=ON"
+ "-DUSE_SYSTEM_PROTO_LIBS=ON"
# "-DUSE_SYSTEM_QMDNS_LIBS=ON" # qmdnsengine not in nixpkgs yet
"-DENABLE_TESTS=ON"
]
- ++ lib.optional (withRPiDispmanx == false) "-DENABLE_DISPMANX=OFF";
+ ++ lib.optional (withRPiDispmanx == false) "-DENABLE_DISPMANX=OFF"
+ ++ lib.optional (
+ stdenv.hostPlatform.system == "aarch64-linux"
+ ) "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"; # required to build dependencies/external/rpi_ws281x
doCheck = true;
checkPhase = ''
diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix
index 57300cd86484..15c9748675d6 100644
--- a/pkgs/applications/video/jellyfin-media-player/default.nix
+++ b/pkgs/applications/video/jellyfin-media-player/default.nix
@@ -1,6 +1,7 @@
{
lib,
fetchFromGitHub,
+ fetchpatch,
mkDerivation,
stdenv,
SDL2,
@@ -38,6 +39,12 @@ mkDerivation rec {
./fix-web-path.patch
# disable update notifications since the end user can't simply download the release artifacts to update
./disable-update-notifications.patch
+
+ # cmake 4 compatibility
+ (fetchpatch {
+ url = "https://github.com/jellyfin/jellyfin-media-player/commit/6c5c603a1db489872832ed560581d98fdee89d6f.patch";
+ hash = "sha256-Blq7y7kOygbZ6uKxPJl9aDXJWqhE0jnM5GNEAwyQEA0=";
+ })
];
buildInputs = [
diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix
index 86383f95aca2..c4061e7dd7c9 100644
--- a/pkgs/applications/virtualization/docker/buildx.nix
+++ b/pkgs/applications/virtualization/docker/buildx.nix
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "docker-buildx";
- version = "0.28.0";
+ version = "0.29.0";
src = fetchFromGitHub {
owner = "docker";
repo = "buildx";
rev = "v${version}";
- hash = "sha256-sYhmXVc1pU0nzG57AIuaLqUOWz9MfFlpJZQ9B5Ki5ik=";
+ hash = "sha256-HGhwO0bILHbRyk6YjzI+v6wiIANvTkIRR+SkL4mxv0w=";
};
doCheck = false;
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 85c5d60af109..26754231051b 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -113,13 +113,13 @@ let
});
docker-tini = tini.overrideAttrs {
- pname = "docker-init";
+ pname = "docker-tini";
inherit version;
src = fetchFromGitHub {
owner = "krallin";
repo = "tini";
- tag = tiniRev;
+ rev = tiniRev;
hash = tiniHash;
};
@@ -401,8 +401,8 @@ in
runcHash = "sha256-J/QmOZxYnMPpzm87HhPTkYdt+fN+yeSUu2sv6aUeTY4=";
containerdRev = "v1.7.27";
containerdHash = "sha256-H94EHnfW2Z59KcHcbfJn+BipyZiNUvHe50G5EXbrIps=";
- tiniRev = "v0.19.0";
- tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI=";
+ tiniRev = "369448a167e8b3da4ca5bca0b3307500c3371828";
+ tiniHash = "sha256-jCBNfoJAjmcTJBx08kHs+FmbaU82CbQcf0IVjd56Nuw=";
};
docker_28 =
@@ -419,8 +419,8 @@ in
runcHash = "sha256-oXoDio3l23Z6UyAhb9oDMo1O4TLBbFyLh9sRWXnfLVY=";
containerdRev = "v1.7.28";
containerdHash = "sha256-vz7RFJkFkMk2gp7bIMx1kbkDFUMS9s0iH0VoyD9A21s=";
- tiniRev = "v0.19.0";
- tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI=";
+ tiniRev = "369448a167e8b3da4ca5bca0b3307500c3371828";
+ tiniHash = "sha256-jCBNfoJAjmcTJBx08kHs+FmbaU82CbQcf0IVjd56Nuw=";
};
}
diff --git a/pkgs/applications/virtualization/qemu/canokey-qemu.nix b/pkgs/applications/virtualization/qemu/canokey-qemu.nix
index 0ad27dd55cfb..34a9bccbeeb5 100644
--- a/pkgs/applications/virtualization/qemu/canokey-qemu.nix
+++ b/pkgs/applications/virtualization/qemu/canokey-qemu.nix
@@ -57,5 +57,10 @@ stdenv.mkDerivation rec {
description = "CanoKey QEMU Virt Card";
license = licenses.asl20;
maintainers = with maintainers; [ oxalica ];
+ # Uses a four‐year‐old patched vendored version of Mbed TLS for
+ # cryptography that doesn’t build with CMake 4. Doesn’t build with
+ # gurrent versions of `canokey-core`, either. No upstream
+ # development since 2023.
+ broken = true;
};
}
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 7c78704ef8c6..00521e0feb27 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -90,7 +90,7 @@
tpmSupport ? !minimal,
uringSupport ? stdenv.hostPlatform.isLinux && !userOnly,
liburing,
- canokeySupport ? !minimal,
+ canokeySupport ? false,
canokey-qemu,
capstoneSupport ? !minimal,
capstone,
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index b7be83f5d33c..8988fe5569c3 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -70,8 +70,24 @@ stdenv.mkDerivation rec {
url = "https://github.com/awesomeWM/awesome/commit/d256d9055095f27a33696e0aeda4ee20ed4fb1a0.patch";
sha256 = "1n3y4wnjra8blss7642jgpxnm9n92zhhjj541bb9i60m4b7bgfzz";
})
+
+ # lib, tests: use GioUnix to use platform-specific Gio classes
+ # https://github.com/awesomeWM/awesome/pull/4022
+ (fetchpatch {
+ name = "glib-2.86.0.patch";
+ url = "https://github.com/void-linux/void-packages/raw/933b305b313a2c7d971d746835deb9f49b652204/srcpkgs/awesome/patches/glib-2.86.0.patch";
+ hash = "sha256-qVzD8O34sULcV6S4daDUBPnxVDd8T6ZyLOE+gYxCmf0=";
+ })
];
+ # Fix build with CMake 4
+ # https://github.com/awesomeWM/awesome/pull/4030#issuecomment-3370822668
+ postPatch = ''
+ substituteInPlace {,tests/examples/}CMakeLists.txt \
+ --replace-fail 'cmake_minimum_required(VERSION 3.0.0)' 'cmake_minimum_required(VERSION 3.10)' \
+ --replace-warn 'cmake_policy(VERSION 2.6)' 'cmake_policy(VERSION 3.10)'
+ '';
+
nativeBuildInputs = [
cmake
doxygen
diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix
index de2b46050b72..11de395dc1a0 100644
--- a/pkgs/build-support/appimage/default.nix
+++ b/pkgs/build-support/appimage/default.nix
@@ -203,7 +203,7 @@ rec {
glew110
openssl
libidn
- tbb
+ onetbb
wayland
libgbm
libxkbcommon
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 4484739d0e59..3c6126786fcc 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -690,7 +690,7 @@ stdenvNoCC.mkDerivation {
#
# Unfortunately, setting -B appears to override the default search
# path. Thus, the gcc-specific "../includes-fixed" directory is
- # now longer searched and glibc's header fails to
+ # no longer searched and glibc's header fails to
# compile, because it uses "#include_next " to find the
# limits.h file in ../includes-fixed. To remedy the problem,
# another -idirafter is necessary to add that directory again.
diff --git a/pkgs/build-support/fetchbitbucket/default.nix b/pkgs/build-support/fetchbitbucket/default.nix
index b5f04d8afbd1..31dc8b6bec83 100644
--- a/pkgs/build-support/fetchbitbucket/default.nix
+++ b/pkgs/build-support/fetchbitbucket/default.nix
@@ -1,6 +1,7 @@
{
lib,
repoRevToNameMaybe,
+ fetchgit,
fetchzip,
}:
@@ -8,23 +9,103 @@ lib.makeOverridable (
{
owner,
repo,
- rev,
- name ? repoRevToNameMaybe repo rev "bitbucket",
+ tag ? null,
+ rev ? null,
+ name ? repoRevToNameMaybe repo (lib.revOrTag rev tag) "bitbucket",
+ fetchSubmodules ? false,
+ leaveDotGit ? false,
+ deepClone ? false,
+ forceFetchGit ? false,
+ fetchLFS ? false,
+ rootDir ? "",
+ sparseCheckout ? lib.optional (rootDir != "") rootDir,
+ meta ? { },
... # For hash agility
}@args:
- fetchzip (
- {
- inherit name;
- url = "https://bitbucket.org/${owner}/${repo}/get/${lib.strings.escapeURL rev}.tar.gz";
- meta.homepage = "https://bitbucket.org/${owner}/${repo}/";
- }
- // removeAttrs args [
+
+ assert (
+ lib.assertMsg (lib.xor (tag == null) (
+ rev == null
+ )) "fetchFromBitbucket requires one of either `rev` or `tag` to be provided (not both)."
+ );
+
+ let
+ position = (
+ if args.meta.description or null != null then
+ builtins.unsafeGetAttrPos "description" args.meta
+ else if tag != null then
+ builtins.unsafeGetAttrPos "tag" args
+ else
+ builtins.unsafeGetAttrPos "rev" args
+ );
+ baseUrl = "https://bitbucket.org/${owner}/${repo}";
+ newMeta =
+ meta
+ // {
+ homepage = meta.homepage or baseUrl;
+ }
+ // lib.optionalAttrs (position != null) {
+ # to indicate where derivation originates, similar to make-derivation.nix's mkDerivation
+ position = "${position.file}:${toString position.line}";
+ };
+ gitRepoUrl = "${baseUrl}.git";
+
+ # the tag is escaped to support mercurial-based tags as bitbucket supports them
+ revWithTag = if tag != null then "refs/tags/${lib.strings.escapeURL tag}" else rev;
+
+ passthruAttrs = removeAttrs args [
"owner"
"repo"
"rev"
- ]
- )
+ "tag"
+ "fetchSubmodules"
+ "forceFetchGit"
+ ];
+
+ useFetchGit =
+ fetchSubmodules
+ || (leaveDotGit == true)
+ || deepClone
+ || forceFetchGit
+ || fetchLFS
+ || (rootDir != "")
+ || (sparseCheckout != [ ]);
+
+ fetcher = if useFetchGit then fetchgit else fetchzip;
+
+ fetcherArgs =
+ (
+ if useFetchGit then
+ {
+ inherit
+ rev
+ tag
+ deepClone
+ fetchSubmodules
+ sparseCheckout
+ fetchLFS
+ ;
+ url = gitRepoUrl;
+ }
+ // lib.optionalAttrs (leaveDotGit != null) { inherit leaveDotGit; }
+ else
+ {
+ url = "https://bitbucket.org/${owner}/${repo}/get/${revWithTag}.tar.gz";
+ extension = "tar.gz";
+ passthru = {
+ inherit gitRepoUrl;
+ };
+ }
+ )
+ // passthruAttrs
+ // {
+ inherit name;
+ };
+ in
+ fetcher fetcherArgs
// {
- inherit rev;
+ meta = newMeta;
+ inherit owner repo tag;
+ rev = revWithTag;
}
)
diff --git a/pkgs/build-support/fetchbitbucket/tests.nix b/pkgs/build-support/fetchbitbucket/tests.nix
index 4e9b97b7e709..e0d8f9b474f2 100644
--- a/pkgs/build-support/fetchbitbucket/tests.nix
+++ b/pkgs/build-support/fetchbitbucket/tests.nix
@@ -4,15 +4,24 @@
name = "withWhitespace";
owner = "tetov";
repo = "fetchbitbucket_tester";
- rev = "tag%20with%20encoded%20spaces";
+ tag = "tag%20with%20encoded%20spaces";
sha256 = "sha256-Nf1Cvbx7Sbab8EeSSBU5baLBiuFYiQtITED+f4tfjC0=";
};
+ withEncodedWhitespaceGit = testers.invalidateFetcherByDrvHash fetchFromBitbucket {
+ name = "withWhitespaceGit";
+ owner = "tetov";
+ repo = "fetchbitbucket_tester";
+ tag = "tag%20with%20encoded%20spaces";
+ sha256 = "sha256-Nf1Cvbx7Sbab8EeSSBU5baLBiuFYiQtITED+f4tfjC0=";
+ forceFetchGit = true;
+ };
+
withoutWhitespace = testers.invalidateFetcherByDrvHash fetchFromBitbucket {
name = "withoutWhitespace";
owner = "tetov";
repo = "fetchbitbucket_tester";
- rev = "main";
+ rev = "6b611eb75c7b3bf04b510dfc1268284039d55542";
sha256 = "sha256-eTd773gE1z4+Fl2YPBbbsrADD4Dr7sFGoOWgphXUhtE=";
};
}
diff --git a/pkgs/build-support/fetchhg/default.nix b/pkgs/build-support/fetchhg/default.nix
index 45319bad3f68..7f4ed2ff3e8c 100644
--- a/pkgs/build-support/fetchhg/default.nix
+++ b/pkgs/build-support/fetchhg/default.nix
@@ -18,7 +18,7 @@ lib.extendMkDerivation {
fetchSubrepos ? false,
preferLocalBuild ? true,
}:
- # TODO: statically check if mercurial as the https support if the url starts with https.
+ # TODO: statically check if mercurial has https support if the url starts with https.
{
name = "hg-archive" + (lib.optionalString (name != null) "-${name}");
builder = ./builder.sh;
diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix
index 2bdacb2f341f..d524c760c1a3 100644
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/pkgs/build-support/fetchurl/default.nix
@@ -7,11 +7,14 @@
curl, # Note that `curl' may be `null', in case of the native stdenvNoCC.
cacert ? null,
rewriteURL,
+ hashedMirrors,
}:
let
- mirrors = import ./mirrors.nix;
+ mirrors = import ./mirrors.nix // {
+ inherit hashedMirrors;
+ };
# Write the list of mirrors to a file that we can reuse between
# fetchurl instantiations, instead of passing the mirrors to
diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 1a412617835f..44af3749723f 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -1,9 +1,6 @@
{
- # Content-addressable Nix mirrors
- hashedMirrors = [
- "https://tarballs.nixos.org"
- ];
+ hashedMirrors = throw "Use config.hashedMirrors instead of (import ./pkgs/build-support/fetchurl/mirrors.nix).hashedMirrors";
# Mirrors for mirror://site/filename URIs, where "site" is
# "sourceforge", "gnu", etc.
diff --git a/pkgs/build-support/fetchurl/tests.nix b/pkgs/build-support/fetchurl/tests.nix
index 6d214a74d18a..b4baeec9a9e7 100644
--- a/pkgs/build-support/fetchurl/tests.nix
+++ b/pkgs/build-support/fetchurl/tests.nix
@@ -22,6 +22,21 @@
${jq}/bin/jq -r '.headers.Hello' $out | ${moreutils}/bin/sponge $out
'';
};
+
+ # Tests that hashedMirrors works
+ hashedMirrors = testers.invalidateFetcherByDrvHash fetchurl {
+ # Make sure that we can only download from hashed mirrors
+ url = "http://broken";
+ # A file with this hash is definitely on tarballs.nixos.org
+ sha256 = "1j1y3cq6ys30m734axc0brdm2q9n2as4h32jws15r7w5fwr991km";
+
+ # No chance
+ curlOptsList = [
+ "--retry"
+ "0"
+ ];
+ };
+
# Tests that downloadToTemp works with hashedMirrors
no-skipPostFetch = testers.invalidateFetcherByDrvHash fetchurl {
# Make sure that we can only download from hashed mirrors
@@ -40,6 +55,5 @@
# $downloadedFile, but here we know that because the URL is broken, it will
# have to fallback to fetching the previously-built derivation from
# tarballs.nixos.org, which provides pre-built derivation outputs.
-
};
}
diff --git a/pkgs/build-support/go/README.md b/pkgs/build-support/go/README.md
index 6e87879f20ac..e65f81d17a67 100644
--- a/pkgs/build-support/go/README.md
+++ b/pkgs/build-support/go/README.md
@@ -13,7 +13,7 @@ If `gopls` is compiled for Go 1.23, it won't work for projects that require Go 1
Go only ever has two supported toolchains. With a new minor release, the second last Go toolchain is automatically end of life, meaning it won't receive security updates anymore.
-Based on this, we align on the following policy for toolchain/builder upgrades:
+Based on this, we align on the following policy for toolchain/builder upgrades for the unstable release:
1. Default toolchain (the `go` package) and builder (`buildGoModule`) are upgraded to the latest minor release of Go as soon as it is released.
As it is a mass rebuild, this package will be made against the `staging` branch.
@@ -42,4 +42,8 @@ Based on this, we align on the following policy for toolchain/builder upgrades:
If the package won't build with that builder anymore, the package is marked broken.
It is the package maintainers responsibility to fix the package and get it working with a supported Go toolchain.
+For the stable release, we recognize that (1) removing a Go version, or updating the `go_latest` or `go` packages to a new Go minor release, would be a breaking change, and (2) some packages will need backports (e.g. for security reasons) that require the latest Go version.
+Therefore, on the stable release, new Go versions will be backported to the `release-2x.xx` branch, but the old versions will remain, and `go`, `buildGoModule`, `go_latest`, and `buildGoLatestModule` will remain unchanged.
+However, `rc` versions should not be backported to the stable branch.
+
[1]: http://go.dev/doc/go1compat
diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix
index c9ed1cf0e36e..c1c644e4294e 100644
--- a/pkgs/build-support/go/module.nix
+++ b/pkgs/build-support/go/module.nix
@@ -16,7 +16,6 @@ lib.extendMkDerivation {
{
nativeBuildInputs ? [ ], # Native build inputs used for the derivation.
passthru ? { },
- patches ? [ ],
# A function to override the `goModules` derivation.
overrideModAttrs ? (finalAttrs: previousAttrs: { }),
@@ -235,7 +234,7 @@ lib.extendMkDerivation {
++
lib.warnIf (builtins.elem "-trimpath" GOFLAGS)
"`-trimpath` is added by default to GOFLAGS by buildGoModule when allowGoReference isn't set to true"
- (lib.optional (!allowGoReference) "-trimpath");
+ (lib.optional (!finalAttrs.allowGoReference) "-trimpath");
inherit enableParallelBuilding;
@@ -395,7 +394,8 @@ lib.extendMkDerivation {
strictDeps = true;
- disallowedReferences = lib.optional (!allowGoReference) go;
+ inherit allowGoReference;
+ disallowedReferences = lib.optional (!finalAttrs.allowGoReference) go;
passthru = {
inherit go;
diff --git a/pkgs/build-support/rust/fetch-cargo-vendor.nix b/pkgs/build-support/rust/fetch-cargo-vendor.nix
index 3297764bb4bb..15b6214a4ae3 100644
--- a/pkgs/build-support/rust/fetch-cargo-vendor.nix
+++ b/pkgs/build-support/rust/fetch-cargo-vendor.nix
@@ -22,9 +22,12 @@ let
} (builtins.readFile ./replace-workspace-values.py);
fetchCargoVendorUtil = writers.writePython3Bin "fetch-cargo-vendor-util" {
- libraries = with python3Packages; [
- requests
- ];
+ libraries =
+ with python3Packages;
+ [
+ requests
+ ]
+ ++ requests.optional-dependencies.socks; # to support socks proxy envs like ALL_PROXY in requests
flakeIgnore = [
"E501"
];
diff --git a/pkgs/build-support/rust/replace-workspace-values.py b/pkgs/build-support/rust/replace-workspace-values.py
index 708ce14a7e8f..64fd7151d46c 100644
--- a/pkgs/build-support/rust/replace-workspace-values.py
+++ b/pkgs/build-support/rust/replace-workspace-values.py
@@ -31,7 +31,12 @@ def replace_key(
local_dep = table[key]
del local_dep["workspace"]
- workspace_dep = workspace_manifest[section][key]
+ try:
+ workspace_dep = workspace_manifest[section][key]
+ except KeyError:
+ # Key is not present in workspace manifest, we can't inherit the value, so we mark it for deletion
+ table[key] = {}
+ return True
if section == "dependencies":
if isinstance(workspace_dep, str):
@@ -39,17 +44,17 @@ def replace_key(
final: dict[str, Any] = workspace_dep.copy()
- merged_features = local_dep.pop("features", []) + workspace_dep.get("features", [])
+ merged_features = local_dep.pop("features", []) + workspace_dep.get(
+ "features", []
+ )
if merged_features:
final["features"] = merged_features
local_default_features = local_dep.pop(
- "default-features",
- local_dep.pop("default_features", None)
+ "default-features", local_dep.pop("default_features", None)
)
workspace_default_features = workspace_dep.get(
- "default-features",
- workspace_dep.get("default_features")
+ "default-features", workspace_dep.get("default_features")
)
if not workspace_default_features and local_default_features:
@@ -63,7 +68,9 @@ def replace_key(
final["package"] = local_dep.pop("package")
if local_dep:
- raise Exception(f"Unhandled keys in inherited dependency {key}: {local_dep}")
+ raise Exception(
+ f"Unhandled keys in inherited dependency {key}: {local_dep}"
+ )
table[key] = final
elif section == "package":
@@ -104,10 +111,18 @@ def main() -> None:
changed = False
+ to_remove = []
for key in crate_manifest["package"].keys():
- changed |= replace_key(
+ changed_key = replace_key(
workspace_manifest, crate_manifest["package"], "package", key
)
+ if changed_key and crate_manifest["package"][key] == {}:
+ # Key is missing from workspace manifest, mark for deletion
+ to_remove.append(key)
+ changed |= changed_key
+ # Remove keys which have no value
+ for key in to_remove:
+ del crate_manifest["package"][key]
changed |= replace_dependencies(workspace_manifest, crate_manifest)
diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/crate_missing_field.toml b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/crate_missing_field.toml
new file mode 100644
index 000000000000..6474a3893285
--- /dev/null
+++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/crate_missing_field.toml
@@ -0,0 +1,13 @@
+[package]
+name = "im_using_workspaces"
+version = { workspace = true }
+publish = false
+readme.workspace = true
+keywords = [
+ "workspace",
+ "other_thing",
+ "third_thing",
+]
+
+[dependencies]
+bar = "1.0.0"
diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/default.nix
index b52026190e29..e0f64510d61a 100644
--- a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/default.nix
+++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/default.nix
@@ -8,4 +8,8 @@ runCommand "git-dependency-workspace-inheritance-test" { } ''
cp --no-preserve=mode ${./crate_lints.toml} "$out"
${replaceWorkspaceValues} "$out" ${./workspace.toml}
diff -u "$out" ${./want_lints.toml}
+
+ cp --no-preserve=mode ${./crate_missing_field.toml} "$out"
+ ${replaceWorkspaceValues} "$out" ${./workspace.toml}
+ diff -u "$out" ${./want_missing_field.toml}
''
diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/want_missing_field.toml b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/want_missing_field.toml
new file mode 100644
index 000000000000..fc4b44bf7e50
--- /dev/null
+++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/want_missing_field.toml
@@ -0,0 +1,12 @@
+[package]
+name = "im_using_workspaces"
+version = "1.0.0"
+publish = false
+keywords = [
+ "workspace",
+ "other_thing",
+ "third_thing",
+]
+
+[dependencies]
+bar = "1.0.0"
diff --git a/pkgs/build-support/wasm-bindgen-cli/default.nix b/pkgs/build-support/wasm-bindgen-cli/default.nix
index 112e999323ed..c4688dfec76e 100644
--- a/pkgs/build-support/wasm-bindgen-cli/default.nix
+++ b/pkgs/build-support/wasm-bindgen-cli/default.nix
@@ -38,13 +38,16 @@ rustPlatform.buildRustPackage {
passthru.updateScript = nix-update-script { };
meta = {
- homepage = "https://rustwasm.github.io/docs/wasm-bindgen/";
+ homepage = "https://wasm-bindgen.github.io/wasm-bindgen/";
license = with lib.licenses; [
asl20 # or
mit
];
description = "Facilitating high-level interactions between wasm modules and JavaScript";
- maintainers = with lib.maintainers; [ rizary ];
+ maintainers = with lib.maintainers; [
+ rizary
+ insipx
+ ];
mainProgram = "wasm-bindgen";
};
}
diff --git a/pkgs/by-name/64/64tass/package.nix b/pkgs/by-name/64/64tass/package.nix
new file mode 100644
index 000000000000..9179e41cfa65
--- /dev/null
+++ b/pkgs/by-name/64/64tass/package.nix
@@ -0,0 +1,30 @@
+{
+ lib,
+ stdenv,
+ fetchzip,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "64tass";
+ version = "1.60.3243";
+
+ src = fetchzip {
+ url = "mirror://sourceforge/tass64/64tass-${finalAttrs.version}-src.zip";
+ hash = "sha256-73/MoQqqM966xtN4D8F85HZSw/gEpcFQ2JiH3k6vI+4=";
+ };
+
+ installFlags = [ "prefix=$(out)" ];
+
+ meta = {
+ homepage = "https://tass64.sourceforge.net/";
+ description = "Multi pass optimizing macro assembler for the 65xx series of processors";
+ license = [
+ lib.licenses.gpl2Plus
+ lib.licenses.lgpl2Only
+ lib.licenses.lgpl21Only
+ lib.licenses.mit
+ ];
+ maintainers = [ lib.maintainers.matthewcroughan ];
+ platforms = lib.platforms.linux;
+ };
+})
diff --git a/pkgs/by-name/_7/_7zz/package.nix b/pkgs/by-name/_7/_7zz/package.nix
index 9b539cf98d2d..cc084c3e199b 100644
--- a/pkgs/by-name/_7/_7zz/package.nix
+++ b/pkgs/by-name/_7/_7zz/package.nix
@@ -75,6 +75,10 @@ stdenv.mkDerivation (finalAttrs: {
"-Wno-unsafe-buffer-usage"
"-Wno-cast-function-type-strict"
])
+ # These three probably started to appear with clang 20 or 21:
+ "-Wno-c++-keyword"
+ "-Wno-implicit-void-ptr-cast"
+ "-Wno-nrvo"
]
);
diff --git a/pkgs/by-name/aa/aalib/clang.patch b/pkgs/by-name/aa/aalib/clang.patch
index 5f8fa80f387d..2ed572a906f4 100644
--- a/pkgs/by-name/aa/aalib/clang.patch
+++ b/pkgs/by-name/aa/aalib/clang.patch
@@ -72,3 +72,11 @@ diff -ur a/src/aatest.c b/src/aatest.c
#include "aalib.h"
int main(int argc, char **argv)
{
+diff -ur a/src/aalib.c b/src/aalib.c
+--- a/src/aalib.c 2001-04-26 10:37:31.000000000 -0400
++++ b/src/aalib.c 2025-06-02 00:52:04.119364652 -0400
+@@ -1,3 +1,4 @@
++#include
+ #include
+ #include
+ #include
diff --git a/pkgs/by-name/ab/abseil-cpp_202508/package.nix b/pkgs/by-name/ab/abseil-cpp/package.nix
similarity index 100%
rename from pkgs/by-name/ab/abseil-cpp_202508/package.nix
rename to pkgs/by-name/ab/abseil-cpp/package.nix
diff --git a/pkgs/by-name/ab/abseil-cpp_202501/package.nix b/pkgs/by-name/ab/abseil-cpp_202501/package.nix
deleted file mode 100644
index 7fffca86c037..000000000000
--- a/pkgs/by-name/ab/abseil-cpp_202501/package.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{
- lib,
- stdenv,
- fetchFromGitHub,
- cmake,
- gtest,
- static ? stdenv.hostPlatform.isStatic,
- cxxStandard ? null,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
- pname = "abseil-cpp";
- version = "20250127.1";
-
- src = fetchFromGitHub {
- owner = "abseil";
- repo = "abseil-cpp";
- tag = finalAttrs.version;
- hash = "sha256-QTywqQCkyGFpdbtDBvUwz9bGXxbJs/qoFKF6zYAZUmQ=";
- };
-
- cmakeFlags = [
- (lib.cmakeBool "ABSL_BUILD_TEST_HELPERS" true)
- (lib.cmakeBool "ABSL_USE_EXTERNAL_GOOGLETEST" true)
- (lib.cmakeBool "BUILD_SHARED_LIBS" (!static))
- ]
- ++ lib.optionals (cxxStandard != null) [
- (lib.cmakeFeature "CMAKE_CXX_STANDARD" cxxStandard)
- ];
-
- strictDeps = true;
-
- nativeBuildInputs = [ cmake ];
-
- buildInputs = [ gtest ];
-
- meta = {
- description = "Open-source collection of C++ code designed to augment the C++ standard library";
- homepage = "https://abseil.io/";
- changelog = "https://github.com/abseil/abseil-cpp/releases/tag/${finalAttrs.version}";
- license = lib.licenses.asl20;
- platforms = lib.platforms.all;
- maintainers = [ lib.maintainers.GaetanLepage ];
- };
-})
diff --git a/pkgs/by-name/ab/abseil-cpp_202505/package.nix b/pkgs/by-name/ab/abseil-cpp_202505/package.nix
deleted file mode 100644
index c1884d4a953d..000000000000
--- a/pkgs/by-name/ab/abseil-cpp_202505/package.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{
- lib,
- stdenv,
- fetchFromGitHub,
- cmake,
- gtest,
- static ? stdenv.hostPlatform.isStatic,
- cxxStandard ? null,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
- pname = "abseil-cpp";
- version = "20250512.1";
-
- src = fetchFromGitHub {
- owner = "abseil";
- repo = "abseil-cpp";
- tag = finalAttrs.version;
- hash = "sha256-eB7OqTO9Vwts9nYQ/Mdq0Ds4T1KgmmpYdzU09VPWOhk=";
- };
-
- cmakeFlags = [
- (lib.cmakeBool "ABSL_BUILD_TEST_HELPERS" true)
- (lib.cmakeBool "ABSL_USE_EXTERNAL_GOOGLETEST" true)
- (lib.cmakeBool "BUILD_SHARED_LIBS" (!static))
- ]
- ++ lib.optionals (cxxStandard != null) [
- (lib.cmakeFeature "CMAKE_CXX_STANDARD" cxxStandard)
- ];
-
- strictDeps = true;
-
- nativeBuildInputs = [ cmake ];
-
- buildInputs = [ gtest ];
-
- meta = {
- description = "Open-source collection of C++ code designed to augment the C++ standard library";
- homepage = "https://abseil.io/";
- changelog = "https://github.com/abseil/abseil-cpp/releases/tag/${finalAttrs.version}";
- license = lib.licenses.asl20;
- platforms = lib.platforms.all;
- maintainers = [ lib.maintainers.GaetanLepage ];
- };
-})
diff --git a/pkgs/by-name/ad/adaptivecpp/tests.nix b/pkgs/by-name/ad/adaptivecpp/tests.nix
index 7ce1149ff6b7..68a2d41b58ab 100644
--- a/pkgs/by-name/ad/adaptivecpp/tests.nix
+++ b/pkgs/by-name/ad/adaptivecpp/tests.nix
@@ -9,7 +9,7 @@
# Not setting an explicit target makes it default to the generic target.
targets ? null,
enablePstlTests ? false,
- tbb,
+ onetbb,
cmake,
boost,
}:
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
cmake
- tbb
+ onetbb
];
buildInputs = [ boost ];
diff --git a/pkgs/development/mobile/adb-sync/default.nix b/pkgs/by-name/ad/adb-sync/package.nix
similarity index 95%
rename from pkgs/development/mobile/adb-sync/default.nix
rename to pkgs/by-name/ad/adb-sync/package.nix
index d254c7e2a5e1..2f96ee0c5f45 100644
--- a/pkgs/development/mobile/adb-sync/default.nix
+++ b/pkgs/by-name/ad/adb-sync/package.nix
@@ -3,11 +3,11 @@
stdenv,
fetchFromGitHub,
python3,
- platform-tools,
makeWrapper,
socat,
go-mtpfs,
adbfs-rootless,
+ androidenv,
}:
stdenv.mkDerivation {
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
installPhase =
let
dependencies = lib.makeBinPath [
- platform-tools
+ androidenv.androidPkgs.platform-tools
socat
go-mtpfs
adbfs-rootless
diff --git a/pkgs/by-name/af/aften/package.nix b/pkgs/by-name/af/aften/package.nix
index b0960550c857..f95f018bc21e 100644
--- a/pkgs/by-name/af/aften/package.nix
+++ b/pkgs/by-name/af/aften/package.nix
@@ -23,6 +23,14 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DSHARED=ON" ];
+ # Fix the build with CMake 4.
+ postPatch = ''
+ substituteInPlace CMakeLists.txt \
+ --replace-fail \
+ 'CMAKE_MINIMUM_REQUIRED(VERSION 2.4)' \
+ 'CMAKE_MINIMUM_REQUIRED(VERSION 3.10)'
+ '';
+
meta = {
description = "Audio encoder which generates compressed audio streams based on ATSC A/52 specification";
homepage = "https://aften.sourceforge.net/";
diff --git a/pkgs/by-name/al/alertmanager-ntfy/package.nix b/pkgs/by-name/al/alertmanager-ntfy/package.nix
index dd0ce61d4212..f1a761eebc2b 100644
--- a/pkgs/by-name/al/alertmanager-ntfy/package.nix
+++ b/pkgs/by-name/al/alertmanager-ntfy/package.nix
@@ -8,13 +8,13 @@
buildGoModule (finalAttrs: {
pname = "alertmanager-ntfy";
- version = "1.0.1";
+ version = "1.0.2";
src = fetchFromGitHub {
owner = "alexbakker";
repo = "alertmanager-ntfy";
tag = "v${finalAttrs.version}";
- hash = "sha256-CtjWZIw0RHVnPP5OMiLbPjv/EuJI6GfWo2hEzRi7zVI=";
+ hash = "sha256-aVK8HCRXRprNoBhILLN7F/Fb3RePPzBW4vBMnQr9zRU=";
};
vendorHash = "sha256-CpVGLM6ZtfYODhP6gzWGcnpEuDvKRiMWzoPNm2qtML4=";
diff --git a/pkgs/by-name/al/alliance/package.nix b/pkgs/by-name/al/alliance/package.nix
index 1b6ab31d2318..fe56e205ed8f 100644
--- a/pkgs/by-name/al/alliance/package.nix
+++ b/pkgs/by-name/al/alliance/package.nix
@@ -74,7 +74,7 @@ stdenv.mkDerivation {
description = "(deprecated) Complete set of free CAD tools and portable libraries for VLSI design";
homepage = "http://coriolis.lip6.fr/";
license = with licenses; gpl2Plus;
- maintainers = with maintainers; [ l-as ];
+ maintainers = [ ];
platforms = with platforms; linux;
};
}
diff --git a/pkgs/by-name/al/alsa-firmware/package.nix b/pkgs/by-name/al/alsa-firmware/package.nix
index f9b04d0c0a5d..9950b4933b0e 100644
--- a/pkgs/by-name/al/alsa-firmware/package.nix
+++ b/pkgs/by-name/al/alsa-firmware/package.nix
@@ -57,6 +57,6 @@ stdenv.mkDerivation (finalAttrs: {
description = "Soundcard firmwares from the alsa project";
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.linux;
- maintainers = with lib.maintainers; [ l-as ];
+ maintainers = [ ];
};
})
diff --git a/pkgs/by-name/al/alsa-lib/package.nix b/pkgs/by-name/al/alsa-lib/package.nix
index 8f564b7e6b59..d0768cf443e3 100644
--- a/pkgs/by-name/al/alsa-lib/package.nix
+++ b/pkgs/by-name/al/alsa-lib/package.nix
@@ -60,6 +60,6 @@ stdenv.mkDerivation (finalAttrs: {
"alsa-topology"
];
platforms = with lib.platforms; linux ++ freebsd;
- maintainers = with lib.maintainers; [ l-as ];
+ maintainers = [ ];
};
})
diff --git a/pkgs/by-name/am/amazon-q-cli/package.nix b/pkgs/by-name/am/amazon-q-cli/package.nix
index e861befe2f92..8690a64d5509 100644
--- a/pkgs/by-name/am/amazon-q-cli/package.nix
+++ b/pkgs/by-name/am/amazon-q-cli/package.nix
@@ -7,20 +7,20 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "amazon-q-cli";
- version = "1.14.1";
+ version = "1.17.1";
src = fetchFromGitHub {
owner = "aws";
repo = "amazon-q-developer-cli";
tag = "v${finalAttrs.version}";
- hash = "sha256-RZUe08hPcfPuovfDqndytjz+OVwd3SGvAhWp5XMm+jU=";
+ hash = "sha256-bRin4JKnBsWLvk+dIwHWAf4KKD1n6FOf2wICYNZpHd4=";
};
nativeBuildInputs = [
rustPlatform.bindgenHook
];
- cargoHash = "sha256-qcuxJf038260hr/1Mi5hgWC4Nwmj2xkt4XFkdfgs4QQ=";
+ cargoHash = "sha256-Isa7kxnov4D+Sd7b4LJW52TIR864CDFkAjAHJoVQRcA=";
cargoBuildFlags = [
"-p"
diff --git a/pkgs/by-name/an/ansel/package.nix b/pkgs/by-name/an/ansel/package.nix
index 4f94568f3568..7a9e430b4f51 100644
--- a/pkgs/by-name/an/ansel/package.nix
+++ b/pkgs/by-name/an/ansel/package.nix
@@ -82,13 +82,13 @@ let
in
stdenv.mkDerivation {
pname = "ansel";
- version = "0-unstable-2025-06-11";
+ version = "0-unstable-2025-10-04";
src = fetchFromGitHub {
owner = "aurelienpierreeng";
repo = "ansel";
- rev = "b51cfa38c41abe9933b40e1583807b105c5933c1";
- hash = "sha256-EEML6agNDQbCZ1+b4dTHr3JA9Jh3iTW0U4krVylGVTg=";
+ rev = "dd5b73cd78d32618aca3f81a041e45c8d2adcece";
+ hash = "sha256-x8glXiweW1/mzPjGrGRDeCHIG1GqbjvEmAM4sEhor14=";
fetchSubmodules = true;
};
diff --git a/pkgs/by-name/an/antimatter-dimensions/package.nix b/pkgs/by-name/an/antimatter-dimensions/package.nix
index 1b32d06b5b7a..7052b32ae64e 100644
--- a/pkgs/by-name/an/antimatter-dimensions/package.nix
+++ b/pkgs/by-name/an/antimatter-dimensions/package.nix
@@ -19,12 +19,12 @@ let
in
buildNpmPackage rec {
pname = "antimatter-dimensions";
- version = "0-unstable-2025-07-15";
+ version = "0-unstable-2025-09-17";
src = fetchFromGitHub {
owner = "IvarK";
repo = "AntimatterDimensionsSourceCode";
- rev = "01d29026a9d4a85193b563ab0a44b2b3cf02ad6e";
- hash = "sha256-w66JgLo4SX0b63LjRd1XKDs7O/TpFFJYSbE+dOW1Unw=";
+ rev = "8b5a34c1211df7cb35969dc8e5d402b0b28b7589";
+ hash = "sha256-ptyLpGtHHhsPBS//LpuO327uXPqQWTs1DLGjcsrvZtw=";
};
nativeBuildInputs = [
copyDesktopItems
diff --git a/pkgs/by-name/an/anytype-heart/package.nix b/pkgs/by-name/an/anytype-heart/package.nix
index cf0e7dd49934..94142acdda9a 100644
--- a/pkgs/by-name/an/anytype-heart/package.nix
+++ b/pkgs/by-name/an/anytype-heart/package.nix
@@ -26,13 +26,13 @@ buildGoModule (finalAttrs: {
# Use only versions specified in anytype-ts middleware.version file:
# https://github.com/anyproto/anytype-ts/blob/v/middleware.version
- version = "0.44.1";
+ version = "0.44.3";
src = fetchFromGitHub {
owner = "anyproto";
repo = "anytype-heart";
tag = "v${finalAttrs.version}";
- hash = "sha256-Kb5Z484zeKJT8oBmfqbHszcxYPwnx7mvssseNyRDMWE=";
+ hash = "sha256-seGjGokKZz4oP+jgWF+IVKMLJLQM+aU5CqS7moKpoUs=";
};
vendorHash = "sha256-T7CPD6mbxkN1x53oe9jsS2XMqluqWv8VPPd1pnXZvlc=";
@@ -95,5 +95,6 @@ buildGoModule (finalAttrs: {
"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 c870f19706ba..67c6020cf2e4 100644
--- a/pkgs/by-name/an/anytype/package.nix
+++ b/pkgs/by-name/an/anytype/package.nix
@@ -14,23 +14,23 @@
buildNpmPackage (finalAttrs: {
pname = "anytype";
- version = "0.50.3";
+ version = "0.50.4";
src = fetchFromGitHub {
owner = "anyproto";
repo = "anytype-ts";
tag = "v${finalAttrs.version}";
- hash = "sha256-D2B8DY9VogRc0YP/NKEmg0uVT1ZaqQrOA/4AS845phU=";
+ hash = "sha256-S0zA6/55je/iLkgfPyxkFeyA3zHjI3Y9RlSS76eMWyk=";
};
locales = fetchFromGitHub {
owner = "anyproto";
repo = "l10n-anytype-ts";
- rev = "27d713f500ed375aabb57b551dbc0561cd1983b3";
- hash = "sha256-1SyCVwicUoxj/xxlYe3dElYYXWtzbw2bHiHZ0FKgYDw=";
+ rev = "eba098d97b271cb037beb3e3b349b15c0ffe9358";
+ hash = "sha256-lTT5n+uT+sw1GXP7wwvUb+JhjmjlCjxXiD9Mr1u4aHc=";
};
- npmDepsHash = "sha256-pC1hT85Lk4asGRkQf4ZGlNULtmdlKX/2X1eDHMi6BZ0=";
+ npmDepsHash = "sha256-RL4f9N0DX+qhxM4x5Vdku3EydRIa9IQUYB3R2wJbY4E=";
env = {
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
diff --git a/pkgs/by-name/ap/apparmor-parser/package.nix b/pkgs/by-name/ap/apparmor-parser/package.nix
index 2e00c9c5eb4e..4a71ca7879d7 100644
--- a/pkgs/by-name/ap/apparmor-parser/package.nix
+++ b/pkgs/by-name/ap/apparmor-parser/package.nix
@@ -61,12 +61,6 @@ stdenv.mkDerivation (finalAttrs: {
checkTarget = "tests";
- checkFlags = lib.optionals stdenv.hostPlatform.isMusl [
- # equality tests are broken on musl due to different priority values
- # https://gitlab.com/apparmor/apparmor/-/issues/513
- "-o equality"
- ];
-
postCheck = "popd";
doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
diff --git a/pkgs/by-name/ap/apple-sdk/common/process-stubs.nix b/pkgs/by-name/ap/apple-sdk/common/process-stubs.nix
index 28679553b7bf..88ebf23ee273 100644
--- a/pkgs/by-name/ap/apple-sdk/common/process-stubs.nix
+++ b/pkgs/by-name/ap/apple-sdk/common/process-stubs.nix
@@ -36,21 +36,5 @@ self: super: {
llvm-readtapi --filetype=tbd-v4 usr/lib/$libSystem~ -o usr/lib/$libSystem
rm usr/lib/$libSystem~
done
-
- # Strip weak C++ symbols to work around `libc++` leakage in system
- # frameworks for now. These are only present on `x86_64-darwin`, so
- # it should hopefully be harmless.
- #
- # TODO FIXME: This is kind of horrible.
- while read -r -d "" stub; do
- printf 'Stripping weak C++ symbols from %s\n' "$stub"
- llvm-readtapi --filetype=tbd-v5 "$stub" \
- | jq '
- (.main_library, .libraries[]?).exported_symbols[]?.data.weak[]? |=
- select(startswith("__Z") | not)
- ' > $stub~
- llvm-readtapi --filetype=tbd-v4 $stub~ -o $stub
- rm $stub~
- done < <(find . -name '*.tbd' -print0)
'';
}
diff --git a/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json b/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json
index 5157b58ce3df..2dc99f12620d 100644
--- a/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json
+++ b/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json
@@ -711,14 +711,14 @@
"version": "10063.101.15"
}
},
- "15.2": {
+ "15.5": {
"CarbonHeaders": {
"hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=",
"version": "18.1"
},
"CommonCrypto": {
"hash": "sha256-+qAwL6+s7di9cX/qXtapLkjCFoDuZaSYltRJEG4qekM=",
- "version": "600033.60.1"
+ "version": "600035"
},
"IOAudioFamily": {
"hash": "sha256-VSk3jvsITJugtL67Qt0m4qJ879i7Fj6B/NGBFVCwpiU=",
@@ -757,16 +757,16 @@
"version": "261"
},
"IOGraphics": {
- "hash": "sha256-Ag37fd3tZJLXLVq1yzHOCWGOYYfwwTkC8hnvNaTEaWg=",
- "version": "598"
+ "hash": "sha256-iysZE42mOKZbFxSZBNspaBTCRKEKK38DFGBxZWQxZxI=",
+ "version": "599"
},
"IOHIDFamily": {
- "hash": "sha256-utWAwmn9jss/6fc4flDHXeJR5ZBymO0ZFbDFIFVBnt4=",
- "version": "2104.61.1"
+ "hash": "sha256-gEYPyjXgQ2ABGufCKPjmzMdNRLxhELkCvOURCokyTO4=",
+ "version": "2115.100.21"
},
"IOKitUser": {
- "hash": "sha256-vfz/kLZlVyoHKOlrNdNrf2HcUOB6bY+mpbCvEEg2sus=",
- "version": "100140.60.14"
+ "hash": "sha256-p32U+jHfwA/tqnjF4p1BmojghEXK8KxiflW3IHs2iIY=",
+ "version": "100150.120.2"
},
"IONetworkingFamily": {
"hash": "sha256-gZ7Dkk4Iu7AV9K2ioqSeJ1W7bTNxv77bmT18iv3ljLg=",
@@ -777,28 +777,28 @@
"version": "93"
},
"IOStorageFamily": {
- "hash": "sha256-tjzvlJYVjSTG7oF3AhHgCASKax1fYjOBAxcsrKh/urY=",
- "version": "317.40.2"
+ "hash": "sha256-/0H0tqWUWkgYigYypucbc7lOCFYDuukwF9fvLEOhwOk=",
+ "version": "323"
},
"IOUSBFamily": {
"hash": "sha256-Z0E3TfKP49toYo1Fo9kElRap8CZ+mVDHy5RIexgJTpA=",
"version": "630.4.5"
},
"Libc": {
- "hash": "sha256-/J1Oawa+cMbcAlMlpr6ce32KQQp2lMGnfbRi/2Oc1cY=",
- "version": "1669.60.4"
+ "hash": "sha256-nWDokN0Vr5pUyNGculnDOah9RNgHiWr3S13RSQLmZrc=",
+ "version": "1698.100.8"
},
"Libinfo": {
- "hash": "sha256-D7JMCakQVCQ9j2zUHQSGB8zZcHD6azwYY3bsJU0JfEE=",
- "version": "592"
+ "hash": "sha256-UI5mGvzZ6BPafGYD6CrNAJAKjeJLB6urAS2lpB6X/Ec=",
+ "version": "597"
},
"Libm": {
"hash": "sha256-p4BndAag9d0XSMYWQ+c4myGv5qXbKx5E1VghudSbpTk=",
"version": "2026"
},
"Libnotify": {
- "hash": "sha256-XwVB4sYXPLAHDuLv8mxAWlC1ia17V4cf73DEJDDm4ck=",
- "version": "327.60.1"
+ "hash": "sha256-GDYMVi1034f9empq0YOuumQp/BDJ7phTb0Zl4KTY9xg=",
+ "version": "342"
},
"Librpcsvc": {
"hash": "sha256-UWYdCQ9QsBqwM01bWr+igINAHSdSluB/FrOclC5AjTI=",
@@ -813,80 +813,80 @@
"version": "146"
},
"Security": {
- "hash": "sha256-sRpFQyMk3x4kRthXpqeAnfQ9dE5RMxiSFUiUKRCneck=",
- "version": "61439.60.117"
+ "hash": "sha256-ZOrOOCk+hZbzDilzkihpQfsDpzV3Ul4zy6fpFRWUQHw=",
+ "version": "61439.120.27"
},
"architecture": {
"hash": "sha256-PRNUrhzSOrwmxSPkKmV0LV7yEIik65sdkfKdBqcwFhU=",
"version": "282"
},
"configd": {
- "hash": "sha256-xRaEzq/OOMBi7lvi2bV2/ObN5JJJ5vcFy8DGHLItUWM=",
- "version": "1351"
+ "hash": "sha256-ZdUq1SrOwB88Lx68ekrA4zeVsLDZz4TAJywNnF+uAzY=",
+ "version": "1351.120.3"
},
"copyfile": {
- "hash": "sha256-Vz1fo4p2b6S8xfyDPu1FNgMkH1aX0tkpXCZkdzkRdq0=",
- "version": "213.40.2"
+ "hash": "sha256-rLqT6e44W2ohgwUXREmiOyJBYCrV3gRLbtVnbUq60xc=",
+ "version": "221.121.1"
},
"dtrace": {
"hash": "sha256-iNEZyxK3DmEwO3gzrfvCaVZSEuuOMQm5IG/6FodPNdI=",
"version": "411"
},
"dyld": {
- "hash": "sha256-DDhV7X81nhd3oeJuICEvF8FU43yE/afQ/LYgDNtXswA=",
- "version": "1241.17"
+ "hash": "sha256-4OOghgUYyMJbsTe96fiWCndTJ1BS94rK9v6Kqn/ooYs=",
+ "version": "1285.19"
},
"eap8021x": {
- "hash": "sha256-2FdEb76KBbCAl2iwly4c1Xstar53O8qgGdN/3WXO23U=",
- "version": "364"
+ "hash": "sha256-Kx/wwnt108hDm0qQPyTNbZ8KoHkD5m7L4yb5qjSuQjI=",
+ "version": "365.120.2"
},
"hfs": {
- "hash": "sha256-isTLSBDxh12W10I5KY6O6SsygqnOvqJ0TfdWIKSK3pM=",
- "version": "677.60.1"
+ "hash": "sha256-5/3Ycp3cKqlgAl1kjBmbF5tFlfJYQS5rbrbk4SS66b8=",
+ "version": "683.120.3"
},
"launchd": {
"hash": "sha256-8mW9bnuHmRXCx9py8Wy28C5b2QPICW0rlAps5njYa00=",
"version": "842.1.4"
},
"libclosure": {
- "hash": "sha256-I0PKQFnoJVRMA7H3yT+inHS0454/FXHhQB6nwmHFvFs=",
- "version": "95"
+ "hash": "sha256-pvwfcbeEJmTEPdt6/lgVswiabLRG+sMN6VT5FwG7C4Q=",
+ "version": "96"
},
"libdispatch": {
- "hash": "sha256-f2ex/53OFeSR5A0nMapxC6AocqBSweecNtEhp4bWjhE=",
- "version": "1504.60.7"
+ "hash": "sha256-jTp2DolOOCQPBt1HRotkmPnKgQ2LGgniEqeHoM+vlKg=",
+ "version": "1521.120.4"
},
"libmalloc": {
- "hash": "sha256-Rw/9s7yY3qPtKfDhP+p+0z+aaCsxgwvdUyRG2V1N6D8=",
- "version": "657.60.21"
+ "hash": "sha256-d9AVHSYTqHDlgctv8Hh4HAYW53MJelj4F8LWPsjrsws=",
+ "version": "715.120.13"
},
"libplatform": {
- "hash": "sha256-o/W1pQ9yGTE8HQlGcggM+XiJbEyqgc/s0uiY3+yBtnA=",
- "version": "340.60.2"
+ "hash": "sha256-gpijoTMvdkM0PdG8gyIllOJlh/MtTc4ro9ODDAhN6gM=",
+ "version": "349"
},
"libpthread": {
- "hash": "sha256-eYHDAt2wNk7hJZJxsC7Y9w4ASKdexidu613kPo7TAKs=",
- "version": "535"
+ "hash": "sha256-N+MMXdbthsxauTTfZ5ElUs39dVH+Chn1yyU6pObZpkU=",
+ "version": "536"
},
"mDNSResponder": {
- "hash": "sha256-mDyY/2S4EHbGh02J6VWZVxhNXXZmWGX+NjUjPfMZgZA=",
- "version": "2559.60.39.0.1"
+ "hash": "sha256-ILx12PRxj/+VqfpCCErJFEJXFI9yzTh4g+FK0UCenIE=",
+ "version": "2600.120.12"
},
"objc4": {
- "hash": "sha256-uBFS5extMQkXAXJfPtPlBYAQpz+zsRHQnEaLpDOcYGM=",
- "version": "928.3"
+ "hash": "sha256-DMxa25gXjKCkiDnVJ/8SyJUjaBlmBGABg8EfCHcmTj0=",
+ "version": "940.4"
},
"ppp": {
"hash": "sha256-8+QUA79sHf85yvGSPE9qCmGsrZDT3NZnbgZVroJw/Hg=",
"version": "1016"
},
"removefile": {
- "hash": "sha256-h1jb4DcgDHwi9eiUguc2e5OLP8ZHxCN3B4Myp/DFDBg=",
- "version": "75"
+ "hash": "sha256-Z5UD0mk/s80CQB0PZWDzSl2JWXmnVmwUvlNb28+hR3k=",
+ "version": "81"
},
"xnu": {
- "hash": "sha256-o8CxHvM2OXiAWJmnFe5ERQYnrNyJ+Bpdb9H0sjd6L10=",
- "version": "11215.61.5"
+ "hash": "sha256-o4tCuCAIgAYg/Li3wTs12mVWr5C/4vbwu1zi+kJ9d6w=",
+ "version": "11417.121.6"
}
}
}
diff --git a/pkgs/by-name/ap/apple-sdk/metadata/versions.json b/pkgs/by-name/ap/apple-sdk/metadata/versions.json
index 8de44211cfa1..6c0b1ecabf46 100644
--- a/pkgs/by-name/ap/apple-sdk/metadata/versions.json
+++ b/pkgs/by-name/ap/apple-sdk/metadata/versions.json
@@ -33,10 +33,10 @@
},
"15": {
"urls": [
- "https://swcdn.apple.com/content/downloads/36/33/072-44426-A_G1AII30AST/ddbss9h6gse6a32rg6luosbrm6vgniu033/CLTools_macOSNMOS_SDK.pkg",
- "https://web.archive.org/web/20250210234739/https://swcdn.apple.com/content/downloads/36/33/072-44426-A_G1AII30AST/ddbss9h6gse6a32rg6luosbrm6vgniu033/CLTools_macOSNMOS_SDK.pkg"
+ "https://swcdn.apple.com/content/downloads/52/01/082-41241-A_0747ZN8FHV/dectd075r63pppkkzsb75qk61s0lfee22j/CLTools_macOSNMOS_SDK.pkg",
+ "https://web.archive.org/web/20250530132510/https://swcdn.apple.com/content/downloads/52/01/082-41241-A_0747ZN8FHV/dectd075r63pppkkzsb75qk61s0lfee22j/CLTools_macOSNMOS_SDK.pkg"
],
- "version": "15.2",
- "hash": "sha256-OP5Ah/JnSZ6sD42BD5vGDmikgFzjsfFBmz1hvQD1dOI="
+ "version": "15.5",
+ "hash": "sha256-HBiSJuw1XBUK5R/8Sj65c3rftSEvQl/O9ZZVp/g1Amo="
}
}
diff --git a/pkgs/by-name/ar/arkade/package.nix b/pkgs/by-name/ar/arkade/package.nix
index 037dcbffd0f1..f9e6c80fc37a 100644
--- a/pkgs/by-name/ar/arkade/package.nix
+++ b/pkgs/by-name/ar/arkade/package.nix
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "arkade";
- version = "0.11.47";
+ version = "0.11.50";
src = fetchFromGitHub {
owner = "alexellis";
repo = "arkade";
tag = version;
- hash = "sha256-aWIMnqpf7HehGingl0z7lpUnr7P3k5tiD7+PVjF0Uso=";
+ hash = "sha256-EM4bd++oDQBqcMIcjobvoNzzsQKgkCC0yekY1s/AoNM=";
};
env.CGO_ENABLED = 0;
diff --git a/pkgs/by-name/as/ashell/package.nix b/pkgs/by-name/as/ashell/package.nix
index b11517fd94d8..2d543163899b 100644
--- a/pkgs/by-name/as/ashell/package.nix
+++ b/pkgs/by-name/as/ashell/package.nix
@@ -14,16 +14,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "ashell";
- version = "0.5.0";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = "MalpenZibo";
repo = "ashell";
tag = version;
- hash = "sha256-4OJHnYy3LcABDaSraqoXdTpdfcjRQd+B4hc2AOM/oi8=";
+ hash = "sha256-1PqK+jq0ZioTluwQtEp8rpB/ZNsrvQhLgJiyIM9PQ0k=";
};
- cargoHash = "sha256-6NNWdAUZQY2yPW8OGeQUjOCV+REI+LU2wpJGitqq5hI=";
+ cargoHash = "sha256-L8RxsDxL8oyR3kz+F/NckGikfNLg+Pa1DI2nFgHL5VM=";
nativeBuildInputs = [
pkg-config
diff --git a/pkgs/by-name/au/audit/package.nix b/pkgs/by-name/au/audit/package.nix
index e33b1116c061..215cda4ba459 100644
--- a/pkgs/by-name/au/audit/package.nix
+++ b/pkgs/by-name/au/audit/package.nix
@@ -7,47 +7,51 @@
bashNonInteractive,
buildPackages,
linuxHeaders,
- python3,
+ python3Packages,
swig,
- pkgsCross,
libcap_ng,
installShellFiles,
+ makeWrapper,
+ gawk,
+ gnugrep,
+ coreutils,
- # Enabling python support while cross compiling would be possible, but the
- # configure script tries executing python to gather info instead of relying on
- # python3-config exclusively
- enablePython ? stdenv.hostPlatform == stdenv.buildPlatform,
+ enablePython ? !stdenv.hostPlatform.isStatic,
+
+ # passthru
nix-update-script,
testers,
nixosTests,
+ pkgsStatic ? { }, # CI has allowVariants = false, in which case pkgsMusl would not be passed. So, instead add a default here.
+ pkgsMusl ? { },
}:
stdenv.mkDerivation (finalAttrs: {
pname = "audit";
- version = "4.1.1-unstable-2025-08-01";
+ version = "4.1.2-unstable-2025-09-06"; # fixes to non-static builds right after 4.1.2 release
src = fetchFromGitHub {
owner = "linux-audit";
repo = "audit-userspace";
- rev = "bee5984843d0b38992a369825a87a65fb54b18fc"; # musl fixes, --disable-legacy-actions and --runstatedir support
- hash = "sha256-l3JHWEHz2xGrYxEvfCUD29W8xm5llUnXwX5hLymRG74=";
+ rev = "cb13fe75ee2c36d5c525ed9de22aae10dbc8caf4";
+ hash = "sha256-NX0TWA+LtcZgbM9aQfokWv2rGNAAb3ksGqAH8URAkYM=";
};
postPatch = ''
substituteInPlace bindings/swig/src/auditswig.i \
--replace-fail "/usr/include/linux/audit.h" \
"${linuxHeaders}/include/linux/audit.h"
+ ''
+ + lib.optionalString (enablePython && finalAttrs.finalPackage.doCheck) ''
+ patchShebangs auparse/test/auparse_test.py
'';
- # https://github.com/linux-audit/audit-userspace/issues/474
- # building databuf_test fails otherwise, as that uses hidden symbols only available in the static builds
- dontDisableStatic = true;
-
outputs = [
"bin"
"lib"
"dev"
"out"
"man"
+ "scripts"
];
strictDeps = true;
@@ -59,9 +63,10 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
autoreconfHook
installShellFiles
+ makeWrapper
]
++ lib.optionals enablePython [
- python3
+ python3Packages.python # for python3-config
swig
];
@@ -87,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: {
# capability dropping, currently mostly for plugins as those get spawned as root
# see auditd-plugins(5)
"--with-libcap-ng=yes"
- (if enablePython then "--with-python" else "--without-python")
+ (lib.withFeature enablePython "python3")
];
__structuredAttrs = true;
@@ -98,16 +103,55 @@ stdenv.mkDerivation (finalAttrs: {
bashNonInteractive
];
+ # bin output is used if audit is enabled, becoming part of the system closure.
+ outputChecks.bin.disallowedRequisites = [
+ bash
+ bashNonInteractive
+ ];
+
+ nativeCheckInputs = lib.optionals enablePython [
+ python3Packages.pythonImportsCheckHook
+ ];
+
+ pythonImportsCheck = [ "audit" ];
+
+ enableParallelChecking = false;
+ doCheck = true;
+
postInstall = ''
installShellCompletion --bash init.d/audit.bash_completion
'';
+ # augenrules is a bit broken, but may be helpful to collect audit rules in a builder.
+ # It is not required on a running system, it can just go into its own output.
+ # audit-rules.service relies on augenrules, and is not useful on a nixos system.
+ # It is intended to collect rule files from /etc/audit/rules.d, which we don't set up.
+ # Instead, we load audit rules in a dedicated module.
+ postFixup = ''
+ moveToOutput bin/augenrules $scripts
+ substituteInPlace $scripts/bin/augenrules \
+ --replace-fail "/sbin/auditctl -R" "$bin/bin/auditctl -R" \
+ --replace-fail "auditctl -s" "$bin/bin/auditctl -s" \
+ --replace-fail "/bin/ls" "ls"
+ wrapProgram $scripts/bin/augenrules \
+ --prefix PATH : ${
+ lib.makeBinPath [
+ gawk
+ gnugrep
+ coreutils
+ ]
+ }
+
+ rm $out/lib/systemd/system/audit-rules.service
+ '';
+
enableParallelBuilding = true;
passthru = {
updateScript = nix-update-script { };
tests = {
- musl = pkgsCross.musl64.audit;
+ musl = pkgsMusl.audit or null;
+ static = pkgsStatic.audit or null;
pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
audit = nixosTests.audit;
};
@@ -116,7 +160,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
homepage = "https://people.redhat.com/sgrubb/audit/";
description = "Audit Library";
- changelog = "https://github.com/linux-audit/audit-userspace/releases/tag/v4.1.1";
+ changelog = "https://github.com/linux-audit/audit-userspace/releases/tag/v4.1.2";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ grimmauld ];
pkgConfigModules = [
diff --git a/pkgs/by-name/au/auth0-cli/package.nix b/pkgs/by-name/au/auth0-cli/package.nix
index f401e9664214..f2d34eb7490d 100644
--- a/pkgs/by-name/au/auth0-cli/package.nix
+++ b/pkgs/by-name/au/auth0-cli/package.nix
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "auth0-cli";
- version = "1.20.1";
+ version = "1.21.0";
src = fetchFromGitHub {
owner = "auth0";
repo = "auth0-cli";
tag = "v${version}";
- hash = "sha256-puRrqghNyzui4wnvCPcTRvFrdzLQWtkIds9xvAjkvMQ=";
+ hash = "sha256-HII1qRJ4or5gncSVUA41DmkC8EQ9w6fdmMM15JTUFsw=";
};
- vendorHash = "sha256-VTHdtcSw2yHsNNx+4zR62i0c8iDOTPumb2l+HqI1GLI=";
+ vendorHash = "sha256-g/vpUbtWFKyoPObpd9yOdsbzD/8d0SjAUZzL7A92bio=";
ldflags = [
"-s"
diff --git a/pkgs/by-name/au/autopanosiftc/package.nix b/pkgs/by-name/au/autopanosiftc/package.nix
deleted file mode 100644
index 358bce7edefd..000000000000
--- a/pkgs/by-name/au/autopanosiftc/package.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{
- lib,
- stdenv,
- fetchurl,
- cmake,
- libpng,
- libtiff,
- libjpeg,
- panotools,
- libxml2,
-}:
-
-stdenv.mkDerivation rec {
- pname = "autopano-sift-C";
- version = "2.5.1";
-
- src = fetchurl {
- url = "mirror://sourceforge/hugin/autopano-sift-C-${version}.tar.gz";
- sha256 = "0dqk8ff82gmy4v5ns5nr9gpzkc1p7c2y8c8fkid102r47wsjk44s";
- };
-
- nativeBuildInputs = [ cmake ];
- buildInputs = [
- libpng
- libtiff
- libjpeg
- panotools
- libxml2
- ];
-
- patches = [
- (fetchurl {
- url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/autopano-sift-C/files/autopano-sift-C-2.5.1-lm.patch?id=dec60bb6900d6ebdaaa6aa1dcb845b30b739f9b5";
- sha256 = "1bfcr5sps0ip9gl4jprji5jgf9wkczz6d2clsjjlbsy8r3ixi3lv";
- })
- ];
-
- meta = {
- homepage = "http://hugin.sourceforge.net/";
- description = "Implementation in C of the autopano-sift algorithm for automatically stitching panoramas";
- license = lib.licenses.gpl2;
- platforms = lib.platforms.linux;
- };
-}
diff --git a/pkgs/by-name/au/autotier/package.nix b/pkgs/by-name/au/autotier/package.nix
index ffd7a0679cd9..9da9946f4271 100644
--- a/pkgs/by-name/au/autotier/package.nix
+++ b/pkgs/by-name/au/autotier/package.nix
@@ -8,7 +8,7 @@
boost,
fuse3,
lib45d,
- tbb_2022,
+ onetbb,
liburing,
installShellFiles,
}:
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
boost
fuse3
lib45d
- tbb_2022
+ onetbb
liburing
];
diff --git a/pkgs/by-name/aw/aws-c-auth/package.nix b/pkgs/by-name/aw/aws-c-auth/package.nix
index 48c1a85ac843..0fdb9c282641 100644
--- a/pkgs/by-name/aw/aws-c-auth/package.nix
+++ b/pkgs/by-name/aw/aws-c-auth/package.nix
@@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "aws-c-auth";
# nixpkgs-update: no auto update
- version = "0.9.0";
+ version = "0.9.1";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-auth";
- rev = "v${version}";
- hash = "sha256-HzDUINTmgjW7rNEe+5iwZBv6ayxNKmGAJy+Lg4tp1t0=";
+ tag = "v${version}";
+ hash = "sha256-8oQTTqBuEzhBUWqXHVYrGtaX44SmB2sJQZchiweHekM=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/aw/aws-c-common/package.nix b/pkgs/by-name/aw/aws-c-common/package.nix
index e2b86d35fec9..33d8dd77c2c1 100644
--- a/pkgs/by-name/aw/aws-c-common/package.nix
+++ b/pkgs/by-name/aw/aws-c-common/package.nix
@@ -36,6 +36,8 @@ stdenv.mkDerivation rec {
let
ignoreTests = [
"promise_test_multiple_waiters"
+ # Flaky test https://github.com/NixOS/nixpkgs/issues/443233
+ "test_memory_usage_maxrss"
];
in
''
diff --git a/pkgs/by-name/aw/aws-c-event-stream/package.nix b/pkgs/by-name/aw/aws-c-event-stream/package.nix
index d71b3861e6ab..93a7d254ad02 100644
--- a/pkgs/by-name/aw/aws-c-event-stream/package.nix
+++ b/pkgs/by-name/aw/aws-c-event-stream/package.nix
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "aws-c-event-stream";
# nixpkgs-update: no auto update
- version = "0.5.5";
+ version = "0.5.7";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-event-stream";
rev = "v${version}";
- hash = "sha256-wVjpDKKwoksq5gFtvhH76c7ciP0XmMozhkWmzY6GwgU=";
+ hash = "sha256-JvjUrIj1bh5WZEzkauLSLIolxrT8CKIMjO7p1c35XZI=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/aw/aws-c-io/package.nix b/pkgs/by-name/aw/aws-c-io/package.nix
index 68efabd3aef1..f130056cdada 100644
--- a/pkgs/by-name/aw/aws-c-io/package.nix
+++ b/pkgs/by-name/aw/aws-c-io/package.nix
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "aws-c-io";
# nixpkgs-update: no auto update
- version = "0.21.2";
+ version = "0.22.0";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-io";
rev = "v${version}";
- hash = "sha256-QNf4TJIqtypDliiu6I72CbgjyJhdS9Uuim9tZOb3SJs=";
+ hash = "sha256-NOEjXk4s/FV4CdmyXOr4Oh2y+pFNrUMP/Sy+X+fVQc4=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/aw/aws-c-s3/package.nix b/pkgs/by-name/aw/aws-c-s3/package.nix
index 88419b389db4..b4787f2db12d 100644
--- a/pkgs/by-name/aw/aws-c-s3/package.nix
+++ b/pkgs/by-name/aw/aws-c-s3/package.nix
@@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "aws-c-s3";
# nixpkgs-update: no auto update
- version = "0.8.6";
+ version = "0.8.7";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-s3";
rev = "v${version}";
- hash = "sha256-g2w1igjv0N0o6+bewypJm2coHTvhYN2v8usdMN7TBI4=";
+ hash = "sha256-8yUwgiZ50BiItapeg0zIc5vr0+OFHvzIRrwWH4lQFBM=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/aw/aws-crt-cpp/package.nix b/pkgs/by-name/aw/aws-crt-cpp/package.nix
index b8b35b095602..d5629c850d1f 100644
--- a/pkgs/by-name/aw/aws-crt-cpp/package.nix
+++ b/pkgs/by-name/aw/aws-crt-cpp/package.nix
@@ -20,7 +20,7 @@
stdenv.mkDerivation rec {
pname = "aws-crt-cpp";
# nixpkgs-update: no auto update
- version = "0.33.1";
+ version = "0.34.3";
outputs = [
"out"
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
owner = "awslabs";
repo = "aws-crt-cpp";
rev = "v${version}";
- sha256 = "sha256-C8KWe5+CXujD8nN3gLkjaaMld15sat/ohwEKhyWELKI=";
+ sha256 = "sha256-jKmIsWAzxnfsNgHavR6crhIQXVJq/PbQgaj4KVGrMP0=";
};
postPatch = ''
diff --git a/pkgs/by-name/aw/aws-sdk-cpp/package.nix b/pkgs/by-name/aw/aws-sdk-cpp/package.nix
index 28b2e2bb146c..4471a43b9243 100644
--- a/pkgs/by-name/aw/aws-sdk-cpp/package.nix
+++ b/pkgs/by-name/aw/aws-sdk-cpp/package.nix
@@ -35,13 +35,13 @@ in
stdenv.mkDerivation rec {
pname = "aws-sdk-cpp";
# nixpkgs-update: no auto update
- version = "1.11.612";
+ version = "1.11.647";
src = fetchFromGitHub {
owner = "aws";
repo = "aws-sdk-cpp";
tag = version;
- hash = "sha256-W4eKgUvN2NLYEOO47HTJYJpEmyn10gNK29RIrvoXkek=";
+ hash = "sha256-RJKR0xw3HTNItaLGyYCjibmfK3UBDA4hfAZzQ0xYg9U=";
};
postPatch = ''
diff --git a/pkgs/by-name/aw/awscli/package.nix b/pkgs/by-name/aw/awscli/package.nix
index 298f46a9773c..35018deb4cf7 100644
--- a/pkgs/by-name/aw/awscli/package.nix
+++ b/pkgs/by-name/aw/awscli/package.nix
@@ -14,14 +14,14 @@ let
pname = "awscli";
# N.B: if you change this, change botocore and boto3 to a matching version too
# check e.g. https://github.com/aws/aws-cli/blob/1.33.21/setup.py
- version = "1.42.4";
+ version = "1.42.18";
pyproject = true;
src = fetchFromGitHub {
owner = "aws";
repo = "aws-cli";
tag = version;
- hash = "sha256-vkQFhSsK9MWhp+jvomkVdjxXuBOH4GnFgz/9jtPRNIs=";
+ hash = "sha256-f6CVQotsdvU2g/GjOMWPay/7FxxRvhtBrVZE5TLHTNY=";
};
pythonRelaxDeps = [
diff --git a/pkgs/by-name/ba/bambu-studio/package.nix b/pkgs/by-name/ba/bambu-studio/package.nix
index 646344d6ae04..441b62d5a67f 100644
--- a/pkgs/by-name/ba/bambu-studio/package.nix
+++ b/pkgs/by-name/ba/bambu-studio/package.nix
@@ -34,7 +34,7 @@
opencv,
pcre,
systemd,
- tbb_2022,
+ onetbb,
webkitgtk_4_1,
wxGTK31,
xorg,
@@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: {
opencascade-occt_7_6
openvdb
pcre
- tbb_2022
+ onetbb
webkitgtk_4_1
wxGTK'
xorg.libX11
diff --git a/pkgs/by-name/ba/basalt-monado/package.nix b/pkgs/by-name/ba/basalt-monado/package.nix
index 3a1acbf76abc..9df8831d84da 100644
--- a/pkgs/by-name/ba/basalt-monado/package.nix
+++ b/pkgs/by-name/ba/basalt-monado/package.nix
@@ -20,21 +20,21 @@
opencv,
pkg-config,
stdenv,
- tbb,
+ onetbb,
xorg,
cudaPackages,
enableCuda ? config.cudaSupport,
}:
stdenv.mkDerivation {
pname = "basalt-monado";
- version = "0-unstable-2024-06-21";
+ version = "0-unstable-2025-09-25";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "mateosss";
repo = "basalt";
- rev = "385c161f35720df3a6c606054565f9d49a1c5787";
- hash = "sha256-+2/pc2OWDwE04xPcfHL5GGyhQ1ZTN6o7cCNAilDgd2Y=";
+ rev = "5337898271f5c2ce523258e93e80fd870130be31";
+ hash = "sha256-IoXZlXyOc5y9aSHBU3WCNhHi4L9xzHmbv6VMEvX2ZeE=";
fetchSubmodules = true;
};
@@ -58,7 +58,7 @@ stdenv.mkDerivation {
lz4
magic-enum
opencv.cxxdev
- tbb
+ onetbb
xorg.libX11
]
++ lib.optionals enableCuda [
diff --git a/pkgs/by-name/bc/bcache-tools/package.nix b/pkgs/by-name/bc/bcache-tools/package.nix
index 0b20b7d00475..9220ff281f25 100644
--- a/pkgs/by-name/bc/bcache-tools/package.nix
+++ b/pkgs/by-name/bc/bcache-tools/package.nix
@@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
-e "/INSTALL.*initcpio\/install/d" \
-e "/INSTALL.*dracut\/module-setup.sh/d" \
-e "/INSTALL.*probe-bcache/d" \
+ -e "s/pkg-config/$PKG_CONFIG/" \
-i Makefile
# * Remove probe-bcache which is handled by util-linux
sed -e "/probe-bcache/d" \
diff --git a/pkgs/by-name/bc/bcc/package.nix b/pkgs/by-name/bc/bcc/package.nix
index 608e81a4ddd3..1a378885979d 100644
--- a/pkgs/by-name/bc/bcc/package.nix
+++ b/pkgs/by-name/bc/bcc/package.nix
@@ -5,6 +5,7 @@
cmake,
elfutils,
fetchFromGitHub,
+ fetchpatch,
flex,
iperf,
lib,
@@ -43,6 +44,12 @@ python3Packages.buildPythonApplication rec {
(replaceVars ./absolute-ausyscall.patch {
ausyscall = lib.getExe' audit "ausyscall";
})
+
+ (fetchpatch {
+ name = "clang-21.patch";
+ url = "https://github.com/iovisor/bcc/commit/8c5c96ad3beeed2fa827017f451a952306826974.diff";
+ hash = "sha256-VOzhdeZ3mRstLlMhxHwEgqCa6L39eRpbFJuKZqFnBws=";
+ })
];
build-system = [ python3Packages.setuptools ];
diff --git a/pkgs/by-name/bc/bcg729/package.nix b/pkgs/by-name/bc/bcg729/package.nix
index 7dc3ccb8cd64..942e9e4d6ebc 100644
--- a/pkgs/by-name/bc/bcg729/package.nix
+++ b/pkgs/by-name/bc/bcg729/package.nix
@@ -22,7 +22,11 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace CMakeLists.txt \
- --replace '\$'{exec_prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR}
+ --replace-fail '\$'{exec_prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR}
+
+ # cmake 4 compatibility, upstream has patches but they don't backport cleanly
+ substituteInPlace CMakeLists.txt \
+ --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
'';
meta = {
diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix
index 84480751e8f0..ec3891a548dd 100644
--- a/pkgs/by-name/be/beeper/package.nix
+++ b/pkgs/by-name/be/beeper/package.nix
@@ -9,10 +9,10 @@
}:
let
pname = "beeper";
- version = "4.1.186";
+ version = "4.1.253";
src = fetchurl {
url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}.AppImage";
- hash = "sha256-/SEBOQF5XzOLVyaCn0+a0iPvVz/JE38hEt9iNJgDRaU=";
+ hash = "sha256-/vjJmDP183M8B/g0IIcWytB5NUoteWMZlef0j8nZdOQ=";
};
appimageContents = appimageTools.extract {
inherit pname version src;
diff --git a/pkgs/by-name/bi/biboumi/package.nix b/pkgs/by-name/bi/biboumi/package.nix
index ea9b4688c9fa..ebc9dfa625e3 100644
--- a/pkgs/by-name/bi/biboumi/package.nix
+++ b/pkgs/by-name/bi/biboumi/package.nix
@@ -79,6 +79,12 @@ stdenv.mkDerivation {
"man"
];
+ cmakeFlags = [
+ # Fix breakage with CMake 4
+ "-DCMAKE_SKIP_RPATH=ON"
+ "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
+ ];
+
preConfigure = ''
substituteInPlace CMakeLists.txt --replace /etc/biboumi $out/etc/biboumi
cp ${catch}/single_include/catch.hpp tests/
diff --git a/pkgs/by-name/bi/bitbake-language-server/package.nix b/pkgs/by-name/bi/bitbake-language-server/package.nix
index ea0d3de4642f..dffbf7964106 100644
--- a/pkgs/by-name/bi/bitbake-language-server/package.nix
+++ b/pkgs/by-name/bi/bitbake-language-server/package.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
src = fetchFromGitHub {
owner = "Freed-Wu";
repo = "bitbake-language-server";
- rev = version;
+ tag = version;
hash = "sha256-NLDQ2P5peweugkoNYskpCyCEgBwVFA7RTs8+NvH8fj8=";
};
diff --git a/pkgs/by-name/bi/bitlbee-discord/package.nix b/pkgs/by-name/bi/bitlbee-discord/package.nix
index 4be2d69cf9f0..e3356027cef5 100644
--- a/pkgs/by-name/bi/bitlbee-discord/package.nix
+++ b/pkgs/by-name/bi/bitlbee-discord/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
version = "0.4.3";
src = fetchFromGitHub {
- rev = version;
+ tag = version;
owner = "sm00th";
repo = "bitlbee-discord";
sha256 = "00qgdvrp7hv02n0ns685igp810zxmv3adsama8601122al6x041n";
diff --git a/pkgs/by-name/bi/bitwarden-cli/fix-lockfile.patch b/pkgs/by-name/bi/bitwarden-cli/fix-lockfile.patch
new file mode 100644
index 000000000000..0b65d6552040
--- /dev/null
+++ b/pkgs/by-name/bi/bitwarden-cli/fix-lockfile.patch
@@ -0,0 +1,567 @@
+diff --git a/package-lock.json b/package-lock.json
+index 1b4fe5f40e..fe3166797e 100644
+--- a/package-lock.json
++++ b/package-lock.json
+@@ -230,51 +230,6 @@
+ "bw": "build/bw.js"
+ }
+ },
+- "apps/cli/node_modules/define-lazy-prop": {
+- "version": "2.0.0",
+- "license": "MIT",
+- "engines": {
+- "node": ">=8"
+- }
+- },
+- "apps/cli/node_modules/is-docker": {
+- "version": "2.2.1",
+- "license": "MIT",
+- "bin": {
+- "is-docker": "cli.js"
+- },
+- "engines": {
+- "node": ">=8"
+- },
+- "funding": {
+- "url": "https://github.com/sponsors/sindresorhus"
+- }
+- },
+- "apps/cli/node_modules/is-wsl": {
+- "version": "2.2.0",
+- "license": "MIT",
+- "dependencies": {
+- "is-docker": "^2.0.0"
+- },
+- "engines": {
+- "node": ">=8"
+- }
+- },
+- "apps/cli/node_modules/open": {
+- "version": "8.4.2",
+- "license": "MIT",
+- "dependencies": {
+- "define-lazy-prop": "^2.0.0",
+- "is-docker": "^2.1.1",
+- "is-wsl": "^2.2.0"
+- },
+- "engines": {
+- "node": ">=12"
+- },
+- "funding": {
+- "url": "https://github.com/sponsors/sindresorhus"
+- }
+- },
+ "apps/desktop": {
+ "name": "@bitwarden/desktop",
+ "version": "2025.9.0",
+@@ -4913,33 +4868,6 @@
+ }
+ }
+ },
+- "node_modules/@compodoc/compodoc/node_modules/@angular-devkit/schematics/node_modules/chokidar": {
+- "version": "3.6.0",
+- "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+- "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+- "dev": true,
+- "license": "MIT",
+- "optional": true,
+- "peer": true,
+- "dependencies": {
+- "anymatch": "~3.1.2",
+- "braces": "~3.0.2",
+- "glob-parent": "~5.1.2",
+- "is-binary-path": "~2.1.0",
+- "is-glob": "~4.0.1",
+- "normalize-path": "~3.0.0",
+- "readdirp": "~3.6.0"
+- },
+- "engines": {
+- "node": ">= 8.10.0"
+- },
+- "funding": {
+- "url": "https://paulmillr.com/funding/"
+- },
+- "optionalDependencies": {
+- "fsevents": "~2.3.2"
+- }
+- },
+ "node_modules/@compodoc/compodoc/node_modules/@babel/core": {
+ "version": "7.25.8",
+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.8.tgz",
+@@ -5122,21 +5050,6 @@
+ "dev": true,
+ "license": "MIT"
+ },
+- "node_modules/@compodoc/compodoc/node_modules/glob-parent": {
+- "version": "5.1.2",
+- "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+- "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+- "dev": true,
+- "license": "ISC",
+- "optional": true,
+- "peer": true,
+- "dependencies": {
+- "is-glob": "^4.0.1"
+- },
+- "engines": {
+- "node": ">= 6"
+- }
+- },
+ "node_modules/@compodoc/compodoc/node_modules/magic-string": {
+ "version": "0.30.11",
+ "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz",
+@@ -5147,36 +5060,6 @@
+ "@jridgewell/sourcemap-codec": "^1.5.0"
+ }
+ },
+- "node_modules/@compodoc/compodoc/node_modules/readdirp": {
+- "version": "3.6.0",
+- "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+- "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+- "dev": true,
+- "license": "MIT",
+- "optional": true,
+- "peer": true,
+- "dependencies": {
+- "picomatch": "^2.2.1"
+- },
+- "engines": {
+- "node": ">=8.10.0"
+- }
+- },
+- "node_modules/@compodoc/compodoc/node_modules/readdirp/node_modules/picomatch": {
+- "version": "2.3.1",
+- "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+- "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+- "dev": true,
+- "license": "MIT",
+- "optional": true,
+- "peer": true,
+- "engines": {
+- "node": ">=8.6"
+- },
+- "funding": {
+- "url": "https://github.com/sponsors/jonschlinkert"
+- }
+- },
+ "node_modules/@compodoc/live-server": {
+ "version": "1.2.3",
+ "resolved": "https://registry.npmjs.org/@compodoc/live-server/-/live-server-1.2.3.tgz",
+@@ -5908,28 +5791,6 @@
+ "node": ">=16.4"
+ }
+ },
+- "node_modules/@electron/windows-sign": {
+- "version": "1.2.2",
+- "resolved": "https://registry.npmjs.org/@electron/windows-sign/-/windows-sign-1.2.2.tgz",
+- "integrity": "sha512-dfZeox66AvdPtb2lD8OsIIQh12Tp0GNCRUDfBHIKGpbmopZto2/A8nSpYYLoedPIHpqkeblZ/k8OV0Gy7PYuyQ==",
+- "dev": true,
+- "license": "BSD-2-Clause",
+- "optional": true,
+- "peer": true,
+- "dependencies": {
+- "cross-dirname": "^0.1.0",
+- "debug": "^4.3.4",
+- "fs-extra": "^11.1.1",
+- "minimist": "^1.2.8",
+- "postject": "^1.0.0-alpha.6"
+- },
+- "bin": {
+- "electron-windows-sign": "bin/electron-windows-sign.js"
+- },
+- "engines": {
+- "node": ">=14.14"
+- }
+- },
+ "node_modules/@emnapi/core": {
+ "version": "1.4.3",
+ "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.4.3.tgz",
+@@ -8285,21 +8146,6 @@
+ "@msgpack/msgpack": "^2.7.0"
+ }
+ },
+- "node_modules/@microsoft/signalr/node_modules/utf-8-validate": {
+- "version": "5.0.10",
+- "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.10.tgz",
+- "integrity": "sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==",
+- "hasInstallScript": true,
+- "license": "MIT",
+- "optional": true,
+- "peer": true,
+- "dependencies": {
+- "node-gyp-build": "^4.3.0"
+- },
+- "engines": {
+- "node": ">=6.14.2"
+- }
+- },
+ "node_modules/@microsoft/signalr/node_modules/ws": {
+ "version": "7.5.10",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+@@ -11310,21 +11156,6 @@
+ "linux"
+ ]
+ },
+- "node_modules/@rollup/rollup-linux-riscv64-musl": {
+- "version": "4.44.0",
+- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.44.0.tgz",
+- "integrity": "sha512-TDKO8KlHJuvTEdfw5YYFBjhFts2TR0VpZsnLLSYmB7AaohJhM8ctDSdDnUGq77hUh4m/djRafw+9zQpkOanE2Q==",
+- "cpu": [
+- "riscv64"
+- ],
+- "dev": true,
+- "license": "MIT",
+- "optional": true,
+- "os": [
+- "linux"
+- ],
+- "peer": true
+- },
+ "node_modules/@rollup/rollup-linux-s390x-gnu": {
+ "version": "4.34.8",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.34.8.tgz",
+@@ -18997,15 +18828,6 @@
+ "integrity": "sha512-vQOuWmBgsgG1ovGeDi8m6Zeu1JaqH/JncrxKmaqMbv/LunyOQdLiQhPHtOsNlbUI05TocR5nod/Mbs3HYtr6sQ==",
+ "license": "MIT"
+ },
+- "node_modules/cross-dirname": {
+- "version": "0.1.0",
+- "resolved": "https://registry.npmjs.org/cross-dirname/-/cross-dirname-0.1.0.tgz",
+- "integrity": "sha512-+R08/oI0nl3vfPcqftZRpytksBXDzOUveBq/NBVx0sUp1axwzPQrKinNx5yd5sxPu8j1wIy8AfnVQ+5eFdha6Q==",
+- "dev": true,
+- "license": "MIT",
+- "optional": true,
+- "peer": true
+- },
+ "node_modules/cross-env": {
+ "version": "10.0.0",
+ "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-10.0.0.tgz",
+@@ -33661,36 +33483,6 @@
+ "dev": true,
+ "license": "MIT"
+ },
+- "node_modules/postject": {
+- "version": "1.0.0-alpha.6",
+- "resolved": "https://registry.npmjs.org/postject/-/postject-1.0.0-alpha.6.tgz",
+- "integrity": "sha512-b9Eb8h2eVqNE8edvKdwqkrY6O7kAwmI8kcnBv1NScolYJbo59XUF0noFq+lxbC1yN20bmC0WBEbDC5H/7ASb0A==",
+- "dev": true,
+- "license": "MIT",
+- "optional": true,
+- "peer": true,
+- "dependencies": {
+- "commander": "^9.4.0"
+- },
+- "bin": {
+- "postject": "dist/cli.js"
+- },
+- "engines": {
+- "node": ">=14.0.0"
+- }
+- },
+- "node_modules/postject/node_modules/commander": {
+- "version": "9.5.0",
+- "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz",
+- "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==",
+- "dev": true,
+- "license": "MIT",
+- "optional": true,
+- "peer": true,
+- "engines": {
+- "node": "^12.20.0 || >=14"
+- }
+- },
+ "node_modules/prebuild-install": {
+ "version": "7.1.3",
+ "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz",
+@@ -39330,291 +39122,6 @@
+ }
+ }
+ },
+- "node_modules/vite/node_modules/@rollup/rollup-android-arm-eabi": {
+- "version": "4.44.0",
+- "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.44.0.tgz",
+- "integrity": "sha512-xEiEE5oDW6tK4jXCAyliuntGR+amEMO7HLtdSshVuhFnKTYoeYMyXQK7pLouAJJj5KHdwdn87bfHAR2nSdNAUA==",
+- "cpu": [
+- "arm"
+- ],
+- "dev": true,
+- "license": "MIT",
+- "optional": true,
+- "os": [
+- "android"
+- ],
+- "peer": true
+- },
+- "node_modules/vite/node_modules/@rollup/rollup-android-arm64": {
+- "version": "4.44.0",
+- "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.44.0.tgz",
+- "integrity": "sha512-uNSk/TgvMbskcHxXYHzqwiyBlJ/lGcv8DaUfcnNwict8ba9GTTNxfn3/FAoFZYgkaXXAdrAA+SLyKplyi349Jw==",
+- "cpu": [
+- "arm64"
+- ],
+- "dev": true,
+- "license": "MIT",
+- "optional": true,
+- "os": [
+- "android"
+- ],
+- "peer": true
+- },
+- "node_modules/vite/node_modules/@rollup/rollup-darwin-arm64": {
+- "version": "4.44.0",
+- "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.44.0.tgz",
+- "integrity": "sha512-VGF3wy0Eq1gcEIkSCr8Ke03CWT+Pm2yveKLaDvq51pPpZza3JX/ClxXOCmTYYq3us5MvEuNRTaeyFThCKRQhOA==",
+- "cpu": [
+- "arm64"
+- ],
+- "dev": true,
+- "license": "MIT",
+- "optional": true,
+- "os": [
+- "darwin"
+- ],
+- "peer": true
+- },
+- "node_modules/vite/node_modules/@rollup/rollup-darwin-x64": {
+- "version": "4.44.0",
+- "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.44.0.tgz",
+- "integrity": "sha512-fBkyrDhwquRvrTxSGH/qqt3/T0w5Rg0L7ZIDypvBPc1/gzjJle6acCpZ36blwuwcKD/u6oCE/sRWlUAcxLWQbQ==",
+- "cpu": [
+- "x64"
+- ],
+- "dev": true,
+- "license": "MIT",
+- "optional": true,
+- "os": [
+- "darwin"
+- ],
+- "peer": true
+- },
+- "node_modules/vite/node_modules/@rollup/rollup-freebsd-arm64": {
+- "version": "4.44.0",
+- "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.44.0.tgz",
+- "integrity": "sha512-u5AZzdQJYJXByB8giQ+r4VyfZP+walV+xHWdaFx/1VxsOn6eWJhK2Vl2eElvDJFKQBo/hcYIBg/jaKS8ZmKeNQ==",
+- "cpu": [
+- "arm64"
+- ],
+- "dev": true,
+- "license": "MIT",
+- "optional": true,
+- "os": [
+- "freebsd"
+- ],
+- "peer": true
+- },
+- "node_modules/vite/node_modules/@rollup/rollup-freebsd-x64": {
+- "version": "4.44.0",
+- "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.44.0.tgz",
+- "integrity": "sha512-qC0kS48c/s3EtdArkimctY7h3nHicQeEUdjJzYVJYR3ct3kWSafmn6jkNCA8InbUdge6PVx6keqjk5lVGJf99g==",
+- "cpu": [
+- "x64"
+- ],
+- "dev": true,
+- "license": "MIT",
+- "optional": true,
+- "os": [
+- "freebsd"
+- ],
+- "peer": true
+- },
+- "node_modules/vite/node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+- "version": "4.44.0",
+- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.44.0.tgz",
+- "integrity": "sha512-x+e/Z9H0RAWckn4V2OZZl6EmV0L2diuX3QB0uM1r6BvhUIv6xBPL5mrAX2E3e8N8rEHVPwFfz/ETUbV4oW9+lQ==",
+- "cpu": [
+- "arm"
+- ],
+- "dev": true,
+- "license": "MIT",
+- "optional": true,
+- "os": [
+- "linux"
+- ],
+- "peer": true
+- },
+- "node_modules/vite/node_modules/@rollup/rollup-linux-arm-musleabihf": {
+- "version": "4.44.0",
+- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.44.0.tgz",
+- "integrity": "sha512-1exwiBFf4PU/8HvI8s80icyCcnAIB86MCBdst51fwFmH5dyeoWVPVgmQPcKrMtBQ0W5pAs7jBCWuRXgEpRzSCg==",
+- "cpu": [
+- "arm"
+- ],
+- "dev": true,
+- "license": "MIT",
+- "optional": true,
+- "os": [
+- "linux"
+- ],
+- "peer": true
+- },
+- "node_modules/vite/node_modules/@rollup/rollup-linux-arm64-gnu": {
+- "version": "4.44.0",
+- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.44.0.tgz",
+- "integrity": "sha512-ZTR2mxBHb4tK4wGf9b8SYg0Y6KQPjGpR4UWwTFdnmjB4qRtoATZ5dWn3KsDwGa5Z2ZBOE7K52L36J9LueKBdOQ==",
+- "cpu": [
+- "arm64"
+- ],
+- "dev": true,
+- "license": "MIT",
+- "optional": true,
+- "os": [
+- "linux"
+- ],
+- "peer": true
+- },
+- "node_modules/vite/node_modules/@rollup/rollup-linux-arm64-musl": {
+- "version": "4.44.0",
+- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.44.0.tgz",
+- "integrity": "sha512-GFWfAhVhWGd4r6UxmnKRTBwP1qmModHtd5gkraeW2G490BpFOZkFtem8yuX2NyafIP/mGpRJgTJ2PwohQkUY/Q==",
+- "cpu": [
+- "arm64"
+- ],
+- "dev": true,
+- "license": "MIT",
+- "optional": true,
+- "os": [
+- "linux"
+- ],
+- "peer": true
+- },
+- "node_modules/vite/node_modules/@rollup/rollup-linux-loongarch64-gnu": {
+- "version": "4.44.0",
+- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.44.0.tgz",
+- "integrity": "sha512-xw+FTGcov/ejdusVOqKgMGW3c4+AgqrfvzWEVXcNP6zq2ue+lsYUgJ+5Rtn/OTJf7e2CbgTFvzLW2j0YAtj0Gg==",
+- "cpu": [
+- "loong64"
+- ],
+- "dev": true,
+- "license": "MIT",
+- "optional": true,
+- "os": [
+- "linux"
+- ],
+- "peer": true
+- },
+- "node_modules/vite/node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
+- "version": "4.44.0",
+- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.44.0.tgz",
+- "integrity": "sha512-bKGibTr9IdF0zr21kMvkZT4K6NV+jjRnBoVMt2uNMG0BYWm3qOVmYnXKzx7UhwrviKnmK46IKMByMgvpdQlyJQ==",
+- "cpu": [
+- "ppc64"
+- ],
+- "dev": true,
+- "license": "MIT",
+- "optional": true,
+- "os": [
+- "linux"
+- ],
+- "peer": true
+- },
+- "node_modules/vite/node_modules/@rollup/rollup-linux-riscv64-gnu": {
+- "version": "4.44.0",
+- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.44.0.tgz",
+- "integrity": "sha512-vV3cL48U5kDaKZtXrti12YRa7TyxgKAIDoYdqSIOMOFBXqFj2XbChHAtXquEn2+n78ciFgr4KIqEbydEGPxXgA==",
+- "cpu": [
+- "riscv64"
+- ],
+- "dev": true,
+- "license": "MIT",
+- "optional": true,
+- "os": [
+- "linux"
+- ],
+- "peer": true
+- },
+- "node_modules/vite/node_modules/@rollup/rollup-linux-s390x-gnu": {
+- "version": "4.44.0",
+- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.44.0.tgz",
+- "integrity": "sha512-8541GEyktXaw4lvnGp9m84KENcxInhAt6vPWJ9RodsB/iGjHoMB2Pp5MVBCiKIRxrxzJhGCxmNzdu+oDQ7kwRA==",
+- "cpu": [
+- "s390x"
+- ],
+- "dev": true,
+- "license": "MIT",
+- "optional": true,
+- "os": [
+- "linux"
+- ],
+- "peer": true
+- },
+- "node_modules/vite/node_modules/@rollup/rollup-linux-x64-gnu": {
+- "version": "4.44.0",
+- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.44.0.tgz",
+- "integrity": "sha512-iUVJc3c0o8l9Sa/qlDL2Z9UP92UZZW1+EmQ4xfjTc1akr0iUFZNfxrXJ/R1T90h/ILm9iXEY6+iPrmYB3pXKjw==",
+- "cpu": [
+- "x64"
+- ],
+- "dev": true,
+- "license": "MIT",
+- "optional": true,
+- "os": [
+- "linux"
+- ],
+- "peer": true
+- },
+- "node_modules/vite/node_modules/@rollup/rollup-linux-x64-musl": {
+- "version": "4.44.0",
+- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.44.0.tgz",
+- "integrity": "sha512-PQUobbhLTQT5yz/SPg116VJBgz+XOtXt8D1ck+sfJJhuEsMj2jSej5yTdp8CvWBSceu+WW+ibVL6dm0ptG5fcA==",
+- "cpu": [
+- "x64"
+- ],
+- "dev": true,
+- "license": "MIT",
+- "optional": true,
+- "os": [
+- "linux"
+- ],
+- "peer": true
+- },
+- "node_modules/vite/node_modules/@rollup/rollup-win32-arm64-msvc": {
+- "version": "4.44.0",
+- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.44.0.tgz",
+- "integrity": "sha512-M0CpcHf8TWn+4oTxJfh7LQuTuaYeXGbk0eageVjQCKzYLsajWS/lFC94qlRqOlyC2KvRT90ZrfXULYmukeIy7w==",
+- "cpu": [
+- "arm64"
+- ],
+- "dev": true,
+- "license": "MIT",
+- "optional": true,
+- "os": [
+- "win32"
+- ],
+- "peer": true
+- },
+- "node_modules/vite/node_modules/@rollup/rollup-win32-ia32-msvc": {
+- "version": "4.44.0",
+- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.44.0.tgz",
+- "integrity": "sha512-3XJ0NQtMAXTWFW8FqZKcw3gOQwBtVWP/u8TpHP3CRPXD7Pd6s8lLdH3sHWh8vqKCyyiI8xW5ltJScQmBU9j7WA==",
+- "cpu": [
+- "ia32"
+- ],
+- "dev": true,
+- "license": "MIT",
+- "optional": true,
+- "os": [
+- "win32"
+- ],
+- "peer": true
+- },
+- "node_modules/vite/node_modules/@rollup/rollup-win32-x64-msvc": {
+- "version": "4.44.0",
+- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.44.0.tgz",
+- "integrity": "sha512-Q2Mgwt+D8hd5FIPUuPDsvPR7Bguza6yTkJxspDGkZj7tBRn2y4KSWYuIXpftFSjBra76TbKerCV7rgFPQrn+wQ==",
+- "cpu": [
+- "x64"
+- ],
+- "dev": true,
+- "license": "MIT",
+- "optional": true,
+- "os": [
+- "win32"
+- ],
+- "peer": true
+- },
+ "node_modules/vite/node_modules/rollup": {
+ "version": "4.44.0",
+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.44.0.tgz",
diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix
index 85ee2cb8631f..99fe107c25f7 100644
--- a/pkgs/by-name/bi/bitwarden-cli/package.nix
+++ b/pkgs/by-name/bi/bitwarden-cli/package.nix
@@ -2,37 +2,41 @@
lib,
stdenv,
buildNpmPackage,
- nodejs_20,
fetchFromGitHub,
- cctools,
- nix-update-script,
- nixosTests,
+ nodejs_22,
perl,
xcbuild,
+ writableTmpDirAsHomeHook,
+ versionCheckHook,
+ nixosTests,
+ nix-update-script,
}:
-buildNpmPackage rec {
+buildNpmPackage (finalAttrs: {
pname = "bitwarden-cli";
- version = "2025.5.0";
+ version = "2025.9.0";
src = fetchFromGitHub {
owner = "bitwarden";
repo = "clients";
- tag = "cli-v${version}";
- hash = "sha256-8jVKwqKhTfhur226SER4sb1i4dY+TjJRYmOY8YtO6CY=";
+ tag = "cli-v${finalAttrs.version}";
+ hash = "sha256-vxGyDYtv0O5U4pnVrQm/BOIpDtpcDUOyFFdBDehQ2to=";
};
+ patches = [
+ ./fix-lockfile.patch
+ ];
+
postPatch = ''
# remove code under unfree license
rm -r bitwarden_license
'';
- nodejs = nodejs_20;
+ nodejs = nodejs_22;
- npmDepsHash = "sha256-0IoBPRGdtkMeTrT5cqZLHB/WrUCONtsJ6YHh0y4K5Ls=";
+ npmDepsHash = "sha256-bn39QlZXNUa/GEZhJsjLiG3PRYdQ/Y36Tvef2fXH8yQ=";
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
- cctools
perl
xcbuild.xcrun
];
@@ -61,9 +65,6 @@ buildNpmPackage rec {
rm -r node_modules/**/prebuilds
shopt -u globstar
- # FIXME one of the esbuild versions fails to download @esbuild/linux-x64
- rm -r node_modules/esbuild node_modules/vite/node_modules/esbuild
-
npm rebuild --verbose
'';
@@ -84,6 +85,14 @@ buildNpmPackage rec {
installShellCompletion --cmd bw --zsh <($out/bin/bw completion --shell zsh)
'';
+ doInstallCheck = true;
+ nativeInstallCheckInputs = [
+ writableTmpDirAsHomeHook
+ versionCheckHook
+ ];
+ versionCheckKeepEnvironment = [ "HOME" ];
+ versionCheckProgramArg = "--version";
+
passthru = {
tests = {
vaultwarden = nixosTests.vaultwarden.sqlite;
@@ -97,13 +106,14 @@ buildNpmPackage rec {
};
meta = {
- # https://github.com/NixOS/nixpkgs/issues/339576
- broken = stdenv.hostPlatform.isDarwin;
- changelog = "https://github.com/bitwarden/clients/releases/tag/${src.tag}";
+ changelog = "https://github.com/bitwarden/clients/releases/tag/${finalAttrs.src.tag}";
description = "Secure and free password manager for all of your devices";
homepage = "https://bitwarden.com";
license = lib.licenses.gpl3Only;
mainProgram = "bw";
- maintainers = with lib.maintainers; [ dotlambda ];
+ maintainers = with lib.maintainers; [
+ xiaoxiangmoe
+ dotlambda
+ ];
};
-}
+})
diff --git a/pkgs/by-name/bl/blackfire/package.nix b/pkgs/by-name/bl/blackfire/package.nix
index 3fa51eec49e3..e4cfedfc53d7 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 = "2.29.0";
+ version = "2.29.1";
src =
passthru.sources.${stdenv.hostPlatform.system}
@@ -60,23 +60,23 @@ stdenv.mkDerivation rec {
sources = {
"x86_64-linux" = fetchurl {
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb";
- sha256 = "i5R/O9pcIGpJqSl+txjDKl6qBDQmjNO2VJpDm6En4b8=";
+ sha256 = "n4jG21FgJbRtxhQSxXNKNFJHPqb9CmQFMd2P3+vnHVE=";
};
"i686-linux" = fetchurl {
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb";
- sha256 = "orymOOYL7/VwuN8itOhBSINNaBJ9gI7Zn2mTN55BpUA=";
+ sha256 = "eX8kMQM9ofssQ9USft69ZzMV/pl1CV5EnUMgxOLuIcA=";
};
"aarch64-linux" = fetchurl {
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb";
- sha256 = "d4GML/5uvMnx6g+PNaNEqD3pXVwzWLHFiV8VzSSvIHw=";
+ sha256 = "LCqGWc/KJHa5YA1Ex35qI/wVbe1leBwPeG6SUlxrpvY=";
};
"aarch64-darwin" = fetchurl {
url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz";
- sha256 = "YZ61kEVr40BwiOCsQUz1UfiScNvWW1/ZF/daR+8BV+Q=";
+ sha256 = "RlTCB0lARb94dwDnDh9L6QYMZXTD/v5Ae756RETias0=";
};
"x86_64-darwin" = fetchurl {
url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz";
- sha256 = "IuFmV3FjMMY6bPooFU9egJplyP0fzi032QCZxr6Y1tw=";
+ sha256 = "PGfBHkKOSd4uRKWW95MwyFRD7SWQzck9g6Jk/mWC384=";
};
};
diff --git a/pkgs/by-name/bl/blasfeo/package.nix b/pkgs/by-name/bl/blasfeo/package.nix
index 8053b628b59f..1355e51da77e 100644
--- a/pkgs/by-name/bl/blasfeo/package.nix
+++ b/pkgs/by-name/bl/blasfeo/package.nix
@@ -1,6 +1,7 @@
{
cmake,
fetchFromGitHub,
+ fetchpatch,
lib,
stdenv,
withTarget ? "GENERIC",
@@ -17,6 +18,14 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-p1pxqJ38h6RKXMg1t+2RHlfmRKPuM18pbUarUx/w9lw=";
};
+ patches = [
+ (fetchpatch {
+ name = "blasfeo-fix-cmake-4.patch";
+ url = "https://github.com/giaf/blasfeo/commit/75078e2b6153d1c8bc5329e83a82d4d4d3eefd76.patch";
+ hash = "sha256-bH5xUKAjNFCO9rRc655BcMiUesNFFln+iEPC5JHcQAU=";
+ })
+ ];
+
nativeBuildInputs = [ cmake ];
cmakeFlags = [ "-DTARGET=${withTarget}" ];
diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix
index bc02d8848575..dc4f903ade7f 100644
--- a/pkgs/by-name/bl/blender/package.nix
+++ b/pkgs/by-name/bl/blender/package.nix
@@ -74,7 +74,7 @@
spaceNavSupport ? stdenv.hostPlatform.isLinux,
sse2neon,
stdenv,
- tbb_2022,
+ onetbb,
vulkan-headers,
vulkan-loader,
wayland,
@@ -112,8 +112,6 @@ let
tag = "v8.0.0";
hash = "sha256-SXkXZHzQH8JOkXypjjxNvT/lUlWZkCuhh6hNCHE7FkY=";
};
-
- tbb = tbb_2022;
in
stdenv'.mkDerivation (finalAttrs: {
@@ -262,20 +260,20 @@ stdenv'.mkDerivation (finalAttrs: {
openexr
openimageio
openjpeg
- (openpgl.override { inherit tbb; })
+ openpgl
(opensubdiv.override { inherit cudaSupport; })
- (openvdb.override { inherit tbb; })
+ openvdb
potrace
pugixml
python3
python3Packages.materialx
- tbb
+ onetbb
zlib
zstd
]
++ lib.optional embreeSupport embree
++ lib.optional hipSupport rocmPackages.clr
- ++ lib.optional openImageDenoiseSupport (openimagedenoise.override { inherit cudaSupport tbb; })
+ ++ lib.optional openImageDenoiseSupport (openimagedenoise.override { inherit cudaSupport; })
++ (
if (!stdenv.hostPlatform.isDarwin) then
[
diff --git a/pkgs/by-name/bm/bmake/package.nix b/pkgs/by-name/bm/bmake/package.nix
index c221957f8f3e..6cdfb11e2954 100644
--- a/pkgs/by-name/bm/bmake/package.nix
+++ b/pkgs/by-name/bm/bmake/package.nix
@@ -53,22 +53,17 @@ stdenv.mkDerivation (finalAttrs: {
];
# Disabled tests:
+ # * cmd-interrupt: tries to `SIGINT` make itself, flaky as a result
# * directive-export{,-gmake}: another failure related to TZ variables
# * opt-keep-going-indirect: not yet known
- # * varmod-localtime: musl doesn't support TZDIR and this test relies on
- # impure, implicit paths
- # * interrupt-compat (fails on x86_64-linux building for i686-linux)
- env.BROKEN_TESTS = lib.concatStringsSep " " (
- [
- "directive-export"
- "directive-export-gmake"
- "opt-keep-going-indirect"
- "varmod-localtime"
- ]
- ++ lib.optionals stdenv.targetPlatform.is32bit [
- "interrupt-compat"
- ]
- );
+ # * varmod-localtime: musl doesn't support TZDIR and this test relies on impure, implicit paths
+ env.BROKEN_TESTS = lib.concatStringsSep " " [
+ "cmd-interrupt"
+ "directive-export"
+ "directive-export-gmake"
+ "opt-keep-going-indirect"
+ "varmod-localtime"
+ ];
strictDeps = true;
diff --git a/pkgs/by-name/bo/boehmgc/package.nix b/pkgs/by-name/bo/boehmgc/package.nix
index bb5b68f8eefa..d4616fbd002b 100644
--- a/pkgs/by-name/bo/boehmgc/package.nix
+++ b/pkgs/by-name/bo/boehmgc/package.nix
@@ -37,6 +37,8 @@ stdenv.mkDerivation (finalAttrs: {
];
separateDebugInfo = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.libc != "musl";
+ __structuredAttrs = true;
+
nativeBuildInputs = [
autoreconfHook
];
diff --git a/pkgs/by-name/bo/bom/package.nix b/pkgs/by-name/bo/bom/package.nix
index 760be97f557a..63c855f3b696 100644
--- a/pkgs/by-name/bo/bom/package.nix
+++ b/pkgs/by-name/bo/bom/package.nix
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "bom";
- version = "0.6.0";
+ version = "0.7.1";
src = fetchFromGitHub {
owner = "kubernetes-sigs";
repo = "bom";
tag = "v${version}";
- hash = "sha256-nYzBaFtOJhqO0O6MJsxTw/mxsIOa+cnU27nOFRe2/uI=";
+ hash = "sha256-OLbzk1Ix8N2R+od3NQg0JviEcnw6Sw1+wrak26ZWYFw=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@@ -27,7 +27,7 @@ buildGoModule rec {
'';
};
- vendorHash = "sha256-q2dK1hO3ruvts4BtQ1VGgTH3qNMzmS22CUuA52t5OvE=";
+ vendorHash = "sha256-gHlrpseovxAv+YdHipUwuIhUDoK05oizMfUpQTHqi6M=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/bo/bowtie2/package.nix b/pkgs/by-name/bo/bowtie2/package.nix
index adc49a98e353..5286edb36f81 100644
--- a/pkgs/by-name/bo/bowtie2/package.nix
+++ b/pkgs/by-name/bo/bowtie2/package.nix
@@ -5,7 +5,7 @@
cmake,
perl,
python3,
- tbb,
+ onetbb,
zlib,
runCommand,
bowtie2,
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ cmake ];
buildInputs = [
- tbb
+ onetbb
zlib
python3
perl
diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/by-name/br/brasero-unwrapped/package.nix
similarity index 100%
rename from pkgs/tools/cd-dvd/brasero/default.nix
rename to pkgs/by-name/br/brasero-unwrapped/package.nix
diff --git a/pkgs/tools/cd-dvd/brasero/remove-symlink-check.patch b/pkgs/by-name/br/brasero-unwrapped/remove-symlink-check.patch
similarity index 100%
rename from pkgs/tools/cd-dvd/brasero/remove-symlink-check.patch
rename to pkgs/by-name/br/brasero-unwrapped/remove-symlink-check.patch
diff --git a/pkgs/tools/cd-dvd/brasero/wrapper.nix b/pkgs/by-name/br/brasero/package.nix
similarity index 100%
rename from pkgs/tools/cd-dvd/brasero/wrapper.nix
rename to pkgs/by-name/br/brasero/package.nix
diff --git a/pkgs/by-name/br/brickstore/package.nix b/pkgs/by-name/br/brickstore/package.nix
index 44ba98dd143a..f3d36b7f2b54 100644
--- a/pkgs/by-name/br/brickstore/package.nix
+++ b/pkgs/by-name/br/brickstore/package.nix
@@ -7,7 +7,7 @@
gst_all_1,
cmake,
libglvnd,
- tbb,
+ onetbb,
ninja,
pkg-config,
}:
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
qt6.qttools
qt6.qtwayland
qt6.wrapQtAppsHook
- tbb
+ onetbb
];
patches = [
diff --git a/pkgs/by-name/br/brogue/fix-compilation.diff b/pkgs/by-name/br/brogue/fix-compilation.diff
deleted file mode 100644
index e68f6fcafcc1..000000000000
--- a/pkgs/by-name/br/brogue/fix-compilation.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/src/brogue/Architect.c b/src/brogue/Architect.c
-index abe5acf..b38291d 100755
---- a/src/brogue/Architect.c
-+++ b/src/brogue/Architect.c
-@@ -1676,7 +1676,7 @@ void addMachines() {
- // Add the amulet holder if it's depth 26:
- if (rogue.depthLevel == AMULET_LEVEL) {
- for (failsafe = 50; failsafe; failsafe--) {
-- if (buildAMachine(MT_AMULET_AREA, -1, -1, NULL, NULL, NULL, NULL)) {
-+ if (buildAMachine(MT_AMULET_AREA, -1, -1, 0L, NULL, NULL, NULL)) {
- break;
- }
- }
-diff --git a/src/brogue/RogueMain.c b/src/brogue/RogueMain.c
-index 49b08b9..3666963 100755
---- a/src/brogue/RogueMain.c
-+++ b/src/brogue/RogueMain.c
-@@ -880,7 +880,7 @@ void startLevel(short oldLevelNumber, short stairDirection) {
- getQualifyingPathLocNear(&loc[0], &loc[1],
- player.xLoc, player.yLoc,
- true,
-- T_DIVIDES_LEVEL, NULL,
-+ T_DIVIDES_LEVEL, 0L,
- T_PATHING_BLOCKER, (HAS_MONSTER | HAS_ITEM | HAS_STAIRS | IS_IN_MACHINE),
- false);
- }
-diff --git a/src/platform/platformdependent.c b/src/platform/platformdependent.c
-index 635a738..e725513 100644
---- a/src/platform/platformdependent.c
-+++ b/src/platform/platformdependent.c
-@@ -21,6 +21,7 @@
- * along with Brogue. If not, see .
- */
-
-+#include
- #include
- #include
- #include
diff --git a/pkgs/by-name/br/brogue/package.nix b/pkgs/by-name/br/brogue/package.nix
deleted file mode 100644
index f3891abbd5ef..000000000000
--- a/pkgs/by-name/br/brogue/package.nix
+++ /dev/null
@@ -1,85 +0,0 @@
-{
- lib,
- stdenv,
- fetchurl,
- fetchpatch,
- SDL,
- ncurses,
- libtcod,
- makeDesktopItem,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
- pname = "brogue";
- version = "1.7.5";
-
- src = fetchurl {
- url = "https://drive.google.com/uc?export=download&id=1ED_2nPubP-P0e_PHKYVzZF42M1Y9pUb4";
- hash = "sha256-p0/xgTlWTFl9BHz7Fn90qxlj3YYItvsuA052NdYXBEQ=";
- name = "brogue.tbz2";
- };
-
- patches = [
- # Pull upstream fix for -fno-common toolchains:
- # https://github.com/tmewett/BrogueCE/pull/63
- (fetchpatch {
- name = "fno-common.patch";
- url = "https://github.com/tmewett/BrogueCE/commit/2c7ed0c48d9efd06bf0a2589ba967c0a22a8fa87.patch";
- sha256 = "19lr2fa25dh79klm4f4kqyyqq7w5xmw9z0fvylkcckqvcv7dwhp3";
- })
- # error: passing argument 4 of 'buildAMachine' makes integer from pointer without a cast []
- ./fix-compilation.diff
- ];
-
- prePatch = ''
- sed -i Makefile -e 's,LIBTCODDIR=.*,LIBTCODDIR=${libtcod},g' \
- -e 's,sdl-config,${lib.getDev SDL}/bin/sdl-config,g'
- sed -i src/platform/tcod-platform.c -e "s,fonts/font,$out/share/brogue/fonts/font,g"
- make clean
- rm -rf src/libtcod*
- '';
-
- buildInputs = [
- SDL
- ncurses
- libtcod
- ];
-
- desktopItem = makeDesktopItem {
- name = "brogue";
- desktopName = "Brogue";
- genericName = "Roguelike";
- comment = "Brave the Dungeons of Doom!";
- icon = "brogue";
- exec = "brogue";
- categories = [
- "Game"
- "AdventureGame"
- ];
- };
-
- installPhase = ''
- install -m 555 -D bin/brogue $out/bin/brogue
- install -m 444 -D ${finalAttrs.desktopItem}/share/applications/brogue.desktop $out/share/applications/brogue.desktop
- install -m 444 -D bin/brogue-icon.png $out/share/icons/hicolor/256x256/apps/brogue.png
- mkdir -p $out/share/brogue
- cp -r bin/fonts $out/share/brogue/
- '';
-
- # fix crash; shouldn’t be a security risk because it’s an offline game
- hardeningDisable = [
- "stackprotector"
- "fortify"
- ];
-
- meta = with lib; {
- description = "Roguelike game";
- mainProgram = "brogue";
- homepage = "https://sites.google.com/site/broguegame/";
- license = licenses.agpl3Plus;
- maintainers = with maintainers; [
- fgaz
- ];
- platforms = [ "x86_64-linux" ];
- };
-})
diff --git a/pkgs/by-name/br/browserpass/package.nix b/pkgs/by-name/br/browserpass/package.nix
index 950e7aabd373..47a12a2ac940 100644
--- a/pkgs/by-name/br/browserpass/package.nix
+++ b/pkgs/by-name/br/browserpass/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
src = fetchFromGitHub {
owner = "browserpass";
repo = "browserpass-native";
- rev = version;
+ tag = version;
sha256 = "sha256-UZzOPRRiCUIG7uSSp9AEPMDN/+4cgyK47RhrI8oUx8U=";
};
diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix
index 7ea87f3c5001..b6d25b670993 100644
--- a/pkgs/by-name/br/bruno/package.nix
+++ b/pkgs/by-name/br/bruno/package.nix
@@ -19,20 +19,20 @@
buildNpmPackage rec {
pname = "bruno";
- version = "2.11.0";
+ version = "2.12.0";
src = fetchFromGitHub {
owner = "usebruno";
repo = "bruno";
tag = "v${version}";
- hash = "sha256-U6q82T/xqwREGsUcCdeAzvk9DWu9579MtF/JE0OIBW4=";
+ hash = "sha256-5yYcclJBb5kKaDr9irkLQBa6Tg8yO1LWh89ntBiMQho=";
postFetch = ''
${lib.getExe npm-lockfile-fix} $out/package-lock.json
'';
};
- npmDepsHash = "sha256-i7bT6ZvdkHwqw+LkMqCdSMCNUsz1LPOHuF+u//lUYJ8=";
+ npmDepsHash = "sha256-mLl8igkdujzI4Fz4SoUrCdnI2KUo6DsNtPdAhwjYpac=";
npmFlags = [ "--legacy-peer-deps" ];
nativeBuildInputs = [
diff --git a/pkgs/by-name/br/brunsli/package.nix b/pkgs/by-name/br/brunsli/package.nix
index c687020c0a31..1a0399733fb8 100644
--- a/pkgs/by-name/br/brunsli/package.nix
+++ b/pkgs/by-name/br/brunsli/package.nix
@@ -42,6 +42,11 @@ stdenv.mkDerivation rec {
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
rm -r build
+ ''
+ # fix build with cmake v4, should be removed in next release
+ + ''
+ substituteInPlace CMakeLists.txt \
+ --replace-fail 'cmake_minimum_required(VERSION 3.1)' 'cmake_minimum_required(VERSION 3.10)'
'';
nativeBuildInputs = [
diff --git a/pkgs/by-name/br/brutalmaze/package.nix b/pkgs/by-name/br/brutalmaze/package.nix
index ba4559dc2b4e..b49940db1124 100644
--- a/pkgs/by-name/br/brutalmaze/package.nix
+++ b/pkgs/by-name/br/brutalmaze/package.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
src = fetchFromSourcehut {
owner = "~cnx";
repo = "brutalmaze";
- rev = version;
+ tag = version;
sha256 = "1m105iq378mypj64syw59aldbm6bj4ma4ynhc50gafl656fabg4y";
};
diff --git a/pkgs/by-name/br/bruteforce-luks/package.nix b/pkgs/by-name/br/bruteforce-luks/package.nix
index 018181123154..1070911a7fc4 100644
--- a/pkgs/by-name/br/bruteforce-luks/package.nix
+++ b/pkgs/by-name/br/bruteforce-luks/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "glv2";
repo = "bruteforce-luks";
- rev = version;
+ tag = version;
hash = "sha256-t07YyfCjaXQs/OMekcPNBT8DeSRtq2+8tUpsPP2pG7o=";
};
diff --git a/pkgs/by-name/br/bruteforce-salted-openssl/package.nix b/pkgs/by-name/br/bruteforce-salted-openssl/package.nix
index c7f77cf9926a..743f09e7d980 100644
--- a/pkgs/by-name/br/bruteforce-salted-openssl/package.nix
+++ b/pkgs/by-name/br/bruteforce-salted-openssl/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "glv2";
repo = "bruteforce-salted-openssl";
- rev = version;
+ tag = version;
hash = "sha256-hXB4CUQ5pihKmahyK359cgQACrs6YH1gHmZJAuTXgQM=";
};
diff --git a/pkgs/by-name/br/bruteforce-wallet/package.nix b/pkgs/by-name/br/bruteforce-wallet/package.nix
index b97d94dd5373..ffb4b44d87a0 100644
--- a/pkgs/by-name/br/bruteforce-wallet/package.nix
+++ b/pkgs/by-name/br/bruteforce-wallet/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "glv2";
repo = "bruteforce-wallet";
- rev = version;
+ tag = version;
hash = "sha256-ngzG39c/bWv++PHVgce9r1PXElFhpgYoAepbqD/1Dq0=";
};
diff --git a/pkgs/by-name/bs/bschaffl/package.nix b/pkgs/by-name/bs/bschaffl/package.nix
index e79c070e35d3..d99738ef42a7 100644
--- a/pkgs/by-name/bs/bschaffl/package.nix
+++ b/pkgs/by-name/bs/bschaffl/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "sjaehn";
repo = "bschaffl";
- rev = version;
+ tag = version;
sha256 = "sha256-zfhPYH4eUNWHV27ZtX2IIvobyPdKs5yGr/ryJRQa6as=";
};
diff --git a/pkgs/by-name/bs/bsequencer/package.nix b/pkgs/by-name/bs/bsequencer/package.nix
index 965195fe0360..9752f02a5574 100644
--- a/pkgs/by-name/bs/bsequencer/package.nix
+++ b/pkgs/by-name/bs/bsequencer/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "sjaehn";
repo = "BSEQuencer";
- rev = version;
+ tag = version;
sha256 = "sha256-1PSICm5mw37nO3gkHA9MNUH+CFULeOZURjimYEA/dXA=";
};
diff --git a/pkgs/by-name/bs/bslizr/package.nix b/pkgs/by-name/bs/bslizr/package.nix
index ecd0622094cd..67bc8b89c7cf 100644
--- a/pkgs/by-name/bs/bslizr/package.nix
+++ b/pkgs/by-name/bs/bslizr/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "sjaehn";
repo = "BSlizr";
- rev = version;
+ tag = version;
sha256 = "sha256-5DvVkTz79CLvZMZ3XnI0COIfxnhERDSvzbVoJAcqNRI=";
};
diff --git a/pkgs/by-name/bs/bspwm/package.nix b/pkgs/by-name/bs/bspwm/package.nix
index fd571ea760ca..0bf452910e21 100644
--- a/pkgs/by-name/bs/bspwm/package.nix
+++ b/pkgs/by-name/bs/bspwm/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "baskerville";
repo = "bspwm";
- rev = version;
+ tag = version;
sha256 = "sha256-5mAw3uSsDozGUJdYE1gD1u0u6Xnik3/LbE654vCFU9E=";
};
diff --git a/pkgs/by-name/bt/btor2tools/package.nix b/pkgs/by-name/bt/btor2tools/package.nix
index e47800f7aa2c..50591eba7f09 100644
--- a/pkgs/by-name/bt/btor2tools/package.nix
+++ b/pkgs/by-name/bt/btor2tools/package.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation {
pname = "btor2tools";
- version = "0-unstable-2024-08-07";
+ version = "0-unstable-2025-09-18";
src = fetchFromGitHub {
owner = "boolector";
repo = "btor2tools";
- rev = "44bcadbfede292ff4c4a4a8962cc18130de522fb";
- sha256 = "0ncl4xwms8d656x95ga8v8zjybx4cmdl5hlcml7dpcgm3p8qj4ks";
+ rev = "d33c73ff1d173f1bfac8ba6b1c6d68ba62c55f8e";
+ sha256 = "sha256-RVjZ5HM2yQ3eAICFuzwvNeQDXzWzzSiCCslIWMJi6U8=";
};
nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
diff --git a/pkgs/by-name/bt/btrfs-heatmap/package.nix b/pkgs/by-name/bt/btrfs-heatmap/package.nix
index ff7bc2a9462d..32c6c06c1070 100644
--- a/pkgs/by-name/bt/btrfs-heatmap/package.nix
+++ b/pkgs/by-name/bt/btrfs-heatmap/package.nix
@@ -46,6 +46,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/knorrie/btrfs-heatmap";
license = licenses.mit;
platforms = platforms.linux;
- maintainers = [ maintainers.evils ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/by-name/bt/btrfs-snap/package.nix b/pkgs/by-name/bt/btrfs-snap/package.nix
index 862acb1495c0..bbf9db4e99c7 100644
--- a/pkgs/by-name/bt/btrfs-snap/package.nix
+++ b/pkgs/by-name/bt/btrfs-snap/package.nix
@@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation rec {
src = fetchFromGitHub {
owner = "jf647";
repo = "btrfs-snap";
- rev = version;
+ tag = version;
sha256 = "sha256-SDzLjgNRuR9XpmcYCD9T10MLS+//+pWFGDiTAb8NiLQ=";
};
buildInputs = [ bash ];
diff --git a/pkgs/by-name/bu/buildkit/package.nix b/pkgs/by-name/bu/buildkit/package.nix
index 3456a4f15eee..a0adffc54600 100644
--- a/pkgs/by-name/bu/buildkit/package.nix
+++ b/pkgs/by-name/bu/buildkit/package.nix
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "buildkit";
- version = "0.24.0";
+ version = "0.25.0";
src = fetchFromGitHub {
owner = "moby";
repo = "buildkit";
rev = "v${version}";
- hash = "sha256-cii+A+CFJcuix++f4ZdW6z5GKpPGdp9C9iJS+KPb4LY=";
+ hash = "sha256-6BLu9wz/V0YSEEFelUMg1mYG6MxZgnkW4lwd5A+X90Q=";
};
vendorHash = null;
diff --git a/pkgs/by-name/bu/bulky/package.nix b/pkgs/by-name/bu/bulky/package.nix
index 3a0468f2bc9a..f926e9979b78 100644
--- a/pkgs/by-name/bu/bulky/package.nix
+++ b/pkgs/by-name/bu/bulky/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "linuxmint";
repo = "bulky";
- rev = version;
+ tag = version;
hash = "sha256-LrArLx0AOEaeAvLBVhV9ho5H+qeiaBfjs8+iV5W9u+w=";
};
diff --git a/pkgs/by-name/bu/bullet/package.nix b/pkgs/by-name/bu/bullet/package.nix
index 287716871294..df5ba69cb3f0 100644
--- a/pkgs/by-name/bu/bullet/package.nix
+++ b/pkgs/by-name/bu/bullet/package.nix
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
+ fetchpatch,
cmake,
libGLU,
libGL,
@@ -15,7 +16,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "bulletphysics";
repo = "bullet3";
- rev = version;
+ tag = version;
sha256 = "sha256-AGP05GoxLjHqlnW63/KkZe+TjO3IKcgBi+Qb/osQuCM=";
};
@@ -26,6 +27,14 @@ stdenv.mkDerivation rec {
libglut
];
+ patches = [
+ # fix for CMake v4, merged upstream
+ (fetchpatch {
+ url = "https://github.com/bulletphysics/bullet3/commit/d1a4256b3a019117f2bb6cb8c63d6367aaf512e2.patch";
+ hash = "sha256-FklMKYw5dKUcR5kZOkqv+KVLcWL/7r/0SAdYolmrn5A=";
+ })
+ ];
+
postPatch = ''
substituteInPlace examples/ThirdPartyLibs/Gwen/CMakeLists.txt \
--replace "-DGLEW_STATIC" "-DGLEW_STATIC -Wno-narrowing"
diff --git a/pkgs/by-name/bu/bully/package.nix b/pkgs/by-name/bu/bully/package.nix
index 91cf6c834dfb..a49c7559b328 100644
--- a/pkgs/by-name/bu/bully/package.nix
+++ b/pkgs/by-name/bu/bully/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "kimocoder";
repo = "bully";
- rev = version;
+ tag = version;
sha256 = "1n2754a5z44g414a0hj3cmi9q5lwnzyvmvzskrj2nci8c8m2kgnf";
};
diff --git a/pkgs/by-name/bu/bundix/package.nix b/pkgs/by-name/bu/bundix/package.nix
index 7a79eae438d5..5be47b5a0fb0 100644
--- a/pkgs/by-name/bu/bundix/package.nix
+++ b/pkgs/by-name/bu/bundix/package.nix
@@ -18,7 +18,7 @@ buildRubyGem rec {
src = fetchFromGitHub {
owner = "nix-community";
repo = "bundix";
- rev = version;
+ tag = version;
hash = "sha256-QnNdseCSwQYhO/ybzWsflMEk68TMgPU3HqXJ7av3SHE=";
};
diff --git a/pkgs/by-name/bu/bup/package.nix b/pkgs/by-name/bu/bup/package.nix
index e5069e993889..c1b7ff256622 100644
--- a/pkgs/by-name/bu/bup/package.nix
+++ b/pkgs/by-name/bu/bup/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
src = fetchFromGitHub {
repo = "bup";
owner = "bup";
- rev = version;
+ tag = version;
hash = "sha256-MW4kScu81XW89W7WpvOj40+S8bG5QozN30Hfj4TsnX4=";
};
diff --git a/pkgs/by-name/bu/burp/package.nix b/pkgs/by-name/bu/burp/package.nix
index 1ce4d3570e4b..7a7b45897c9e 100644
--- a/pkgs/by-name/bu/burp/package.nix
+++ b/pkgs/by-name/bu/burp/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "grke";
repo = "burp";
- rev = version;
+ tag = version;
hash = "sha256-y6kRd1jD6t+Q6d5t7W9MDuk+m2Iq1THQkP50PJwI7Nc=";
};
diff --git a/pkgs/by-name/bu/buttermanager/package.nix b/pkgs/by-name/bu/buttermanager/package.nix
index 7c15ca68290a..179f91e7fd87 100644
--- a/pkgs/by-name/bu/buttermanager/package.nix
+++ b/pkgs/by-name/bu/buttermanager/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
src = fetchFromGitHub {
owner = "egara";
repo = "buttermanager";
- rev = version;
+ tag = version;
hash = "sha256-/U5IVJvYCw/YzBWjQ949YP9uoxsTNRJ5FO7rrI6Cvhs=";
};
diff --git a/pkgs/by-name/bz/bzrtp/package.nix b/pkgs/by-name/bz/bzrtp/package.nix
index 891e168b0d2a..600a23b474c8 100644
--- a/pkgs/by-name/bz/bzrtp/package.nix
+++ b/pkgs/by-name/bz/bzrtp/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
owner = "public";
group = "BC";
repo = "bzrtp";
- rev = version;
+ tag = version;
hash = "sha256-sLvvQhJ9uVt/dx57xs9ftY/ETi46xmyGDH8372zpqj8=";
};
diff --git a/pkgs/by-name/c2/c2patool/package.nix b/pkgs/by-name/c2/c2patool/package.nix
index 468912e1d9be..e5d5c2952b49 100644
--- a/pkgs/by-name/c2/c2patool/package.nix
+++ b/pkgs/by-name/c2/c2patool/package.nix
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "c2patool";
- version = "0.23.2";
+ version = "0.23.4";
src = fetchFromGitHub {
owner = "contentauth";
repo = "c2pa-rs";
tag = "c2patool-v${finalAttrs.version}";
- hash = "sha256-elEl0tSO7SEbyMuLhOxnkiejmalJgtEGzX2hWNBYISs=";
+ hash = "sha256-6y7IKuYnwSSrfe44U+fNU8Q9YdHOq2Btvie6ZqTIBRw=";
};
- cargoHash = "sha256-dt+6bJ1ax/hR8ZAx/HvkePh5Y3/Cl/O8BCuwEW2aJTk=";
+ cargoHash = "sha256-JnbvX/EkvatP/xlY+cTtRjVV+Rz2jjFIsqIvOFXqB5Q=";
# use the non-vendored openssl
env.OPENSSL_NO_VENDOR = 1;
diff --git a/pkgs/by-name/c3/c3c/package.nix b/pkgs/by-name/c3/c3c/package.nix
index b94a8e079d3b..37c858dec037 100644
--- a/pkgs/by-name/c3/c3c/package.nix
+++ b/pkgs/by-name/c3/c3c/package.nix
@@ -19,13 +19,13 @@ in
llvmPackages.stdenv.mkDerivation (finalAttrs: {
pname = "c3c${optionalString debug "-debug"}";
- version = "0.7.5";
+ version = "0.7.6";
src = fetchFromGitHub {
owner = "c3lang";
repo = "c3c";
tag = "v${finalAttrs.version}";
- hash = "sha256-o95Y5CYPITjn8KjxIZlBtwc6FfvZo2m5atR1Fyh9w+c=";
+ hash = "sha256-VZFMRu3iI3L57cQDLeS1I+1GiIWxAjUnO/cXbISB7M8=";
};
cmakeBuildType = if debug then "Debug" else "Release";
diff --git a/pkgs/by-name/ca/cabinpkg/package.nix b/pkgs/by-name/ca/cabinpkg/package.nix
index d8144db6aa42..2672addf2fff 100644
--- a/pkgs/by-name/ca/cabinpkg/package.nix
+++ b/pkgs/by-name/ca/cabinpkg/package.nix
@@ -2,7 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
- tbb_2022,
+ onetbb,
libgit2,
curl,
fmt,
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
buildInputs = [
libgit2
fmt
- tbb_2022
+ onetbb
nlohmann_json
curl
];
diff --git a/pkgs/by-name/ca/cadzinho/package.nix b/pkgs/by-name/ca/cadzinho/package.nix
index 4c20b1e545e0..a9280b1ef470 100644
--- a/pkgs/by-name/ca/cadzinho/package.nix
+++ b/pkgs/by-name/ca/cadzinho/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "zecruel";
repo = "CadZinho";
- rev = version;
+ tag = version;
hash = "sha256-AHojy6lYLEyeBaYiIzo6MdQCM3jX5ENNTKgU+PGSD00=";
};
diff --git a/pkgs/by-name/ca/caerbannog/package.nix b/pkgs/by-name/ca/caerbannog/package.nix
index e9e10e55dc0c..ece5fd79700b 100644
--- a/pkgs/by-name/ca/caerbannog/package.nix
+++ b/pkgs/by-name/ca/caerbannog/package.nix
@@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec {
src = fetchFromSourcehut {
owner = "~craftyguy";
repo = "caerbannog";
- rev = version;
+ tag = version;
sha256 = "0wqkb9zcllxm3fdsr5lphknkzy8r1cr80f84q200hbi99qql1dxh";
};
diff --git a/pkgs/by-name/ca/caf/package.nix b/pkgs/by-name/ca/caf/package.nix
index c1b329dc6950..d75d7166b8b5 100644
--- a/pkgs/by-name/ca/caf/package.nix
+++ b/pkgs/by-name/ca/caf/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "actor-framework";
repo = "actor-framework";
- rev = version;
+ tag = version;
hash = "sha256-opQaRMjEgPS78wPSFRIWb5kkxcQMuAb7aAa/93LKqpo=";
};
diff --git a/pkgs/by-name/ca/callaudiod/package.nix b/pkgs/by-name/ca/callaudiod/package.nix
index 78c3f523936c..6ca7f2dd72fa 100644
--- a/pkgs/by-name/ca/callaudiod/package.nix
+++ b/pkgs/by-name/ca/callaudiod/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
domain = "gitlab.com";
owner = "mobian1";
repo = "callaudiod";
- rev = version;
+ tag = version;
hash = "sha256-gc66XrrFyhF1TvrDECBfGQc+MiDtqZPxdCn0S/43XQU=";
};
diff --git a/pkgs/by-name/ca/canta-theme/package.nix b/pkgs/by-name/ca/canta-theme/package.nix
index 4f327102f1bf..c664a2177125 100644
--- a/pkgs/by-name/ca/canta-theme/package.nix
+++ b/pkgs/by-name/ca/canta-theme/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "vinceliuice";
repo = "canta-theme";
- rev = version;
+ tag = version;
sha256 = "05h42nrggb6znzjcbh4lqqfcm41h4r85n3vwimp3l4lq5p90igr2";
};
diff --git a/pkgs/shells/carapace/default.nix b/pkgs/by-name/ca/carapace/package.nix
similarity index 100%
rename from pkgs/shells/carapace/default.nix
rename to pkgs/by-name/ca/carapace/package.nix
diff --git a/pkgs/by-name/ca/cargo-about/package.nix b/pkgs/by-name/ca/cargo-about/package.nix
index aee2c09bbb97..cb2762589585 100644
--- a/pkgs/by-name/ca/cargo-about/package.nix
+++ b/pkgs/by-name/ca/cargo-about/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "EmbarkStudios";
repo = "cargo-about";
- rev = version;
+ tag = version;
sha256 = "sha256-cNKZpDlfqEXeOE5lmu79AcKOawkPpk4PQCsBzNtIEbs=";
};
diff --git a/pkgs/by-name/ca/cargo-benchcmp/package.nix b/pkgs/by-name/ca/cargo-benchcmp/package.nix
index f1db1a74b5d3..2be387f51be6 100644
--- a/pkgs/by-name/ca/cargo-benchcmp/package.nix
+++ b/pkgs/by-name/ca/cargo-benchcmp/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "BurntSushi";
repo = "cargo-benchcmp";
- rev = version;
+ tag = version;
hash = "sha256-J8KFI0V/mOhUlYtVnFAQgPIpXL9/dLhOFxSly4bR00I=";
};
diff --git a/pkgs/by-name/ca/cargo-binstall/package.nix b/pkgs/by-name/ca/cargo-binstall/package.nix
index d8586fed0712..2802095cff1d 100644
--- a/pkgs/by-name/ca/cargo-binstall/package.nix
+++ b/pkgs/by-name/ca/cargo-binstall/package.nix
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-binstall";
- version = "1.15.5";
+ version = "1.15.6";
src = fetchFromGitHub {
owner = "cargo-bins";
repo = "cargo-binstall";
rev = "v${version}";
- hash = "sha256-XfudrzPvCdTi9y/3YRfMl5hh9dFDkcOxsxPXGmr8JnI=";
+ hash = "sha256-TzO7xz58nvuT6r8SN0cUKdW0x1yR1FlpsnGhU67SNOA=";
};
- cargoHash = "sha256-C9GubczQ6A5vdi8UcxPO7BYlgz+1U5lOHT7QYvDDxJQ=";
+ cargoHash = "sha256-cYjsSPHcWYobosSlB2tLda3NSGUTxE5DyA4AxAF8C/8=";
nativeBuildInputs = [
pkg-config
diff --git a/pkgs/by-name/ca/cargo-cache/package.nix b/pkgs/by-name/ca/cargo-cache/package.nix
index 0a10617b3e6b..adb7d99abb9a 100644
--- a/pkgs/by-name/ca/cargo-cache/package.nix
+++ b/pkgs/by-name/ca/cargo-cache/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "matthiaskrgr";
repo = "cargo-cache";
- rev = version;
+ tag = version;
sha256 = "sha256-q9tYKXK8RqiqbDZ/lTxUI1Dm/h28/yZR8rTQuq+roZs=";
};
diff --git a/pkgs/by-name/ca/cargo-criterion/package.nix b/pkgs/by-name/ca/cargo-criterion/package.nix
index 6b468474e150..aa8dbf3cbd66 100644
--- a/pkgs/by-name/ca/cargo-criterion/package.nix
+++ b/pkgs/by-name/ca/cargo-criterion/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "bheisler";
repo = "cargo-criterion";
- rev = version;
+ tag = version;
sha256 = "sha256-RPix9DM6E32PhObvV3xPGrnXrrVHn3auxLUhysP8GM0=";
};
diff --git a/pkgs/by-name/ca/cargo-deadlinks/package.nix b/pkgs/by-name/ca/cargo-deadlinks/package.nix
index 5d5783ccc7da..3e55dea4f82e 100644
--- a/pkgs/by-name/ca/cargo-deadlinks/package.nix
+++ b/pkgs/by-name/ca/cargo-deadlinks/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "deadlinks";
repo = "cargo-deadlinks";
- rev = version;
+ tag = version;
sha256 = "0s5q9aghncsk9834azn5cgnn5ms3zzyjan2rq06kaqcgzhld4cjh";
};
diff --git a/pkgs/by-name/ca/cargo-deny/package.nix b/pkgs/by-name/ca/cargo-deny/package.nix
index 444467bd817e..34ffdbf04277 100644
--- a/pkgs/by-name/ca/cargo-deny/package.nix
+++ b/pkgs/by-name/ca/cargo-deny/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "EmbarkStudios";
repo = "cargo-deny";
- rev = version;
+ tag = version;
hash = "sha256-FYVMeq/728uXayGbDKVK2kZNkf9tdXET+uEorJ6WNto=";
};
diff --git a/pkgs/by-name/ca/cargo-expand/package.nix b/pkgs/by-name/ca/cargo-expand/package.nix
index e567998c42dc..6ef51fc8b5f6 100644
--- a/pkgs/by-name/ca/cargo-expand/package.nix
+++ b/pkgs/by-name/ca/cargo-expand/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "dtolnay";
repo = "cargo-expand";
- rev = version;
+ tag = version;
hash = "sha256-IpqDab4JYZoWvtuEU4DkKimOhgZ/c5WsH58cVj4RzGU=";
};
diff --git a/pkgs/by-name/ca/cargo-fund/package.nix b/pkgs/by-name/ca/cargo-fund/package.nix
index 5dea28ce4973..c963048e21eb 100644
--- a/pkgs/by-name/ca/cargo-fund/package.nix
+++ b/pkgs/by-name/ca/cargo-fund/package.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "acfoltzer";
repo = "cargo-fund";
- rev = version;
+ tag = version;
hash = "sha256-8mnCwWwReNH9s/gbxIhe7XdJRIA6BSUKm5jzykU5qMU=";
};
diff --git a/pkgs/by-name/ca/cargo-fuzz/package.nix b/pkgs/by-name/ca/cargo-fuzz/package.nix
index 8c217aa7aebe..755648279144 100644
--- a/pkgs/by-name/ca/cargo-fuzz/package.nix
+++ b/pkgs/by-name/ca/cargo-fuzz/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "rust-fuzz";
repo = "cargo-fuzz";
- rev = version;
+ tag = version;
hash = "sha256-wOzzPhAuCaJfp7uRZ1kPpzMIr03couRaIbbrjL0EyYo=";
};
diff --git a/pkgs/by-name/ca/cargo-info/package.nix b/pkgs/by-name/ca/cargo-info/package.nix
index 554623f411db..413863c60ef2 100644
--- a/pkgs/by-name/ca/cargo-info/package.nix
+++ b/pkgs/by-name/ca/cargo-info/package.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitLab {
owner = "imp";
repo = "cargo-info";
- rev = version;
+ tag = version;
hash = "sha256-MrkYGUd1jsAqIVYWe7YDZaq7NPv/mHQqLS7GFrYYIo8=";
};
diff --git a/pkgs/by-name/ca/cargo-insta/package.nix b/pkgs/by-name/ca/cargo-insta/package.nix
index a08a11b827fe..169220d1d0be 100644
--- a/pkgs/by-name/ca/cargo-insta/package.nix
+++ b/pkgs/by-name/ca/cargo-insta/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "mitsuhiko";
repo = "insta";
- rev = version;
+ tag = version;
hash = "sha256-+0FJr1IXTnIc947ytB00z30m81peY/CjnBHMYvcQZl0=";
};
diff --git a/pkgs/by-name/ca/cargo-limit/package.nix b/pkgs/by-name/ca/cargo-limit/package.nix
index cf678be55579..11b64c020215 100644
--- a/pkgs/by-name/ca/cargo-limit/package.nix
+++ b/pkgs/by-name/ca/cargo-limit/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "alopatindev";
repo = "cargo-limit";
- rev = version;
+ tag = version;
sha256 = "sha256-joWDB9fhCsYVZFZdr+Gfm4JaRlm5kj+CHp34Sx5iQYk=";
};
diff --git a/pkgs/by-name/ca/cargo-llvm-cov/Cargo.lock b/pkgs/by-name/ca/cargo-llvm-cov/Cargo.lock
index d8acc72693fc..db75a59c33ba 100644
--- a/pkgs/by-name/ca/cargo-llvm-cov/Cargo.lock
+++ b/pkgs/by-name/ca/cargo-llvm-cov/Cargo.lock
@@ -13,9 +13,9 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.98"
+version = "1.0.100"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
+checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
[[package]]
name = "autocfg"
@@ -25,9 +25,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
[[package]]
name = "bitflags"
-version = "2.9.1"
+version = "2.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
+checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394"
[[package]]
name = "bstr"
@@ -42,25 +42,25 @@ dependencies = [
[[package]]
name = "camino"
-version = "1.1.10"
+version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0da45bc31171d8d6960122e222a67740df867c1dd53b4d51caa297084c185cab"
+checksum = "276a59bf2b2c967788139340c9f0c5b12d7fd6630315c15c217e559de85d2609"
[[package]]
name = "cargo-config2"
-version = "0.1.34"
+version = "0.1.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82de3b1a1dd72252c6d456247864ffe52110d109da949f579eeb16349e0eb5d"
+checksum = "2bf2da6c8158a7ad35217e3187ac07db64d19719a934ffaf9b7591cda1f31964"
dependencies = [
"serde",
"serde_derive",
- "toml_edit",
- "windows-sys 0.60.2",
+ "toml",
+ "windows-sys 0.61.2",
]
[[package]]
name = "cargo-llvm-cov"
-version = "0.6.17"
+version = "0.6.20"
dependencies = [
"anyhow",
"camino",
@@ -88,15 +88,15 @@ dependencies = [
[[package]]
name = "cfg-if"
-version = "1.0.1"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
+checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
[[package]]
name = "duct"
-version = "1.0.0"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6ce170a0e8454fa0f9b0e5ca38a6ba17ed76a50916839d217eb5357e05cdfde"
+checksum = "d7478638a31d1f1f3d6c9f5e57c76b906a04ac4879d6fd0fb6245bc88f73fd0b"
dependencies = [
"libc",
"os_pipe",
@@ -104,20 +104,14 @@ dependencies = [
"shared_thread",
]
-[[package]]
-name = "equivalent"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
-
[[package]]
name = "errno"
-version = "0.3.13"
+version = "0.3.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
dependencies = [
"libc",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
]
[[package]]
@@ -128,46 +122,30 @@ checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
[[package]]
name = "filetime"
-version = "0.2.25"
+version = "0.2.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
+checksum = "bc0505cd1b6fa6580283f6bdf70a73fcf4aba1184038c90902b92b3dd0df63ed"
dependencies = [
"cfg-if",
"libc",
"libredox",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
]
[[package]]
name = "fs-err"
-version = "3.1.1"
+version = "3.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d7be93788013f265201256d58f04936a8079ad5dc898743aa20525f503b683"
+checksum = "6ad492b2cf1d89d568a43508ab24f98501fe03f2f31c01e1d0fe7366a71745d2"
dependencies = [
"autocfg",
]
[[package]]
name = "glob"
-version = "0.3.2"
+version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
-
-[[package]]
-name = "hashbrown"
-version = "0.15.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
-
-[[package]]
-name = "indexmap"
-version = "2.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
-dependencies = [
- "equivalent",
- "hashbrown",
-]
+checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
[[package]]
name = "itoa"
@@ -195,15 +173,15 @@ checksum = "9fa0e2a1fcbe2f6be6c42e342259976206b383122fc152e872795338b5a3f3a7"
[[package]]
name = "libc"
-version = "0.2.174"
+version = "0.2.176"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
+checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174"
[[package]]
name = "libredox"
-version = "0.1.4"
+version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1580801010e535496706ba011c15f8532df6b42297d2e471fec38ceadd8c0638"
+checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb"
dependencies = [
"bitflags",
"libc",
@@ -212,23 +190,23 @@ dependencies = [
[[package]]
name = "linux-raw-sys"
-version = "0.9.4"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
+checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
[[package]]
name = "memchr"
-version = "2.7.5"
+version = "2.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
+checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
[[package]]
name = "normpath"
-version = "1.3.0"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8911957c4b1549ac0dc74e30db9c8b0e66ddcd6d7acc33098f4c63a64a6d7ed"
+checksum = "bf23ab2b905654b4cb177e30b629937b3868311d4e1cba859f899c041046e69b"
dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
]
[[package]]
@@ -239,13 +217,13 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
[[package]]
name = "opener"
-version = "0.8.2"
+version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "771b9704f8cd8b424ec747a320b30b47517a6966ba2c7da90047c16f4a962223"
+checksum = "cb9024962ab91e00c89d2a14352a8d0fc1a64346bf96f1839b45c09149564e47"
dependencies = [
"bstr",
"normpath",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
]
[[package]]
@@ -260,9 +238,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.95"
+version = "1.0.101"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
+checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
dependencies = [
"unicode-ident",
]
@@ -278,27 +256,27 @@ dependencies = [
[[package]]
name = "quote"
-version = "1.0.40"
+version = "1.0.41"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
dependencies = [
"proc-macro2",
]
[[package]]
name = "redox_syscall"
-version = "0.5.13"
+version = "0.5.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d04b7d0ee6b4a0207a0a7adb104d23ecb0b47d6beae7152d0fa34b692b29fd6"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
dependencies = [
"bitflags",
]
[[package]]
name = "regex"
-version = "1.11.1"
+version = "1.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+checksum = "8b5288124840bee7b386bc413c487869b360b2b4ec421ea56425128692f2a82c"
dependencies = [
"aho-corasick",
"memchr",
@@ -308,9 +286,9 @@ dependencies = [
[[package]]
name = "regex-automata"
-version = "0.4.9"
+version = "0.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+checksum = "833eb9ce86d40ef33cb1306d8accf7bc8ec2bfea4355cbdebb3df68b40925cad"
dependencies = [
"aho-corasick",
"memchr",
@@ -319,34 +297,34 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.8.5"
+version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001"
[[package]]
name = "rustc-demangle"
-version = "0.1.25"
+version = "0.1.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f"
+checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace"
[[package]]
name = "rustix"
-version = "1.0.7"
+version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266"
+checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
dependencies = [
"bitflags",
"errno",
"libc",
"linux-raw-sys",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
]
[[package]]
name = "rustversion"
-version = "1.0.21"
+version = "1.0.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
[[package]]
name = "ruzstd"
@@ -371,18 +349,27 @@ dependencies = [
[[package]]
name = "serde"
-version = "1.0.219"
+version = "1.0.228"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.219"
+version = "1.0.228"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
dependencies = [
"proc-macro2",
"quote",
@@ -391,23 +378,24 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.140"
+version = "1.0.145"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
+checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
dependencies = [
"itoa",
"memchr",
"ryu",
"serde",
+ "serde_core",
]
[[package]]
name = "serde_spanned"
-version = "0.6.9"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
+checksum = "5417783452c2be558477e104686f7de5dae53dba813c28435e0e70f82d9b04ee"
dependencies = [
- "serde",
+ "serde_core",
]
[[package]]
@@ -417,15 +405,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e362d9935bc50f019969e2f9ecd66786612daae13e8f277be7bfb66e8bed3f7"
dependencies = [
"libc",
- "sigchld",
"windows-sys 0.60.2",
]
[[package]]
name = "shared_thread"
-version = "0.1.0"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7a6f98357c6bb0ebace19b22220e5543801d9de90ffe77f8abb27c056bac064"
+checksum = "52b86057fcb5423f5018e331ac04623e32d6b5ce85e33300f92c79a1973928b0"
[[package]]
name = "shell-escape"
@@ -433,41 +420,11 @@ version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f"
-[[package]]
-name = "sigchld"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47106eded3c154e70176fc83df9737335c94ce22f821c32d17ed1db1f83badb1"
-dependencies = [
- "libc",
- "os_pipe",
- "signal-hook",
-]
-
-[[package]]
-name = "signal-hook"
-version = "0.3.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2"
-dependencies = [
- "libc",
- "signal-hook-registry",
-]
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410"
-dependencies = [
- "libc",
-]
-
[[package]]
name = "syn"
-version = "2.0.104"
+version = "2.0.106"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
+checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
dependencies = [
"proc-macro2",
"quote",
@@ -487,14 +444,14 @@ dependencies = [
[[package]]
name = "tempfile"
-version = "3.20.0"
+version = "3.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
+checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16"
dependencies = [
"fastrand",
"once_cell",
"rustix",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
]
[[package]]
@@ -515,32 +472,41 @@ dependencies = [
]
[[package]]
-name = "toml_datetime"
-version = "0.6.11"
+name = "toml"
+version = "0.9.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
+checksum = "00e5e5d9bf2475ac9d4f0d9edab68cc573dc2fd644b0dba36b0c30a92dd9eaa0"
dependencies = [
- "serde",
+ "serde_core",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_parser",
+ "winnow",
]
[[package]]
-name = "toml_edit"
-version = "0.22.27"
+name = "toml_datetime"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
+checksum = "32f1085dec27c2b6632b04c80b3bb1b4300d6495d1e129693bdda7d91e72eec1"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "toml_parser"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cf893c33be71572e0e9aa6dd15e6677937abd686b066eac3f8cd3531688a627"
dependencies = [
- "indexmap",
- "serde",
- "serde_spanned",
- "toml_datetime",
"winnow",
]
[[package]]
name = "unicode-ident"
-version = "1.0.18"
+version = "1.0.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
[[package]]
name = "walkdir"
@@ -554,13 +520,19 @@ dependencies = [
[[package]]
name = "winapi-util"
-version = "0.1.9"
+version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
]
+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
[[package]]
name = "windows-sys"
version = "0.59.0"
@@ -576,7 +548,16 @@ version = "0.60.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
dependencies = [
- "windows-targets 0.53.2",
+ "windows-targets 0.53.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link",
]
[[package]]
@@ -597,18 +578,19 @@ dependencies = [
[[package]]
name = "windows-targets"
-version = "0.53.2"
+version = "0.53.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef"
+checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
dependencies = [
- "windows_aarch64_gnullvm 0.53.0",
- "windows_aarch64_msvc 0.53.0",
- "windows_i686_gnu 0.53.0",
- "windows_i686_gnullvm 0.53.0",
- "windows_i686_msvc 0.53.0",
- "windows_x86_64_gnu 0.53.0",
- "windows_x86_64_gnullvm 0.53.0",
- "windows_x86_64_msvc 0.53.0",
+ "windows-link",
+ "windows_aarch64_gnullvm 0.53.1",
+ "windows_aarch64_msvc 0.53.1",
+ "windows_i686_gnu 0.53.1",
+ "windows_i686_gnullvm 0.53.1",
+ "windows_i686_msvc 0.53.1",
+ "windows_x86_64_gnu 0.53.1",
+ "windows_x86_64_gnullvm 0.53.1",
+ "windows_x86_64_msvc 0.53.1",
]
[[package]]
@@ -619,9 +601,9 @@ checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
[[package]]
name = "windows_aarch64_gnullvm"
-version = "0.53.0"
+version = "0.53.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
[[package]]
name = "windows_aarch64_msvc"
@@ -631,9 +613,9 @@ checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
[[package]]
name = "windows_aarch64_msvc"
-version = "0.53.0"
+version = "0.53.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
+checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
[[package]]
name = "windows_i686_gnu"
@@ -643,9 +625,9 @@ checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
[[package]]
name = "windows_i686_gnu"
-version = "0.53.0"
+version = "0.53.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
[[package]]
name = "windows_i686_gnullvm"
@@ -655,9 +637,9 @@ checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
[[package]]
name = "windows_i686_gnullvm"
-version = "0.53.0"
+version = "0.53.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
+checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
[[package]]
name = "windows_i686_msvc"
@@ -667,9 +649,9 @@ checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
[[package]]
name = "windows_i686_msvc"
-version = "0.53.0"
+version = "0.53.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
+checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
[[package]]
name = "windows_x86_64_gnu"
@@ -679,9 +661,9 @@ checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
[[package]]
name = "windows_x86_64_gnu"
-version = "0.53.0"
+version = "0.53.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
[[package]]
name = "windows_x86_64_gnullvm"
@@ -691,9 +673,9 @@ checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
[[package]]
name = "windows_x86_64_gnullvm"
-version = "0.53.0"
+version = "0.53.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
+checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
[[package]]
name = "windows_x86_64_msvc"
@@ -703,24 +685,21 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
[[package]]
name = "windows_x86_64_msvc"
-version = "0.53.0"
+version = "0.53.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
[[package]]
name = "winnow"
-version = "0.7.11"
+version = "0.7.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74c7b26e3480b707944fc872477815d29a8e429d2f93a1ce000f5fa84a15cbcd"
-dependencies = [
- "memchr",
-]
+checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
[[package]]
name = "xattr"
-version = "1.5.1"
+version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af3a19837351dc82ba89f8a125e22a3c475f05aba604acc023d62b2739ae2909"
+checksum = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156"
dependencies = [
"libc",
"rustix",
diff --git a/pkgs/by-name/ca/cargo-llvm-cov/package.nix b/pkgs/by-name/ca/cargo-llvm-cov/package.nix
index e5f08c4c2e30..a620b5d61ef4 100644
--- a/pkgs/by-name/ca/cargo-llvm-cov/package.nix
+++ b/pkgs/by-name/ca/cargo-llvm-cov/package.nix
@@ -24,7 +24,7 @@
let
pname = "cargo-llvm-cov";
- version = "0.6.17";
+ version = "0.6.20";
owner = "taiki-e";
homepage = "https://github.com/${owner}/${pname}";
@@ -41,7 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
inherit owner;
repo = "cargo-llvm-cov";
rev = "v${version}";
- sha256 = "sha256-0Dgcl1r+j86WVhkyJNJxUnk85vrtD1fBBxfJkV0mcAI=";
+ sha256 = "sha256-LAiN9Opc0XQVepQ9IhK9JFWGoeRR3U6V680jgGiaDGo=";
};
# Upstream doesn't include the lockfile so we need to add it back
diff --git a/pkgs/by-name/ca/cargo-llvm-lines/package.nix b/pkgs/by-name/ca/cargo-llvm-lines/package.nix
index 0298800f2e87..38f4982e9d04 100644
--- a/pkgs/by-name/ca/cargo-llvm-lines/package.nix
+++ b/pkgs/by-name/ca/cargo-llvm-lines/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "dtolnay";
repo = "cargo-llvm-lines";
- rev = version;
+ tag = version;
hash = "sha256-5Tf3vkDTCQCmYvfKW3OHCese6HEs9CNbcUeLyS7MsOE=";
};
diff --git a/pkgs/by-name/ca/cargo-make/package.nix b/pkgs/by-name/ca/cargo-make/package.nix
index 3d606fd0c01a..ff48f1e3326e 100644
--- a/pkgs/by-name/ca/cargo-make/package.nix
+++ b/pkgs/by-name/ca/cargo-make/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "sagiegurari";
repo = "cargo-make";
- rev = version;
+ tag = version;
hash = "sha256-hrUd4J15cDyd78BVVzi8jiDqJI1dE35WUdOo6Tq8gH8=";
};
diff --git a/pkgs/by-name/ca/cargo-nextest/package.nix b/pkgs/by-name/ca/cargo-nextest/package.nix
index c073518318f6..77b2be8479f5 100644
--- a/pkgs/by-name/ca/cargo-nextest/package.nix
+++ b/pkgs/by-name/ca/cargo-nextest/package.nix
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-nextest";
- version = "0.9.104";
+ version = "0.9.105";
src = fetchFromGitHub {
owner = "nextest-rs";
repo = "nextest";
rev = "cargo-nextest-${version}";
- hash = "sha256-CZNnOuMF5P3OgdwlAfUgbbXnDVm4IQ7P617Rblq0lgk=";
+ hash = "sha256-IBw6adO9Mzv878n+glLJTNeFykx6bGxfrPGxl014/7o=";
};
- cargoHash = "sha256-jppSWm20Md++mxvs/h1pB1Bh/02muWqUm1DyR46nusY=";
+ cargoHash = "sha256-qHiifv1je7oNwOGYeT/QGcfagiXcLTCTG2kHV1rJJ4o=";
cargoBuildFlags = [
"-p"
diff --git a/pkgs/by-name/ca/cargo-play/package.nix b/pkgs/by-name/ca/cargo-play/package.nix
index 58583b970e7d..507b2cf647aa 100644
--- a/pkgs/by-name/ca/cargo-play/package.nix
+++ b/pkgs/by-name/ca/cargo-play/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "fanzeyi";
repo = "cargo-play";
- rev = version;
+ tag = version;
sha256 = "sha256-Z5zcLQYfQeGybsnt2U+4Z+peRHxNPbDriPMKWhJ+PeA=";
};
diff --git a/pkgs/by-name/ca/cargo-rdme/package.nix b/pkgs/by-name/ca/cargo-rdme/package.nix
index 15227629d5db..d9bf09e84f5e 100644
--- a/pkgs/by-name/ca/cargo-rdme/package.nix
+++ b/pkgs/by-name/ca/cargo-rdme/package.nix
@@ -6,14 +6,14 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-rdme";
- version = "1.4.8";
+ version = "1.4.9";
src = fetchCrate {
inherit pname version;
- hash = "sha256-lVu9w8l3+SeqiMoQ8Bjoslf7tWz49jrrE4g/pDU1axI=";
+ hash = "sha256-ostDwjj93WhDfBKJY9xpKd74knQi9z9UFb5Q84waHuM=";
};
- cargoHash = "sha256-W800jepxDv6OjbcxRKphAnDU2OuBGGGSLELe8gAfTr8=";
+ cargoHash = "sha256-pk7tYvN2Drn+Gpk170ITsAF38dVWjk+RBfrnb0YpZc4=";
meta = {
description = "Cargo command to create the README.md from your crate's documentation";
diff --git a/pkgs/by-name/ca/cargo-sync-readme/package.nix b/pkgs/by-name/ca/cargo-sync-readme/package.nix
index 97bff8e81a1b..659e9844f56f 100644
--- a/pkgs/by-name/ca/cargo-sync-readme/package.nix
+++ b/pkgs/by-name/ca/cargo-sync-readme/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "phaazon";
repo = "cargo-sync-readme";
- rev = version;
+ tag = version;
sha256 = "sha256-n9oIWblTTuXFFQFN6mpQiCH5N7yg5fAp8v9vpB5/DAo=";
};
diff --git a/pkgs/by-name/ca/cargo-tarpaulin/package.nix b/pkgs/by-name/ca/cargo-tarpaulin/package.nix
index 84ec855da9a5..be41b31ba7a8 100644
--- a/pkgs/by-name/ca/cargo-tarpaulin/package.nix
+++ b/pkgs/by-name/ca/cargo-tarpaulin/package.nix
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-tarpaulin";
- version = "0.32.8";
+ version = "0.33.0";
src = fetchFromGitHub {
owner = "xd009642";
repo = "tarpaulin";
- rev = version;
- hash = "sha256-DdDYTMtiHFrTnUihhZlHB9ZuuyXwGL8eQ4mqgsgPnsQ=";
+ tag = version;
+ hash = "sha256-yCuyeBL/7Dh9+V7fWvKkmj9OLGh88Jre7o0+TQXem9U=";
};
- cargoHash = "sha256-2VnQo+WSc/bMMnGXY+kyLh5P2a39S8KDirfqbLJRSu0=";
+ cargoHash = "sha256-S3cIcw6ZDAn8DVbCM7T5t7R3t45iGuh5600KeKQNXS8=";
nativeBuildInputs = [
pkg-config
diff --git a/pkgs/by-name/ca/caroline/package.nix b/pkgs/by-name/ca/caroline/package.nix
index 03acbe72bb08..62a762c0e9a0 100644
--- a/pkgs/by-name/ca/caroline/package.nix
+++ b/pkgs/by-name/ca/caroline/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "dcharles525";
repo = "caroline";
- rev = version;
+ tag = version;
hash = "sha256-v423h9EC/h6B9VABhkvmYcyYXKPpvqhI8O7ZjbO637k";
};
diff --git a/pkgs/by-name/ca/casadi/clang-19.diff b/pkgs/by-name/ca/casadi/clang-19.diff
deleted file mode 100644
index e7706cb320ba..000000000000
--- a/pkgs/by-name/ca/casadi/clang-19.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/casadi/interfaces/clang/clang_compiler.hpp b/casadi/interfaces/clang/clang_compiler.hpp
-index 7f54853..9f8d4b1 100644
---- a/casadi/interfaces/clang/clang_compiler.hpp
-+++ b/casadi/interfaces/clang/clang_compiler.hpp
-@@ -52,7 +52,7 @@
- #include "llvm/IR/LLVMContext.h"
- //#include "llvm/IR/Verifier.h"
- #include
--#include
-+#include
- #include
- #include
- #include
-diff --git a/cmake/FindCLANG.cmake b/cmake/FindCLANG.cmake
-index 4edf60b..f23a348 100644
---- a/cmake/FindCLANG.cmake
-+++ b/cmake/FindCLANG.cmake
-@@ -16,7 +16,7 @@ set(CLANG_CXX_FLAGS "-fPIC -fvisibility-inlines-hidden -ffunction-sections -fdat
- set(CLANG_INCLUDE_DIR ${LLVM_INSTALL_PREFIX}/include)
-
- # All clang libraries
--set(CLANG_DEP clangFrontend clangDriver clangCodeGen clangRewriteFrontend clangSerialization clangParse clangSema clangAnalysis clangEdit clangAST clangLex clangBasic ${LLVM_DEP})
-+set(CLANG_DEP clangFrontend clangDriver clangCodeGen clangRewriteFrontend clangSerialization clangParse clangSema clangAPINotes clangAnalysis clangEdit clangAST clangLex clangBasic ${LLVM_DEP})
-
- # Get libraries
- set(CLANG_LIBRARIES)
-@@ -86,7 +86,7 @@ set(CLANG_INCLUDE_DIR ${CLANG_LLVM_INCLUDE_DIR})
-
- # All clang libraries
- set(CLANG_DEP clangFrontend clangDriver clangCodeGen clangRewriteFrontend clangSerialization
-- clangParse clangSema clangAnalysis clangEdit clangAST clangLex clangBasic)
-+ clangParse clangSema clangAPINotes clangAnalysis clangEdit clangAST clangLex clangBasic)
-
- # Get libraries
- foreach(D ${CLANG_DEP})
diff --git a/pkgs/by-name/ca/casadi/package.nix b/pkgs/by-name/ca/casadi/package.nix
index c2a247525efc..73df0e0d930b 100644
--- a/pkgs/by-name/ca/casadi/package.nix
+++ b/pkgs/by-name/ca/casadi/package.nix
@@ -38,20 +38,16 @@
stdenv.mkDerivation (finalAttrs: {
pname = "casadi";
- version = "3.7.1";
+ version = "3.7.2";
src = fetchFromGitHub {
owner = "casadi";
repo = "casadi";
tag = finalAttrs.version;
- hash = "sha256-554ZN+GfkGHN0cthsb/fPWdo+U2IqLz4q+x60SxRAfk=";
+ hash = "sha256-I6CYtKVvE67NSYH/JGJFP5wHhm1xACctz7uTwOFFihA=";
};
patches = [
- # update include file path and link with clangAPINotes
- # https://github.com/casadi/casadi/issues/3969
- ./clang-19.diff
-
# Add missing include
# ref. https://github.com/casadi/casadi/pull/4192
(fetchpatch {
@@ -77,11 +73,6 @@ stdenv.mkDerivation (finalAttrs: {
"FATROP HPIPM" \
"FATROP hpipm"
- # nix provide lib/clang headers in libclang, not in llvm.
- substituteInPlace casadi/interfaces/clang/CMakeLists.txt --replace-fail \
- '$'{CLANG_LLVM_LIB_DIR} \
- ${lib.getLib llvmPackages.libclang}/lib
-
# help casadi find its own libs
substituteInPlace casadi/core/casadi_os.cpp --replace-fail \
"std::vector search_paths;" \
@@ -108,11 +99,6 @@ stdenv.mkDerivation (finalAttrs: {
substituteInPlace casadi/interfaces/hpipm/hpipm_runtime.hpp --replace-fail \
"d_print_exp_tran_mat" \
"//d_print_exp_tran_mat"
-
- # fix missing symbols
- substituteInPlace cmake/FindCLANG.cmake --replace-fail \
- "clangBasic)" \
- "clangBasic clangASTMatchers clangSupport)"
'';
nativeBuildInputs = [
@@ -189,7 +175,9 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeBool "WITH_TINYXML" true)
(lib.cmakeBool "WITH_BUILD_DSDP" true) # not sure where this come from
(lib.cmakeBool "WITH_DSDP" true)
- (lib.cmakeBool "WITH_CLANG" true)
+ # "clang_compiler.cpp has basically been abandonded for several years", ref.
+ # https://github.com/casadi/casadi/issues/4225#issuecomment-3352552113
+ (lib.cmakeBool "WITH_CLANG" false)
(lib.cmakeBool "WITH_LAPACK" true)
(lib.cmakeBool "WITH_QPOASES" true)
(lib.cmakeBool "WITH_BLOCKSQP" true)
@@ -223,6 +211,7 @@ stdenv.mkDerivation (finalAttrs: {
Python or Matlab/Octave
'';
homepage = "https://github.com/casadi/casadi";
+ changelog = "https://github.com/casadi/casadi/releases/tag/${finalAttrs.version}";
license = lib.licenses.lgpl3Only;
maintainers = with lib.maintainers; [ nim65s ];
platforms = lib.platforms.all;
diff --git a/pkgs/by-name/ca/catch/package.nix b/pkgs/by-name/ca/catch/package.nix
deleted file mode 100644
index 96bb28887d19..000000000000
--- a/pkgs/by-name/ca/catch/package.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
- lib,
- stdenv,
- fetchFromGitHub,
- fetchpatch,
- cmake,
-}:
-
-stdenv.mkDerivation rec {
- pname = "catch";
- version = "1.12.2";
-
- src = fetchFromGitHub {
- owner = "catchorg";
- repo = "Catch";
- rev = "v${version}";
- sha256 = "1gdp5wm8khn02g2miz381llw3191k7309qj8s3jd6sasj01rhf23";
- };
-
- nativeBuildInputs = [ cmake ];
- cmakeFlags = [ "-DUSE_CPP14=ON" ];
-
- patches = [
- # https://github.com/catchorg/Catch2/pull/2151
- (fetchpatch {
- url = "https://github.com/catchorg/Catch2/commit/bb6d08323f23a39eb65dd86671e68f4f5d3f2d6c.patch";
- sha256 = "1vhbzx84nrhhf9zlbl6h5zmg3r5w5v833ihlswsysb9wp2i4isc5";
- })
-
- # Fix glibc-2.34 build
- (fetchpatch {
- url = "https://src.fedoraproject.org/rpms/catch1/raw/23276476148a657e7a45ade547f858cbf965a33a/f/catch1-sigstksz.patch";
- sha256 = "sha256-XSsI3iDEZCUSbozlYWC0y/LZ7qr/5zwACpn1jHKD0yU=";
- })
- ];
-
- doCheck = true;
- checkTarget = "test";
-
- meta = with lib; {
- description = "Multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)";
- homepage = "http://catch-lib.net";
- license = licenses.boost;
- maintainers = with maintainers; [
- edwtjo
- ];
- platforms = with platforms; unix;
- };
-}
diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/by-name/ca/catch2/package.nix
similarity index 100%
rename from pkgs/development/libraries/catch2/default.nix
rename to pkgs/by-name/ca/catch2/package.nix
diff --git a/pkgs/by-name/ca/catch2_3/clang-20-disable-broken-test.patch b/pkgs/by-name/ca/catch2_3/clang-20-disable-broken-test.patch
new file mode 100644
index 000000000000..372243455aed
--- /dev/null
+++ b/pkgs/by-name/ca/catch2_3/clang-20-disable-broken-test.patch
@@ -0,0 +1,15 @@
+diff --git a/tests/SelfTest/UsageTests/Misc.tests.cpp b/tests/SelfTest/UsageTests/Misc.tests.cpp
+index 3697f0695c..8c10aace7b 100644
+--- a/tests/SelfTest/UsageTests/Misc.tests.cpp
++++ b/tests/SelfTest/UsageTests/Misc.tests.cpp
+@@ -384,10 +384,6 @@
+ REQUIRE(x.size() > 0);
+ }
+
+-TEMPLATE_PRODUCT_TEST_CASE("Product with differing arities", "[template][product]", std::tuple, (int, (int, double), (int, double, float))) {
+- REQUIRE(std::tuple_size::value >= 1);
+-}
+-
+ using MyTypes = std::tuple;
+ TEMPLATE_LIST_TEST_CASE("Template test case with test types specified inside std::tuple", "[template][list]", MyTypes)
+ {
diff --git a/pkgs/development/libraries/catch2/3.nix b/pkgs/by-name/ca/catch2_3/package.nix
similarity index 72%
rename from pkgs/development/libraries/catch2/3.nix
rename to pkgs/by-name/ca/catch2_3/package.nix
index 5ba4113754d2..269a445c48a4 100644
--- a/pkgs/development/libraries/catch2/3.nix
+++ b/pkgs/by-name/ca/catch2_3/package.nix
@@ -4,19 +4,31 @@
fetchFromGitHub,
cmake,
python3,
+ spdlog,
}:
stdenv.mkDerivation rec {
pname = "catch2";
- version = "3.8.1";
+ version = "3.10.0";
src = fetchFromGitHub {
owner = "catchorg";
repo = "Catch2";
- rev = "v${version}";
- hash = "sha256-blhSdtNXwe4wKPVKlopsE0omgikMdl12JjwqASwJM2w=";
+ tag = "v${version}";
+ hash = "sha256-eeqqzHMeXLRiXzbY+ay8gJ/YDuxDj3f6+d6eXA1uZHE=";
};
+ patches = lib.optionals stdenv.cc.isClang [
+ # This test fails to compile with Clang 20
+ # See: https://github.com/catchorg/Catch2/issues/2991
+ ./clang-20-disable-broken-test.patch
+ ];
+
+ postPatch = ''
+ substituteInPlace CMake/*.pc.in \
+ --replace-fail "\''${prefix}/" ""
+ '';
+
nativeBuildInputs = [
cmake
];
@@ -50,10 +62,14 @@ stdenv.mkDerivation rec {
python3
];
+ passthru.tests = {
+ inherit spdlog;
+ };
+
meta = {
description = "Modern, C++-native, test framework for unit-tests";
homepage = "https://github.com/catchorg/Catch2";
- changelog = "https://github.com/catchorg/Catch2/blob/${src.rev}/docs/release-notes.md";
+ changelog = "https://github.com/catchorg/Catch2/blob/${src.tag}/docs/release-notes.md";
license = lib.licenses.boost;
maintainers = with lib.maintainers; [ dotlambda ];
platforms = with lib.platforms; unix ++ windows;
diff --git a/pkgs/by-name/ca/catppuccin/package.nix b/pkgs/by-name/ca/catppuccin/package.nix
index 9435bd31dfc6..d6ae9a5e091a 100644
--- a/pkgs/by-name/ca/catppuccin/package.nix
+++ b/pkgs/by-name/ca/catppuccin/package.nix
@@ -68,16 +68,16 @@ let
name = "bat";
owner = "catppuccin";
repo = "bat";
- rev = "699f60fc8ec434574ca7451b444b880430319941";
- hash = "sha256-6fWoCH90IGumAMc4buLRWL0N61op+AuMNN9CAR9/OdI=";
+ rev = "6810349b28055dce54076712fc05fc68da4b8ec0";
+ hash = "sha256-lJapSgRVENTrbmpVyn+UQabC9fpV1G1e+CdlJ090uvg=";
};
bottom = fetchFromGitHub {
name = "bottom";
owner = "catppuccin";
repo = "bottom";
- rev = "ed09bd5a5dd78d83acdc8ff5fdec40a6340ed1c2";
- hash = "sha256-Vi438I+YVvoD2xzq2t9hJ9R3a+2TlDdbakjFYFtjtXQ=";
+ rev = "eadd75acd0ecad4a58ade9a1d6daa3b97ccec07c";
+ hash = "sha256-dfukdk70ug1lRGADKBnvMhkl+3tsY7F+UAwTS2Qyapk=";
};
btop = fetchFromGitHub {
@@ -100,8 +100,8 @@ let
name = "grub";
owner = "catppuccin";
repo = "grub";
- rev = "2a5c8be8185dae49dd22030df45860df8c796312";
- hash = "sha256-20D1EcV8SWOd5BLdAc6FaQu3onha0+aS5yA/GK8Ra0g=";
+ rev = "0a37ab19f654e77129b409fed371891c01ffd0b9";
+ hash = "sha256-jgM22pvCQvb0bjQQXoiqGMgScR9AgCK3OfDF5Ud+/mk=";
};
hyprland = fetchFromGitHub {
@@ -124,16 +124,16 @@ let
name = "kvantum";
owner = "catppuccin";
repo = "Kvantum";
- rev = "a87694e0a3c97644dbb34f8835112d17b54ace68";
- hash = "sha256-eQmEeKC+L408ajlNg3oKMnDK6Syy2GV6FrR2TN5ZBCg=";
+ rev = "c7cb144b041395e83e4f510a62526b7adfb79911";
+ hash = "sha256-YNUkri+no+rNLTJHf6cPdy4AmQLzPiRK1Jbp2o8e1LE=";
};
lazygit = fetchFromGitHub {
name = "lazygit";
owner = "catppuccin";
repo = "lazygit";
- rev = "d3c95a67ea3f778f7705d8ef814f87ac5213436d";
- hash = "sha256-b2SoIeXT1BaoxvEeQ0VaPmnBND+7qUe342kOIkyOcAc=";
+ rev = "c24895902ec2a3cb62b4557f6ecd8e0afeed95d5";
+ hash = "sha256-4eJEOEfwLBc4EoQ32TpuhXS3QDvQ8FtT7EgpotEKV7o=";
};
lxqt = fetchFromGitHub {
@@ -156,32 +156,32 @@ let
name = "qt5ct";
owner = "catppuccin";
repo = "qt5ct";
- rev = "0442cc931390c226d143e3a6d6e77f819c68502a";
- hash = "sha256-hXyPuI225WdMuVSeX1AwrylUzNt0VA33h8C7MoSJ+8A=";
+ rev = "cb585307edebccf74b8ae8f66ea14f21e6666535";
+ hash = "sha256-wDj6kQ2LQyMuEvTQP6NifYFdsDLT+fMCe3Fxr8S783w=";
};
refind = fetchFromGitHub {
name = "refind";
owner = "catppuccin";
repo = "refind";
- rev = "ff0b593c19bb9b469ee0ee36068b8d373f0fadc5";
- hash = "sha256-itUMo0lA23bJzH0Ndq7L2IaEYoVdNPYxbB/VWkRfRso=";
+ rev = "e92ad6f4673e30fbc79e69c9cbe3780fb9a3f05f";
+ hash = "sha256-34+MkvWEp3xq6Di1uWKR4ieaG4t2rufnRRN1/V0WRfw=";
};
rofi = fetchFromGitHub {
name = "rofi";
owner = "catppuccin";
repo = "rofi";
- rev = "c24a212a6b07c2d45f32d01d7f10b4d88ddc9f45";
- hash = "sha256-WGYEA4Q7UvSaRDjP/DiEtfXjvmWbewtdyJWRpjhbZgg=";
+ rev = "71fb15577ccb091df2f4fc1f65710edbc61b5a53";
+ hash = "sha256-81eeFjwM/haPjIEWkZPp1JSDwhWbWDAuKtWiCg7P9Q0=";
};
starship = fetchFromGitHub {
name = "starship";
owner = "catppuccin";
repo = "starship";
- rev = "e99ba6b210c0739af2a18094024ca0bdf4bb3225";
- hash = "sha256-1w0TJdQP5lb9jCrCmhPlSexf0PkAlcz8GBDEsRjPRns=";
+ rev = "5906cc369dd8207e063c0e6e2d27bd0c0b567cb8";
+ hash = "sha256-FLHjbClpTqaK4n2qmepCPkb8rocaAo3qeV4Zp1hia0g=";
};
thunderbird = fetchFromGitHub {
@@ -196,8 +196,8 @@ let
name = "waybar";
owner = "catppuccin";
repo = "waybar";
- rev = "v1.1";
- hash = "sha256-9lY+v1CTbpw2lREG/h65mLLw5KuT8OJdEPOb+NNC6Fo=";
+ rev = "ee8ed32b4f63e9c417249c109818dcc05a2e25da";
+ hash = "sha256-za0y6hcN2rvN6Xjf31xLRe4PP0YyHu2i454ZPjr+lWA=";
};
};
in
@@ -213,7 +213,7 @@ lib.checkListOfEnum "${pname}: variant" validVariants [ variant ] lib.checkListO
stdenvNoCC.mkDerivation
{
inherit pname;
- version = "unstable-2025-02-21";
+ version = "unstable-2025-10-07";
srcs = selectedSources;
@@ -331,9 +331,12 @@ lib.checkListOfEnum "${pname}: variant" validVariants [ variant ] lib.checkListO
meta = {
description = "Soothing pastel themes";
- homepage = "https://github.com/catppuccin/catppuccin";
+ homepage = "https://catppuccin.com";
license = lib.licenses.mit;
platforms = lib.platforms.all;
- maintainers = [ lib.maintainers.khaneliman ];
+ maintainers = with lib.maintainers; [
+ khaneliman
+ SchweGELBin
+ ];
};
}
diff --git a/pkgs/by-name/cb/cbc/package.nix b/pkgs/by-name/cb/cbc/package.nix
index 3cc7618781eb..f50429737041 100644
--- a/pkgs/by-name/cb/cbc/package.nix
+++ b/pkgs/by-name/cb/cbc/package.nix
@@ -1,21 +1,23 @@
{
lib,
stdenv,
- fetchurl,
- zlib,
+ fetchFromGitHub,
bzip2,
+ cgl,
+ clp,
+ pkg-config,
+ zlib,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "cbc";
- version = "2.10.4";
+ version = "2.10.12";
- # Note: Cbc 2.10.5 contains Clp 1.17.5 which hits this bug
- # that breaks or-tools https://github.com/coin-or/Clp/issues/130
-
- src = fetchurl {
- url = "https://www.coin-or.org/download/source/Cbc/Cbc-${version}.tgz";
- sha256 = "0zq66j1vvpslswhzi9yfgkv6vmg7yry4pdmfgqaqw2vhyqxnsy39";
+ src = fetchFromGitHub {
+ owner = "coin-or";
+ repo = "Cbc";
+ tag = "releases/${finalAttrs.version}";
+ sha256 = "sha256-0Sz4/7CRKrArIUy/XxGIP7WMmICqDJ0VxZo62thChYQ=";
};
# or-tools has a hard dependency on Cbc static libraries, so we build both
@@ -25,13 +27,21 @@ stdenv.mkDerivation rec {
]
++ lib.optionals stdenv.cc.isClang [ "CXXFLAGS=-std=c++14" ];
+ nativeBuildInputs = [ pkg-config ];
+
enableParallelBuilding = true;
hardeningDisable = [ "format" ];
buildInputs = [
- zlib
bzip2
+ zlib
+ ];
+
+ # cbc lists cgl and clp in its .pc requirements, so it needs to be propagated.
+ propagatedBuildInputs = [
+ cgl
+ clp
];
# FIXME: move share/coin/Data to a separate output?
@@ -43,4 +53,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.linux ++ lib.platforms.darwin;
description = "Mixed integer programming solver";
};
-}
+})
diff --git a/pkgs/by-name/cb/cbor-diag/Gemfile.lock b/pkgs/by-name/cb/cbor-diag/Gemfile.lock
index 3fb8993319ef..67a53ba2856c 100644
--- a/pkgs/by-name/cb/cbor-diag/Gemfile.lock
+++ b/pkgs/by-name/cb/cbor-diag/Gemfile.lock
@@ -3,7 +3,7 @@ GEM
specs:
cbor-canonical (0.1.2)
cbor-deterministic (0.1.3)
- cbor-diag (0.9.6)
+ cbor-diag (0.10.2)
cbor-canonical
cbor-deterministic
cbor-packed
@@ -24,4 +24,4 @@ DEPENDENCIES
cbor-diag
BUNDLED WITH
- 2.6.6
+ 2.7.1
diff --git a/pkgs/by-name/cb/cbor-diag/gemset.nix b/pkgs/by-name/cb/cbor-diag/gemset.nix
index c01ae16a4451..721d4678ff9f 100644
--- a/pkgs/by-name/cb/cbor-diag/gemset.nix
+++ b/pkgs/by-name/cb/cbor-diag/gemset.nix
@@ -32,10 +32,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
- sha256 = "0c0a4pfvnhkh8dmih1igm7qm2ligzvccppjskpz85v69xizfsj71";
+ sha256 = "1w64msy9wdyagcl2rcr7lynmdrazjb8wr6406r47x6k007q8jpd3";
type = "gem";
};
- version = "0.9.6";
+ version = "0.10.2";
};
cbor-packed = {
groups = [ "default" ];
diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix
index 92edc587336d..3c178a55b7cc 100644
--- a/pkgs/by-name/cd/cdncheck/package.nix
+++ b/pkgs/by-name/cd/cdncheck/package.nix
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "cdncheck";
- version = "1.2.3";
+ version = "1.2.4";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "cdncheck";
tag = "v${version}";
- hash = "sha256-E6LMl0cArzVZ33xaG/2nvSgLy+Owr9br2fU3oFNyvGY=";
+ hash = "sha256-O4tw/Uc2EuZerAVD8l2n5HejqWZUcCPHuU757r+uRmY=";
};
- vendorHash = "sha256-IJk6HTiF2B1paVZ4qa63DwivtpOf5V0OKQEKAs3BpYY=";
+ vendorHash = "sha256-6GxqDWRnvvj4OM2hqkwWFDvhOm+2VQvoGHivuOtTyCg=";
subPackages = [ "cmd/cdncheck/" ];
diff --git a/pkgs/by-name/ce/cereal_1_3_2/package.nix b/pkgs/by-name/ce/cereal/package.nix
similarity index 100%
rename from pkgs/by-name/ce/cereal_1_3_2/package.nix
rename to pkgs/by-name/ce/cereal/package.nix
diff --git a/pkgs/by-name/ce/cereal_1_3_0/package.nix b/pkgs/by-name/ce/cereal_1_3_0/package.nix
deleted file mode 100644
index 2f433d7f268e..000000000000
--- a/pkgs/by-name/ce/cereal_1_3_0/package.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
- lib,
- stdenv,
- fetchFromGitHub,
- fetchpatch,
- cmake,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
- pname = "cereal";
- version = "1.3.0";
-
- src = fetchFromGitHub {
- owner = "USCiLab";
- repo = "cereal";
- rev = "v${finalAttrs.version}";
- hash = "sha256-NwyUVeqXxfdyuDevjum6r8LyNtHa0eJ+4IFd3hLkiEE=";
- };
-
- patches = [
- (fetchpatch {
- name = "CVE-2020-11105.patch";
- url = "https://github.com/USCiLab/cereal/commit/f27c12d491955c94583512603bf32c4568f20929.patch";
- hash = "sha256-CIkbJ7bAN0MXBhTXQdoQKXUmY60/wQvsdn99FaWt31w=";
- })
- ];
-
- nativeBuildInputs = [ cmake ];
-
- cmakeFlags = [ "-DJUST_INSTALL_CEREAL=yes" ];
-
- meta = {
- homepage = "https://uscilab.github.io/cereal/";
- description = "Header-only C++11 serialization library";
- changelog = "https://github.com/USCiLab/cereal/releases/tag/v${finalAttrs.version}";
- license = lib.licenses.bsd3;
- maintainers = [ ];
- platforms = lib.platforms.all;
- };
-})
diff --git a/pkgs/by-name/cf/cfitsio/package.nix b/pkgs/by-name/cf/cfitsio/package.nix
index 215a9989b37c..7d97bb020849 100644
--- a/pkgs/by-name/cf/cfitsio/package.nix
+++ b/pkgs/by-name/cf/cfitsio/package.nix
@@ -2,6 +2,7 @@
stdenv,
lib,
fetchFromGitHub,
+ fetchpatch,
gitUpdater,
cmake,
bzip2,
@@ -29,6 +30,12 @@ stdenv.mkDerivation (finalAttrs: {
patches = [
./cfitsio-pc-cmake.patch
+
+ (fetchpatch {
+ name = "cfitsio-fix-cmake-4.patch";
+ url = "https://github.com/HEASARC/cfitsio/commit/101e0880fca41e2223df7eec56d9e84e90b9ed56.patch";
+ hash = "sha256-rufuqOBfE7ItTYwsGdu9G4BXSz4vZd52XmJi09kqrCM=";
+ })
];
nativeBuildInputs = [
diff --git a/pkgs/by-name/ch/chainsaw/package.nix b/pkgs/by-name/ch/chainsaw/package.nix
index 297e35afe7d0..c0a2f57dee67 100644
--- a/pkgs/by-name/ch/chainsaw/package.nix
+++ b/pkgs/by-name/ch/chainsaw/package.nix
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "chainsaw";
- version = "2.12.2";
+ version = "2.13.0";
src = fetchFromGitHub {
owner = "WithSecureLabs";
repo = "chainsaw";
tag = "v${finalAttrs.version}";
- hash = "sha256-SoQXGpkMrE0vno0dJ00ebB0oR1sDVlgWRSgKQoHlv2A=";
+ hash = "sha256-/55MzQW6Fd1HpiK44USysk15DQt5Qk9JFHoX48rfXK4=";
};
- cargoHash = "sha256-ncf5fRf9NulcWTOuRE2rdAOIyvz5YEgpB1j/Rfj8vDk=";
+ cargoHash = "sha256-A9F9aojHUupn0Sa/pXkxkimPm9XqXwCx0zKNWr82cwQ=";
ldflags = [
"-w"
diff --git a/pkgs/by-name/ch/changelogen/package.nix b/pkgs/by-name/ch/changelogen/package.nix
new file mode 100644
index 000000000000..dd14b2029d0f
--- /dev/null
+++ b/pkgs/by-name/ch/changelogen/package.nix
@@ -0,0 +1,54 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+ nodejs,
+ pnpm_10,
+ npmHooks,
+}:
+let
+ pnpm = pnpm_10;
+in
+stdenv.mkDerivation (finalAttrs: {
+ pname = "changelogen";
+ version = "0.6.2";
+
+ src = fetchFromGitHub {
+ owner = "unjs";
+ repo = "changelogen";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-N6X9Wffl9WumCXvAt4y+vs3ZJY7NheK+O8BObmuIa/g=";
+ };
+
+ pnpmDeps = pnpm.fetchDeps {
+ inherit (finalAttrs) pname version src;
+ fetcherVersion = 2;
+ hash = "sha256-UKSIfn2iR8Ydk9ViGCgWtspZr1FjTeW49UMwTcL57UA=";
+ };
+
+ nativeBuildInputs = [
+ nodejs
+ pnpm.configHook
+ npmHooks.npmInstallHook
+ ];
+
+ buildPhase = ''
+ runHook preBuild
+
+ pnpm run build
+
+ runHook postBuild
+ '';
+
+ dontNpmPrune = true;
+
+ meta = {
+ description = "Beautiful Changelogs using Conventional Commits";
+ homepage = "https://github.com/unjs/changelogen";
+ changelog = "https://github.com/unjs/changelogen/releases/tag/v${finalAttrs.version}";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ higherorderlogic ];
+ mainProgram = "changelogen";
+ platforms = nodejs.meta.platforms;
+ };
+})
diff --git a/pkgs/by-name/ch/chatgpt-shell-cli/package.nix b/pkgs/by-name/ch/chatgpt-shell-cli/package.nix
index 5118aa3bb4e1..5a2ab5ae10da 100644
--- a/pkgs/by-name/ch/chatgpt-shell-cli/package.nix
+++ b/pkgs/by-name/ch/chatgpt-shell-cli/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
src = fetchFromGitHub {
owner = "0xacx";
repo = "chatgpt-shell-cli";
- rev = version;
+ tag = version;
hash = "sha256-hYLrUya4UCsIB1J/n+jp1jFRCEqnGFJOr3ATxm0zwdY=";
};
diff --git a/pkgs/by-name/ch/chatterino2/package.nix b/pkgs/by-name/ch/chatterino2/package.nix
index ac8e02141c46..bd4e9cfc18a1 100644
--- a/pkgs/by-name/ch/chatterino2/package.nix
+++ b/pkgs/by-name/ch/chatterino2/package.nix
@@ -3,55 +3,51 @@
callPackage,
fetchFromGitHub,
gitUpdater,
- boost186,
}:
-(callPackage ./common.nix {
- boost = boost186;
-}).overrideAttrs
- (
- finalAttrs: _: {
- pname = "chatterino2";
- version = "2.5.4";
+(callPackage ./common.nix { }).overrideAttrs (
+ finalAttrs: _: {
+ pname = "chatterino2";
+ version = "2.5.4";
- src = fetchFromGitHub {
- owner = "Chatterino";
- repo = "chatterino2";
- tag = "v${finalAttrs.version}";
- hash = "sha256-eozT3Lfra4i+q3pCxH0Z1v/3Y/FB5yJc/88tA90hTzI=";
- fetchSubmodules = true;
- leaveDotGit = true;
- postFetch = ''
- git -C $out rev-parse --short HEAD > $out/GIT_HASH
- find "$out" -name .git -print0 | xargs -0 rm -rf
- '';
- };
+ src = fetchFromGitHub {
+ owner = "Chatterino";
+ repo = "chatterino2";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-eozT3Lfra4i+q3pCxH0Z1v/3Y/FB5yJc/88tA90hTzI=";
+ fetchSubmodules = true;
+ leaveDotGit = true;
+ postFetch = ''
+ git -C $out rev-parse --short HEAD > $out/GIT_HASH
+ find "$out" -name .git -print0 | xargs -0 rm -rf
+ '';
+ };
- passthru = {
- buildChatterino = args: callPackage ./common.nix args;
- updateScript = gitUpdater {
- rev-prefix = "v";
- ignoredVersions = "beta";
- };
+ passthru = {
+ buildChatterino = args: callPackage ./common.nix args;
+ updateScript = gitUpdater {
+ rev-prefix = "v";
+ ignoredVersions = "beta";
};
+ };
- meta = {
- description = "Chat client for Twitch chat";
- mainProgram = "chatterino";
- longDescription = ''
- Chatterino is a chat client for Twitch chat. It aims to be an
- improved/extended version of the Twitch web chat. Chatterino 2 is
- the second installment of the Twitch chat client series
- "Chatterino".
- '';
- homepage = "https://github.com/Chatterino/chatterino2";
- changelog = "https://github.com/Chatterino/chatterino2/blob/${finalAttrs.src.rev}/CHANGELOG.md";
- license = lib.licenses.mit;
- platforms = lib.platforms.unix;
- maintainers = with lib.maintainers; [
- supa
- marie
- ];
- };
- }
- )
+ meta = {
+ description = "Chat client for Twitch chat";
+ mainProgram = "chatterino";
+ longDescription = ''
+ Chatterino is a chat client for Twitch chat. It aims to be an
+ improved/extended version of the Twitch web chat. Chatterino 2 is
+ the second installment of the Twitch chat client series
+ "Chatterino".
+ '';
+ homepage = "https://github.com/Chatterino/chatterino2";
+ changelog = "https://github.com/Chatterino/chatterino2/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+ license = lib.licenses.mit;
+ platforms = lib.platforms.unix;
+ maintainers = with lib.maintainers; [
+ supa
+ marie
+ ];
+ };
+ }
+)
diff --git a/pkgs/by-name/ch/cheat/package.nix b/pkgs/by-name/ch/cheat/package.nix
index 6d964df186b1..6caa772fef06 100644
--- a/pkgs/by-name/ch/cheat/package.nix
+++ b/pkgs/by-name/ch/cheat/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
src = fetchFromGitHub {
owner = "cheat";
repo = "cheat";
- rev = version;
+ tag = version;
sha256 = "sha256-GUU6VWfTmNS6ny12HnMr3uQmS7HI86Oupcmqx0MVAvE=";
};
diff --git a/pkgs/by-name/ch/checkmake/package.nix b/pkgs/by-name/ch/checkmake/package.nix
index 920cad4793be..51b9fc954e64 100644
--- a/pkgs/by-name/ch/checkmake/package.nix
+++ b/pkgs/by-name/ch/checkmake/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
src = fetchFromGitHub {
owner = "mrtazz";
repo = "checkmake";
- rev = version;
+ tag = version;
hash = "sha256-Ql8XSQA/w7wT9GbmYOM2vG15GVqj9LxOGIu8Wqp9Wao=";
};
diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix
index 339d80d64f0a..908ff3f15881 100644
--- a/pkgs/by-name/ch/checkov/package.nix
+++ b/pkgs/by-name/ch/checkov/package.nix
@@ -37,14 +37,14 @@ with py.pkgs;
python3.pkgs.buildPythonApplication rec {
pname = "checkov";
- version = "3.2.473";
+ version = "3.2.474";
pyproject = true;
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = "checkov";
tag = version;
- hash = "sha256-FfzAMuFF+ftjcKn+6uYgoeUPoBDnkVTBCPSeom6KR5k=";
+ hash = "sha256-q0knnfogAPTqzEluOyU4OwXWnFYPilW9/NtuhZd50GA=";
};
pythonRelaxDeps = [
diff --git a/pkgs/by-name/ch/cherry/package.nix b/pkgs/by-name/ch/cherry/package.nix
index 727601743e0c..d9554124b5d6 100644
--- a/pkgs/by-name/ch/cherry/package.nix
+++ b/pkgs/by-name/ch/cherry/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "turquoise-hexagon";
repo = "cherry";
- rev = version;
+ tag = version;
sha256 = "13zkxwp6r6kcxv4x459vwscr0n0sik4a3kcz5xnmlpvcdnbxi586";
};
diff --git a/pkgs/by-name/ch/chez-racket/shared.nix b/pkgs/by-name/ch/chez-racket/shared.nix
index 5e80c2ff7a5d..752dde048323 100644
--- a/pkgs/by-name/ch/chez-racket/shared.nix
+++ b/pkgs/by-name/ch/chez-racket/shared.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation (
description = "Fork of Chez Scheme for Racket";
homepage = "https://github.com/racket/ChezScheme";
license = lib.licenses.asl20;
- maintainers = with lib.maintainers; [ l-as ];
+ maintainers = [ ];
platforms = lib.platforms.unix;
};
}
diff --git a/pkgs/by-name/ch/chez/package.nix b/pkgs/by-name/ch/chez/package.nix
index 7cfb7e682c43..42035a6a82ba 100644
--- a/pkgs/by-name/ch/chez/package.nix
+++ b/pkgs/by-name/ch/chez/package.nix
@@ -1,26 +1,54 @@
{
lib,
stdenv,
- fetchurl,
- coreutils,
+ fetchFromGitHub,
+ zuo,
+ zlib,
+ lz4,
+ libffi,
cctools,
darwin,
ncurses,
libiconv,
libX11,
- libuuid,
testers,
-}@args:
+ writableTmpDirAsHomeHook,
+ buildPackages,
+}:
+let
+ inherit (stdenv.hostPlatform) extensions;
+ arch =
+ {
+ "x86_64-linux" = "ta6le";
+ "x86-linux" = "ti3le";
+ "aarch64-linux" = "tarm64le";
+ "x86_64-darwin" = "ta6osx";
+ "aarch64-darwin" = "tarm64osx";
+ "x86_64-windows" = "ta6nt";
+ "aarch64-windows" = "tarm64nt";
+ }
+ .${stdenv.hostPlatform.system}
+ or (throw "Unsupported host system, try checking https://cisco.github.io/ChezScheme/release_notes/latest/release_notes.html to see if ${stdenv.hostPlatform.system} is supported");
+in
stdenv.mkDerivation (finalAttrs: {
pname = "chez-scheme";
version = "10.2.0";
- src = fetchurl {
- url = "https://github.com/cisco/ChezScheme/releases/download/v${finalAttrs.version}/csv${finalAttrs.version}.tar.gz";
- hash = "sha256-t5WRbUz+1ZJAxfRLG1B6hlfv0o5i5y4TTQNIbp8+N0o=";
+ src = fetchFromGitHub {
+ owner = "cisco";
+ repo = "ChezScheme";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-wAEnuC6hktCK/l00G48jYD9fwdyiXkzHjC2YYVeCJXo=";
+ # Vendored nanopass and stex
+ fetchSubmodules = true;
};
+ strictDeps = true;
+ depsBuildBuild = [
+ zuo # Used as the build driver
+ buildPackages.stdenv.cc # Needed for cross
+ ];
nativeBuildInputs =
lib.optionals stdenv.hostPlatform.isDarwin [
cctools
@@ -28,42 +56,54 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
darwin.autoSignDarwinBinariesHook
];
+
buildInputs = [
ncurses
libiconv
+ zlib
+ lz4
+ libffi
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isUnix [
libX11
- libuuid
];
- enableParallelBuilding = true;
-
- env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=format-truncation";
-
/*
- ** We have to fix a few occurrences to tools with absolute
- ** paths in some helper scripts, otherwise the build will fail on
- ** NixOS or in any chroot build.
- */
- patchPhase = ''
- substituteInPlace ./makefiles/installsh \
- --replace-warn "/usr/bin/true" "${coreutils}/bin/true"
-
- substituteInPlace zlib/configure \
- --replace-warn "/usr/bin/libtool" libtool
- '';
-
- /*
- ** Don't use configureFlags, since that just implicitly appends
- ** everything onto a --prefix flag, which ./configure gets very angry
- ** about.
+ ** Set to use Nixpkgs dependencies when possible
+ ** instead of vendored dependencies.
**
- ** Also, carefully set a manual workarea argument, so that we
+ ** Carefully set a manual workarea argument, so that we
** can later easily find the machine type that we built Chez
** for.
*/
- configurePhase = ''
- ./configure --as-is --threads --installprefix=$out --installman=$out/share/man
- '';
+ enableParallelBuilding = true;
+ dontAddPrefix = true;
+ configurePlatforms = [ ]; # So it doesn't add the default --build --host flags
+ configureFlags = [
+ # Skip submodule update
+ "--as-is"
+ # Threaded version
+ "--threads"
+ "--installprefix=${placeholder "out"}"
+ "--installman=${placeholder "out"}/share/man"
+ "--enable-libffi"
+ "CC_FOR_BUILD=cc"
+ # Use Nixpkgs dependencies
+ "ZUO=zuo"
+ "ZLIB=${zlib}/lib/libz${extensions.sharedLibrary}"
+ "LZ4=${lz4.lib}/lib/liblz4${extensions.sharedLibrary}"
+ # Append to CFLAGS or else get errors
+ # Don't set CFLAGS so it can do some detections stuff
+ "CFLAGS+=${lib.optionalString stdenv.cc.isGNU "-Wno-error=format-truncation"}"
+ ]
+ ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+ "--cross"
+ "-m=${arch}"
+ ];
+
+ enableParallelChecking = true;
+ nativeCheckInputs = [ writableTmpDirAsHomeHook ];
+ doCheck = false; # Filesystem checks are impure
# ** Clean up some of the examples from the build output.
postInstall = ''
@@ -72,18 +112,20 @@ stdenv.mkDerivation (finalAttrs: {
setupHook = ./setup-hook.sh;
- passthru.tests = {
- version = testers.testVersion {
- package = finalAttrs.finalPackage;
- };
+ passthru.tests.version = testers.testVersion {
+ package = finalAttrs.finalPackage;
};
meta = {
description = "Powerful and incredibly fast R6RS Scheme compiler";
homepage = "https://cisco.github.io/ChezScheme/";
+ changelog = "https://cisco.github.io/ChezScheme/release_notes/v${finalAttrs.version}/release_notes.html";
license = lib.licenses.asl20;
- maintainers = with lib.maintainers; [ thoughtpolice ];
- platforms = lib.platforms.unix;
+ maintainers = with lib.maintainers; [
+ thoughtpolice
+ RossSmyth
+ ];
+ platforms = lib.platforms.all;
mainProgram = "scheme";
};
})
diff --git a/pkgs/by-name/ch/chirp/package.nix b/pkgs/by-name/ch/chirp/package.nix
index 6d6276aa2fed..c7f4f44c5d14 100644
--- a/pkgs/by-name/ch/chirp/package.nix
+++ b/pkgs/by-name/ch/chirp/package.nix
@@ -11,14 +11,14 @@
python3Packages.buildPythonApplication {
pname = "chirp";
- version = "0.4.0-unstable-2025-09-22";
+ version = "0.4.0-unstable-2025-10-02";
pyproject = true;
src = fetchFromGitHub {
owner = "kk7ds";
repo = "chirp";
- rev = "d958adbc6c332d6bbac4e2844025ca7331bb01b9";
- hash = "sha256-htpdcm705Pm5a+me8vo5aQVWRAKTVPYac/0KgIpRKuA=";
+ rev = "bf848935eef3a739948a4a6c3ef8b5a31807481e";
+ hash = "sha256-8hQmH62yplZ5xao7nVwRdmyPQj3x5eitSBmFJYU3mb4=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/ch/chit/package.nix b/pkgs/by-name/ch/chit/package.nix
index 218d867f4482..f31d82f28468 100644
--- a/pkgs/by-name/ch/chit/package.nix
+++ b/pkgs/by-name/ch/chit/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "peterheesterman";
repo = "chit";
- rev = version;
+ tag = version;
sha256 = "0iixczy3cad44j2d7zzj8f3lnmp4jwnb0snmwfgiq3vj9wrn28pz";
};
diff --git a/pkgs/by-name/ch/cholmod-extra/package.nix b/pkgs/by-name/ch/cholmod-extra/package.nix
index cbc6669c4c9e..ba149490eba9 100644
--- a/pkgs/by-name/ch/cholmod-extra/package.nix
+++ b/pkgs/by-name/ch/cholmod-extra/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
repo = "cholmod-extra";
owner = "jluttine";
- rev = version;
+ tag = version;
sha256 = "0hz1lfp0zaarvl0dv0zgp337hyd8np41kmdpz5rr3fc6yzw7vmkg";
};
diff --git a/pkgs/by-name/ch/chromaprint/package.nix b/pkgs/by-name/ch/chromaprint/package.nix
index e4a4f48ecba2..d0c7fe4bbef4 100644
--- a/pkgs/by-name/ch/chromaprint/package.nix
+++ b/pkgs/by-name/ch/chromaprint/package.nix
@@ -3,7 +3,6 @@
stdenv,
fetchFromGitHub,
fetchpatch,
- fetchpatch2,
fetchurl,
cmake,
ninja,
@@ -18,33 +17,20 @@
stdenv.mkDerivation (finalAttrs: {
pname = "chromaprint";
- version = "1.5.1";
+ version = "1.6.0";
src = fetchFromGitHub {
owner = "acoustid";
repo = "chromaprint";
tag = "v${finalAttrs.version}";
- hash = "sha256-bFplHaqXYvGbl8E8b/HUNFO4X+B/HPZjGTmuVFPjS3g=";
+ hash = "sha256-G3HIMgbjaAXsC+8nt7mkj58xA62qwA8FC+PfTGblhNg=";
};
patches = [
- # Use FFmpeg 5.x
- # https://github.com/acoustid/chromaprint/pull/120
+ # fix generated pkg-config files
(fetchpatch {
- url = "https://github.com/acoustid/chromaprint/commit/8ccad6937177b1b92e40ab8f4447ea27bac009a7.patch";
- hash = "sha256-yO2iWmU9s2p0uJfwIdmk3jZ5HXBIQZ/NyOqG+Y5EHdg=";
- excludes = [ "package/build.sh" ];
- })
- # ffmpeg5 fix for issue #122
- # https://github.com/acoustid/chromaprint/pull/125
- (fetchpatch {
- url = "https://github.com/acoustid/chromaprint/commit/aa67c95b9e486884a6d3ee8b0c91207d8c2b0551.patch";
- hash = "sha256-dLY8FBzBqJehAofE924ayZK0HA/aKiuFhEFxL7dg6rY=";
- })
- # Fix for FFmpeg 7
- (fetchpatch2 {
- url = "https://gitlab.archlinux.org/archlinux/packaging/packages/chromaprint/-/raw/74ae4c7faea2114f2d70a57755f714e348476d28/ffmpeg-7.patch";
- hash = "sha256-io+dzhDNlz+2hWhNfsyePKLQjiUvSzbv10lHVKumTEk=";
+ url = "https://github.com/acoustid/chromaprint/commit/782ef6bb5f6498e35f8e275f76998fbd5ffa36d6.patch";
+ hash = "sha256-drUfAMzTrqqB5UbzOnfPq6XD3HI+3sxyJJSTCa0BmD8=";
})
];
diff --git a/pkgs/by-name/ci/cie-middleware-linux/package.nix b/pkgs/by-name/ci/cie-middleware-linux/package.nix
index e765490f117b..4d51469fe91d 100644
--- a/pkgs/by-name/ci/cie-middleware-linux/package.nix
+++ b/pkgs/by-name/ci/cie-middleware-linux/package.nix
@@ -26,7 +26,7 @@ let
src = fetchFromGitHub {
owner = "M0rf30";
repo = "cie-middleware-linux";
- rev = version;
+ tag = version;
hash = "sha256-2UMKxanF35oBNBtIqfU46QUYJwXiTU1xCrCMqzqetgI=";
};
diff --git a/pkgs/by-name/ci/cinnamon-control-center/package.nix b/pkgs/by-name/ci/cinnamon-control-center/package.nix
index 96f1e1a38059..d3b3fd3a28a6 100644
--- a/pkgs/by-name/ci/cinnamon-control-center/package.nix
+++ b/pkgs/by-name/ci/cinnamon-control-center/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "linuxmint";
repo = "cinnamon-control-center";
- rev = version;
+ tag = version;
hash = "sha256-nw70sbiz3+dp40WP957hOVo/mQOg2MJknZNN5Kw/Q/0=";
};
diff --git a/pkgs/by-name/ci/cinnamon-desktop/package.nix b/pkgs/by-name/ci/cinnamon-desktop/package.nix
index df1c5ad8f513..82d33765f183 100644
--- a/pkgs/by-name/ci/cinnamon-desktop/package.nix
+++ b/pkgs/by-name/ci/cinnamon-desktop/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "linuxmint";
repo = "cinnamon-desktop";
- rev = version;
+ tag = version;
hash = "sha256-kNxVdPtCQtz4TSyCc6uKHmAGWm2nlWnLwC3Cm0E42Jc=";
};
diff --git a/pkgs/by-name/ci/cinnamon-menus/package.nix b/pkgs/by-name/ci/cinnamon-menus/package.nix
index 405987fcec75..2a16b445dbbc 100644
--- a/pkgs/by-name/ci/cinnamon-menus/package.nix
+++ b/pkgs/by-name/ci/cinnamon-menus/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "linuxmint";
repo = "cinnamon-menus";
- rev = version;
+ tag = version;
hash = "sha256-ug1RSP2TBrypi0aGhF05k39koY3rGgJi0LuWyuuICd0=";
};
diff --git a/pkgs/by-name/ci/cinnamon-screensaver/package.nix b/pkgs/by-name/ci/cinnamon-screensaver/package.nix
index 14fc59669d4a..1c60e62db173 100644
--- a/pkgs/by-name/ci/cinnamon-screensaver/package.nix
+++ b/pkgs/by-name/ci/cinnamon-screensaver/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "linuxmint";
repo = "cinnamon-screensaver";
- rev = version;
+ tag = version;
hash = "sha256-CK4WP5IafNII81e8HxUNN3Vp36Ln78Xvv5lIMvL+nbk=";
};
diff --git a/pkgs/by-name/ci/cinnamon-session/package.nix b/pkgs/by-name/ci/cinnamon-session/package.nix
index 67460c093280..35268a0d0033 100644
--- a/pkgs/by-name/ci/cinnamon-session/package.nix
+++ b/pkgs/by-name/ci/cinnamon-session/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "linuxmint";
repo = "cinnamon-session";
- rev = version;
+ tag = version;
hash = "sha256-zv1X1MLZBg+Bayd4hjsmrdXkFTRkH4kz7PJe6mFTBqc=";
};
diff --git a/pkgs/by-name/ci/cinnamon-settings-daemon/package.nix b/pkgs/by-name/ci/cinnamon-settings-daemon/package.nix
index 7a0753864cfb..ac136d982534 100644
--- a/pkgs/by-name/ci/cinnamon-settings-daemon/package.nix
+++ b/pkgs/by-name/ci/cinnamon-settings-daemon/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "linuxmint";
repo = "cinnamon-settings-daemon";
- rev = version;
+ tag = version;
hash = "sha256-L7+OgymYoYBdprw66RW8tiGA7XGWjTBpDpXhli8Fjoo=";
};
diff --git a/pkgs/by-name/ci/cinnamon-translations/package.nix b/pkgs/by-name/ci/cinnamon-translations/package.nix
index 36c3be20728a..3739ebd18421 100644
--- a/pkgs/by-name/ci/cinnamon-translations/package.nix
+++ b/pkgs/by-name/ci/cinnamon-translations/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "linuxmint";
repo = "cinnamon-translations";
- rev = version;
+ tag = version;
hash = "sha256-By09Y4iHZz3XR7tRd5MyXK5BKOr01yJzTTLQHEZ00q0=";
};
diff --git a/pkgs/by-name/ci/cinnamon/package.nix b/pkgs/by-name/ci/cinnamon/package.nix
index f22db1eca8c4..f41853691399 100644
--- a/pkgs/by-name/ci/cinnamon/package.nix
+++ b/pkgs/by-name/ci/cinnamon/package.nix
@@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "linuxmint";
repo = "cinnamon";
- rev = version;
+ tag = version;
hash = "sha256-XGG5Qf6Kx1gvZITuuZWn1ggY4FNW/aEuBLbpWyxE2V8=";
};
diff --git a/pkgs/by-name/ci/cipher/package.nix b/pkgs/by-name/ci/cipher/package.nix
index 1db35c979473..f428d91a693a 100644
--- a/pkgs/by-name/ci/cipher/package.nix
+++ b/pkgs/by-name/ci/cipher/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "arshubham";
repo = "cipher";
- rev = version;
+ tag = version;
sha256 = "00azc5ck17zkdypfza6x1viknwhimd9fqgk2ybff3mx6aphmla7a";
};
diff --git a/pkgs/by-name/ci/circumflex/package.nix b/pkgs/by-name/ci/circumflex/package.nix
index b2d65ddb6479..204c267bb7d3 100644
--- a/pkgs/by-name/ci/circumflex/package.nix
+++ b/pkgs/by-name/ci/circumflex/package.nix
@@ -14,7 +14,7 @@ buildGoModule rec {
src = fetchFromGitHub {
owner = "bensadeh";
repo = "circumflex";
- rev = version;
+ tag = version;
hash = "sha256-qponQtfpAXQxpAhkXaylgzpsvbccTIz9kmhdI4tPuNQ=";
};
diff --git a/pkgs/by-name/ci/civetweb/fix-pkg-config-files.patch b/pkgs/by-name/ci/civetweb/fix-pkg-config-files.patch
new file mode 100644
index 000000000000..2557ee38ae0a
--- /dev/null
+++ b/pkgs/by-name/ci/civetweb/fix-pkg-config-files.patch
@@ -0,0 +1,43 @@
+From 69b825ef5daebdb6e3b51ce23663003807028634 Mon Sep 17 00:00:00 2001
+From: Thomas Gerbet
+Date: Sun, 28 Sep 2025 21:45:34 +0200
+Subject: [PATCH] Use `@CMAKE_INSTALL_FULL_*DIR@` in pkg-config files
+
+This make possible to install to absolute paths and not only to relative
+paths.
+---
+ cmake/civetweb-cpp.pc.in | 4 ++--
+ cmake/civetweb.pc.in | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/cmake/civetweb-cpp.pc.in b/cmake/civetweb-cpp.pc.in
+index ca1232c5..dc2d99e3 100644
+--- a/cmake/civetweb-cpp.pc.in
++++ b/cmake/civetweb-cpp.pc.in
+@@ -1,7 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@
+
+ Name: @PROJECT_NAME@-cpp
+ Description: generic graph library
+diff --git a/cmake/civetweb.pc.in b/cmake/civetweb.pc.in
+index 27cea8f1..dd669c5f 100644
+--- a/cmake/civetweb.pc.in
++++ b/cmake/civetweb.pc.in
+@@ -1,7 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@
+
+ Name: @PROJECT_NAME@
+ Description: generic graph library
+--
+2.51.0
+
diff --git a/pkgs/by-name/ci/civetweb/package.nix b/pkgs/by-name/ci/civetweb/package.nix
index 7c12e2456849..6736b11090e8 100644
--- a/pkgs/by-name/ci/civetweb/package.nix
+++ b/pkgs/by-name/ci/civetweb/package.nix
@@ -2,20 +2,30 @@
lib,
stdenv,
fetchFromGitHub,
+ fetchpatch,
cmake,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "civetweb";
- version = "1.15";
+ version = "1.16";
src = fetchFromGitHub {
owner = "civetweb";
repo = "civetweb";
- rev = "v${version}";
- sha256 = "sha256-Qh6BGPk7a01YzCeX42+Og9M+fjXRs7kzNUCyT4mYab4=";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-eXb5f2jhtfxDORG+JniSy17kzB7A4vM0UnUQAfKTquU=";
};
+ patches = [
+ ./fix-pkg-config-files.patch
+ (fetchpatch {
+ name = "CVE-2025-55763.patch";
+ url = "https://github.com/civetweb/civetweb/commit/76e222bcb77ba8452e5da4e82ae6cecd499c25e0.patch";
+ hash = "sha256-gv2FR53SxmRCCTRjj17RhIjoHkgOz5ENs9oHmcfFmw8=";
+ })
+ ];
+
outputs = [
"out"
"dev"
@@ -47,6 +57,9 @@ stdenv.mkDerivation rec {
#
# [1] https://github.com/civetweb/civetweb/blob/cafd5f8fae3b859b7f8c29feb03ea075c7221497/CMakeLists.txt#L56
"-DCIVETWEB_THREAD_STACK_SIZE=0"
+
+ # Workaround CMake 4 compat
+ (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5")
];
meta = {
@@ -55,4 +68,4 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/civetweb/civetweb";
license = [ lib.licenses.mit ];
};
-}
+})
diff --git a/pkgs/by-name/cj/cjson/package.nix b/pkgs/by-name/cj/cjson/package.nix
index 7f1eac88571a..c1fa9f4c55cd 100644
--- a/pkgs/by-name/cj/cjson/package.nix
+++ b/pkgs/by-name/cj/cjson/package.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "cjson";
- version = "1.7.18";
+ version = "1.7.19";
src = fetchFromGitHub {
owner = "DaveGamble";
repo = "cJSON";
rev = "v${version}";
- sha256 = "sha256-UgUWc/+Zie2QNijxKK5GFe4Ypk97EidG8nTiiHhn5Ys=";
+ sha256 = "sha256-WjgzokT9aHJ7dB40BtmhS7ur1slTuXmemgDimZHLVQM=";
};
nativeBuildInputs = [ cmake ];
@@ -22,11 +22,24 @@ stdenv.mkDerivation rec {
lib.cmakeBool "ENABLE_CUSTOM_COMPILER_FLAGS" false
);
- # cJSON actually uses C99 standard, not C89
- # https://github.com/DaveGamble/cJSON/issues/275
- postPatch = ''
- substituteInPlace CMakeLists.txt --replace -std=c89 -std=c99
- '';
+ postPatch =
+ # cJSON actually uses C99 standard, not C89
+ # https://github.com/DaveGamble/cJSON/issues/275
+ ''
+ substituteInPlace CMakeLists.txt --replace -std=c89 -std=c99
+ ''
+ # Fix the build with CMake 4.
+ #
+ # See:
+ # *
+ # *
+ # *
+ + ''
+ substituteInPlace CMakeLists.txt \
+ --replace-fail \
+ 'cmake_minimum_required(VERSION 3.0)' \
+ 'cmake_minimum_required(VERSION 3.10)'
+ '';
meta = with lib; {
homepage = "https://github.com/DaveGamble/cJSON";
diff --git a/pkgs/by-name/cl/clapboard/package.nix b/pkgs/by-name/cl/clapboard/package.nix
index 5523b7b2439f..a808323b4a06 100644
--- a/pkgs/by-name/cl/clapboard/package.nix
+++ b/pkgs/by-name/cl/clapboard/package.nix
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "clapboard";
- version = "1.1.0";
+ version = "1.1.1";
src = fetchFromGitHub {
owner = "bjesus";
repo = "clapboard";
rev = "v${version}";
- hash = "sha256-1y2tG4ajnsstNkPTE3eBr8QJJF6Qq/HCQzJoj1ETuUY=";
+ hash = "sha256-vRIwdbt8f9/K7QAfFtBXrr4ezymlnzarq08W7J3aRiU=";
};
- cargoHash = "sha256-DEwipAG/zPPftYwYahRJfpXgHPXerGdn10PkS8DHWCM=";
+ cargoHash = "sha256-w3VR6j1ZcMQsk8r9eDqMtRJrGS6+XRM8t/pf5GpTVFA=";
meta = with lib; {
description = "Wayland clipboard manager that will make you clap";
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index bdf99d251ed7..c629da724535 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -7,11 +7,11 @@
}:
buildNpmPackage (finalAttrs: {
pname = "claude-code";
- version = "2.0.5";
+ version = "2.0.9";
src = fetchzip {
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
- hash = "sha256-ZAolpT/NW48NpIoY2jUzbBlcHmyNcw+G1GhZ40qtJoY=";
+ hash = "sha256-eBhg8RCATVIgC5Dex+cTnLDzLKfnJI8M7eOSGDE4bAw=";
};
npmDepsHash = "sha256-DehkeMZvzn+hvcCDzJfd4p9oYc1GSZm8gu8vKS4Uncw=";
diff --git a/pkgs/by-name/cl/clblast/package.nix b/pkgs/by-name/cl/clblast/package.nix
index 8f93b2d236a5..c1f9cd6e7336 100644
--- a/pkgs/by-name/cl/clblast/package.nix
+++ b/pkgs/by-name/cl/clblast/package.nix
@@ -1,6 +1,7 @@
{
lib,
stdenv,
+ fetchpatch,
fetchFromGitHub,
cmake,
ninja,
@@ -19,6 +20,15 @@ stdenv.mkDerivation rec {
hash = "sha256-fzenYFCAQ0B2NQgh5OaErv/yNEzjznB6ogRapqfL6P4=";
};
+ patches = [
+ (fetchpatch {
+ name = "clblast-fix-cmake4.patch";
+ url = "https://github.com/CNugteren/CLBlast/commit/dd714f1b72aa8c341e5a27aa9e968b4ecdaf1abb.patch";
+ includes = [ "CMakeLists.txt" ];
+ hash = "sha256-AVFzEdj1CaVSJxOcn5PoqFb+b8k5YgSMD3VhvHeBd7o=";
+ })
+ ];
+
nativeBuildInputs = [
cmake
ninja
diff --git a/pkgs/by-name/cl/cld2/package.nix b/pkgs/by-name/cl/cld2/package.nix
index 0c9b5c6a0b37..5be7109400b9 100644
--- a/pkgs/by-name/cl/cld2/package.nix
+++ b/pkgs/by-name/cl/cld2/package.nix
@@ -4,6 +4,7 @@
fetchFromGitHub,
cmake,
fetchpatch,
+ fetchDebianPatch,
}:
stdenv.mkDerivation {
@@ -18,10 +19,17 @@ stdenv.mkDerivation {
};
patches = [
+ (fetchDebianPatch {
+ pname = "cld2";
+ version = "0.0.0-git20150806";
+ debianRevision = "10";
+ patch = "add-cmake-file.patch";
+ hash = "sha256-iLacWD4jQxid76pzGpDW3ZJ8Dyaksfj1pNTrU7qSBQM=";
+ })
(fetchpatch {
- name = "add-cmakelists.txt";
- url = "https://github.com/CLD2Owners/cld2/pull/65/commits/9cfac02c2ac7802ab7079560b38a474473c45f51.patch";
- hash = "sha256-uOjmUk8kMFl+wED44ErXoLRyblhgDwFx9K1Wj65Omh8=";
+ name = "fix-narrowing-errors.txt";
+ url = "https://github.com/ripjar/cld2/pull/1/commits/79be1adea78f0d376cb793f4dae8e70b100dadcc.patch";
+ hash = "sha256-i4WWYBx16kYXZ5IQPACWbS/HGsQysXre1SngYlAfNaM=";
})
];
diff --git a/pkgs/by-name/cl/cloudcompare/package.nix b/pkgs/by-name/cl/cloudcompare/package.nix
index b2079b16ad36..496b0e7a761e 100644
--- a/pkgs/by-name/cl/cloudcompare/package.nix
+++ b/pkgs/by-name/cl/cloudcompare/package.nix
@@ -15,7 +15,7 @@
mpfr,
pcl,
libsForQt5,
- tbb,
+ onetbb,
xercesc,
wrapGAppsHook3,
}:
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
libsForQt5.qtbase
libsForQt5.qtsvg
libsForQt5.qttools
- tbb
+ onetbb
xercesc
];
diff --git a/pkgs/by-name/cl/cloudflare-warp/package.nix b/pkgs/by-name/cl/cloudflare-warp/package.nix
index 4e2644b37018..28abf20de44d 100644
--- a/pkgs/by-name/cl/cloudflare-warp/package.nix
+++ b/pkgs/by-name/cl/cloudflare-warp/package.nix
@@ -24,19 +24,19 @@
}:
let
- version = "2025.6.1335";
+ version = "2025.7.176";
sources = {
x86_64-linux = fetchurl {
url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}.0_amd64.deb";
- hash = "sha256-zb+DrBKUOsNBaUE+2CNtocsDs3bcYpG0nHCnjcnH2Mo=";
+ hash = "sha256-tRz7T3Sevf00ViWYALzSdiyY1i3BEnFQUjRFs+Uybbk=";
};
aarch64-linux = fetchurl {
url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}.0_arm64.deb";
- hash = "sha256-5DuJKyyr8AUkvuSVrcJYmrc+HAG19wmvrWNN8jrm+wY=";
+ hash = "sha256-GYMC+v3yqP2G+WILhTTGg5SGnb7ts5MpWrhulj4udqA=";
};
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
inherit version;
pname = "cloudflare-warp" + lib.optionalString headless "-headless";
@@ -130,7 +130,6 @@ stdenv.mkDerivation rec {
'';
doInstallCheck = true;
- versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
versionCheckProgramArg = "--version";
passthru = {
@@ -156,22 +155,23 @@ stdenv.mkDerivation rec {
rg '([^/]+)\.0\.yaml\b' --only-matching --replace '$1'
)"
- for platform in ${lib.escapeShellArgs meta.platforms}; do
- update-source-version "${pname}" "$new_version" --ignore-same-version --source-key="sources.$platform"
+ for platform in ${lib.escapeShellArgs finalAttrs.meta.platforms}; do
+ update-source-version "${finalAttrs.pname}" "$new_version" --ignore-same-version --source-key="sources.$platform"
done
'';
});
};
- meta = with lib; {
+ meta = {
+ changelog = "https://github.com/cloudflare/cloudflare-docs/blob/production/src/content/warp-releases/linux/ga/${finalAttrs.version}.0.yaml";
description =
"Replaces the connection between your device and the Internet with a modern, optimized, protocol"
+ lib.optionalString headless " (headless version)";
homepage = "https://pkg.cloudflareclient.com/";
- sourceProvenance = with sourceTypes; [ binaryNativeCode ];
- license = licenses.unfree;
+ sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+ license = lib.licenses.unfree;
mainProgram = "warp-cli";
- maintainers = with maintainers; [
+ maintainers = with lib.maintainers; [
marcusramberg
];
platforms = [
@@ -179,4 +179,4 @@ stdenv.mkDerivation rec {
"aarch64-linux"
];
};
-}
+})
diff --git a/pkgs/by-name/cm/cmake-language-server/package.nix b/pkgs/by-name/cm/cmake-language-server/package.nix
index c9efc80dbe2b..d03a6abe72bd 100644
--- a/pkgs/by-name/cm/cmake-language-server/package.nix
+++ b/pkgs/by-name/cm/cmake-language-server/package.nix
@@ -45,11 +45,11 @@ python3Packages.buildPythonApplication rec {
nativeCheckInputs = [
cmake
cmake-format
+ versionCheckHook
]
++ (with python3Packages; [
pytest-datadir
pytestCheckHook
- versionCheckHook
]);
versionCheckProgramArg = "--version";
@@ -59,6 +59,17 @@ python3Packages.buildPythonApplication rec {
echo "__version__ = \"$PDM_BUILD_SCM_VERSION\"" > cmake_language_server/version.py
'';
+ disabledTests = [
+ # AssertionError: CTEST_SCP_COMMAND not found
+ "test_parse_variables"
+
+ # AssertionError: AddFileDependencies not found
+ "test_parse_modules"
+
+ # AssertionError: assert 'Boost' in [...
+ "test_completions_triggercharacter"
+ ];
+
meta = {
description = "CMake LSP Implementation";
homepage = "https://github.com/regen100/cmake-language-server";
diff --git a/pkgs/by-name/cm/cmake/004-cygwin.diff b/pkgs/by-name/cm/cmake/004-cygwin.diff
deleted file mode 100644
index 982aba17e874..000000000000
--- a/pkgs/by-name/cm/cmake/004-cygwin.diff
+++ /dev/null
@@ -1,274 +0,0 @@
---- cmake-3.2.2/Source/cmFileCommand.cxx 2015-04-13 19:09:00.000000000 +0200
-+++ cmake-3.2.2/Source/ccmFileCommand.cxx 2015-06-10 11:02:27.345598700 +0200
-@@ -1179,7 +1179,7 @@
- MatchProperties CollectMatchProperties(const char* file)
- {
- // Match rules are case-insensitive on some platforms.
--#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__)
-+#if defined(_WIN32) || defined(__APPLE__)
- std::string lower = cmSystemTools::LowerCase(file);
- const char* file_to_match = lower.c_str();
- #else
---- cmake-3.2.2/Source/cmInstallCommand.cxx 2015-04-13 19:09:00.000000000 +0200
-+++ cmake-3.2.2/Source/cmInstallCommand.cxx 2015-06-10 11:04:19.257935200 +0200
-@@ -1138,7 +1138,7 @@
- {
- literal_args += " REGEX \"";
- // Match rules are case-insensitive on some platforms.
--#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__)
-+#if defined(_WIN32) || defined(__APPLE__)
- std::string regex = cmSystemTools::LowerCase(args[i]);
- #else
- std::string regex = args[i];
---- cmake-3.2.2/Source/kwsys/Glob.cxx 2015-04-13 19:09:00.000000000 +0200
-+++ cmake-3.2.2/Source/kwsys/Glob.cxx 2015-06-10 11:05:51.602674000 +0200
-@@ -37,7 +37,7 @@
- #include
- namespace KWSYS_NAMESPACE
- {
--#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__)
-+#if defined(_WIN32) || defined(__APPLE__)
- // On Windows and apple, no difference between lower and upper case
- # define KWSYS_GLOB_CASE_INDEPENDENT
- #endif
---- cmake-3.2.2/Source/kwsys/SystemInformation.cxx 2015-04-13 19:09:00.000000000 +0200
-+++ cmake-3.2.2/Source/kwsys/SystemInformation.cxx 2015-06-10 11:13:00.308303500 +0200
-@@ -911,7 +911,7 @@
- // Hide implementation details in an anonymous namespace.
- namespace {
- // *****************************************************************************
--#if defined(__linux) || defined(__APPLE__)
-+#if defined(__linux) || defined(__APPLE__) || defined(__CYGWIN__)
- int LoadLines(
- FILE *file,
- kwsys_stl::vector &lines)
-@@ -947,7 +947,7 @@
- return nRead;
- }
-
--# if defined(__linux)
-+# if defined(__linux) || defined(__CYGWIN__)
- // *****************************************************************************
- int LoadLines(
- const char *fileName,
-@@ -986,7 +986,7 @@
- }
- #endif
-
--#if defined(__linux)
-+#if defined(__linux) || defined(__CYGWIN__)
- // ****************************************************************************
- template
- int GetFieldsFromFile(
-@@ -3132,7 +3132,6 @@
- pos = buffer.find("processor\t",pos+1);
- }
-
--#ifdef __linux
- // Find the largest physical id.
- int maxId = -1;
- kwsys_stl::string idc =
-@@ -3165,14 +3164,6 @@
- atoi(this->ExtractValueFromCpuInfoFile(buffer,"ncpus active").c_str());
- }
-
--#else // __CYGWIN__
-- // does not have "physical id" entries, neither "cpu cores"
-- // this has to be fixed for hyper-threading.
-- kwsys_stl::string cpucount =
-- this->ExtractValueFromCpuInfoFile(buffer,"cpu count");
-- this->NumberOfPhysicalCPU=
-- this->NumberOfLogicalCPU = atoi(cpucount.c_str());
--#endif
- // gotta have one, and if this is 0 then we get a / by 0n
- // better to have a bad answer than a crash
- if(this->NumberOfPhysicalCPU <= 0)
-@@ -3370,7 +3361,7 @@
- GlobalMemoryStatusEx(&statex);
- return statex.ullTotalPhys/1024;
- # endif
--#elif defined(__linux)
-+#elif defined(__linux) || defined(__CYGWIN__)
- SystemInformation::LongLong memTotal=0;
- int ierr=GetFieldFromFile("/proc/meminfo","MemTotal:",memTotal);
- if (ierr)
-@@ -3501,7 +3492,7 @@
- GlobalMemoryStatusEx(&statex);
- return (statex.ullTotalPhys - statex.ullAvailPhys)/1024;
- # endif
--#elif defined(__linux)
-+#elif defined(__linux) || defined(__CYGWIN__)
- const char *names[3]={"MemTotal:","MemFree:",NULL};
- SystemInformation::LongLong values[2]={SystemInformation::LongLong(0)};
- int ierr=GetFieldsFromFile("/proc/meminfo",names,values);
-@@ -3560,7 +3551,7 @@
- return -2;
- }
- return pmc.WorkingSetSize/1024;
--#elif defined(__linux)
-+#elif defined(__linux) || defined(__CYGWIN__)
- SystemInformation::LongLong memUsed=0;
- int ierr=GetFieldFromFile("/proc/self/status","VmRSS:",memUsed);
- if (ierr)
-@@ -3612,7 +3603,7 @@
- {
- #if defined(_WIN32)
- return GetCurrentProcessId();
--#elif defined(__linux) || defined(__APPLE__)
-+#elif defined(__linux) || defined(__APPLE__) || defined(__CYGWIN__)
- return getpid();
- #else
- return -1;
---- cmake-3.2.2/Source/kwsys/SystemTools.cxx 2015-04-13 19:09:00.000000000 +0200
-+++ cmake-3.2.2/Source/kwsys/SystemTools.cxx 2015-06-10 11:21:58.980443200 +0200
-@@ -93,19 +93,12 @@
- # if defined(_MSC_VER) && _MSC_VER >= 1800
- # define KWSYS_WINDOWS_DEPRECATED_GetVersionEx
- # endif
--#elif defined (__CYGWIN__)
--# include
--# undef _WIN32
- #endif
-
- #if !KWSYS_CXX_HAS_ENVIRON_IN_STDLIB_H
- extern char **environ;
- #endif
-
--#ifdef __CYGWIN__
--# include
--#endif
--
- // getpwnam doesn't exist on Windows and Cray Xt3/Catamount
- // same for TIOCGWINSZ
- #if defined(_WIN32) || defined (__LIBCATAMOUNT__)
-@@ -1148,15 +1141,7 @@
- {
- return false;
- }
--#if defined(__CYGWIN__)
-- // Convert filename to native windows path if possible.
-- char winpath[MAX_PATH];
-- if(SystemTools::PathCygwinToWin32(filename.c_str(), winpath))
-- {
-- return (GetFileAttributesA(winpath) != INVALID_FILE_ATTRIBUTES);
-- }
-- return access(filename.c_str(), R_OK) == 0;
--#elif defined(_WIN32)
-+#if defined(_WIN32)
- return (GetFileAttributesW(
- SystemTools::ConvertToWindowsExtendedPath(filename).c_str())
- != INVALID_FILE_ATTRIBUTES);
-@@ -1190,28 +1175,6 @@
- }
-
- //----------------------------------------------------------------------------
--#ifdef __CYGWIN__
--bool SystemTools::PathCygwinToWin32(const char *path, char *win32_path)
--{
-- SystemToolsTranslationMap::iterator i =
-- SystemTools::Cyg2Win32Map->find(path);
--
-- if (i != SystemTools::Cyg2Win32Map->end())
-- {
-- strncpy(win32_path, i->second.c_str(), MAX_PATH);
-- }
-- else
-- {
-- if(cygwin_conv_path(CCP_POSIX_TO_WIN_A, path, win32_path, MAX_PATH) != 0)
-- {
-- win32_path[0] = 0;
-- }
-- SystemToolsTranslationMap::value_type entry(path, win32_path);
-- SystemTools::Cyg2Win32Map->insert(entry);
-- }
-- return win32_path[0] != 0;
--}
--#endif
-
- bool SystemTools::Touch(const kwsys_stl::string& filename, bool create)
- {
-@@ -4307,7 +4270,7 @@
-
- bool SystemTools::FileIsFullPath(const char* in_name, size_t len)
- {
--#if defined(_WIN32) || defined(__CYGWIN__)
-+#if defined(_WIN32)
- // On Windows, the name must be at least two characters long.
- if(len < 2)
- {
-@@ -5078,9 +5041,6 @@
- static unsigned int SystemToolsManagerCount;
- SystemToolsTranslationMap *SystemTools::TranslationMap;
- SystemToolsTranslationMap *SystemTools::LongPathMap;
--#ifdef __CYGWIN__
--SystemToolsTranslationMap *SystemTools::Cyg2Win32Map;
--#endif
-
- // SystemToolsManager manages the SystemTools singleton.
- // SystemToolsManager should be included in any translation unit
-@@ -5126,9 +5086,6 @@
- // Allocate the translation map first.
- SystemTools::TranslationMap = new SystemToolsTranslationMap;
- SystemTools::LongPathMap = new SystemToolsTranslationMap;
--#ifdef __CYGWIN__
-- SystemTools::Cyg2Win32Map = new SystemToolsTranslationMap;
--#endif
-
- // Add some special translation paths for unix. These are not added
- // for windows because drive letters need to be maintained. Also,
-@@ -5183,9 +5140,6 @@
- {
- delete SystemTools::TranslationMap;
- delete SystemTools::LongPathMap;
--#ifdef __CYGWIN__
-- delete SystemTools::Cyg2Win32Map;
--#endif
- }
-
-
---- cmake-3.2.2/Source/kwsys/SystemTools.hxx.in 2015-04-13 19:09:00.000000000 +0200
-+++ cmake-3.2.2/Source/kwsys/SystemTools.hxx.in 2015-06-10 11:24:24.271286600 +0200
-@@ -298,15 +298,6 @@
- static bool FileExists(const kwsys_stl::string& filename);
-
- /**
-- * Converts Cygwin path to Win32 path. Uses dictionary container for
-- * caching and calls to cygwin_conv_to_win32_path from Cygwin dll
-- * for actual translation. Returns true on success, else false.
-- */
--#ifdef __CYGWIN__
-- static bool PathCygwinToWin32(const char *path, char *win32_path);
--#endif
--
-- /**
- * Return file length
- */
- static unsigned long FileLength(const kwsys_stl::string& filename);
-@@ -942,9 +933,6 @@
- */
- static SystemToolsTranslationMap *TranslationMap;
- static SystemToolsTranslationMap *LongPathMap;
--#ifdef __CYGWIN__
-- static SystemToolsTranslationMap *Cyg2Win32Map;
--#endif
- friend class SystemToolsManager;
- };
-
---- cmake-3.2.2/Modules/FindCurses.cmake 2015-04-13 19:09:00.000000000 +0200
-+++ cmake-3.2.2/Modules/FindCurses.cmake 2015-06-10 12:10:19.682030300 +0200
-@@ -60,15 +60,6 @@
- if(CURSES_NCURSES_LIBRARY AND ((NOT CURSES_CURSES_LIBRARY) OR CURSES_NEED_NCURSES))
- set(CURSES_USE_NCURSES TRUE)
- endif()
--# http://cygwin.com/ml/cygwin-announce/2010-01/msg00002.html
--# cygwin ncurses stopped providing curses.h symlinks see above
--# message. Cygwin is an ncurses package, so force ncurses on
--# cygwin if the curses.h is missing
--if(CYGWIN)
-- if(NOT EXISTS /usr/include/curses.h)
-- set(CURSES_USE_NCURSES TRUE)
-- endif()
--endif()
-
-
- # Not sure the logic is correct here.
diff --git a/pkgs/by-name/cm/cmake/006-darwin-always-set-runtime-c-flag.diff b/pkgs/by-name/cm/cmake/006-darwin-always-set-runtime-c-flag.diff
deleted file mode 100644
index dc10e6b34231..000000000000
--- a/pkgs/by-name/cm/cmake/006-darwin-always-set-runtime-c-flag.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Revert of commit 1af23c4de2c7d58c06171d70b37794b5c860d5f4.
---- b/Modules/Platform/Darwin.cmake
-+++ a/Modules/Platform/Darwin.cmake
-@@ -47,9 +47,7 @@
- set(CMAKE_SHARED_MODULE_SUFFIX ".so")
- set(CMAKE_MODULE_EXISTS 1)
- set(CMAKE_DL_LIBS "")
-+set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")
--if(NOT "${_CURRENT_OSX_VERSION}" VERSION_LESS "10.5")
-- set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")
--endif()
-
- foreach(lang C CXX OBJC OBJCXX)
- set(CMAKE_${lang}_OSX_COMPATIBILITY_VERSION_FLAG "-compatibility_version ")
diff --git a/pkgs/by-name/cm/cmake/007-darwin-bsd-ps-abspath.diff b/pkgs/by-name/cm/cmake/007-darwin-bsd-ps-abspath.diff
deleted file mode 100644
index d61019207436..000000000000
--- a/pkgs/by-name/cm/cmake/007-darwin-bsd-ps-abspath.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -ur a/Source/kwsys/ProcessUNIX.c b/Source/kwsys/ProcessUNIX.c
---- a/Source/kwsys/ProcessUNIX.c 2024-04-11 07:12:19.000000000 -0700
-+++ b/Source/kwsys/ProcessUNIX.c 2024-05-15 10:41:00.286160616 -0700
-@@ -2501,20 +2501,20 @@
- have two integers to store: the pid and then the ppid. */
- #if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || \
- defined(__OpenBSD__) || defined(__GLIBC__) || defined(__GNU__)
--# define KWSYSPE_PS_COMMAND "ps axo pid,ppid"
-+# define KWSYSPE_PS_COMMAND "@ps@ axo pid,ppid"
- # define KWSYSPE_PS_FORMAT "%d %d\n"
- #elif defined(__sun) && (defined(__SVR4) || defined(__svr4__)) /* Solaris */
--# define KWSYSPE_PS_COMMAND "ps -e -o pid,ppid"
-+# define KWSYSPE_PS_COMMAND "@ps@ -e -o pid,ppid"
- # define KWSYSPE_PS_FORMAT "%d %d\n"
- #elif defined(__hpux) || defined(__sun__) || defined(__sgi) || \
- defined(_AIX) || defined(__sparc)
--# define KWSYSPE_PS_COMMAND "ps -ef"
-+# define KWSYSPE_PS_COMMAND "@ps@ -ef"
- # define KWSYSPE_PS_FORMAT "%*s %d %d %*[^\n]\n"
- #elif defined(__QNX__)
--# define KWSYSPE_PS_COMMAND "ps -Af"
-+# define KWSYSPE_PS_COMMAND "@ps@ -Af"
- # define KWSYSPE_PS_FORMAT "%*d %d %d %*[^\n]\n"
- #elif defined(__CYGWIN__)
--# define KWSYSPE_PS_COMMAND "ps aux"
-+# define KWSYSPE_PS_COMMAND "@ps@ aux"
- # define KWSYSPE_PS_FORMAT "%d %d %*[^\n]\n"
- #endif
-
-diff -ur a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx
---- a/Source/kwsys/SystemInformation.cxx 2024-04-11 07:12:19.000000000 -0700
-+++ b/Source/kwsys/SystemInformation.cxx 2024-05-15 10:40:00.901059278 -0700
-@@ -3884,7 +3884,7 @@
- long long memUsed = 0;
- pid_t pid = getpid();
- std::ostringstream oss;
-- oss << "ps -o rss= -p " << pid;
-+ oss << "@ps@ -o rss= -p " << pid;
- FILE* file = popen(oss.str().c_str(), "r");
- if (file == nullptr) {
- return -1;
diff --git a/pkgs/by-name/cm/cmake/008-FindCURL-Add-more-target-properties-from-pkg-config.diff b/pkgs/by-name/cm/cmake/008-FindCURL-Add-more-target-properties-from-pkg-config.diff
deleted file mode 100644
index 8dfc354a9c20..000000000000
--- a/pkgs/by-name/cm/cmake/008-FindCURL-Add-more-target-properties-from-pkg-config.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/Modules/FindCURL.cmake b/Modules/FindCURL.cmake
-index 5ce8a9046b..f7361308b7 100644
---- a/Modules/FindCURL.cmake
-+++ b/Modules/FindCURL.cmake
-@@ -239,9 +239,24 @@ if(CURL_FOUND)
- IMPORTED_LOCATION_DEBUG "${CURL_LIBRARY_DEBUG}")
- endif()
-
-- if(CURL_USE_STATIC_LIBS AND MSVC)
-- set_target_properties(CURL::libcurl PROPERTIES
-- INTERFACE_LINK_LIBRARIES "normaliz.lib;ws2_32.lib;wldap32.lib")
-+ if(PC_CURL_FOUND)
-+ if(PC_CURL_LINK_LIBRARIES)
-+ set_property(TARGET CURL::libcurl PROPERTY
-+ INTERFACE_LINK_LIBRARIES "${PC_CURL_LINK_LIBRARIES}")
-+ endif()
-+ if(PC_CURL_LDFLAGS_OTHER)
-+ set_property(TARGET CURL::libcurl PROPERTY
-+ INTERFACE_LINK_OPTIONS "${PC_CURL_LDFLAGS_OTHER}")
-+ endif()
-+ if(PC_CURL_CFLAGS_OTHER)
-+ set_property(TARGET CURL::libcurl PROPERTY
-+ INTERFACE_COMPILE_OPTIONS "${PC_CURL_CFLAGS_OTHER}")
-+ endif()
-+ else()
-+ if(CURL_USE_STATIC_LIBS AND MSVC)
-+ set_target_properties(CURL::libcurl PROPERTIES
-+ INTERFACE_LINK_LIBRARIES "normaliz.lib;ws2_32.lib;wldap32.lib")
-+ endif()
- endif()
-
- endif()
diff --git a/pkgs/by-name/cm/cmake/001-search-path.diff b/pkgs/by-name/cm/cmake/add-nixpkgs-libc-paths.patch
similarity index 52%
rename from pkgs/by-name/cm/cmake/001-search-path.diff
rename to pkgs/by-name/cm/cmake/add-nixpkgs-libc-paths.patch
index 04ab0847a707..3a1cbf0e11ac 100644
--- a/pkgs/by-name/cm/cmake/001-search-path.diff
+++ b/pkgs/by-name/cm/cmake/add-nixpkgs-libc-paths.patch
@@ -1,61 +1,29 @@
diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
-index b9381c3d7d..5e944640b5 100644
+index e95da44ea4..bdf4155232 100644
--- a/Modules/Platform/UnixPaths.cmake
+++ b/Modules/Platform/UnixPaths.cmake
-@@ -26,9 +26,6 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
- # please make sure to keep Help/variable/CMAKE_SYSTEM_PREFIX_PATH.rst
- # synchronized
- list(APPEND CMAKE_SYSTEM_PREFIX_PATH
-- # Standard
-- /usr/local /usr /
--
- # CMake install location
- "${_CMAKE_INSTALL_DIR}"
- )
-@@ -47,48 +44,49 @@ endif()
-
- # Non "standard" but common install prefixes
- list(APPEND CMAKE_SYSTEM_PREFIX_PATH
-- /usr/X11R6
-- /usr/pkg
-- /opt
+@@ -71,28 +71,38 @@
+ /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64
)
- # List common include file locations not under the common prefixes.
+-if(CMAKE_SYSROOT_COMPILE)
+- set(_cmake_sysroot_compile "${CMAKE_SYSROOT_COMPILE}")
++# Add the Nix C library paths.
+if(DEFINED ENV{NIX_CC}
+ AND IS_DIRECTORY "$ENV{NIX_CC}"
+ AND EXISTS "$ENV{NIX_CC}/nix-support/orig-libc"
+ AND EXISTS "$ENV{NIX_CC}/nix-support/orig-libc-dev")
+ file(STRINGS "$ENV{NIX_CC}/nix-support/orig-libc" _nix_cmake_libc)
+ file(STRINGS "$ENV{NIX_CC}/nix-support/orig-libc-dev" _nix_cmake_libc_dev)
-+else()
+ else()
+- set(_cmake_sysroot_compile "${CMAKE_SYSROOT}")
+ set(_nix_cmake_libc @libc_lib@)
+ set(_nix_cmake_libc_dev @libc_dev@)
-+endif()
-+
- list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
-- # X11
-- /usr/include/X11
-+ "${_nix_cmake_libc_dev}/include"
- )
+ endif()
++list(APPEND CMAKE_SYSTEM_INCLUDE_PATH "${_nix_cmake_libc_dev}/include")
++list(APPEND CMAKE_SYSTEM_LIBRARY_PATH "${_nix_cmake_libc}/lib")
++list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${_nix_cmake_libc}/lib")
- list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
-- # X11
-- /usr/lib/X11
-+ "${_nix_cmake_libc}/lib"
- )
-
- list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
-- /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64
-+ "${_nix_cmake_libc}/lib"
- )
-
--if(CMAKE_SYSROOT_COMPILE)
-- set(_cmake_sysroot_compile "${CMAKE_SYSROOT_COMPILE}")
--else()
-- set(_cmake_sysroot_compile "${CMAKE_SYSROOT}")
--endif()
--
# Default per-language values. These may be later replaced after
# parsing the implicit directory information from compiler output.
set(_CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES_INIT
@@ -80,16 +48,3 @@ index b9381c3d7d..5e944640b5 100644
# Reminder when adding new locations computed from environment variables
# please make sure to keep Help/variable/CMAKE_SYSTEM_PREFIX_PATH.rst
-diff --git a/Modules/Platform/WindowsPaths.cmake b/Modules/Platform/WindowsPaths.cmake
-index b9e2f17979..ab517cd4a7 100644
---- a/Modules/Platform/WindowsPaths.cmake
-+++ b/Modules/Platform/WindowsPaths.cmake
-@@ -70,7 +70,7 @@ endif()
-
- if(CMAKE_CROSSCOMPILING AND NOT CMAKE_HOST_SYSTEM_NAME MATCHES "Windows")
- # MinGW (useful when cross compiling from linux with CMAKE_FIND_ROOT_PATH set)
-- list(APPEND CMAKE_SYSTEM_PREFIX_PATH /)
-+ # list(APPEND CMAKE_SYSTEM_PREFIX_PATH /)
- endif()
-
- list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
diff --git a/pkgs/by-name/cm/cmake/darwin-binary-paths.patch b/pkgs/by-name/cm/cmake/darwin-binary-paths.patch
new file mode 100644
index 000000000000..b4e84bef22e6
--- /dev/null
+++ b/pkgs/by-name/cm/cmake/darwin-binary-paths.patch
@@ -0,0 +1,61 @@
+diff --git a/Modules/Platform/Darwin-Initialize.cmake b/Modules/Platform/Darwin-Initialize.cmake
+index 196ab18b0b..31dd4346b1 100644
+--- a/Modules/Platform/Darwin-Initialize.cmake
++++ b/Modules/Platform/Darwin-Initialize.cmake
+@@ -16,7 +16,7 @@
+ endif()
+
+ if(NOT CMAKE_CROSSCOMPILING)
+- execute_process(COMMAND sw_vers -productVersion
++ execute_process(COMMAND @sw_vers@ -productVersion
+ OUTPUT_VARIABLE _CMAKE_HOST_OSX_VERSION
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ endif()
+diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx
+index c65587edbe..0a7cc380c3 100644
+--- a/Source/kwsys/SystemInformation.cxx
++++ b/Source/kwsys/SystemInformation.cxx
+@@ -3833,7 +3833,7 @@
+ }
+ char const* names[3] = { "Pages wired down:", "Pages active:", nullptr };
+ long long values[2] = { 0 };
+- int ierr = GetFieldsFromCommand("vm_stat", names, values);
++ int ierr = GetFieldsFromCommand("@vm_stat@", names, values);
+ if (ierr) {
+ return -1;
+ }
+@@ -5586,7 +5586,7 @@
+ {
+ #ifdef __APPLE__
+ std::vector args;
+- args.push_back("sw_vers");
++ args.push_back("@sw_vers@");
+ args.push_back(arg);
+ args.push_back(nullptr);
+ ver = this->RunProcess(args);
+diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
+index 15a1e2c0c3..33bb304cf7 100644
+--- a/Tests/CMakeLists.txt
++++ b/Tests/CMakeLists.txt
+@@ -1958,7 +1958,7 @@
+ if(CMake_TEST_XCODE_VERSION AND NOT CMake_TEST_XCODE_VERSION VERSION_LESS 5)
+ if(NOT CMake_TEST_XCTest_DEPLOYMENT_TARGET)
+ execute_process(
+- COMMAND sw_vers -productVersion
++ COMMAND @sw_vers@ -productVersion
+ OUTPUT_VARIABLE OSX_VERSION
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
+diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
+index ddc975c202..8ff651fd90 100644
+--- a/Utilities/cmcurl/CMakeLists.txt
++++ b/Utilities/cmcurl/CMakeLists.txt
+@@ -127,7 +127,7 @@
+ set(OSX_VERSION ${CMAKE_OSX_DEPLOYMENT_TARGET})
+ else()
+ execute_process(
+- COMMAND sw_vers -productVersion
++ COMMAND @sw_vers@ -productVersion
+ OUTPUT_VARIABLE OSX_VERSION
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
diff --git a/pkgs/by-name/cm/cmake/darwin-bsd-binary-paths.patch b/pkgs/by-name/cm/cmake/darwin-bsd-binary-paths.patch
new file mode 100644
index 000000000000..b7917467f2f0
--- /dev/null
+++ b/pkgs/by-name/cm/cmake/darwin-bsd-binary-paths.patch
@@ -0,0 +1,79 @@
+diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake
+index dc26258eac..dd8d30e3d9 100644
+--- a/Modules/CMakeDetermineSystem.cmake
++++ b/Modules/CMakeDetermineSystem.cmake
+@@ -68,7 +68,7 @@
+ endif()
+ if(_CMAKE_APPLE_SILICON_PROCESSOR)
+ if(";${_CMAKE_APPLE_SILICON_PROCESSOR};" MATCHES "^;(arm64|x86_64);$")
+- execute_process(COMMAND sysctl -q hw.optional.arm64
++ execute_process(COMMAND @sysctl@ -q hw.optional.arm64
+ OUTPUT_VARIABLE _sysctl_stdout
+ ERROR_VARIABLE _sysctl_stderr
+ RESULT_VARIABLE _sysctl_result
+diff --git a/Modules/Platform/Darwin-Initialize.cmake b/Modules/Platform/Darwin-Initialize.cmake
+index 31dd4346b1..7c4f123a1d 100644
+--- a/Modules/Platform/Darwin-Initialize.cmake
++++ b/Modules/Platform/Darwin-Initialize.cmake
+@@ -28,7 +28,7 @@
+ if(NOT CMAKE_CROSSCOMPILING AND
+ CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND
+ CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^(arm64|x86_64)$")
+- execute_process(COMMAND sysctl -q hw.optional.arm64
++ execute_process(COMMAND @sysctl@ -q hw.optional.arm64
+ OUTPUT_VARIABLE _sysctl_stdout
+ ERROR_VARIABLE _sysctl_stderr
+ RESULT_VARIABLE _sysctl_result
+diff --git a/Modules/ProcessorCount.cmake b/Modules/ProcessorCount.cmake
+index 260b6631c0..ffb8fcd8d2 100644
+--- a/Modules/ProcessorCount.cmake
++++ b/Modules/ProcessorCount.cmake
+@@ -87,8 +87,7 @@
+
+ if(NOT count)
+ # Mac, FreeBSD, OpenBSD (systems with sysctl):
+- find_program(ProcessorCount_cmd_sysctl sysctl
+- PATHS /usr/sbin /sbin)
++ set(ProcessorCount_cmd_sysctl @sysctl@)
+ mark_as_advanced(ProcessorCount_cmd_sysctl)
+ if(ProcessorCount_cmd_sysctl)
+ execute_process(COMMAND ${ProcessorCount_cmd_sysctl} -n hw.ncpu
+diff --git a/Source/kwsys/ProcessUNIX.c b/Source/kwsys/ProcessUNIX.c
+index a918b8d9a7..36145707e1 100644
+--- a/Source/kwsys/ProcessUNIX.c
++++ b/Source/kwsys/ProcessUNIX.c
+@@ -2503,7 +2503,7 @@
+ have two integers to store: the pid and then the ppid. */
+ #if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || \
+ defined(__OpenBSD__) || defined(__GLIBC__) || defined(__GNU__)
+-# define KWSYSPE_PS_COMMAND "ps axo pid,ppid"
++# define KWSYSPE_PS_COMMAND "@ps@ axo pid,ppid"
+ # define KWSYSPE_PS_FORMAT "%d %d\n"
+ #elif defined(__sun) && (defined(__SVR4) || defined(__svr4__)) /* Solaris */
+ # define KWSYSPE_PS_COMMAND "ps -e -o pid,ppid"
+diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx
+index 0a7cc380c3..9923dc4ab9 100644
+--- a/Source/kwsys/SystemInformation.cxx
++++ b/Source/kwsys/SystemInformation.cxx
+@@ -3876,7 +3876,7 @@
+ long long memUsed = 0;
+ pid_t pid = getpid();
+ std::ostringstream oss;
+- oss << "ps -o rss= -p " << pid;
++ oss << "@ps@ -o rss= -p " << pid;
+ FILE* file = popen(oss.str().c_str(), "r");
+ if (!file) {
+ return -1;
+diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
+index 33bb304cf7..7dbda40a81 100644
+--- a/Tests/CMakeLists.txt
++++ b/Tests/CMakeLists.txt
+@@ -216,7 +216,7 @@
+ endif()
+
+ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND NOT DEFINED CMake_TEST_APPLE_SILICON)
+- execute_process(COMMAND sysctl -q hw.optional.arm64
++ execute_process(COMMAND @sysctl@ -q hw.optional.arm64
+ OUTPUT_VARIABLE _sysctl_stdout
+ ERROR_VARIABLE _sysctl_stderr
+ RESULT_VARIABLE _sysctl_result
diff --git a/pkgs/by-name/cm/cmake/fix-curl-8.16.patch b/pkgs/by-name/cm/cmake/fix-curl-8.16.patch
new file mode 100644
index 000000000000..feabba28b0d6
--- /dev/null
+++ b/pkgs/by-name/cm/cmake/fix-curl-8.16.patch
@@ -0,0 +1,13 @@
+diff --git a/Source/CTest/cmCTestCurl.h b/Source/CTest/cmCTestCurl.h
+index 7836f4b9c78a1d103eee515d618856a6712b4480..9113890b5a12cb157b691b66d96e25d0fd4b50ef 100644
+--- a/Source/CTest/cmCTestCurl.h
++++ b/Source/CTest/cmCTestCurl.h
+@@ -52,7 +52,7 @@ private:
+ std::vector HttpHeaders;
+ std::string HTTPProxyAuth;
+ std::string HTTPProxy;
+- curl_proxytype HTTPProxyType;
++ long HTTPProxyType;
+ bool UseHttp10 = false;
+ bool Quiet = false;
+ int TimeOutSeconds = 0;
diff --git a/pkgs/by-name/cm/cmake/000-nixpkgs-cmake-prefix-path.diff b/pkgs/by-name/cm/cmake/nixpkgs-cmake-prefix-path.patch
similarity index 80%
rename from pkgs/by-name/cm/cmake/000-nixpkgs-cmake-prefix-path.diff
rename to pkgs/by-name/cm/cmake/nixpkgs-cmake-prefix-path.patch
index 4ebdcced055c..8a572fc08320 100644
--- a/pkgs/by-name/cm/cmake/000-nixpkgs-cmake-prefix-path.diff
+++ b/pkgs/by-name/cm/cmake/nixpkgs-cmake-prefix-path.patch
@@ -1,8 +1,8 @@
diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx
-index 8840cdcb..c34b7ee9 100644
+index b8d4765692..902c1e5290 100644
--- a/Source/cmFindBase.cxx
+++ b/Source/cmFindBase.cxx
-@@ -280,6 +280,11 @@ void cmFindBase::FillCMakeEnvironmentPath()
+@@ -312,6 +312,11 @@ void cmFindBase::FillCMakeEnvironmentPath()
// Add CMAKE_*_PATH environment variables
std::string var = cmStrCat("CMAKE_", this->CMakePathName, "_PATH");
paths.AddEnvPrefixPath("CMAKE_PREFIX_PATH");
@@ -15,14 +15,14 @@ index 8840cdcb..c34b7ee9 100644
if (this->CMakePathName == "PROGRAM") {
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
-index 9b51b1ad..6acc676c 100644
+index 6201894fd1..9533862a2b 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
-@@ -2039,6 +2039,7 @@ void cmFindPackageCommand::FillPrefixesCMakeEnvironment()
+@@ -2467,6 +2467,7 @@ void cmFindPackageCommand::FillPrefixesCMakeEnvironment()
// And now the general CMake environment variables
paths.AddEnvPath("CMAKE_PREFIX_PATH");
+ paths.AddEnvPath("NIXPKGS_CMAKE_PREFIX_PATH");
- if (this->DebugMode) {
+ if (this->DebugModeEnabled()) {
debugBuffer = cmStrCat(debugBuffer,
"CMAKE_PREFIX_PATH env variable "
diff --git a/pkgs/by-name/cm/cmake/package.nix b/pkgs/by-name/cm/cmake/package.nix
index 8f2f690f90aa..7e3b689f4567 100644
--- a/pkgs/by-name/cm/cmake/package.nix
+++ b/pkgs/by-name/cm/cmake/package.nix
@@ -13,11 +13,13 @@
openssl,
pkg-config,
ps,
+ sysctl,
rhash,
sphinx,
texinfo,
xz,
zlib,
+ darwin,
isBootstrap ? null,
isMinimalBuild ? (
if isBootstrap != null then
@@ -48,33 +50,41 @@ stdenv.mkDerivation (finalAttrs: {
+ lib.optionalString isMinimalBuild "-minimal"
+ lib.optionalString cursesUI "-cursesUI"
+ lib.optionalString qt5UI "-qt5UI";
- version = "3.31.7";
+ version = "4.1.1";
src = fetchurl {
url = "https://cmake.org/files/v${lib.versions.majorMinor finalAttrs.version}/cmake-${finalAttrs.version}.tar.gz";
- hash = "sha256-ptLrHr65kTDf5j71o0DD/bEUMczj18oUhSTBJZJM6mg=";
+ hash = "sha256-sp9vGXM6oiS3djUHoQikJ+1Ixojh+vIrKcROHDBUkoI=";
};
patches = [
# Add NIXPKGS_CMAKE_PREFIX_PATH to cmake which is like CMAKE_PREFIX_PATH
# except it is not searched for programs
- ./000-nixpkgs-cmake-prefix-path.diff
- # Don't search in non-Nix locations such as /usr, but do search in our libc.
- ./001-search-path.diff
+ ./nixpkgs-cmake-prefix-path.patch
+
+ # Add the libc paths from the compiler wrapper.
+ ./add-nixpkgs-libc-paths.patch
]
- ++ lib.optional stdenv.hostPlatform.isCygwin ./004-cygwin.diff
- # On Darwin, always set CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG.
- ++ lib.optional stdenv.hostPlatform.isDarwin ./006-darwin-always-set-runtime-c-flag.diff
- # On platforms where ps is not part of stdenv, patch the invocation of ps to use an absolute path.
- ++ lib.optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isFreeBSD) (
- replaceVars ./007-darwin-bsd-ps-abspath.diff {
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ (replaceVars ./darwin-binary-paths.patch {
+ sw_vers = lib.getExe' darwin.DarwinTools "sw_vers";
+ vm_stat = lib.getExe' darwin.system_cmds "vm_stat";
+ })
+ ]
+ ++ lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isFreeBSD) [
+ (replaceVars ./darwin-bsd-binary-paths.patch {
+ # `ps(1)` is theoretically used on Linux too, but only when
+ # `/proc` is inaccessible, so we can skip the dependency.
ps = lib.getExe ps;
- }
- )
+ sysctl = lib.getExe sysctl;
+ })
+ ]
++ [
- # Backport of https://gitlab.kitware.com/cmake/cmake/-/merge_requests/9900
- # Needed to correctly link curl in pkgsStatic.
- ./008-FindCURL-Add-more-target-properties-from-pkg-config.diff
+ # Backport of https://gitlab.kitware.com/cmake/cmake/-/merge_requests/11134
+ ./fix-curl-8.16.patch
+
+ # Remove references to non‐Nix search paths.
+ ./remove-impure-search-paths.patch
];
outputs = [
@@ -118,7 +128,6 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optional qt5UI qtbase;
preConfigure = ''
- fixCmakeFiles .
substituteInPlace Modules/Platform/UnixPaths.cmake \
--subst-var-by libc_bin ${lib.getBin stdenv.cc.libc} \
--subst-var-by libc_dev ${lib.getDev stdenv.cc.libc} \
@@ -133,7 +142,6 @@ stdenv.mkDerivation (finalAttrs: {
configurePlatforms = [ ];
configureFlags = [
- "CXXFLAGS=-Wno-elaborated-enum-base"
"--docdir=share/doc/${finalAttrs.pname}-${finalAttrs.version}"
]
++ (
@@ -154,11 +162,6 @@ stdenv.mkDerivation (finalAttrs: {
"--sphinx-info"
"--sphinx-man"
]
- # Workaround https://gitlab.kitware.com/cmake/cmake/-/issues/20568
- ++ lib.optionals stdenv.hostPlatform.is32bit [
- "CFLAGS=-D_FILE_OFFSET_BITS=64"
- "CXXFLAGS=-D_FILE_OFFSET_BITS=64"
- ]
++ [
"--"
# We should set the proper `CMAKE_SYSTEM_NAME`.
@@ -177,25 +180,11 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeBool "BUILD_CursesDialog" cursesUI)
];
- # `pkgsCross.musl64.cmake.override { stdenv = pkgsCross.musl64.llvmPackages_16.libcxxStdenv; }`
- # fails with `The C++ compiler does not support C++11 (e.g. std::unique_ptr).`
- # The cause is a compiler warning `warning: argument unused during compilation: '-pie' [-Wunused-command-line-argument]`
- # interfering with the feature check.
- env.NIX_CFLAGS_COMPILE = "-Wno-unused-command-line-argument";
-
# make install attempts to use the just-built cmake
preInstall = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
sed -i 's|bin/cmake|${buildPackages.cmakeMinimal}/bin/cmake|g' Makefile
'';
- # Undo some of `fixCmakeFiles` for Darwin to make sure that checks for libraries in the SDK find them
- # (e.g., `find_library(MATH_LIBRARY m)` should find `$SDKROOT/usr/lib/libm.tbd`).
- postFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
- substituteInPlace "$out/share/cmake-${lib.versions.majorMinor finalAttrs.version}/Modules/Platform/Darwin.cmake" \
- --replace-fail '/var/empty/include' '/usr/include' \
- --replace-fail '/var/empty/lib' '/usr/lib'
- '';
-
dontUseCmakeConfigure = true;
enableParallelBuilding = true;
diff --git a/pkgs/by-name/cm/cmake/remove-impure-search-paths.patch b/pkgs/by-name/cm/cmake/remove-impure-search-paths.patch
new file mode 100644
index 000000000000..cb01326b9c35
--- /dev/null
+++ b/pkgs/by-name/cm/cmake/remove-impure-search-paths.patch
@@ -0,0 +1,1968 @@
+diff --git a/Modules/CMakeDetermineJavaCompiler.cmake b/Modules/CMakeDetermineJavaCompiler.cmake
+index b20a255621..bc67fdf4aa 100644
+--- a/Modules/CMakeDetermineJavaCompiler.cmake
++++ b/Modules/CMakeDetermineJavaCompiler.cmake
+@@ -42,19 +42,6 @@
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/bin"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/bin"
+ $ENV{JAVA_HOME}/bin
+- /usr/bin
+- /usr/lib/java/bin
+- /usr/share/java/bin
+- /usr/local/bin
+- /usr/local/java/bin
+- /usr/local/java/share/bin
+- /usr/java/j2sdk1.4.2_04
+- /usr/lib/j2sdk1.4-sun/bin
+- /usr/java/j2sdk1.4.2_09/bin
+- /usr/lib/j2sdk1.5-sun/bin
+- /opt/sun-jdk-1.5.0.04/bin
+- /usr/local/jdk-1.7.0/bin
+- /usr/local/jdk-1.6.0/bin
+ )
+ # if no compiler has been specified yet, then look for one
+ if(CMAKE_Java_COMPILER_INIT)
+diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake
+index dd8d30e3d9..d500364ba5 100644
+--- a/Modules/CMakeDetermineSystem.cmake
++++ b/Modules/CMakeDetermineSystem.cmake
+@@ -9,7 +9,7 @@
+
+ # find out on which system cmake runs
+ if(CMAKE_HOST_UNIX)
+- find_program(CMAKE_UNAME NAMES uname PATHS /bin /usr/bin /usr/local/bin)
++ find_program(CMAKE_UNAME NAMES uname)
+ if(CMAKE_UNAME)
+ if(CMAKE_HOST_SYSTEM_NAME STREQUAL "AIX")
+ execute_process(COMMAND ${CMAKE_UNAME} -v
+diff --git a/Modules/CMakeFindFrameworks.cmake b/Modules/CMakeFindFrameworks.cmake
+index 87ad38b46b..95f226be40 100644
+--- a/Modules/CMakeFindFrameworks.cmake
++++ b/Modules/CMakeFindFrameworks.cmake
+@@ -39,22 +39,10 @@
+ macro(CMAKE_FIND_FRAMEWORKS fwk)
+ set(${fwk}_FRAMEWORKS)
+ if(APPLE)
+- # 'Frameworks' directory from Brew (Apple Silicon and Intel)
+- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
+- set(_brew_framework_path /opt/homebrew/Frameworks)
+- else()
+- set(_brew_framework_path /usr/local/Frameworks)
+- endif()
+-
+ file(TO_CMAKE_PATH "$ENV{CMAKE_FRAMEWORK_PATH}" _cmff_CMAKE_FRAMEWORK_PATH)
+ set(_cmff_search_paths
+ ${CMAKE_FRAMEWORK_PATH}
+ ${_cmff_CMAKE_FRAMEWORK_PATH}
+- ~/Library/Frameworks
+- ${_brew_framework_path}
+- /Library/Frameworks
+- /System/Library/Frameworks
+- /Network/Library/Frameworks
+ ${CMAKE_SYSTEM_FRAMEWORK_PATH})
+
+ # For backwards compatibility reasons,
+diff --git a/Modules/CMakeFindJavaCommon.cmake b/Modules/CMakeFindJavaCommon.cmake
+index 95ca9b57b6..616295e031 100644
+--- a/Modules/CMakeFindJavaCommon.cmake
++++ b/Modules/CMakeFindJavaCommon.cmake
+@@ -15,20 +15,6 @@
+ if(_ENV_JAVA_HOME AND IS_DIRECTORY "${_ENV_JAVA_HOME}")
+ set(_JAVA_HOME "${_ENV_JAVA_HOME}")
+ set(_JAVA_HOME_EXPLICIT 1)
+- else()
+- set(_CMD_JAVA_HOME "")
+- if(APPLE AND EXISTS /usr/libexec/java_home)
+- execute_process(COMMAND /usr/libexec/java_home
+- OUTPUT_VARIABLE _CMD_JAVA_HOME
+- OUTPUT_STRIP_TRAILING_WHITESPACE
+- ERROR_QUIET
+- )
+- endif()
+- if(_CMD_JAVA_HOME AND IS_DIRECTORY "${_CMD_JAVA_HOME}")
+- set(_JAVA_HOME "${_CMD_JAVA_HOME}")
+- set(_JAVA_HOME_EXPLICIT 0)
+- endif()
+- unset(_CMD_JAVA_HOME)
+ endif()
+ unset(_ENV_JAVA_HOME)
+ endif()
+diff --git a/Modules/CMakeFindPackageMode.cmake b/Modules/CMakeFindPackageMode.cmake
+index 6e2762cf41..f88cf2f7c1 100644
+--- a/Modules/CMakeFindPackageMode.cmake
++++ b/Modules/CMakeFindPackageMode.cmake
+@@ -64,7 +64,7 @@
+ # from the outside
+ if(NOT CMAKE_SIZEOF_VOID_P)
+ set(CMAKE_SIZEOF_VOID_P 4)
+- if(EXISTS ${CMAKE_SYSROOT}/usr/lib64)
++ if(FALSE)
+ set(CMAKE_SIZEOF_VOID_P 8)
+ else()
+ # use the file utility to check whether itself is 64 bit:
+@@ -79,22 +79,6 @@
+ endif()
+ endif()
+
+- # guess Debian multiarch if it has not been set:
+- if(EXISTS /etc/debian_version)
+- if(NOT CMAKE_${LANGUAGE}_LIBRARY_ARCHITECTURE )
+- file(GLOB filesInLib RELATIVE /lib /lib/*-linux-gnu* )
+- foreach(file ${filesInLib})
+- if("${file}" MATCHES "${CMAKE_LIBRARY_ARCHITECTURE_REGEX}")
+- set(CMAKE_${LANGUAGE}_LIBRARY_ARCHITECTURE ${file})
+- break()
+- endif()
+- endforeach()
+- endif()
+- if(NOT CMAKE_LIBRARY_ARCHITECTURE)
+- set(CMAKE_LIBRARY_ARCHITECTURE ${CMAKE_${LANGUAGE}_LIBRARY_ARCHITECTURE})
+- endif()
+- endif()
+-
+ endif()
+
+ set(CMAKE_${LANGUAGE}_COMPILER "dummy")
+diff --git a/Modules/CMakeFindSublimeText2.cmake b/Modules/CMakeFindSublimeText2.cmake
+index fc0ec313b8..46d8418d2c 100644
+--- a/Modules/CMakeFindSublimeText2.cmake
++++ b/Modules/CMakeFindSublimeText2.cmake
+@@ -7,15 +7,6 @@
+
+ find_program(CMAKE_SUBLIMETEXT_EXECUTABLE
+ NAMES subl3 subl sublime_text
+- PATHS
+- "/Applications/Sublime Text.app/Contents/SharedSupport/bin"
+- "/Applications/Sublime Text 3.app/Contents/SharedSupport/bin"
+- "/Applications/Sublime Text 2.app/Contents/SharedSupport/bin"
+- "$ENV{HOME}/Applications/Sublime Text.app/Contents/SharedSupport/bin"
+- "$ENV{HOME}/Applications/Sublime Text 3.app/Contents/SharedSupport/bin"
+- "$ENV{HOME}/Applications/Sublime Text 2.app/Contents/SharedSupport/bin"
+- "/opt/sublime_text"
+- "/opt/sublime_text_3"
+ DOC "The Sublime Text executable")
+
+ if(CMAKE_SUBLIMETEXT_EXECUTABLE)
+diff --git a/Modules/CPackIFW.cmake b/Modules/CPackIFW.cmake
+index 2a2f478fd7..f22281bdca 100644
+--- a/Modules/CPackIFW.cmake
++++ b/Modules/CPackIFW.cmake
+@@ -426,7 +426,7 @@
+ else()
+ list(APPEND _CPACK_IFW_PATHS
+ "$ENV{HOME}/Qt"
+- "/opt/Qt")
++ )
+ endif()
+ list(REMOVE_DUPLICATES _CPACK_IFW_PATHS)
+
+diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake
+index b45a279b94..884ccc0e32 100644
+--- a/Modules/FindBLAS.cmake
++++ b/Modules/FindBLAS.cmake
+@@ -1098,16 +1098,8 @@
+ ((BLA_VENDOR STREQUAL "ACML_GPU") AND (NOT BLAS_ACML_GPU_LIB_DIRS))
+ )
+ # try to find acml in "standard" paths
+- if(WIN32)
+- file(GLOB _ACML_ROOT "C:/AMD/acml*/ACML-EULA.txt")
+- else()
+- file(GLOB _ACML_ROOT "/opt/acml*/ACML-EULA.txt")
+- endif()
+- if(WIN32)
+- file(GLOB _ACML_GPU_ROOT "C:/AMD/acml*/GPGPUexamples")
+- else()
+- file(GLOB _ACML_GPU_ROOT "/opt/acml*/GPGPUexamples")
+- endif()
++ set(_ACML_ROOT)
++ set(_ACML_GPU_ROOT)
+ list(GET _ACML_ROOT 0 _ACML_ROOT)
+ list(GET _ACML_GPU_ROOT 0 _ACML_GPU_ROOT)
+ if(_ACML_ROOT)
+diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
+index bceb615ca0..2350b15655 100644
+--- a/Modules/FindCUDA.cmake
++++ b/Modules/FindCUDA.cmake
+@@ -854,7 +854,6 @@
+ # Now search default paths
+ find_program(CUDA_TOOLKIT_ROOT_DIR_NVCC
+ NAMES nvcc nvcc.exe
+- PATHS /opt/cuda/bin
+ PATH_SUFFIXES cuda/bin
+ DOC "Toolkit location."
+ )
+@@ -1014,7 +1013,6 @@
+ # Search default search paths, after we search our own set of paths.
+ find_library(${_var}
+ NAMES ${_names}
+- PATHS "/usr/lib/nvidia-current"
+ DOC ${_doc}
+ )
+ endif()
+@@ -1114,11 +1112,6 @@
+ if (CUDA_rt_LIBRARY)
+ list(APPEND CUDA_LIBRARIES ${CUDA_rt_LIBRARY})
+ endif()
+- if(APPLE)
+- # We need to add the default path to the driver (libcuda.dylib) as an rpath, so that
+- # the static cuda runtime can find it at runtime.
+- list(APPEND CUDA_LIBRARIES -Wl,-rpath,/usr/local/cuda/lib)
+- endif()
+ else()
+ list(APPEND CUDA_LIBRARIES ${CUDA_CUDART_LIBRARY})
+ endif()
+@@ -1223,8 +1216,6 @@
+ "$ENV{NVSDKCOMPUTE_ROOT}/C"
+ ENV NVSDKCUDA_ROOT
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\NVIDIA Corporation\\Installed Products\\NVIDIA SDK 10\\Compute;InstallDir]"
+- PATHS
+- "/Developer/GPU\ Computing/C"
+ )
+
+ # Keep the CUDA_SDK_ROOT_DIR first in order to be able to override the
+@@ -1236,7 +1227,6 @@
+ "${CUDA_TOOLKIT_ROOT_DIR}/NV_CUDA_SDK"
+ "$ENV{HOME}/NVIDIA_CUDA_SDK"
+ "$ENV{HOME}/NVIDIA_CUDA_SDK_MACOSX"
+- "/Developer/CUDA"
+ )
+
+ # Example of how to find an include file from the CUDA_SDK_ROOT_DIR
+diff --git a/Modules/FindCUDAToolkit.cmake b/Modules/FindCUDAToolkit.cmake
+index b00cd26b7e..f5f74ebe1d 100644
+--- a/Modules/FindCUDAToolkit.cmake
++++ b/Modules/FindCUDAToolkit.cmake
+@@ -776,12 +776,6 @@
+ elseif(CUDAToolkit_ROOT_DIR AND EXISTS "${CUDAToolkit_ROOT_DIR}/${vf}")
+ set(${result_variable} "${CUDAToolkit_ROOT_DIR}/${vf}" PARENT_SCOPE)
+ break()
+- elseif(CMAKE_SYSROOT_LINK AND EXISTS "${CMAKE_SYSROOT_LINK}/usr/lib/cuda/${vf}")
+- set(${result_variable} "${CMAKE_SYSROOT_LINK}/usr/lib/cuda/${vf}" PARENT_SCOPE)
+- break()
+- elseif(EXISTS "${CMAKE_SYSROOT}/usr/lib/cuda/${vf}")
+- set(${result_variable} "${CMAKE_SYSROOT}/usr/lib/cuda/${vf}" PARENT_SCOPE)
+- break()
+ endif()
+ endforeach()
+ endfunction()
+@@ -864,18 +858,8 @@
+ # if CUDAToolkit_ROOT is not specified, it is assumed that the symlinked
+ # directory is the desired location.
+ if(NOT CUDAToolkit_ROOT_DIR)
+- if(UNIX)
+- if(NOT APPLE)
+- set(platform_base "/usr/local/cuda-")
+- else()
+- set(platform_base "/Developer/NVIDIA/CUDA-")
+- endif()
+- else()
+- set(platform_base "C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v")
+- endif()
+-
+ # Build out a descending list of possible cuda installations, e.g.
+- file(GLOB possible_paths "${platform_base}*")
++ set(possible_paths)
+ # Iterate the glob results and create a descending list.
+ set(versions)
+ foreach(p ${possible_paths})
+@@ -891,14 +875,6 @@
+
+ # With a descending list of versions, populate possible paths to search.
+ set(search_paths)
+- foreach(v ${versions})
+- list(APPEND search_paths "${platform_base}${v}")
+- endforeach()
+-
+- # Force the global default /usr/local/cuda to the front on Unix.
+- if(UNIX)
+- list(INSERT search_paths 0 "/usr/local/cuda")
+- endif()
+
+ # Now search for the toolkit again using the platform default search paths.
+ _CUDAToolkit_find_root_dir(SEARCH_PATHS "${search_paths}" FIND_FLAGS PATH_SUFFIXES bin)
+diff --git a/Modules/FindCoin3D.cmake b/Modules/FindCoin3D.cmake
+index 1d89c604e0..5b70e71a87 100644
+--- a/Modules/FindCoin3D.cmake
++++ b/Modules/FindCoin3D.cmake
+@@ -76,10 +76,8 @@
+ else ()
+ if(APPLE)
+ find_path(COIN3D_INCLUDE_DIRS Inventor/So.h
+- /Library/Frameworks/Inventor.framework/Headers
+ )
+ find_library(COIN3D_LIBRARIES Coin
+- /Library/Frameworks/Inventor.framework/Libraries
+ )
+ set(COIN3D_LIBRARIES "-framework Coin3d" CACHE STRING "Coin3D library for OSX")
+ else()
+diff --git a/Modules/FindCurses.cmake b/Modules/FindCurses.cmake
+index 64600c6c64..de6af241a1 100644
+--- a/Modules/FindCurses.cmake
++++ b/Modules/FindCurses.cmake
+@@ -136,15 +136,7 @@
+ # message. Cygwin is an ncurses package, so force ncurses on
+ # cygwin if the curses.h is missing
+ if(CURSES_NCURSES_LIBRARY AND CYGWIN)
+- if (CURSES_NEED_WIDE)
+- if(NOT EXISTS /usr/include/ncursesw/curses.h)
+- set(CURSES_USE_NCURSES TRUE)
+- endif()
+- else()
+- if(NOT EXISTS /usr/include/curses.h)
+- set(CURSES_USE_NCURSES TRUE)
+- endif()
+- endif()
++ set(CURSES_USE_NCURSES TRUE)
+ endif()
+
+
+diff --git a/Modules/FindDCMTK.cmake b/Modules/FindDCMTK.cmake
+index 4e0ff47f52..6db26cb855 100644
+--- a/Modules/FindDCMTK.cmake
++++ b/Modules/FindDCMTK.cmake
+@@ -88,14 +88,7 @@
+
+ set(_dcmtk_dir_description "The directory of DCMTK build or install tree.")
+
+-# Ensure that DCMTK_DIR is set to a reasonable default value
+-# so that DCMTK libraries can be found on a standard Unix distribution.
+-# It also overwrite the value of DCMTK_DIR after this one has been
+-# set by a successful discovery of DCMTK by the unpatched FindDCMTK.cmake module
+-# distributed with CMake (as of 0167cea)
+-if(NOT DCMTK_DIR OR DCMTK_DIR STREQUAL "/usr/include/dcmtk")
+- set(DCMTK_DIR "/usr" CACHE PATH ${_dcmtk_dir_description} FORCE)
+-endif()
++set(DCMTK_DIR CACHE PATH ${_dcmtk_dir_description})
+
+ set(_SAVED_DCMTK_DIR ${DCMTK_DIR})
+
+diff --git a/Modules/FindDart.cmake b/Modules/FindDart.cmake
+index 96cce45590..245dffaf21 100644
+--- a/Modules/FindDart.cmake
++++ b/Modules/FindDart.cmake
+@@ -24,7 +24,6 @@
+ ENV DART_ROOT
+ PATHS
+ ${PROJECT_SOURCE_DIR}
+- /usr/share
+ C:/
+ "C:/Program Files"
+ ${PROJECT_SOURCE_DIR}/..
+diff --git a/Modules/FindDoxygen.cmake b/Modules/FindDoxygen.cmake
+index 2d430994e8..335c733150 100644
+--- a/Modules/FindDoxygen.cmake
++++ b/Modules/FindDoxygen.cmake
+@@ -755,10 +755,6 @@
+ NAMES doxygen
+ PATHS
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\doxygen_is1;Inno Setup: App Path]/bin"
+- /Applications/Doxygen.app/Contents/Resources
+- /Applications/Doxygen.app/Contents/MacOS
+- /Applications/Utilities/Doxygen.app/Contents/Resources
+- /Applications/Utilities/Doxygen.app/Contents/MacOS
+ DOC "Doxygen documentation generation tool (https://www.doxygen.nl)"
+ VALIDATOR _Doxygen_version_validator
+ )
+@@ -845,12 +841,6 @@
+ "$ENV{ProgramFiles}/ATT/Graphviz/bin"
+ "C:/Program Files/ATT/Graphviz/bin"
+ [HKEY_LOCAL_MACHINE\\SOFTWARE\\ATT\\Graphviz;InstallPath]/bin
+- /Applications/Graphviz.app/Contents/MacOS
+- /Applications/Utilities/Graphviz.app/Contents/MacOS
+- /Applications/Doxygen.app/Contents/Resources
+- /Applications/Doxygen.app/Contents/MacOS
+- /Applications/Utilities/Doxygen.app/Contents/Resources
+- /Applications/Utilities/Doxygen.app/Contents/MacOS
+ DOC "Dot tool for use with Doxygen"
+ )
+ mark_as_advanced(DOXYGEN_DOT_EXECUTABLE)
+diff --git a/Modules/FindFontconfig.cmake b/Modules/FindFontconfig.cmake
+index 218ad2fbfa..94e6052564 100644
+--- a/Modules/FindFontconfig.cmake
++++ b/Modules/FindFontconfig.cmake
+@@ -64,7 +64,6 @@
+ fontconfig/fontconfig.h
+ HINTS
+ ${PKG_FONTCONFIG_INCLUDE_DIRS}
+- /usr/X11/include
+ )
+
+ find_library( Fontconfig_LIBRARY
+diff --git a/Modules/FindGLUT.cmake b/Modules/FindGLUT.cmake
+index e29758dc1c..d6255f98c2 100644
+--- a/Modules/FindGLUT.cmake
++++ b/Modules/FindGLUT.cmake
+@@ -120,12 +120,10 @@
+ set(_GLUT_glut_LIB_DIR /boot/develop/lib/x86)
+ else()
+ find_library( GLUT_Xi_LIBRARY Xi
+- /usr/openwin/lib
+ )
+ mark_as_advanced(GLUT_Xi_LIBRARY)
+
+ find_library( GLUT_Xmu_LIBRARY Xmu
+- /usr/openwin/lib
+ )
+ mark_as_advanced(GLUT_Xmu_LIBRARY)
+
+@@ -145,11 +143,6 @@
+
+ find_path( GLUT_INCLUDE_DIR GL/glut.h
+ PATHS
+- /usr/include/GL
+- /usr/openwin/share/include
+- /usr/openwin/include
+- /opt/graphics/OpenGL/include
+- /opt/graphics/OpenGL/contrib/libglut
+ ${_GLUT_INC_DIR}
+ HINTS
+ ${PC_GLUT_INCLUDE_DIRS}
+@@ -158,7 +151,6 @@
+
+ find_library( GLUT_glut_LIBRARY glut
+ PATHS
+- /usr/openwin/lib
+ ${_GLUT_glut_LIB_DIR}
+ HINTS
+ ${PC_GLUT_LIBRARY_DIRS}
+diff --git a/Modules/FindGTK.cmake b/Modules/FindGTK.cmake
+index 6e39f5a989..df231de76e 100644
+--- a/Modules/FindGTK.cmake
++++ b/Modules/FindGTK.cmake
+@@ -71,9 +71,6 @@
+ find_path( GTK_gtk_INCLUDE_PATH NAMES gtk/gtk.h
+ PATH_SUFFIXES gtk-1.2 gtk12
+ PATHS
+- /usr/openwin/share/include
+- /usr/openwin/include
+- /opt/gnome/include
+ )
+
+ # Some Linux distributions (e.g. Red Hat) have glibconfig.h
+@@ -84,26 +81,17 @@
+ find_path( GTK_glibconfig_INCLUDE_PATH NAMES glibconfig.h
+ PATH_SUFFIXES glib/include lib/glib/include include/glib12
+ PATHS
+- /usr/openwin/share/include
+- /opt/gnome/include
+- /opt/gnome/lib/glib/include
+ )
+
+ find_path( GTK_glib_INCLUDE_PATH NAMES glib.h
+ PATH_SUFFIXES gtk-1.2 glib-1.2 glib12 glib/include lib/glib/include
+ PATHS
+- /usr/openwin/share/include
+- /opt/gnome/include
+ )
+
+ find_path( GTK_gtkgl_INCLUDE_PATH NAMES gtkgl/gtkglarea.h
+- PATHS /usr/openwin/share/include
+- /opt/gnome/include
+ )
+
+ find_library( GTK_gtkgl_LIBRARY gtkgl
+- /usr/openwin/lib
+- /opt/gnome/lib
+ )
+
+ #
+@@ -112,38 +100,26 @@
+
+ find_library( GTK_gtk_LIBRARY
+ NAMES gtk gtk12
+- PATHS /usr/openwin/lib
+- /opt/gnome/lib
+ )
+
+ find_library( GTK_gdk_LIBRARY
+ NAMES gdk gdk12
+- PATHS /usr/openwin/lib
+- /opt/gnome/lib
+ )
+
+ find_library( GTK_gmodule_LIBRARY
+ NAMES gmodule gmodule12
+- PATHS /usr/openwin/lib
+- /opt/gnome/lib
+ )
+
+ find_library( GTK_glib_LIBRARY
+ NAMES glib glib12
+- PATHS /usr/openwin/lib
+- /opt/gnome/lib
+ )
+
+ find_library( GTK_Xi_LIBRARY
+ NAMES Xi
+- PATHS /usr/openwin/lib
+- /opt/gnome/lib
+ )
+
+ find_library( GTK_gthread_LIBRARY
+ NAMES gthread gthread12
+- PATHS /usr/openwin/lib
+- /opt/gnome/lib
+ )
+
+ if(GTK_gtk_INCLUDE_PATH
+diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
+index 9c5bc63272..87f8f81149 100644
+--- a/Modules/FindGTK2.cmake
++++ b/Modules/FindGTK2.cmake
+@@ -377,34 +377,12 @@
+ "include suffixes = ${_suffixes}")
+ endif()
+
+- if(CMAKE_LIBRARY_ARCHITECTURE)
+- set(_gtk2_arch_dir /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE})
+- if(GTK2_DEBUG)
+- message(STATUS "Adding ${_gtk2_arch_dir} to search path for multiarch support")
+- endif()
+- endif()
+ find_path(GTK2_${_var}_INCLUDE_DIR ${_hdr}
+ PATHS
+ ${PC_GLIB2_INCLUDEDIR}
+ ${PC_GLIB2_LIBDIR}
+ ${PC_GTK2_INCLUDEDIR}
+ ${PC_GTK2_LIBDIR}
+- ${_gtk2_arch_dir}
+- /usr/local/libx32
+- /usr/local/lib64
+- /usr/local/lib
+- /usr/libx32
+- /usr/lib64
+- /usr/lib
+- /opt/gnome/include
+- /opt/gnome/lib
+- /opt/openwin/include
+- /usr/openwin/lib
+- /sw/lib
+- /opt/local/lib
+- /opt/homebrew/lib
+- /usr/pkg/lib
+- /usr/pkg/include/glib
+ $ENV{GTKMM_BASEPATH}/include
+ $ENV{GTKMM_BASEPATH}/lib
+ [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/include
+@@ -509,8 +487,6 @@
+ find_library(GTK2_${_var}_LIBRARY_RELEASE
+ NAMES ${_lib_list}
+ PATHS
+- /opt/gnome/lib
+- /usr/openwin/lib
+ $ENV{GTKMM_BASEPATH}/lib
+ [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/lib
+ [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]/lib
+diff --git a/Modules/FindIce.cmake b/Modules/FindIce.cmake
+index 82156747d3..cc3f2a64af 100644
+--- a/Modules/FindIce.cmake
++++ b/Modules/FindIce.cmake
+@@ -629,11 +629,6 @@
+ list(APPEND ice_roots "${ice_location}")
+ endif()
+ endforeach()
+- else()
+- foreach(ice_version ${ice_versions})
+- # Prefer 64-bit variants if present (and using a 64-bit compiler)
+- list(APPEND ice_roots "/opt/Ice-${ice_version}")
+- endforeach()
+ endif()
+
+ # Find all Ice programs
+@@ -689,7 +684,7 @@
+ # In common use on Linux, MacOS X (homebrew) and FreeBSD; prefer
+ # version-specific dir
+ list(APPEND ice_slice_paths
+- /usr/local/share /usr/share)
++ )
+ list(APPEND ice_slice_suffixes
+ "Ice-${Ice_VERSION_SLICE2CPP_FULL}/slice"
+ "Ice-${Ice_VERSION_SLICE2CPP_SHORT}/slice"
+diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
+index 10dcc51776..e272bd9583 100644
+--- a/Modules/FindJNI.cmake
++++ b/Modules/FindJNI.cmake
+@@ -363,51 +363,6 @@
+ endif()
+
+ set(_JNI_JAVA_DIRECTORIES_BASE
+- /usr/lib/jvm/java
+- /usr/lib/java
+- /usr/lib/jvm
+- /usr/local/lib/java
+- /usr/local/share/java
+- /usr/lib/j2sdk1.4-sun
+- /usr/lib/j2sdk1.5-sun
+- /opt/sun-jdk-1.5.0.04
+- /usr/lib/jvm/java-6-sun
+- /usr/lib/jvm/java-1.5.0-sun
+- /usr/lib/jvm/java-6-sun-1.6.0.00 # can this one be removed according to #8821 ? Alex
+- /usr/lib/jvm/java-6-openjdk
+- /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0 # fedora
+- # Debian specific paths for default JVM
+- /usr/lib/jvm/default-java
+- # Arch Linux specific paths for default JVM
+- /usr/lib/jvm/default
+- # Ubuntu specific paths for default JVM
+- /usr/lib/jvm/java-21-openjdk-{libarch} # Ubuntu 23.04
+- /usr/lib/jvm/java-20-openjdk-{libarch} # Ubuntu 22.10
+- /usr/lib/jvm/java-19-openjdk-{libarch} # Ubuntu 22.04 LTS
+- /usr/lib/jvm/java-18-openjdk-{libarch} # Ubuntu 22.04 LTS
+- /usr/lib/jvm/java-17-openjdk-{libarch} # Ubuntu 18.04 LTS
+- /usr/lib/jvm/java-16-openjdk-{libarch} # Ubuntu 20.04 LTS
+- /usr/lib/jvm/java-13-openjdk-{libarch} # Ubuntu 20.04 LTS
+- /usr/lib/jvm/java-11-openjdk-{libarch} # Ubuntu 18.04 LTS
+- /usr/lib/jvm/java-8-openjdk-{libarch} # Ubuntu 15.10
+- /usr/lib/jvm/java-7-openjdk-{libarch} # Ubuntu 15.10
+- /usr/lib/jvm/java-6-openjdk-{libarch} # Ubuntu 15.10
+- # OpenBSD specific paths for default JVM
+- /usr/local/jdk-1.7.0
+- /usr/local/jre-1.7.0
+- /usr/local/jdk-1.6.0
+- /usr/local/jre-1.6.0
+- # FreeBSD specific paths for default JVM
+- /usr/local/openjdk15
+- /usr/local/openjdk14
+- /usr/local/openjdk13
+- /usr/local/openjdk12
+- /usr/local/openjdk11
+- /usr/local/openjdk8
+- /usr/local/openjdk7
+- # SuSE specific paths for default JVM
+- /usr/lib64/jvm/java
+- /usr/lib64/jvm/jre
+ )
+
+ set(_JNI_JAVA_AWT_LIBRARY_TRIES)
+diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake
+index 1587ce648b..e92213cba7 100644
+--- a/Modules/FindJava.cmake
++++ b/Modules/FindJava.cmake
+@@ -199,17 +199,6 @@
+ # Hard-coded guesses should still go in PATHS. This ensures that the user
+ # environment can always override hard guesses.
+ set(_JAVA_PATHS
+- /usr/lib/java/bin
+- /usr/share/java/bin
+- /usr/local/java/bin
+- /usr/local/java/share/bin
+- /usr/java/j2sdk1.4.2_04
+- /usr/lib/j2sdk1.4-sun/bin
+- /usr/java/j2sdk1.4.2_09/bin
+- /usr/lib/j2sdk1.5-sun/bin
+- /opt/sun-jdk-1.5.0.04/bin
+- /usr/local/jdk-1.7.0/bin
+- /usr/local/jdk-1.6.0/bin
+ )
+ find_program(Java_JAVA_EXECUTABLE
+ NAMES java
+diff --git a/Modules/FindKDE3.cmake b/Modules/FindKDE3.cmake
+index ccfad5e7fb..265e99eb1a 100644
+--- a/Modules/FindKDE3.cmake
++++ b/Modules/FindKDE3.cmake
+@@ -234,9 +234,6 @@
+ find_program(KDECONFIG_EXECUTABLE NAMES kde-config
+ HINTS
+ $ENV{KDEDIR}/bin
+- PATHS
+- /opt/kde3/bin
+- /opt/kde/bin
+ )
+
+ set(KDE3PREFIX)
+@@ -261,9 +258,6 @@
+ HINTS
+ $ENV{KDEDIR}/include
+ ${KDE3PREFIX}/include
+- PATHS
+- /opt/kde3/include
+- /opt/kde/include
+ PATH_SUFFIXES include/kde
+ )
+
+@@ -272,9 +266,6 @@
+ HINTS
+ $ENV{KDEDIR}/lib
+ ${KDE3PREFIX}/lib
+- PATHS
+- /opt/kde3/lib
+- /opt/kde/lib
+ )
+
+ set(QT_AND_KDECORE_LIBS ${QT_LIBRARIES} ${KDE3_KDECORE_LIBRARY})
+@@ -296,27 +287,18 @@
+ HINTS
+ $ENV{KDEDIR}/bin
+ ${KDE3PREFIX}/bin
+- PATHS
+- /opt/kde3/bin
+- /opt/kde/bin
+ )
+
+ find_program(KDE3_DCOPIDL2CPP_EXECUTABLE NAMES dcopidl2cpp
+ HINTS
+ $ENV{KDEDIR}/bin
+ ${KDE3PREFIX}/bin
+- PATHS
+- /opt/kde3/bin
+- /opt/kde/bin
+ )
+
+ find_program(KDE3_KCFGC_EXECUTABLE NAMES kconfig_compiler
+ HINTS
+ $ENV{KDEDIR}/bin
+ ${KDE3PREFIX}/bin
+- PATHS
+- /opt/kde3/bin
+- /opt/kde/bin
+ )
+
+
+diff --git a/Modules/FindKDE4.cmake b/Modules/FindKDE4.cmake
+index 220906b2de..7eb7b692d8 100644
+--- a/Modules/FindKDE4.cmake
++++ b/Modules/FindKDE4.cmake
+@@ -52,7 +52,6 @@
+ HINTS
+ ${CMAKE_INSTALL_PREFIX}
+ ${_KDEDIRS}
+- /opt/kde4
+ ONLY_CMAKE_FIND_ROOT_PATH
+ )
+
+diff --git a/Modules/FindLATEX.cmake b/Modules/FindLATEX.cmake
+index e272770af3..9f702c3f6d 100644
+--- a/Modules/FindLATEX.cmake
++++ b/Modules/FindLATEX.cmake
+@@ -203,14 +203,12 @@
+ find_program(LATEX_COMPILER
+ NAMES latex
+ PATHS ${MIKTEX_BINARY_PATH}
+- /usr/bin
+ )
+
+ # find pdflatex
+ find_program(PDFLATEX_COMPILER
+ NAMES pdflatex
+ PATHS ${MIKTEX_BINARY_PATH}
+- /usr/bin
+ )
+ if (PDFLATEX_COMPILER)
+ set(LATEX_PDFLATEX_FOUND TRUE)
+@@ -222,7 +220,6 @@
+ find_program(XELATEX_COMPILER
+ NAMES xelatex
+ PATHS ${MIKTEX_BINARY_PATH}
+- /usr/bin
+ )
+ if (XELATEX_COMPILER)
+ set(LATEX_XELATEX_FOUND TRUE)
+@@ -234,7 +231,6 @@
+ find_program(LUALATEX_COMPILER
+ NAMES lualatex
+ PATHS ${MIKTEX_BINARY_PATH}
+- /usr/bin
+ )
+ if (LUALATEX_COMPILER)
+ set(LATEX_LUALATEX_FOUND TRUE)
+@@ -246,7 +242,6 @@
+ find_program(BIBTEX_COMPILER
+ NAMES bibtex
+ PATHS ${MIKTEX_BINARY_PATH}
+- /usr/bin
+ )
+ if (BIBTEX_COMPILER)
+ set(LATEX_BIBTEX_FOUND TRUE)
+@@ -258,7 +253,6 @@
+ find_program(BIBER_COMPILER
+ NAMES biber
+ PATHS ${MIKTEX_BINARY_PATH}
+- /usr/bin
+ )
+ if (BIBER_COMPILER)
+ set(LATEX_BIBER_FOUND TRUE)
+@@ -270,7 +264,6 @@
+ find_program(MAKEINDEX_COMPILER
+ NAMES makeindex
+ PATHS ${MIKTEX_BINARY_PATH}
+- /usr/bin
+ )
+ if (MAKEINDEX_COMPILER)
+ set(LATEX_MAKEINDEX_FOUND TRUE)
+@@ -282,7 +275,6 @@
+ find_program(XINDY_COMPILER
+ NAMES xindy
+ PATHS ${MIKTEX_BINARY_PATH}
+- /usr/bin
+ )
+ if (XINDY_COMPILER)
+ set(LATEX_XINDY_FOUND TRUE)
+@@ -294,7 +286,6 @@
+ find_program(DVIPS_CONVERTER
+ NAMES dvips
+ PATHS ${MIKTEX_BINARY_PATH}
+- /usr/bin
+ )
+ if (DVIPS_CONVERTER)
+ set(LATEX_DVIPS_FOUND TRUE)
+@@ -306,7 +297,6 @@
+ find_program(DVIPDF_CONVERTER
+ NAMES dvipdfm dvipdft dvipdf
+ PATHS ${MIKTEX_BINARY_PATH}
+- /usr/bin
+ )
+ if (DVIPDF_CONVERTER)
+ set(LATEX_DVIPDF_FOUND TRUE)
+@@ -336,7 +326,6 @@
+ find_program(PDFTOPS_CONVERTER
+ NAMES pdftops
+ PATHS ${MIKTEX_BINARY_PATH}
+- /usr/bin
+ )
+ if (PDFTOPS_CONVERTER)
+ set(LATEX_PDFTOPS_FOUND TRUE)
+@@ -348,7 +337,6 @@
+ find_program(LATEX2HTML_CONVERTER
+ NAMES latex2html
+ PATHS ${MIKTEX_BINARY_PATH}
+- /usr/bin
+ )
+ if (LATEX2HTML_CONVERTER)
+ set(LATEX_LATEX2HTML_FOUND TRUE)
+@@ -360,7 +348,6 @@
+ find_program(HTLATEX_COMPILER
+ NAMES htlatex
+ PATHS ${MIKTEX_BINARY_PATH}
+- /usr/bin
+ )
+ if (HTLATEX_COMPILER)
+ set(LATEX_HTLATEX_FOUND TRUE)
+diff --git a/Modules/FindLua50.cmake b/Modules/FindLua50.cmake
+index ac36c86640..fe5d2147e8 100644
+--- a/Modules/FindLua50.cmake
++++ b/Modules/FindLua50.cmake
+@@ -84,10 +84,6 @@
+ HINTS
+ ENV LUA_DIR
+ PATH_SUFFIXES lua50 lua5.0 lua5 lua
+- PATHS
+- ~/Library/Frameworks
+- /Library/Frameworks
+- /opt
+ )
+
+ find_library(LUA_LIBRARY_lua
+@@ -95,10 +91,6 @@
+ HINTS
+ ENV LUA_DIR
+ PATH_SUFFIXES lib
+- PATHS
+- ~/Library/Frameworks
+- /Library/Frameworks
+- /opt
+ )
+
+ # In an OS X framework, lualib is usually included as part of the framework
+@@ -113,7 +105,6 @@
+ ENV LUA_DIR
+ PATH_SUFFIXES lib
+ PATHS
+- /opt
+ )
+ if(LUA_LIBRARY_lualib AND LUA_LIBRARY_lua)
+ # include the math library for Unix
+diff --git a/Modules/FindLua51.cmake b/Modules/FindLua51.cmake
+index cba30e4b58..21a95cb89f 100644
+--- a/Modules/FindLua51.cmake
++++ b/Modules/FindLua51.cmake
+@@ -87,10 +87,6 @@
+ HINTS
+ ENV LUA_DIR
+ PATH_SUFFIXES lua51 lua5.1 lua-5.1 lua
+- PATHS
+- ~/Library/Frameworks
+- /Library/Frameworks
+- /opt
+ )
+
+ find_library(LUA_LIBRARY
+@@ -98,10 +94,6 @@
+ HINTS
+ ENV LUA_DIR
+ PATH_SUFFIXES lib
+- PATHS
+- ~/Library/Frameworks
+- /Library/Frameworks
+- /opt
+ )
+
+ if(LUA_LIBRARY)
+diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
+index 78b1c5c915..741f86aaef 100644
+--- a/Modules/FindMPI.cmake
++++ b/Modules/FindMPI.cmake
+@@ -1349,15 +1349,6 @@
+ endmacro()
+
+ set(MPI_HINT_DIRS ${MPI_HOME} $ENV{MPI_HOME} $ENV{I_MPI_ROOT})
+-if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
+- # SUSE Linux Enterprise Server stores its MPI implementations under /usr/lib64/mpi/gcc/
+- # We enumerate the subfolders and append each as a prefix
+- MPI_search_mpi_prefix_folder("/usr/lib64/mpi/gcc")
+-elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD")
+- # FreeBSD ships mpich under the normal system paths - but available openmpi implementations
+- # will be found in /usr/local/mpi/
+- MPI_search_mpi_prefix_folder("/usr/local/mpi")
+-endif()
+
+ # Most MPI distributions have some form of mpiexec or mpirun which gives us something we can look for.
+ # The MPI standard does not mandate the existence of either, but instead only makes requirements if a distribution
+diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
+index 8a7bd80957..74009fbebc 100644
+--- a/Modules/FindMatlab.cmake
++++ b/Modules/FindMatlab.cmake
+@@ -1529,7 +1529,7 @@
+ endif()
+
+ foreach(_matlab_current_release IN LISTS _matlab_releases)
+- foreach(_macos_app_base IN ITEMS "$ENV{HOME}/Applications" "/Applications")
++ foreach(_macos_app_base IN ITEMS)
+ matlab_get_version_from_release_name("${_matlab_current_release}" _matlab_current_version)
+ string(REPLACE "." "" _matlab_current_version_without_dot "${_matlab_current_version}")
+ set(_matlab_base_path "${_macos_app_base}/MATLAB_${_matlab_current_release}.app")
+diff --git a/Modules/FindMotif.cmake b/Modules/FindMotif.cmake
+index d72b19309e..5753e5c3dc 100644
+--- a/Modules/FindMotif.cmake
++++ b/Modules/FindMotif.cmake
+@@ -39,12 +39,10 @@
+ if(UNIX)
+ find_path(MOTIF_INCLUDE_DIR
+ Xm/Xm.h
+- /usr/openwin/include
+ )
+
+ find_library(MOTIF_LIBRARIES
+ Xm
+- /usr/openwin/lib
+ )
+
+ endif()
+diff --git a/Modules/FindOpenAL.cmake b/Modules/FindOpenAL.cmake
+index dad9ada128..32d02db7c3 100644
+--- a/Modules/FindOpenAL.cmake
++++ b/Modules/FindOpenAL.cmake
+@@ -95,9 +95,6 @@
+ HINTS
+ ENV OPENALDIR
+ PATHS
+- ~/Library/Frameworks
+- /Library/Frameworks
+- /opt
+ [HKEY_LOCAL_MACHINE\\SOFTWARE\\Creative\ Labs\\OpenAL\ 1.1\ Software\ Development\ Kit\\1.00.0000;InstallDir]
+ PATH_SUFFIXES include/AL include/OpenAL include AL OpenAL
+ )
+@@ -113,9 +110,6 @@
+ HINTS
+ ENV OPENALDIR
+ PATHS
+- ~/Library/Frameworks
+- /Library/Frameworks
+- /opt
+ [HKEY_LOCAL_MACHINE\\SOFTWARE\\Creative\ Labs\\OpenAL\ 1.1\ Software\ Development\ Kit\\1.00.0000;InstallDir]
+ PATH_SUFFIXES libx32 lib64 lib libs64 libs ${_OpenAL_ARCH_DIR}
+ )
+diff --git a/Modules/FindOpenCL.cmake b/Modules/FindOpenCL.cmake
+index 3be945ba1b..4086ebe2f2 100644
+--- a/Modules/FindOpenCL.cmake
++++ b/Modules/FindOpenCL.cmake
+@@ -113,8 +113,6 @@
+ ENV CUDA_PATH
+ ENV ATISTREAMSDKROOT
+ ENV OCL_ROOT
+- /usr/local/cuda
+- /opt/cuda
+ PATH_SUFFIXES
+ include
+ OpenCL/common/inc
+@@ -170,8 +168,6 @@
+ PATHS
+ ENV AMDAPPSDKROOT
+ ENV CUDA_PATH
+- /usr/local/cuda
+- /opt/cuda
+ PATH_SUFFIXES
+ lib/x86
+ lib)
+@@ -181,8 +177,6 @@
+ PATHS
+ ENV AMDAPPSDKROOT
+ ENV CUDA_PATH
+- /usr/local/cuda
+- /opt/cuda
+ PATH_SUFFIXES
+ lib/x86_64
+ lib/x64
+diff --git a/Modules/FindOpenGL.cmake b/Modules/FindOpenGL.cmake
+index a842756fcf..a02a66eb60 100644
+--- a/Modules/FindOpenGL.cmake
++++ b/Modules/FindOpenGL.cmake
+@@ -271,12 +271,7 @@
+ set(_OPENGL_INCLUDE_PATH
+ /boot/develop/headers/os/opengl)
+ elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+- # CMake doesn't support arbitrary globs in search paths.
+- file(GLOB _OPENGL_LIB_PATH
+- # The NVidia driver installation tool on Linux installs libraries to a
+- # `nvidia-` subdirectory.
+- "/usr/lib/nvidia-*"
+- "/usr/lib32/nvidia-*")
++ set(_OPENGL_LIB_PATH)
+ endif()
+
+ # The first line below is to make sure that the proper headers
+@@ -287,9 +282,6 @@
+ # Make sure the NVIDIA directory comes BEFORE the others.
+ # - Atanas Georgiev
+ find_path(OPENGL_INCLUDE_DIR GL/gl.h
+- /usr/share/doc/NVIDIA_GLX-1.0/include
+- /usr/openwin/share/include
+- /opt/graphics/OpenGL/include
+ ${_OPENGL_INCLUDE_PATH}
+ )
+ find_path(OPENGL_GLX_INCLUDE_DIR GL/glx.h ${_OPENGL_INCLUDE_PATH})
+@@ -297,9 +289,6 @@
+ find_path(OPENGL_GLES2_INCLUDE_DIR GLES2/gl2.h ${_OPENGL_INCLUDE_PATH})
+ find_path(OPENGL_GLES3_INCLUDE_DIR GLES3/gl3.h ${_OPENGL_INCLUDE_PATH})
+ find_path(OPENGL_xmesa_INCLUDE_DIR GL/xmesa.h
+- /usr/share/doc/NVIDIA_GLX-1.0/include
+- /usr/openwin/share/include
+- /opt/graphics/OpenGL/include
+ )
+
+ find_path(OPENGL_GLU_INCLUDE_DIR GL/glu.h ${_OPENGL_INCLUDE_PATH})
+@@ -347,9 +336,6 @@
+ find_library(OPENGL_glu_LIBRARY
+ NAMES GLU MesaGLU
+ PATHS ${OPENGL_gl_LIBRARY}
+- /opt/graphics/OpenGL/lib
+- /usr/openwin/lib
+- /usr/shlib
+ )
+
+ list(APPEND _OpenGL_CACHE_VARS
+@@ -401,10 +387,7 @@
+ # Search for the legacy GL library.
+ find_library(OPENGL_gl_LIBRARY
+ NAMES GL MesaGL
+- PATHS /opt/graphics/OpenGL/lib
+- /usr/openwin/lib
+- /usr/shlib
+- ${_OPENGL_LIB_PATH}
++ PATHS ${_OPENGL_LIB_PATH}
+ PATH_SUFFIXES libglvnd
+ )
+ list(APPEND _OpenGL_CACHE_VARS OPENGL_gl_LIBRARY)
+@@ -513,9 +496,6 @@
+ find_library(OPENGL_glu_LIBRARY
+ NAMES GLU MesaGLU
+ PATHS ${OPENGL_gl_LIBRARY}
+- /opt/graphics/OpenGL/lib
+- /usr/openwin/lib
+- /usr/shlib
+ )
+ endif ()
+
+diff --git a/Modules/FindPHP4.cmake b/Modules/FindPHP4.cmake
+index edef791cb8..5515f44710 100644
+--- a/Modules/FindPHP4.cmake
++++ b/Modules/FindPHP4.cmake
+@@ -36,15 +36,9 @@
+ #]=======================================================================]
+
+ set(PHP4_POSSIBLE_INCLUDE_PATHS
+- /usr/include/php4
+- /usr/local/include/php4
+- /usr/include/php
+- /usr/local/include/php
+- /usr/local/apache/php
+ )
+
+ set(PHP4_POSSIBLE_LIB_PATHS
+- /usr/lib
+ )
+
+ find_path(PHP4_FOUND_INCLUDE_PATH main/php.h
+diff --git a/Modules/FindPerlLibs.cmake b/Modules/FindPerlLibs.cmake
+index 330700e183..7fc89df6eb 100644
+--- a/Modules/FindPerlLibs.cmake
++++ b/Modules/FindPerlLibs.cmake
+@@ -141,10 +141,6 @@
+ PATHS
+ "${PERL_UPDATE_ARCHLIB}/CORE"
+ "${PERL_ARCHLIB}/CORE"
+- /usr/lib/perl5/${PERL_VERSION_STRING}/${PERL_ARCHNAME}/CORE
+- /usr/lib/perl/${PERL_VERSION_STRING}/${PERL_ARCHNAME}/CORE
+- /usr/lib/perl5/${PERL_VERSION_STRING}/CORE
+- /usr/lib/perl/${PERL_VERSION_STRING}/CORE
+ )
+
+ ### PERL_LIBRARY
+@@ -154,10 +150,6 @@
+ PATHS
+ "${PERL_UPDATE_ARCHLIB}/CORE"
+ "${PERL_ARCHLIB}/CORE"
+- /usr/lib/perl5/${PERL_VERSION_STRING}/${PERL_ARCHNAME}/CORE
+- /usr/lib/perl/${PERL_VERSION_STRING}/${PERL_ARCHNAME}/CORE
+- /usr/lib/perl5/${PERL_VERSION_STRING}/CORE
+- /usr/lib/perl/${PERL_VERSION_STRING}/CORE
+ )
+
+ endif ()
+diff --git a/Modules/FindPhysFS.cmake b/Modules/FindPhysFS.cmake
+index 1894498d9d..03c6e61853 100644
+--- a/Modules/FindPhysFS.cmake
++++ b/Modules/FindPhysFS.cmake
+@@ -52,10 +52,6 @@
+ HINTS
+ ENV PHYSFSDIR
+ PATH_SUFFIXES include/physfs include
+- PATHS
+- ~/Library/Frameworks
+- /Library/Frameworks
+- /opt
+ )
+
+ find_library(PHYSFS_LIBRARY
+@@ -63,10 +59,6 @@
+ HINTS
+ ENV PHYSFSDIR
+ PATH_SUFFIXES lib
+- PATHS
+- ~/Library/Frameworks
+- /Library/Frameworks
+- /opt
+ )
+
+ include(FindPackageHandleStandardArgs)
+diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
+index b230eb5ef5..bf7b204406 100644
+--- a/Modules/FindPkgConfig.cmake
++++ b/Modules/FindPkgConfig.cmake
+@@ -391,7 +391,7 @@
+ if(NOT DEFINED CMAKE_SYSTEM_NAME
+ OR (CMAKE_SYSTEM_NAME MATCHES "^(Linux|GNU)$"
+ AND NOT CMAKE_CROSSCOMPILING))
+- if(EXISTS "/etc/debian_version") # is this a debian system ?
++ if(FALSE) # is this a debian system ?
+ if(CMAKE_LIBRARY_ARCHITECTURE)
+ list(APPEND _lib_dirs "lib/${CMAKE_LIBRARY_ARCHITECTURE}/pkgconfig")
+ endif()
+diff --git a/Modules/FindProducer.cmake b/Modules/FindProducer.cmake
+index 1d034bc207..d176655f46 100644
+--- a/Modules/FindProducer.cmake
++++ b/Modules/FindProducer.cmake
+@@ -100,9 +100,6 @@
+ ENV OSGDIR
+ PATH_SUFFIXES include
+ PATHS
+- ~/Library/Frameworks
+- /Library/Frameworks
+- /opt
+ [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
+ [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
+ )
+@@ -114,8 +111,6 @@
+ ENV OSG_DIR
+ ENV OSGDIR
+ PATH_SUFFIXES lib
+- PATHS
+- /opt
+ )
+
+ include(FindPackageHandleStandardArgs)
+diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake
+index a9441646d1..28ba743f60 100644
+--- a/Modules/FindPython/Support.cmake
++++ b/Modules/FindPython/Support.cmake
+@@ -162,9 +162,6 @@
+ file(TO_CMAKE_PATH "$ENV{CMAKE_FRAMEWORK_PATH}" _pff_CMAKE_FRAMEWORK_PATH)
+ set (_pff_frameworks ${CMAKE_FRAMEWORK_PATH}
+ ${_pff_CMAKE_FRAMEWORK_PATH}
+- ~/Library/Frameworks
+- /usr/local/Frameworks
+- /opt/homebrew/Frameworks
+ ${CMAKE_SYSTEM_FRAMEWORK_PATH})
+ list (REMOVE_DUPLICATES _pff_frameworks)
+ foreach (_pff_implementation IN LISTS _${_PYTHON_PREFIX}_FIND_IMPLEMENTATIONS)
+diff --git a/Modules/FindQt.cmake b/Modules/FindQt.cmake
+index 98cd1e2abf..90ad88365d 100644
+--- a/Modules/FindQt.cmake
++++ b/Modules/FindQt.cmake
+@@ -63,44 +63,6 @@
+ return()
+ endif()
+
+-# look for signs of qt3 installations
+-file(GLOB GLOB_TEMP_VAR /usr/lib*/qt-3*/bin/qmake /usr/lib*/qt3*/bin/qmake)
+-if(GLOB_TEMP_VAR)
+- set(QT3_INSTALLED TRUE)
+-endif()
+-set(GLOB_TEMP_VAR)
+-
+-file(GLOB GLOB_TEMP_VAR /usr/local/qt-x11-commercial-3*/bin/qmake)
+-if(GLOB_TEMP_VAR)
+- set(QT3_INSTALLED TRUE)
+-endif()
+-set(GLOB_TEMP_VAR)
+-
+-file(GLOB GLOB_TEMP_VAR /usr/local/lib/qt3/bin/qmake)
+-if(GLOB_TEMP_VAR)
+- set(QT3_INSTALLED TRUE)
+-endif()
+-set(GLOB_TEMP_VAR)
+-
+-# look for qt4 installations
+-file(GLOB GLOB_TEMP_VAR /usr/local/qt-x11-commercial-4*/bin/qmake)
+-if(GLOB_TEMP_VAR)
+- set(QT4_INSTALLED TRUE)
+-endif()
+-set(GLOB_TEMP_VAR)
+-
+-file(GLOB GLOB_TEMP_VAR /usr/local/Trolltech/Qt-4*/bin/qmake)
+-if(GLOB_TEMP_VAR)
+- set(QT4_INSTALLED TRUE)
+-endif()
+-set(GLOB_TEMP_VAR)
+-
+-file(GLOB GLOB_TEMP_VAR /usr/local/lib/qt4/bin/qmake)
+-if(GLOB_TEMP_VAR)
+- set(QT4_INSTALLED TRUE)
+-endif()
+-set(GLOB_TEMP_VAR)
+-
+ if (Qt_FIND_VERSION)
+ if (Qt_FIND_VERSION MATCHES "^([34])(\\.[0-9]+.*)?$")
+ set(DESIRED_QT_VERSION ${CMAKE_MATCH_1})
+@@ -135,9 +97,6 @@
+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/include/Qt"
+ ${qt_headers}/Qt
+ $ENV{QTDIR}/include/Qt
+- /usr/lib/qt/include/Qt
+- /usr/share/qt4/include/Qt
+- /usr/local/include/X11/qt4/Qt
+ C:/Progra~1/qt/include/Qt
+ PATH_SUFFIXES qt/include/Qt include/Qt)
+
+@@ -152,9 +111,6 @@
+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt"
+ C:/Qt/3.3.3Educational/include
+ $ENV{QTDIR}/include
+- /usr/include/qt3/Qt
+- /usr/share/qt3/include
+- /usr/local/include/X11/qt3
+ C:/Progra~1/qt/include
+ PATH_SUFFIXES qt/include include/qt3)
+
+diff --git a/Modules/FindQt3.cmake b/Modules/FindQt3.cmake
+index 2c62a5f17f..772a8d88f6 100644
+--- a/Modules/FindQt3.cmake
++++ b/Modules/FindQt3.cmake
+@@ -101,10 +101,6 @@
+ endif()
+
+
+-file(GLOB GLOB_PATHS /usr/lib/qt-3*)
+-foreach(GLOB_PATH ${GLOB_PATHS})
+- list(APPEND GLOB_PATHS_BIN "${GLOB_PATH}/bin")
+-endforeach()
+ find_path(QT_INCLUDE_DIR
+ NAMES qt.h
+ PATHS
+@@ -112,10 +108,7 @@
+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt"
+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt"
+ $ENV{QTDIR}/include
+- ${GLOB_PATHS}
+- /usr/share/qt3/include
+ C:/Progra~1/qt/include
+- /usr/local/include/X11/qt3
+ PATH_SUFFIXES lib/qt/include lib/qt3/include include/qt include/qt3 qt/include qt3/include
+ )
+
+@@ -137,7 +130,6 @@
+ set(QT_VERSION_STRING "${qt_version_str}")
+ endif()
+
+-file(GLOB GLOB_PATHS_LIB /usr/lib/qt-3*/lib/)
+ if (QT_MT_REQUIRED)
+ find_library(QT_QT_LIBRARY
+ NAMES
+@@ -148,8 +140,6 @@
+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]"
+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]"
+ ENV QTDIR
+- ${GLOB_PATHS_LIB}
+- /usr/share/qt3
+ C:/Progra~1/qt
+ PATH_SUFFIXES
+ lib lib/qt lib/qt3 qt qt3 qt/lib qt3/lib
+@@ -166,8 +156,6 @@
+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]"
+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]"
+ ENV QTDIR
+- ${GLOB_PATHS_LIB}
+- /usr/share/qt3
+ C:/Progra~1/qt/lib
+ PATH_SUFFIXES
+ lib lib/qt lib/qt3 qt qt3 qt/lib qt3/lib
+@@ -182,8 +170,6 @@
+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]"
+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]"
+ ENV QTDIR
+- ${GLOB_PATHS_LIB}
+- /usr/share/qt3
+ C:/Progra~1/qt
+ PATH_SUFFIXES
+ lib lib/qt lib/qt3 qt qt3 qt/lib qt3/lib
+@@ -198,8 +184,6 @@
+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/include/Qt"
+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt"
+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt"
+- ${GLOB_PATHS_BIN}
+- /usr/share/qt3
+ C:/Progra~1/qt
+ PATH_SUFFIXES
+ bin lib/qt lib/qt3 qt qt3 qt/bin qt3/bin lib/qt/bin lib/qt3/bin
+@@ -218,8 +202,6 @@
+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/include/Qt"
+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt"
+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt"
+- ${GLOB_PATHS_BIN}
+- /usr/share/qt3
+ C:/Progra~1/qt
+ PATH_SUFFIXES
+ bin lib/qt lib/qt3 qt qt3 qt/bin qt3/bin lib/qt/bin lib/qt3/bin
+diff --git a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake
+index 18b9e35855..dba9976565 100644
+--- a/Modules/FindRuby.cmake
++++ b/Modules/FindRuby.cmake
+@@ -367,7 +367,6 @@
+ HINTS
+ ${Ruby_HDR_DIR}
+ ${Ruby_ARCH_DIR}
+- /usr/lib/ruby/${_Ruby_VERSION_SHORT}/i586-linux-gnu/
+ )
+
+ set(Ruby_INCLUDE_DIRS ${Ruby_INCLUDE_DIR})
+diff --git a/Modules/FindSDL.cmake b/Modules/FindSDL.cmake
+index a720dcc3df..73e222a27c 100644
+--- a/Modules/FindSDL.cmake
++++ b/Modules/FindSDL.cmake
+@@ -214,8 +214,6 @@
+ HINTS
+ ENV SDLDIR
+ PATH_SUFFIXES lib ${VC_LIB_PATH_SUFFIX}
+- PATHS
+- /opt
+ )
+ endif()
+ endif()
+diff --git a/Modules/FindSDL_sound.cmake b/Modules/FindSDL_sound.cmake
+index 954303f3d3..26a5781e2a 100644
+--- a/Modules/FindSDL_sound.cmake
++++ b/Modules/FindSDL_sound.cmake
+@@ -292,7 +292,6 @@
+ ENV MIKMODDIR
+ ENV SDLSOUNDDIR
+ ENV SDLDIR
+- /opt
+ PATH_SUFFIXES
+ lib
+ )
+@@ -309,7 +308,6 @@
+ ENV MODPLUGDIR
+ ENV SDLSOUNDDIR
+ ENV SDLDIR
+- /opt
+ PATH_SUFFIXES
+ lib
+ )
+@@ -328,7 +326,6 @@
+ ENV OGGDIR
+ ENV SDLSOUNDDIR
+ ENV SDLDIR
+- /opt
+ PATH_SUFFIXES
+ lib
+ )
+@@ -343,7 +340,6 @@
+ ENV VORBISDIR
+ ENV SDLSOUNDDIR
+ ENV SDLDIR
+- /opt
+ PATH_SUFFIXES
+ lib
+ )
+@@ -361,7 +357,6 @@
+ ENV SMPEGDIR
+ ENV SDLSOUNDDIR
+ ENV SDLDIR
+- /opt
+ PATH_SUFFIXES
+ lib
+ )
+@@ -379,7 +374,6 @@
+ ENV FLACDIR
+ ENV SDLSOUNDDIR
+ ENV SDLDIR
+- /opt
+ PATH_SUFFIXES
+ lib
+ )
+@@ -400,7 +394,6 @@
+ ENV SPEEXDIR
+ ENV SDLSOUNDDIR
+ ENV SDLDIR
+- /opt
+ PATH_SUFFIXES
+ lib
+ )
+@@ -419,7 +412,6 @@
+ ENV SPEEXDIR
+ ENV SDLSOUNDDIR
+ ENV SDLDIR
+- /opt
+ PATH_SUFFIXES lib
+ )
+ if(OGG_LIBRARY)
+diff --git a/Modules/FindX11.cmake b/Modules/FindX11.cmake
+index b2f23bd1dd..9a94529589 100644
+--- a/Modules/FindX11.cmake
++++ b/Modules/FindX11.cmake
+@@ -138,22 +138,9 @@
+ set(CMAKE_REQUIRED_QUIET_SAVE ${CMAKE_REQUIRED_QUIET})
+ set(CMAKE_REQUIRED_QUIET ${X11_FIND_QUIETLY})
+ set(X11_INC_SEARCH_PATH
+- /usr/pkg/xorg/include
+- /usr/X11R6/include
+- /usr/X11R7/include
+- /usr/include/X11
+- /usr/openwin/include
+- /usr/openwin/share/include
+- /opt/graphics/OpenGL/include
+- /opt/X11/include
+ )
+
+ set(X11_LIB_SEARCH_PATH
+- /usr/pkg/xorg/lib
+- /usr/X11R6/lib
+- /usr/X11R7/lib
+- /usr/openwin/lib
+- /opt/X11/lib
+ )
+
+ find_path(X11_X11_INCLUDE_PATH X11/X.h ${X11_INC_SEARCH_PATH})
+diff --git a/Modules/GNUInstallDirs.cmake b/Modules/GNUInstallDirs.cmake
+index ff9c11a9d7..706b34b087 100644
+--- a/Modules/GNUInstallDirs.cmake
++++ b/Modules/GNUInstallDirs.cmake
+@@ -336,17 +336,6 @@
+ set(${out_var} "conda")
+ endif()
+ endif()
+- # If we didn't detect conda from the previous step, check
+- # for the linux variant
+- if(NOT ${out_var})
+- if (EXISTS "/etc/alpine-release")
+- set(${out_var} "alpine")
+- elseif (EXISTS "/etc/arch-release")
+- set(${out_var} "arch linux")
+- elseif (EXISTS "/etc/debian_version")
+- set(${out_var} "debian")
+- endif()
+- endif()
+ return(PROPAGATE ${out_var})
+ endfunction()
+
+diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
+index f1f5db7b7b..9b4bdddb36 100644
+--- a/Modules/GetPrerequisites.cmake
++++ b/Modules/GetPrerequisites.cmake
+@@ -458,11 +458,9 @@
+ if(NOT resolved)
+ set(ri "ri-NOTFOUND")
+ find_file(ri "${item}" ${exepath} ${dirs} NO_DEFAULT_PATH)
+- find_file(ri "${item}" ${exepath} ${dirs} /usr/lib)
+
+ get_filename_component(basename_item "${item}" NAME)
+ find_file(ri "${basename_item}" PATHS ${exepath} ${dirs} NO_DEFAULT_PATH)
+- find_file(ri "${basename_item}" PATHS /usr/lib)
+
+ if(ri)
+ #message(STATUS "info: 'find_file' in exepath/dirs (${ri})")
+@@ -472,23 +470,6 @@
+ endif()
+ endif()
+
+- if(NOT resolved)
+- if(item MATCHES "[^/]+\\.framework/")
+- set(fw "fw-NOTFOUND")
+- find_file(fw "${item}"
+- "~/Library/Frameworks"
+- "/Library/Frameworks"
+- "/System/Library/Frameworks"
+- )
+- if(fw)
+- #message(STATUS "info: 'find_file' found framework (${fw})")
+- set(resolved 1)
+- set(resolved_item "${fw}")
+- set(fw "fw-NOTFOUND")
+- endif()
+- endif()
+- endif()
+-
+ # Using find_program on Windows will find dll files that are in the PATH.
+ # (Converting simple file names into full path names if found.)
+ #
+diff --git a/Modules/Internal/CMakeCUDAFindToolkit.cmake b/Modules/Internal/CMakeCUDAFindToolkit.cmake
+index 8fd408994f..61894813a2 100644
+--- a/Modules/Internal/CMakeCUDAFindToolkit.cmake
++++ b/Modules/Internal/CMakeCUDAFindToolkit.cmake
+@@ -50,18 +50,8 @@
+ # if CUDAToolkit_ROOT is not specified, it is assumed that the symlinked
+ # directory is the desired location.
+ if(NOT _CUDA_NVCC_EXECUTABLE)
+- if(UNIX)
+- if(NOT APPLE)
+- set(platform_base "/usr/local/cuda-")
+- else()
+- set(platform_base "/Developer/NVIDIA/CUDA-")
+- endif()
+- else()
+- set(platform_base "C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v")
+- endif()
+-
+ # Build out a descending list of possible cuda installations, e.g.
+- file(GLOB possible_paths "${platform_base}*")
++ set(possible_paths)
+ # Iterate the glob results and create a descending list.
+ set(versions)
+ foreach(p ${possible_paths})
+@@ -77,14 +67,6 @@
+
+ # With a descending list of versions, populate possible paths to search.
+ set(search_paths)
+- foreach(v ${versions})
+- list(APPEND search_paths "${platform_base}${v}")
+- endforeach()
+-
+- # Force the global default /usr/local/cuda to the front on Unix.
+- if(UNIX)
+- list(INSERT search_paths 0 "/usr/local/cuda")
+- endif()
+
+ # Now search for nvcc again using the platform default search paths.
+ find_program(_CUDA_NVCC_EXECUTABLE
+@@ -140,23 +122,13 @@
+ set(${lang_var_}LIBRARY_ROOT "${_CUDA_COMPILER_LIBRARY_ROOT_FROM_NVVMIR_LIBRARY_DIR}")
+ elseif(EXISTS "${${lang_var_}TOOLKIT_ROOT}/nvvm/libdevice")
+ set(${lang_var_}LIBRARY_ROOT "${${lang_var_}TOOLKIT_ROOT}")
+- elseif(CMAKE_SYSROOT_LINK AND EXISTS "${CMAKE_SYSROOT_LINK}/usr/lib/cuda/nvvm/libdevice")
+- set(${lang_var_}LIBRARY_ROOT "${CMAKE_SYSROOT_LINK}/usr/lib/cuda")
+- elseif(EXISTS "${CMAKE_SYSROOT}/usr/lib/cuda/nvvm/libdevice")
+- set(${lang_var_}LIBRARY_ROOT "${CMAKE_SYSROOT}/usr/lib/cuda")
+ else()
+ message(FATAL_ERROR "Couldn't find CUDA library root.")
+ endif()
+ unset(_CUDA_COMPILER_LIBRARY_ROOT_FROM_NVVMIR_LIBRARY_DIR)
+
+ # ${lang_var_}TOOLKIT_LIBRARY_ROOT contains the linking stubs necessary for device linking and other low-level library files.
+- if(CMAKE_SYSROOT_LINK AND EXISTS "${CMAKE_SYSROOT_LINK}/usr/lib/nvidia-cuda-toolkit/bin/crt/link.stub")
+- set(${lang_var_}TOOLKIT_LIBRARY_ROOT "${CMAKE_SYSROOT_LINK}/usr/lib/nvidia-cuda-toolkit")
+- elseif(EXISTS "${CMAKE_SYSROOT}/usr/lib/nvidia-cuda-toolkit/bin/crt/link.stub")
+- set(${lang_var_}TOOLKIT_LIBRARY_ROOT "${CMAKE_SYSROOT}/usr/lib/nvidia-cuda-toolkit")
+- else()
+- set(${lang_var_}TOOLKIT_LIBRARY_ROOT "${${lang_var_}TOOLKIT_ROOT}")
+- endif()
++ set(${lang_var_}TOOLKIT_LIBRARY_ROOT "${${lang_var_}TOOLKIT_ROOT}")
+
+ # For regular nvcc we the toolkit version is the same as the compiler version and we can parse it from the vendor test output.
+ # For Clang we need to invoke nvcc to get version output.
+diff --git a/Modules/Internal/CPack/CPackRPM.cmake b/Modules/Internal/CPack/CPackRPM.cmake
+index b733cfe964..90709f48e8 100644
+--- a/Modules/Internal/CPack/CPackRPM.cmake
++++ b/Modules/Internal/CPack/CPackRPM.cmake
+@@ -640,7 +640,7 @@
+ endif()
+
+ # With debugedit we prepare source files list
+- find_program(DEBUGEDIT_EXECUTABLE debugedit "/usr/lib/rpm/")
++ find_program(DEBUGEDIT_EXECUTABLE debugedit)
+ if(NOT DEBUGEDIT_EXECUTABLE)
+ message(FATAL_ERROR "CPackRPM: debugedit binary could not be found!"
+ " Required for debuginfo packaging. See documentation of"
+diff --git a/Modules/Platform/CYGWIN.cmake b/Modules/Platform/CYGWIN.cmake
+index cf5e732833..1bbbfeca54 100644
+--- a/Modules/Platform/CYGWIN.cmake
++++ b/Modules/Platform/CYGWIN.cmake
+@@ -15,13 +15,3 @@
+ set(CMAKE_SHARED_LIBRARY_NAME_WITH_VERSION 1)
+
+ include(Platform/UnixPaths)
+-
+-# Windows API on Cygwin
+-list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
+- /usr/include/w32api
+- )
+-
+-# Windows API on Cygwin
+-list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
+- /usr/lib/w32api
+- )
+diff --git a/Modules/Platform/Darwin-Initialize.cmake b/Modules/Platform/Darwin-Initialize.cmake
+index 7c4f123a1d..4cfd53de9f 100644
+--- a/Modules/Platform/Darwin-Initialize.cmake
++++ b/Modules/Platform/Darwin-Initialize.cmake
+@@ -1,19 +1,7 @@
+ set(APPLE 1)
+ set(UNIX 1)
+
+-# Ask xcode-select where to find /Developer or fall back to ancient location.
+-execute_process(COMMAND xcode-select -print-path
+- OUTPUT_VARIABLE _stdout
+- OUTPUT_STRIP_TRAILING_WHITESPACE
+- ERROR_VARIABLE _stderr
+- RESULT_VARIABLE _failed)
+-if(NOT _failed AND IS_DIRECTORY ${_stdout})
+- set(OSX_DEVELOPER_ROOT ${_stdout})
+-elseif(IS_DIRECTORY "/Developer")
+- set(OSX_DEVELOPER_ROOT "/Developer")
+-else()
+- set(OSX_DEVELOPER_ROOT "")
+-endif()
++set(OSX_DEVELOPER_ROOT "")
+
+ if(NOT CMAKE_CROSSCOMPILING)
+ execute_process(COMMAND @sw_vers@ -productVersion
+diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
+index 42c6b35424..f2985f3765 100644
+--- a/Modules/Platform/Darwin.cmake
++++ b/Modules/Platform/Darwin.cmake
+@@ -166,7 +166,6 @@
+
+ # set up the default search directories for frameworks
+ set(CMAKE_SYSTEM_FRAMEWORK_PATH
+- ~/Library/Frameworks
+ )
+ if(_CMAKE_OSX_SYSROOT_PATH)
+ list(APPEND CMAKE_SYSTEM_FRAMEWORK_PATH
+@@ -201,10 +200,6 @@
+ list(APPEND CMAKE_SYSTEM_FRAMEWORK_PATH
+ ${OSX_DEVELOPER_ROOT}/Library/Frameworks)
+ endif()
+-list(APPEND CMAKE_SYSTEM_FRAMEWORK_PATH
+- /Library/Frameworks
+- /Network/Library/Frameworks
+- /System/Library/Frameworks)
+
+ # Warn about known system misconfiguration case.
+ if(CMAKE_OSX_SYSROOT)
+@@ -230,10 +225,6 @@
+ # set up the default search directories for application bundles
+ set(_apps_paths)
+ foreach(_path
+- "~/Applications"
+- "/Applications"
+- "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+
+- "${OSX_DEVELOPER_ROOT}/Applications" # pre-4.3
+ )
+ get_filename_component(_apps "${_path}" ABSOLUTE)
+ if(EXISTS "${_apps}")
+@@ -249,28 +240,6 @@
+
+ include(Platform/UnixPaths)
+
+-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+- execute_process(
+- COMMAND brew --prefix
+- OUTPUT_VARIABLE _cmake_homebrew_prefix
+- RESULT_VARIABLE _brew_result
+- OUTPUT_STRIP_TRAILING_WHITESPACE
+- )
+- if (_brew_result EQUAL 0 AND IS_DIRECTORY "${_cmake_homebrew_prefix}")
+- list(PREPEND CMAKE_SYSTEM_PREFIX_PATH "${_cmake_homebrew_prefix}")
+- elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
+- list(PREPEND CMAKE_SYSTEM_PREFIX_PATH
+- /opt/homebrew # Brew on Apple Silicon
+- )
+- else()
+- list(PREPEND CMAKE_SYSTEM_PREFIX_PATH
+- /usr/local # Brew on Intel
+- )
+- endif()
+- unset(_cmake_homebrew_prefix)
+- unset(_brew_result)
+-endif()
+-
+ if(_CMAKE_OSX_SYSROOT_PATH)
+ if(EXISTS ${_CMAKE_OSX_SYSROOT_PATH}/usr/include)
+ list(INSERT CMAKE_SYSTEM_PREFIX_PATH 0 ${_CMAKE_OSX_SYSROOT_PATH}/usr)
+@@ -285,7 +254,3 @@
+ endforeach()
+ endif()
+ endif()
+-list(APPEND CMAKE_SYSTEM_PREFIX_PATH
+- /sw # Fink
+- /opt/local # MacPorts
+- )
+diff --git a/Modules/Platform/GNU.cmake b/Modules/Platform/GNU.cmake
+index 6a25b00b81..2430bdb7e4 100644
+--- a/Modules/Platform/GNU.cmake
++++ b/Modules/Platform/GNU.cmake
+@@ -48,13 +48,8 @@
+ # checking the platform every time. This option is advanced enough
+ # that only package maintainers should need to adjust it. They are
+ # capable of providing a setting on the command line.
+- if(EXISTS "/etc/debian_version")
+- set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
+- "Install .so files without execute permission.")
+- else()
+- set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
+- "Install .so files without execute permission.")
+- endif()
++ set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
++ "Install .so files without execute permission.")
+ endif()
+
+ include(Platform/UnixPaths)
+diff --git a/Modules/Platform/Linux.cmake b/Modules/Platform/Linux.cmake
+index 5b61dd6b61..d324b903ed 100644
+--- a/Modules/Platform/Linux.cmake
++++ b/Modules/Platform/Linux.cmake
+@@ -45,25 +45,8 @@
+ # checking the platform every time. This option is advanced enough
+ # that only package maintainers should need to adjust it. They are
+ # capable of providing a setting on the command line.
+- if(EXISTS "/etc/debian_version")
+- set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
+- "Install .so files without execute permission.")
+- else()
+- set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
+- "Install .so files without execute permission.")
+- endif()
++ set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
++ "Install .so files without execute permission.")
+ endif()
+
+ include(Platform/UnixPaths)
+-
+-# Debian has lib32 and lib64 paths only for compatibility so they should not be
+-# searched.
+-if(NOT CMAKE_CROSSCOMPILING AND NOT CMAKE_COMPILER_SYSROOT)
+- if (EXISTS "/etc/debian_version")
+- set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS FALSE)
+- set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
+- endif()
+- if (EXISTS "/etc/arch-release")
+- set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
+- endif()
+-endif()
+diff --git a/Modules/Platform/OpenBSD.cmake b/Modules/Platform/OpenBSD.cmake
+index 97e2a6a83e..02c607618c 100644
+--- a/Modules/Platform/OpenBSD.cmake
++++ b/Modules/Platform/OpenBSD.cmake
+@@ -31,13 +31,9 @@
+
+ if($ENV{LOCALBASE})
+ set(OPENBSD_LOCALBASE $ENV{LOCALBASE})
+-else()
+- set(OPENBSD_LOCALBASE /usr/local)
+ endif()
+ if($ENV{X11BASE})
+ set(OPENBSD_X11BASE $ENV{X11BASE})
+-else()
+- set(OPENBSD_X11BASE /usr/X11R6)
+ endif()
+
+ list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${OPENBSD_LOCALBASE})
+diff --git a/Modules/Platform/SunOS.cmake b/Modules/Platform/SunOS.cmake
+index e01e892283..d044d81c88 100644
+--- a/Modules/Platform/SunOS.cmake
++++ b/Modules/Platform/SunOS.cmake
+@@ -19,11 +19,6 @@
+
+ include(Platform/UnixPaths)
+
+-list(APPEND CMAKE_SYSTEM_PREFIX_PATH
+- /opt/csw
+- /opt/openwin
+- )
+-
+ # The Sun linker needs to find transitive shared library dependencies
+ # in the -L path.
+ set(CMAKE_LINK_DEPENDENT_LIBRARY_DIRS 1)
+diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
+index bdf4155232..588064821d 100644
+--- a/Modules/Platform/UnixPaths.cmake
++++ b/Modules/Platform/UnixPaths.cmake
+@@ -29,9 +29,6 @@
+ # please make sure to keep Help/variable/CMAKE_SYSTEM_PREFIX_PATH.rst
+ # synchronized
+ list(APPEND CMAKE_SYSTEM_PREFIX_PATH
+- # Standard
+- /usr/local /usr /
+-
+ # CMake install location
+ "${_CMAKE_INSTALL_DIR}"
+ )
+@@ -49,28 +46,6 @@
+ endif()
+ _cmake_record_install_prefix()
+
+-# Non "standard" but common install prefixes
+-list(APPEND CMAKE_SYSTEM_PREFIX_PATH
+- /usr/X11R6
+- /usr/pkg
+- /opt
+- )
+-
+-# List common include file locations not under the common prefixes.
+-list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
+- # X11
+- /usr/include/X11
+- )
+-
+-list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
+- # X11
+- /usr/lib/X11
+- )
+-
+-list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
+- /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64
+- )
+-
+ # Add the Nix C library paths.
+ if(DEFINED ENV{NIX_CC}
+ AND IS_DIRECTORY "$ENV{NIX_CC}"
+diff --git a/Modules/Platform/WindowsPaths.cmake b/Modules/Platform/WindowsPaths.cmake
+index c56dfaf9ac..4e0b250c1a 100644
+--- a/Modules/Platform/WindowsPaths.cmake
++++ b/Modules/Platform/WindowsPaths.cmake
+@@ -69,11 +69,6 @@
+ endif()
+ _cmake_record_install_prefix()
+
+-if(CMAKE_CROSSCOMPILING AND NOT CMAKE_HOST_SYSTEM_NAME MATCHES "Windows")
+- # MinGW (useful when cross compiling from linux with CMAKE_FIND_ROOT_PATH set)
+- list(APPEND CMAKE_SYSTEM_PREFIX_PATH /)
+-endif()
+-
+ list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
+ )
+
+diff --git a/Modules/ProcessorCount.cmake b/Modules/ProcessorCount.cmake
+index ffb8fcd8d2..6b8fcf87dc 100644
+--- a/Modules/ProcessorCount.cmake
++++ b/Modules/ProcessorCount.cmake
+@@ -128,7 +128,7 @@
+ if(NOT count)
+ # HPUX (systems with machinfo):
+ find_program(ProcessorCount_cmd_machinfo machinfo
+- PATHS /usr/contrib/bin)
++ )
+ mark_as_advanced(ProcessorCount_cmd_machinfo)
+ if(ProcessorCount_cmd_machinfo)
+ execute_process(COMMAND ${ProcessorCount_cmd_machinfo}
+@@ -160,7 +160,7 @@
+ if(NOT count)
+ # AIX (systems with lsconf):
+ find_program(ProcessorCount_cmd_lsconf lsconf
+- PATHS /usr/sbin)
++ )
+ mark_as_advanced(ProcessorCount_cmd_lsconf)
+ if(ProcessorCount_cmd_lsconf)
+ execute_process(COMMAND ${ProcessorCount_cmd_lsconf}
+@@ -190,7 +190,7 @@
+
+ if(NOT count)
+ # Sun (systems where psrinfo tool is available)
+- find_program(ProcessorCount_cmd_psrinfo psrinfo PATHS /usr/sbin /sbin)
++ find_program(ProcessorCount_cmd_psrinfo psrinfo)
+ mark_as_advanced(ProcessorCount_cmd_psrinfo)
+ if (ProcessorCount_cmd_psrinfo)
+ execute_process(COMMAND ${ProcessorCount_cmd_psrinfo} -p -v
+diff --git a/Modules/UseJava.cmake b/Modules/UseJava.cmake
+index b977d955ca..5ff835298d 100644
+--- a/Modules/UseJava.cmake
++++ b/Modules/UseJava.cmake
+@@ -1125,8 +1125,6 @@
+ set(_jar_files)
+ set(_jar_versions)
+ set(_jar_paths
+- /usr/share/java/
+- /usr/local/share/java/
+ ${Java_JAR_PATHS})
+ set(_jar_doc "NOTSET")
+
+diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
+index 8ff651fd90..9659deedf5 100644
+--- a/Utilities/cmcurl/CMakeLists.txt
++++ b/Utilities/cmcurl/CMakeLists.txt
+@@ -1826,43 +1826,6 @@
+ endif()
+ mark_as_advanced(CURL_CA_PATH_SET)
+
+- if(CURL_CA_BUNDLE_SET AND _curl_ca_path_autodetect)
+- # Skip auto-detection of unset CA path because CA bundle is set explicitly
+- elseif(CURL_CA_PATH_SET AND _curl_ca_bundle_autodetect)
+- # Skip auto-detection of unset CA bundle because CA path is set explicitly
+- elseif(_curl_ca_bundle_autodetect OR _curl_ca_path_autodetect)
+- # First try auto-detecting a CA bundle, then a CA path
+-
+- if(_curl_ca_bundle_autodetect)
+- foreach(_search_ca_bundle_path IN ITEMS
+- "/etc/ssl/certs/ca-certificates.crt"
+- "/etc/pki/tls/certs/ca-bundle.crt"
+- "/usr/share/ssl/certs/ca-bundle.crt"
+- "/usr/local/share/certs/ca-root-nss.crt"
+- "/etc/ssl/cert.pem")
+- if(EXISTS "${_search_ca_bundle_path}")
+- message(STATUS "Found CA bundle: ${_search_ca_bundle_path}")
+- set(CURL_CA_BUNDLE "${_search_ca_bundle_path}" CACHE
+- STRING "Path to the CA bundle. Set 'none' to disable or 'auto' for auto-detection. Defaults to 'auto'.")
+- set(CURL_CA_BUNDLE_SET TRUE CACHE BOOL "Path to the CA bundle has been set")
+- break()
+- endif()
+- endforeach()
+- endif()
+-
+- if(_curl_ca_path_autodetect AND NOT CURL_CA_PATH_SET)
+- set(_search_ca_path "/etc/ssl/certs")
+- file(GLOB _curl_ca_files_found "${_search_ca_path}/[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f].0")
+- if(_curl_ca_files_found)
+- unset(_curl_ca_files_found)
+- message(STATUS "Found CA path: ${_search_ca_path}")
+- set(CURL_CA_PATH "${_search_ca_path}" CACHE
+- STRING "Location of default CA path. Set 'none' to disable or 'auto' for auto-detection. Defaults to 'auto'.")
+- set(CURL_CA_PATH_SET TRUE CACHE BOOL "Path to the CA bundle has been set")
+- endif()
+- endif()
+- endif()
+-
+ set(CURL_CA_EMBED_SET FALSE)
+ if(BUILD_CURL_EXE AND NOT CURL_CA_EMBED STREQUAL "")
+ if(EXISTS "${CURL_CA_EMBED}")
+diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt
+index e6ab5de99b..158a407c3e 100644
+--- a/Utilities/cmlibarchive/CMakeLists.txt
++++ b/Utilities/cmlibarchive/CMakeLists.txt
+@@ -39,9 +39,6 @@
+ MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL|NONE)\$")
+ ENDIF()
+
+-# On MacOS, prefer MacPorts libraries to system libraries.
+-# I haven't come up with a compelling argument for this to be conditional.
+-list(APPEND CMAKE_PREFIX_PATH /opt/local)
+ # Enable @rpath in the install name.
+ # detail in "cmake --help-policy CMP0042"
+ SET(CMAKE_MACOSX_RPATH ON)
diff --git a/pkgs/by-name/cm/cmake/setup-hook.sh b/pkgs/by-name/cm/cmake/setup-hook.sh
index ea2d3d2a45bb..5e84594934f4 100755
--- a/pkgs/by-name/cm/cmake/setup-hook.sh
+++ b/pkgs/by-name/cm/cmake/setup-hook.sh
@@ -4,16 +4,6 @@ addCMakeParams() {
addToSearchPath NIXPKGS_CMAKE_PREFIX_PATH $1
}
-fixCmakeFiles() {
- # Replace occurences of /usr and /opt by /var/empty.
- echo "fixing cmake files..."
- find "$1" -type f \( -name "*.cmake" -o -name "*.cmake.in" -o -name CMakeLists.txt \) -print |
- while read fn; do
- sed -e 's^/usr\([ /]\|$\)^/var/empty\1^g' -e 's^/opt\([ /]\|$\)^/var/empty\1^g' < "$fn" > "$fn.tmp"
- mv "$fn.tmp" "$fn"
- done
-}
-
cmakeConfigurePhase() {
runHook preConfigure
@@ -25,10 +15,6 @@ cmakeConfigurePhase() {
export CTEST_PARALLEL_LEVEL=$NIX_BUILD_CORES
fi
- if [ -z "${dontFixCmake-}" ]; then
- fixCmakeFiles .
- fi
-
if [ -z "${dontUseCmakeBuildDir-}" ]; then
mkdir -p "$cmakeBuildDir"
cd "$cmakeBuildDir"
diff --git a/pkgs/by-name/cm/cmark-gfm/package.nix b/pkgs/by-name/cm/cmark-gfm/package.nix
index 645a7aabfbce..1ea91aaa9751 100644
--- a/pkgs/by-name/cm/cmark-gfm/package.nix
+++ b/pkgs/by-name/cm/cmark-gfm/package.nix
@@ -15,6 +15,13 @@ stdenv.mkDerivation rec {
sha256 = "sha256-HiSGtRsSbW03R6aKoMVVFOLrwP5aXtpeXUC/bE5M/qo=";
};
+ # Fix the build with CMake 4.
+ postPatch = ''
+ substituteInPlace CMakeLists.txt --replace-fail \
+ "cmake_minimum_required(VERSION 3.0)" \
+ "cmake_minimum_required(VERSION 3.13)"
+ '';
+
nativeBuildInputs = [ cmake ];
doCheck = true;
diff --git a/pkgs/by-name/cm/cmocka/package.nix b/pkgs/by-name/cm/cmocka/package.nix
index 74de381fbe52..2bb7d843df4c 100644
--- a/pkgs/by-name/cm/cmocka/package.nix
+++ b/pkgs/by-name/cm/cmocka/package.nix
@@ -7,12 +7,11 @@
stdenv.mkDerivation rec {
pname = "cmocka";
- majorVersion = "1.1";
- version = "${majorVersion}.7";
+ version = "1.1.8";
src = fetchurl {
- url = "https://cmocka.org/files/${majorVersion}/cmocka-${version}.tar.xz";
- sha256 = "sha256-gQVw6wuNZIBDMfgrKf9Hx5DOnNaxY+mNR6SAcEfsrYI=";
+ url = "https://cmocka.org/files/${lib.versions.majorMinor version}/cmocka-${version}.tar.xz";
+ hash = "sha256-WENbVYdm1/THKboWO9867Di+07x2batoTjUm7Qqnx4A=";
};
patches = [
diff --git a/pkgs/by-name/co/cocogitto/package.nix b/pkgs/by-name/co/cocogitto/package.nix
index 007b62d3af0c..6a6bc4982611 100644
--- a/pkgs/by-name/co/cocogitto/package.nix
+++ b/pkgs/by-name/co/cocogitto/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "oknozor";
repo = "cocogitto";
- rev = version;
+ tag = version;
hash = "sha256-ij5vpIpqCYGNPNWPY47rWmMLEgBh+wtVmLRt11S14rE=";
};
diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix
index 7019fc6ab242..abf64cc9f4da 100644
--- a/pkgs/by-name/co/codex/package.nix
+++ b/pkgs/by-name/co/codex/package.nix
@@ -14,18 +14,18 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "codex";
- version = "0.44.0";
+ version = "0.45.0";
src = fetchFromGitHub {
owner = "openai";
repo = "codex";
tag = "rust-v${finalAttrs.version}";
- hash = "sha256-i7UhSQ16HqcX/QUb6JQgF6WOTAEDZZNkL/MSqefcwBI=";
+ hash = "sha256-HRVfUK+ZH/Q2xEQ16wboA56q9Ia3Xx5LpdqKSpjr5hI=";
};
sourceRoot = "${finalAttrs.src.name}/codex-rs";
- cargoHash = "sha256-sR7Y1SfP0akLRRvP/6tu3gZRNvQbG/a+4bOSEbbrV30=";
+ cargoHash = "sha256-7uO7I84kthMh4UQUioW7gf1E0IB+9ov/tDvXdiCdK2s=";
nativeBuildInputs = [
installShellFiles
diff --git a/pkgs/by-name/co/coffeescript/package.nix b/pkgs/by-name/co/coffeescript/package.nix
index 0153c233d76a..9cf6b39511d7 100644
--- a/pkgs/by-name/co/coffeescript/package.nix
+++ b/pkgs/by-name/co/coffeescript/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
src = fetchFromGitHub {
owner = "jashkenas";
repo = "coffeescript";
- rev = version;
+ tag = version;
hash = "sha256-vr46LKICX61rFPCkZ3G+8gJykg+MO43YRJnZGM3RoY0=";
};
diff --git a/pkgs/by-name/co/collada-dom/package.nix b/pkgs/by-name/co/collada-dom/package.nix
index 640d2bf15b91..12765e966f85 100644
--- a/pkgs/by-name/co/collada-dom/package.nix
+++ b/pkgs/by-name/co/collada-dom/package.nix
@@ -36,6 +36,11 @@ stdenv.mkDerivation (finalAttrs: {
readline
];
+ cmakeFlags = [
+ # See https://github.com/NixOS/nixpkgs/issues/445447
+ "-DCMAKE_POLICY_VERSION_MINIMUM=3.10"
+ ];
+
meta = {
description = "API that provides a C++ object representation of a COLLADA XML instance document";
longDescription = "This is a fork of [rdiankov/collada-dom](https://github.com/rdiankov/collada-dom) which has been unmaintained for six years.";
diff --git a/pkgs/by-name/co/colloid-gtk-theme/package.nix b/pkgs/by-name/co/colloid-gtk-theme/package.nix
index 7f2c05aa7875..cfb00d16cabc 100644
--- a/pkgs/by-name/co/colloid-gtk-theme/package.nix
+++ b/pkgs/by-name/co/colloid-gtk-theme/package.nix
@@ -62,7 +62,7 @@ lib.checkListOfEnum "colloid-gtk-theme: theme variants"
src = fetchFromGitHub {
owner = "vinceliuice";
repo = "colloid-gtk-theme";
- rev = version;
+ tag = version;
hash = "sha256-0pXbeeBAkk6v2DBWfUYhWWdyrQhgr/JfDbhyS33maMM=";
};
diff --git a/pkgs/by-name/co/colloid-icon-theme/package.nix b/pkgs/by-name/co/colloid-icon-theme/package.nix
index 566897e0df59..fed231ed4bbe 100644
--- a/pkgs/by-name/co/colloid-icon-theme/package.nix
+++ b/pkgs/by-name/co/colloid-icon-theme/package.nix
@@ -49,7 +49,7 @@ lib.checkListOfEnum "colloid-icon-theme: scheme variants"
src = fetchFromGitHub {
owner = "vinceliuice";
repo = "colloid-icon-theme";
- rev = version;
+ tag = version;
hash = "sha256-x2SSaIkKm1415avO7R6TPkpghM30HmMdjMFUUyPWZsk=";
};
diff --git a/pkgs/by-name/co/commafeed/package.nix b/pkgs/by-name/co/commafeed/package.nix
index 297d36ddb179..105b8daa28ea 100644
--- a/pkgs/by-name/co/commafeed/package.nix
+++ b/pkgs/by-name/co/commafeed/package.nix
@@ -15,7 +15,7 @@ let
src = fetchFromGitHub {
owner = "Athou";
repo = "commafeed";
- rev = version;
+ tag = version;
hash = "sha256-Qc2l/CSVK+8k7b3RZA8hQsGTq29OvkDMbMzHcnPm/yE=";
};
diff --git a/pkgs/by-name/co/complete-alias/package.nix b/pkgs/by-name/co/complete-alias/package.nix
index fb51e7c99fa7..0c3dd2867498 100644
--- a/pkgs/by-name/co/complete-alias/package.nix
+++ b/pkgs/by-name/co/complete-alias/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
src = fetchFromGitHub {
owner = "cykerway";
repo = "complete-alias";
- rev = version;
+ tag = version;
sha256 = "18lmdb3inphxyjv08ing5wckqnjq0m5zfl0f15mqzlvf2ypar63x";
};
diff --git a/pkgs/by-name/co/configurable-http-proxy/package.nix b/pkgs/by-name/co/configurable-http-proxy/package.nix
index cf8d346d85ff..16cca147f0d9 100644
--- a/pkgs/by-name/co/configurable-http-proxy/package.nix
+++ b/pkgs/by-name/co/configurable-http-proxy/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
src = fetchFromGitHub {
owner = "jupyterhub";
repo = "configurable-http-proxy";
- rev = version;
+ tag = version;
hash = "sha256-nj6+GmBw5YSQs23rWVh3qU4jdzRdbPyx43QmZ3LRwn4=";
};
diff --git a/pkgs/by-name/co/conftest/package.nix b/pkgs/by-name/co/conftest/package.nix
index f7ddb73e8bf8..a2ec0d24a996 100644
--- a/pkgs/by-name/co/conftest/package.nix
+++ b/pkgs/by-name/co/conftest/package.nix
@@ -11,7 +11,7 @@
buildGoModule (finalAttrs: {
pname = "conftest";
- version = "0.62.0";
+ version = "0.63.0";
__darwinAllowLocalNetworking = true; # required for tests
@@ -19,9 +19,9 @@ buildGoModule (finalAttrs: {
owner = "open-policy-agent";
repo = "conftest";
tag = "v${finalAttrs.version}";
- hash = "sha256-6LEzWvnTMSNdMzoStS8cfJxiYCo752e0Js185PGa0y4=";
+ hash = "sha256-gmfzMup4fdsbdyUufxjcJRPF2faj3RUlvIn2ciyalaQ=";
};
- vendorHash = "sha256-Jf9Ui7iHyUZyDLuhI2tjFFawUfKLdcAJUlk79yAqckg=";
+ vendorHash = "sha256-pBUWM6st5FhhOki3n9NIN4/U8JB7Kq3Aph3AtQs+Ogg=";
ldflags = [
"-s"
diff --git a/pkgs/by-name/co/console-bridge/package.nix b/pkgs/by-name/co/console-bridge/package.nix
index 384f305977c9..4bf24c06e19c 100644
--- a/pkgs/by-name/co/console-bridge/package.nix
+++ b/pkgs/by-name/co/console-bridge/package.nix
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
+ fetchpatch,
cmake,
validatePkgConfig,
}:
@@ -13,10 +14,18 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "ros";
repo = "console_bridge";
- rev = version;
+ tag = version;
sha256 = "sha256-M3GocT0hodw3Sc2NHcFDiPVZ1XN7BqIUuYLW8OaXMqM=";
};
+ patches = [
+ (fetchpatch {
+ name = "console-bridge-fix-cmake-4.patch";
+ url = "https://github.com/ros/console_bridge/commit/81ec67f6daf3cd19ef506e00f02efb1645597b9c.patch";
+ hash = "sha256-qSYnqjD+63lWBdtrXbTawt1OpiAO9uvT7R5KmfpUmwQ=";
+ })
+ ];
+
nativeBuildInputs = [
cmake
validatePkgConfig
diff --git a/pkgs/by-name/co/container/package.nix b/pkgs/by-name/co/container/package.nix
index 3a8a57119615..5e489256da68 100644
--- a/pkgs/by-name/co/container/package.nix
+++ b/pkgs/by-name/co/container/package.nix
@@ -11,11 +11,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "container";
- version = "0.4.1";
+ version = "0.5.0";
src = fetchurl {
url = "https://github.com/apple/container/releases/download/${finalAttrs.version}/container-${finalAttrs.version}-installer-signed.pkg";
- hash = "sha256-Au8Waa0kgU6bAZFTrCBWEeOBhQr6PrJ0AEiA3RsHgYg=";
+ hash = "sha256-YDh6bIWUc1muXqEqy0Z6gvLZHr3MQwgsuBHGVNY1ZDg=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/co/contrast/package.nix b/pkgs/by-name/co/contrast/package.nix
index d5d86fe645c4..9f04c4658031 100644
--- a/pkgs/by-name/co/contrast/package.nix
+++ b/pkgs/by-name/co/contrast/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
group = "World";
owner = "design";
repo = "contrast";
- rev = version;
+ tag = version;
hash = "sha256-8A1qX1H0cET5AUvMoHC1/VyIQiaTysEY5RJRrVYvGng=";
};
diff --git a/pkgs/by-name/co/coppwr/package.nix b/pkgs/by-name/co/coppwr/package.nix
index 49d5455e25aa..3b90b72e7630 100644
--- a/pkgs/by-name/co/coppwr/package.nix
+++ b/pkgs/by-name/co/coppwr/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "dimtpap";
repo = "coppwr";
- rev = version;
+ tag = version;
hash = "sha256-9oFWX44jToJh0vJaDV/KZXVNQgLG0lr1iA+0hInAhLA=";
};
diff --git a/pkgs/applications/editors/jupyter-kernels/coq/kernel.nix b/pkgs/by-name/co/coq-kernel/kernel.nix
similarity index 100%
rename from pkgs/applications/editors/jupyter-kernels/coq/kernel.nix
rename to pkgs/by-name/co/coq-kernel/kernel.nix
diff --git a/pkgs/applications/editors/jupyter-kernels/coq/default.nix b/pkgs/by-name/co/coq-kernel/package.nix
similarity index 100%
rename from pkgs/applications/editors/jupyter-kernels/coq/default.nix
rename to pkgs/by-name/co/coq-kernel/package.nix
diff --git a/pkgs/by-name/co/cordova/package.nix b/pkgs/by-name/co/cordova/package.nix
index 394fc87059ac..568566383c11 100644
--- a/pkgs/by-name/co/cordova/package.nix
+++ b/pkgs/by-name/co/cordova/package.nix
@@ -11,7 +11,7 @@ buildNpmPackage rec {
src = fetchFromGitHub {
owner = "apache";
repo = "cordova-cli";
- rev = version;
+ tag = version;
hash = "sha256-fEV7NlRcRpyeRplsdXHI2U4/89DsvKQpVwHD5juiNPo=";
};
diff --git a/pkgs/by-name/co/coroot-node-agent/package.nix b/pkgs/by-name/co/coroot-node-agent/package.nix
index c17c799aae44..84b0acf96538 100644
--- a/pkgs/by-name/co/coroot-node-agent/package.nix
+++ b/pkgs/by-name/co/coroot-node-agent/package.nix
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "coroot-node-agent";
- version = "1.26.1";
+ version = "1.26.2";
src = fetchFromGitHub {
owner = "coroot";
repo = "coroot-node-agent";
rev = "v${version}";
- hash = "sha256-fg+dth3wCOdsSU8B6mdvlMFgfrG7Gu6IgpxENkk2/sw=";
+ hash = "sha256-IpjAXoQArvPxClvgT+qFj3RNmWh9fFYKAzh5Y3XlC54=";
};
vendorHash = "sha256-LJq45IGXgYNx0Hky2w+O5Enwc5EvD79/cJRQ/iCythk=";
diff --git a/pkgs/by-name/co/cortex-command-community-project/package.nix b/pkgs/by-name/co/cortex-command-community-project/package.nix
index ec2f85a455bf..80198390624b 100644
--- a/pkgs/by-name/co/cortex-command-community-project/package.nix
+++ b/pkgs/by-name/co/cortex-command-community-project/package.nix
@@ -16,7 +16,7 @@
pkg-config,
SDL2,
SDL2_image,
- tbb,
+ onetbb,
}:
stdenv.mkDerivation rec {
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
luajit
minizip
SDL2_image
- tbb
+ onetbb
];
passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/co/cosmic-protocols/package.nix b/pkgs/by-name/co/cosmic-protocols/package.nix
index 0cb9221a598b..44fc0a3fad81 100644
--- a/pkgs/by-name/co/cosmic-protocols/package.nix
+++ b/pkgs/by-name/co/cosmic-protocols/package.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation {
pname = "cosmic-protocols";
- version = "0-unstable-2025-09-17";
+ version = "0-unstable-2025-09-26";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-protocols";
- rev = "af1997b1827ad64aab46fa31c0b77fb20d7a537a";
- hash = "sha256-gIfCk8FqZo1iFwTTtcLqnX14Jg3k6UXIBkpKsom43EU=";
+ rev = "d0e95be25e423cfe523b11111a3666ed7aaf0dc4";
+ hash = "sha256-KvXQJ/EIRyrlmi80WKl2T9Bn+j7GCfQlcjgcEVUxPkc=";
};
makeFlags = [ "PREFIX=${placeholder "out"}" ];
diff --git a/pkgs/by-name/co/coulr/package.nix b/pkgs/by-name/co/coulr/package.nix
index c7db6a671b15..ba9cdc61901e 100644
--- a/pkgs/by-name/co/coulr/package.nix
+++ b/pkgs/by-name/co/coulr/package.nix
@@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec {
src = fetchFromGitHub {
owner = "Huluti";
repo = "Coulr";
- rev = version;
+ tag = version;
hash = "sha256-1xnL5AWl/rLQu3i9m6uxbS4QT+690hmEW8kYTwkg7Gw=";
};
diff --git a/pkgs/by-name/co/cowpatty/package.nix b/pkgs/by-name/co/cowpatty/package.nix
index f264c18c0c56..735de69c250b 100644
--- a/pkgs/by-name/co/cowpatty/package.nix
+++ b/pkgs/by-name/co/cowpatty/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "joswr1ght";
repo = "cowpatty";
- rev = version;
+ tag = version;
sha256 = "0fvwwghhd7wsx0lw2dj9rdsjnirawnq3c6silzvhi0yfnzn5fs0s";
};
diff --git a/pkgs/by-name/co/coz/package.nix b/pkgs/by-name/co/coz/package.nix
index 90e08f176aaf..715d22aae4ae 100644
--- a/pkgs/by-name/co/coz/package.nix
+++ b/pkgs/by-name/co/coz/package.nix
@@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec {
src = fetchFromGitHub {
owner = "plasma-umass";
repo = "coz";
- rev = version;
+ tag = version;
hash = "sha256-tvFXInxjodB0jEgEKgnOGapiVPomBG1hvrhYtG2X5jI=";
};
diff --git a/pkgs/by-name/co/cozy/package.nix b/pkgs/by-name/co/cozy/package.nix
index ff77b3ab05b2..63ca2d2b931d 100644
--- a/pkgs/by-name/co/cozy/package.nix
+++ b/pkgs/by-name/co/cozy/package.nix
@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
src = fetchFromGitHub {
owner = "geigi";
repo = "cozy";
- rev = version;
+ tag = version;
hash = "sha256-oMgdz2dny0u1XV13aHu5s8/pcAz8z/SAOf4hbCDsdjw";
};
diff --git a/pkgs/by-name/cp/cpio/package.nix b/pkgs/by-name/cp/cpio/package.nix
index 879b52a98c7d..d2b2ed66fa1d 100644
--- a/pkgs/by-name/cp/cpio/package.nix
+++ b/pkgs/by-name/cp/cpio/package.nix
@@ -24,6 +24,12 @@ stdenv.mkDerivation rec {
separateDebugInfo = true;
+ # The code won't compile in c23 mode.
+ # https://gcc.gnu.org/gcc-15/porting_to.html#c23-fn-decls-without-parameters
+ configureFlags = [
+ "CFLAGS=-std=gnu17"
+ ];
+
preConfigure = lib.optionalString stdenv.hostPlatform.isCygwin ''
sed -i gnu/fpending.h -e 's,include ,,'
'';
diff --git a/pkgs/by-name/cp/cpptoml/package.nix b/pkgs/by-name/cp/cpptoml/package.nix
index 9cc05daed374..825a8b61b67f 100644
--- a/pkgs/by-name/cp/cpptoml/package.nix
+++ b/pkgs/by-name/cp/cpptoml/package.nix
@@ -34,6 +34,19 @@ stdenv.mkDerivation {
"-DCPPTOML_BUILD_EXAMPLES=OFF"
];
+ # Fix the build with CMake 4.
+ #
+ # See:
+ #
+ # *
+ # *
+ postPatch = ''
+ substituteInPlace CMakeLists.txt \
+ --replace-fail \
+ 'cmake_minimum_required(VERSION 3.1.0)' \
+ 'cmake_minimum_required(VERSION 3.10)'
+ '';
+
meta = with lib; {
description = "C++ TOML configuration library";
homepage = "https://github.com/skystrife/cpptoml";
diff --git a/pkgs/by-name/cr/crc32c/package.nix b/pkgs/by-name/cr/crc32c/package.nix
index fa2dd97b7a14..977f35dc9c68 100644
--- a/pkgs/by-name/cr/crc32c/package.nix
+++ b/pkgs/by-name/cr/crc32c/package.nix
@@ -2,6 +2,7 @@
stdenv,
lib,
fetchFromGitHub,
+ fetchpatch,
cmake,
gflags,
staticOnly ? stdenv.hostPlatform.isStatic,
@@ -19,10 +20,22 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
+ patches = [
+ (fetchpatch {
+ name = "crc32c-fix-cmake-4.patch";
+ url = "https://github.com/google/crc32c/commit/2bbb3be42e20a0e6c0f7b39dc07dc863d9ffbc07.patch";
+ excludes = [ "third_party/*" ];
+ hash = "sha256-XYH0Mwvmf8RkXscVo6pAejTbRmVl9tY+lpp1sqbNXa0=";
+ })
+ ];
+
nativeBuildInputs = [ cmake ];
buildInputs = [ gflags ];
- env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isAarch64 "-march=armv8-a+crc";
+ env.NIX_CFLAGS_COMPILE =
+ lib.optionalString stdenv.hostPlatform.isAarch64 "-march=armv8-a+crc"
+ # TODO: probably fixed for version > 1.1.2
+ + lib.optionalString stdenv.cc.isClang " -Wno-error=character-conversion";
cmakeFlags = [
"-DCRC32C_INSTALL=1"
diff --git a/pkgs/by-name/cr/criterion/package.nix b/pkgs/by-name/cr/criterion/package.nix
index 611aff9167d5..9d508d64d68e 100644
--- a/pkgs/by-name/cr/criterion/package.nix
+++ b/pkgs/by-name/cr/criterion/package.nix
@@ -4,7 +4,6 @@
fetchFromGitHub,
boxfort,
meson,
- libcsptr,
pkg-config,
gettext,
cmake,
@@ -61,7 +60,6 @@ stdenv.mkDerivation rec {
(lib.getDev boxfort)
dyncall
gettext
- libcsptr
nanomsg
nanopbMalloc
libgit2
diff --git a/pkgs/by-name/ct/ctagdrc/package.nix b/pkgs/by-name/ct/ctagdrc/package.nix
new file mode 100644
index 000000000000..44a0feea8879
--- /dev/null
+++ b/pkgs/by-name/ct/ctagdrc/package.nix
@@ -0,0 +1,95 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+ cmake,
+ pkg-config,
+ alsa-lib,
+ fontconfig,
+ freetype,
+ libX11,
+ libXcomposite,
+ libXcursor,
+ libXdmcp,
+ libXext,
+ libXinerama,
+ libXrandr,
+ libXtst,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "ctagdrc";
+ version = "0.1.1";
+
+ src = fetchFromGitHub {
+ owner = "BillyDM";
+ repo = "CTAGDRC";
+ tag = finalAttrs.version;
+ hash = "sha256-szBI8ESJz1B/JuGcZD8D53c1yJeUW1uK4GewQExtD9Q=";
+ fetchSubmodules = true;
+ };
+
+ nativeBuildInputs = [
+ cmake
+ pkg-config
+ ];
+
+ buildInputs = [
+ alsa-lib
+ fontconfig
+ freetype
+ libX11
+ libXcomposite
+ libXcursor
+ libXdmcp
+ libXext
+ libXinerama
+ libXrandr
+ libXtst
+ ];
+
+ enableParallelBuilding = true;
+
+ postPatch = ''
+ substituteInPlace CMakeLists.txt \
+ --replace-fail 'COPY_PLUGIN_AFTER_BUILD TRUE' 'COPY_PLUGIN_AFTER_BUILD FALSE'
+ substituteInPlace CMakeLists.txt \
+ --replace-fail 'include(cmake-include/CPM.cmake)' '# No CPM needed'
+ substituteInPlace CMakeLists.txt \
+ --replace-fail 'juce::juce_recommended_lto_flags' '# Not forcing LTO'
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/bin $out/lib/clap $out/lib/vst3
+ install -Dm755 "CTAGDRC_artefacts/Release/Standalone/CTAGDRC" $out/bin/CTAGDRC
+ install -Dm644 "CTAGDRC_artefacts/Release/CLAP/CTAGDRC.clap" -t $out/lib/clap
+ cp -r "CTAGDRC_artefacts/Release/VST3/CTAGDRC.vst3" $out/lib/vst3
+
+ runHook postInstall
+ '';
+
+ # JUCE dlopens these, make sure they are in rpath
+ # Otherwise, segfault will happen
+ env.NIX_LDFLAGS = toString [
+ "-lX11"
+ "-lXext"
+ "-lXcomposite"
+ "-lXcursor"
+ "-lXinerama"
+ "-lXrandr"
+ "-lXrender"
+ "-lXtst"
+ "-lXdmcp"
+ ];
+
+ meta = {
+ description = "Audio compressor plugin created with JUCE";
+ homepage = "https://github.com/BillyDM/CTAGDRC";
+ license = lib.licenses.gpl3Plus;
+ maintainers = with lib.maintainers; [ magnetophon ];
+ mainProgram = "CTAGDRC";
+ platforms = lib.platforms.all;
+ };
+})
diff --git a/pkgs/development/libraries/ctranslate2/default.nix b/pkgs/by-name/ct/ctranslate2/package.nix
similarity index 62%
rename from pkgs/development/libraries/ctranslate2/default.nix
rename to pkgs/by-name/ct/ctranslate2/package.nix
index 8524bb3e16ce..aaa3cbb13e27 100644
--- a/pkgs/development/libraries/ctranslate2/default.nix
+++ b/pkgs/by-name/ct/ctranslate2/package.nix
@@ -1,13 +1,14 @@
{
lib,
stdenv,
+ config,
fetchFromGitHub,
cmake,
llvmPackages, # openmp
withMkl ? false,
mkl,
- withCUDA ? false,
- withCuDNN ? false,
+ withCUDA ? config.cudaSupport,
+ withCuDNN ? withCUDA && (cudaPackages ? cudnn),
cudaPackages,
# Enabling both withOneDNN and withOpenblas is broken
# https://github.com/OpenNMT/CTranslate2/issues/1294
@@ -23,21 +24,33 @@
}:
let
- cmakeBool = b: if b then "ON" else "OFF";
stdenv' = if withCUDA then cudaPackages.backendStdenv else stdenv;
in
-stdenv'.mkDerivation rec {
+stdenv'.mkDerivation (finalAttrs: {
pname = "ctranslate2";
version = "4.6.0";
src = fetchFromGitHub {
owner = "OpenNMT";
repo = "CTranslate2";
- rev = "v${version}";
- hash = "sha256-EM2kunqtxo0BTIzrEomfaRsdav7sx6QEOhjDtjjSoYY=";
+ tag = "v${finalAttrs.version}";
fetchSubmodules = true;
+ hash = "sha256-EM2kunqtxo0BTIzrEomfaRsdav7sx6QEOhjDtjjSoYY=";
};
+ # Fix CMake 4 compatibility
+ postPatch = ''
+ substituteInPlace third_party/cpu_features/CMakeLists.txt \
+ --replace-fail \
+ 'cmake_minimum_required(VERSION 3.0)' \
+ 'cmake_minimum_required(VERSION 3.10)'
+
+ substituteInPlace third_party/ruy/third_party/cpuinfo/deps/clog/CMakeLists.txt \
+ --replace-fail \
+ 'CMAKE_MINIMUM_REQUIRED(VERSION 3.1 FATAL_ERROR)' \
+ 'CMAKE_MINIMUM_REQUIRED(VERSION 3.10 FATAL_ERROR)'
+ '';
+
nativeBuildInputs = [
cmake
]
@@ -49,15 +62,17 @@ stdenv'.mkDerivation rec {
# https://opennmt.net/CTranslate2/installation.html#build-options
# https://github.com/OpenNMT/CTranslate2/blob/54810350e662ebdb01ecbf8e4a746f02aeff1dd7/python/tools/prepare_build_environment_linux.sh#L53
# https://github.com/OpenNMT/CTranslate2/blob/59d223abcc7e636c1c2956e62482bc3299cc7766/python/tools/prepare_build_environment_macos.sh#L12
- "-DOPENMP_RUNTIME=COMP"
- "-DWITH_CUDA=${cmakeBool withCUDA}"
- "-DWITH_CUDNN=${cmakeBool withCuDNN}"
- "-DWITH_DNNL=${cmakeBool withOneDNN}"
- "-DWITH_OPENBLAS=${cmakeBool withOpenblas}"
- "-DWITH_RUY=${cmakeBool withRuy}"
- "-DWITH_MKL=${cmakeBool withMkl}"
+ (lib.cmakeFeature "OPENMP_RUNTIME" "COMP")
+ (lib.cmakeBool "WITH_CUDA" withCUDA)
+ (lib.cmakeBool "WITH_CUDNN" withCuDNN)
+ (lib.cmakeBool "WITH_DNNL" withOneDNN)
+ (lib.cmakeBool "WITH_OPENBLAS" withOpenblas)
+ (lib.cmakeBool "WITH_RUY" withRuy)
+ (lib.cmakeBool "WITH_MKL" withMkl)
]
- ++ lib.optional stdenv.hostPlatform.isDarwin "-DWITH_ACCELERATE=ON";
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ (lib.cmakeBool "WITH_ACCELERATE" true)
+ ];
buildInputs =
lib.optionals withMkl [
@@ -89,16 +104,16 @@ stdenv'.mkDerivation rec {
;
};
- meta = with lib; {
+ meta = {
description = "Fast inference engine for Transformer models";
mainProgram = "ct2-translator";
homepage = "https://github.com/OpenNMT/CTranslate2";
- changelog = "https://github.com/OpenNMT/CTranslate2/blob/${src.rev}/CHANGELOG.md";
- license = licenses.mit;
- maintainers = with maintainers; [
+ changelog = "https://github.com/OpenNMT/CTranslate2/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [
hexa
misuzu
];
broken = !(withCuDNN -> withCUDA);
};
-}
+})
diff --git a/pkgs/by-name/cu/cuneiform/package.nix b/pkgs/by-name/cu/cuneiform/package.nix
index 2a677a51923b..01ede4ac0d3b 100644
--- a/pkgs/by-name/cu/cuneiform/package.nix
+++ b/pkgs/by-name/cu/cuneiform/package.nix
@@ -7,6 +7,7 @@
testers,
}:
+# Deprecated: unmaintained, no consumers in nixpkgs as of 2025-10-05, and doesn't compile with gcc 15.
stdenv.mkDerivation (finalAttrs: {
pname = "cuneiform";
version = "1.1.0";
@@ -36,6 +37,9 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = ''
rm cuneiform_src/Kern/hhh/tigerh/h/strings.h
+ substituteInPlace CMakeLists.txt --replace-fail \
+ 'cmake_minimum_required(VERSION 2.6.2)' \
+ 'cmake_minimum_required(VERSION 3.10)'
'';
# make the install path match the rpath
diff --git a/pkgs/by-name/cu/cups/package.nix b/pkgs/by-name/cu/cups/package.nix
index 7ca9ce3dfe28..cbb6616f968c 100644
--- a/pkgs/by-name/cu/cups/package.nix
+++ b/pkgs/by-name/cu/cups/package.nix
@@ -25,11 +25,11 @@
stdenv.mkDerivation rec {
pname = "cups";
- version = "2.4.12";
+ version = "2.4.14";
src = fetchurl {
url = "https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz";
- hash = "sha256-sd3hkaSuJ2DEciDILKYVWijDgnAebBoBWdEFSZAjHVk=";
+ hash = "sha256-ZgKIAg3W95yveZgRxMGjIHpIaJiZrCCTlZ1wo73Ldpk=";
};
outputs = [
diff --git a/pkgs/by-name/cu/curlMinimal/package.nix b/pkgs/by-name/cu/curlMinimal/package.nix
index a2d1835da18e..2ce9522d6f4d 100644
--- a/pkgs/by-name/cu/curlMinimal/package.nix
+++ b/pkgs/by-name/cu/curlMinimal/package.nix
@@ -34,7 +34,6 @@
http3Support ? false,
nghttp3,
ngtcp2,
- quictls,
websocketSupport ? false,
idnSupport ? false,
libidn2,
@@ -85,13 +84,9 @@ assert
]) > 1
);
-let
- openssl' = if http3Support then quictls else openssl;
-in
-
stdenv.mkDerivation (finalAttrs: {
pname = "curl";
- version = "8.14.1";
+ version = "8.16.0";
src = fetchurl {
urls = [
@@ -100,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version
}/curl-${finalAttrs.version}.tar.xz"
];
- hash = "sha256-9GGaHiR0xLv+3IinwhkSCcgzS0j6H05T/VhMwS6RIN0=";
+ hash = "sha256-QMjN28tsxiUcA96kI6Ryps6kA3vmVLpc9d7G6y0i/x0=";
};
# this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion
@@ -137,7 +132,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeCheckInputs = [
# See https://github.com/curl/curl/pull/16928
- openssl'
+ openssl
];
# Zlib and OpenSSL must be propagated because `libcurl.la' contains
@@ -156,7 +151,7 @@ stdenv.mkDerivation (finalAttrs: {
]
++ lib.optional idnSupport libidn2
++ lib.optional ldapSupport openldap
- ++ lib.optional opensslSupport openssl'
+ ++ lib.optional opensslSupport openssl
++ lib.optional pslSupport libpsl
++ lib.optional rtmpSupport rtmpdump
++ lib.optional scpSupport libssh2
@@ -179,8 +174,8 @@ stdenv.mkDerivation (finalAttrs: {
(lib.enableFeature ldapSupport "ldap")
(lib.enableFeature ldapSupport "ldaps")
(lib.enableFeature websocketSupport "websockets")
- # --with-ca-fallback is only supported for openssl and gnutls https://github.com/curl/curl/blame/curl-8_0_1/acinclude.m4#L1640
- (lib.withFeature (opensslSupport || gnutlsSupport) "ca-fallback")
+ # --with-ca-fallback is only supported for openssl https://github.com/curl/curl/blame/curl-8_16_0/acinclude.m4#L1258
+ (lib.withFeature opensslSupport "ca-fallback")
(lib.withFeature http3Support "nghttp3")
(lib.withFeature http3Support "ngtcp2")
(lib.withFeature rtmpSupport "librtmp")
@@ -190,7 +185,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.withFeatureAs brotliSupport "brotli" (lib.getDev brotli))
(lib.withFeatureAs gnutlsSupport "gnutls" (lib.getDev gnutls))
(lib.withFeatureAs idnSupport "libidn2" (lib.getDev libidn2))
- (lib.withFeatureAs opensslSupport "openssl" (lib.getDev openssl'))
+ (lib.withFeatureAs opensslSupport "openssl" (lib.getDev openssl))
(lib.withFeatureAs scpSupport "libssh2" (lib.getDev libssh2))
(lib.withFeatureAs wolfsslSupport "wolfssl" (lib.getDev wolfssl))
]
@@ -255,8 +250,7 @@ stdenv.mkDerivation (finalAttrs: {
useThisCurl = attr: attr.override { curl = finalAttrs.finalPackage; };
in
{
- inherit opensslSupport;
- openssl = openssl';
+ inherit opensslSupport openssl;
tests = {
withCheck = finalAttrs.finalPackage.overrideAttrs (_: {
doCheck = true;
diff --git a/pkgs/by-name/cu/curv/package.nix b/pkgs/by-name/cu/curv/package.nix
index 2d68ac3aeef0..2859522af3d2 100644
--- a/pkgs/by-name/cu/curv/package.nix
+++ b/pkgs/by-name/cu/curv/package.nix
@@ -11,7 +11,7 @@
libGL,
libpng,
openexr,
- tbb,
+ onetbb,
xorg,
ilmbase,
llvmPackages,
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
libGL
libpng
openexr
- tbb
+ onetbb
xorg.libX11
xorg.libXcursor
xorg.libXext
diff --git a/pkgs/by-name/cx/cxxopts/package.nix b/pkgs/by-name/cx/cxxopts/package.nix
index a00858fb2fff..8accbcad0630 100644
--- a/pkgs/by-name/cx/cxxopts/package.nix
+++ b/pkgs/by-name/cx/cxxopts/package.nix
@@ -2,29 +2,38 @@
lib,
stdenv,
fetchFromGitHub,
+ fetchpatch2,
cmake,
icu74,
pkg-config,
+ testers,
+ validatePkgConfig,
enableUnicodeHelp ? true,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "cxxopts";
- version = "3.2.1";
+ version = "3.3.1";
src = fetchFromGitHub {
owner = "jarro2783";
repo = "cxxopts";
- rev = "v${version}";
- sha256 = "sha256-aOF3owz7SIV4trJY0PnMtIcwqoUpDbB3tNxZcsl9dzM=";
+ rev = "v${finalAttrs.version}";
+ hash = "sha256-baM6EX9D0yfrKxuPXyUUV9RqdrVLyygeG6x57xN8lc4=";
};
- buildInputs = lib.optionals enableUnicodeHelp [ icu74.dev ];
+ propagatedBuildInputs = lib.optionals enableUnicodeHelp [ icu74.dev ];
cmakeFlags = [
"-DCXXOPTS_BUILD_EXAMPLES=OFF"
]
++ lib.optional enableUnicodeHelp "-DCXXOPTS_USE_UNICODE_HELP=TRUE";
- nativeBuildInputs = [ cmake ] ++ lib.optionals enableUnicodeHelp [ pkg-config ];
+ nativeBuildInputs = [
+ cmake
+ ]
+ ++ lib.optionals enableUnicodeHelp [
+ pkg-config
+ validatePkgConfig
+ ];
doCheck = true;
@@ -34,14 +43,30 @@ stdenv.mkDerivation rec {
# https://github.com/jarro2783/cxxopts/issues/332
postPatch = ''
substituteInPlace packaging/pkgconfig.pc.in \
- --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@
+ --replace-fail '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@
'';
+ patches = [
+ (fetchpatch2 {
+ url = "https://github.com/jarro2783/cxxopts/commit/e98c73d665915b292a0592bf34fcbe8522035bc1.patch?full_index=1";
+ name = "fix-icu-uc-typo-in-pkgconfig.patch";
+ hash = "sha256-bqd3H66Op1/EkN2HLd84Obky4Y2ndPPY8MGZ5fqtdk4=";
+ })
+ ];
+
+ passthru = {
+ tests.pkg-config = testers.hasPkgConfigModules {
+ package = finalAttrs.finalPackage;
+ versionCheck = true;
+ };
+ };
+
meta = with lib; {
homepage = "https://github.com/jarro2783/cxxopts";
description = "Lightweight C++ GNU-style option parser library";
license = licenses.mit;
maintainers = [ maintainers.spease ];
+ pkgConfigModules = [ "cxxopts" ];
platforms = platforms.all;
};
-}
+})
diff --git a/pkgs/tools/security/cyclonedx-gomod/default.nix b/pkgs/by-name/cy/cyclonedx-gomod/package.nix
similarity index 100%
rename from pkgs/tools/security/cyclonedx-gomod/default.nix
rename to pkgs/by-name/cy/cyclonedx-gomod/package.nix
diff --git a/pkgs/by-name/da/dafny/deps.json b/pkgs/by-name/da/dafny/deps.json
index ce1545664768..e445c3452626 100644
--- a/pkgs/by-name/da/dafny/deps.json
+++ b/pkgs/by-name/da/dafny/deps.json
@@ -1,73 +1,73 @@
[
{
"pname": "Boogie",
- "version": "3.2.5",
- "hash": "sha256-/ZbKajyZuBV3zyh7JfwBfrcxaRpIkUfWGOjxB1qExX8="
+ "version": "3.5.5",
+ "hash": "sha256-8+/ZHJYvaAp3EoWGDKdVDWMEv1Q8MdTszDU9xFpKBGk="
},
{
"pname": "Boogie.AbstractInterpretation",
- "version": "3.4.3",
- "hash": "sha256-s3cykv7AMeC+UhmYzGdM75/3/7CxX4h292DGTE9Yd4U="
+ "version": "3.5.5",
+ "hash": "sha256-PBMwpm19GwzDDtf8ONiKLs1BNhEJ1TwJdzW/ktGzpBE="
},
{
"pname": "Boogie.BaseTypes",
- "version": "3.4.3",
- "hash": "sha256-vSjGt+GKK2oGNY9ZJTvDT8A/H+eCbm1D+CppoKIWW88="
+ "version": "3.5.5",
+ "hash": "sha256-qGnzoVzf2S8sBU9XAIg/JcS5hqGLikEhalkOBhnuRdQ="
},
{
"pname": "Boogie.CodeContractsExtender",
- "version": "3.4.3",
- "hash": "sha256-mb8RXgKJCutupsg/oFxMENlltn5nmjt7bXAodN6t9dA="
+ "version": "3.5.5",
+ "hash": "sha256-XEZ1htkdiOsowqc3JQ8iBF6ty/OPqcaG68CwR8cRNa8="
},
{
"pname": "Boogie.Concurrency",
- "version": "3.4.3",
- "hash": "sha256-piDvI01lZb23LkL/NX+NDnGVnHn1q4B/YoS7FrcQZ+M="
+ "version": "3.5.5",
+ "hash": "sha256-0zKDKhIxSV9GK77UHGBlhHXPhHUVIkLzUgoi8GfQj3s="
},
{
"pname": "Boogie.Core",
- "version": "3.4.3",
- "hash": "sha256-EUckeyktsBHLVCQlf9CQtx3vmgts2zpVcS0NiVw6WlY="
+ "version": "3.5.5",
+ "hash": "sha256-aotlVqCDEDLiHYVqJPE+BP+rjH6TKmLa/wsUlEVkvWg="
},
{
"pname": "Boogie.ExecutionEngine",
- "version": "3.4.3",
- "hash": "sha256-+57PiqmW9CJuHYoAt6hMuWOveZpZTztwUrzzQsajo2A="
+ "version": "3.5.5",
+ "hash": "sha256-Pwe2V0pJMYp5TGF8yWu5D2ZC/Ct3+EjEH2tG6xWCvbU="
},
{
"pname": "Boogie.Graph",
- "version": "3.4.3",
- "hash": "sha256-eWn8EWUlWZQ2U06anUBaPfdBNzqK5xP7xdntSB7F3mw="
+ "version": "3.5.5",
+ "hash": "sha256-DgPrUOVMIzTY87Ytq0WAu8j/OahLIVLO3Nh5VgYdDiM="
},
{
"pname": "Boogie.Houdini",
- "version": "3.4.3",
- "hash": "sha256-BJLTqC2ih5XHLCmzf/4TKUZCpUCf6PmBTujIIRykLcc="
+ "version": "3.5.5",
+ "hash": "sha256-84RbD21xds0ycZ0aQEAaQDUKV9nyYn6O8mUJKygI+nM="
},
{
"pname": "Boogie.Model",
- "version": "3.4.3",
- "hash": "sha256-3CrdoCM85IkZ7E8gTdmUspmUFbYpBu1PmbF4a2U7I8E="
+ "version": "3.5.5",
+ "hash": "sha256-7mJYhgT2XsnA1yZ5lHU9gbog9BHDwmCM0U6nIg7WxAc="
},
{
"pname": "Boogie.Provers.LeanAuto",
- "version": "3.4.3",
- "hash": "sha256-GJY7XUBFhL6N7U8QJmvCc7G8k3pV8LfyMhDev37GmFc="
+ "version": "3.5.5",
+ "hash": "sha256-s7zqacQxogd5yFEtVxb6NzFoQjoB/NkzulkWGty4Zm8="
},
{
"pname": "Boogie.Provers.SMTLib",
- "version": "3.4.3",
- "hash": "sha256-llI/WhQsM8KygDB/OYY5yc8U9SN3rd3NCkWFsB3yCDM="
+ "version": "3.5.5",
+ "hash": "sha256-PNprXXr7p0jbS6aL8PDelvINo6QCUJs6b+fBajMG1Ok="
},
{
"pname": "Boogie.VCExpr",
- "version": "3.4.3",
- "hash": "sha256-muY74ki4Cq8JoA4tGUxxWPNAlGhAq4dtGTSoCxNQZm0="
+ "version": "3.5.5",
+ "hash": "sha256-8f4e51g2N/jpT2BJ5LZrXsIKqrlCvWtS63hFUBK5lAk="
},
{
"pname": "Boogie.VCGeneration",
- "version": "3.4.3",
- "hash": "sha256-ngZtONjWgr0BbQcGNl5uynY5Ac6JRDZujgUNQJgvhJg="
+ "version": "3.5.5",
+ "hash": "sha256-BGeJ1F14hZSeY9bwCpNnyh5F6whAWX18YBcOMorS9/Y="
},
{
"pname": "CocoR",
@@ -244,16 +244,6 @@
"version": "1.1.0",
"hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="
},
- {
- "pname": "Microsoft.NETFramework.ReferenceAssemblies",
- "version": "1.0.3",
- "hash": "sha256-FBoJP5DHZF0QHM0xLm9yd4HJZVQOuSpSKA+VQRpphEE="
- },
- {
- "pname": "Microsoft.NETFramework.ReferenceAssemblies.net452",
- "version": "1.0.3",
- "hash": "sha256-RTPuFG8D7gnwINEoEtAqmVm4oTW8K4Z87v1o4DDeLMI="
- },
{
"pname": "Microsoft.TestPlatform.Extensions.TrxLogger",
"version": "17.9.0",
@@ -299,16 +289,16 @@
"version": "6.0.0",
"hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="
},
+ {
+ "pname": "Namotion.Reflection",
+ "version": "3.2.0",
+ "hash": "sha256-yHTow9l4YkN3SKsCkW2htxcoCX3/ewXVavFzucl835M="
+ },
{
"pname": "Nerdbank.Streams",
"version": "2.6.81",
"hash": "sha256-0Zshmi1IMWj9/MKUieffpgJxKhJyVgBXPKMg9RSDkRs="
},
- {
- "pname": "NETStandard.Library",
- "version": "2.0.3",
- "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="
- },
{
"pname": "Newtonsoft.Json",
"version": "11.0.2",
@@ -316,8 +306,18 @@
},
{
"pname": "Newtonsoft.Json",
- "version": "13.0.1",
- "hash": "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="
+ "version": "13.0.3",
+ "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="
+ },
+ {
+ "pname": "NJsonSchema",
+ "version": "11.1.0",
+ "hash": "sha256-DaBs+DNbMzkzfEbMd2Y2dNrubNzaa1nu2wnno6y8+Wk="
+ },
+ {
+ "pname": "NJsonSchema.Annotations",
+ "version": "11.1.0",
+ "hash": "sha256-oxr6gv3VIvk1vH0YZdAmWgyY0yobxtjFfRwnW1D8Pcc="
},
{
"pname": "OmniSharp.Extensions.JsonRpc",
@@ -544,11 +544,6 @@
"version": "4.3.0",
"hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="
},
- {
- "pname": "System.Buffers",
- "version": "4.4.0",
- "hash": "sha256-KTxAhYawFG2V5VX1jw3pzx3IrQXRgn1TsvgjPgxAbqA="
- },
{
"pname": "System.Collections",
"version": "4.3.0",
@@ -644,21 +639,11 @@
"version": "4.1.0",
"hash": "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4="
},
- {
- "pname": "System.Memory",
- "version": "4.5.3",
- "hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk="
- },
{
"pname": "System.Net.WebSockets",
"version": "4.3.0",
"hash": "sha256-l3h3cF1cCC9zMhWLKSDnZBZvFADUd0Afe2+iAwBA0r0="
},
- {
- "pname": "System.Numerics.Vectors",
- "version": "4.4.0",
- "hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U="
- },
{
"pname": "System.ObjectModel",
"version": "4.0.12",
@@ -754,11 +739,6 @@
"version": "4.4.0",
"hash": "sha256-SeTI4+yVRO2SmAKgOrMni4070OD+Oo8L1YiEVeKDyig="
},
- {
- "pname": "System.Runtime.CompilerServices.Unsafe",
- "version": "4.5.2",
- "hash": "sha256-8eUXXGWO2LL7uATMZye2iCpQOETn2jCcjUhG6coR5O8="
- },
{
"pname": "System.Runtime.CompilerServices.Unsafe",
"version": "4.7.1",
diff --git a/pkgs/by-name/da/dafny/package.nix b/pkgs/by-name/da/dafny/package.nix
index 9484b7aadf7f..1acf4a956aa8 100644
--- a/pkgs/by-name/da/dafny/package.nix
+++ b/pkgs/by-name/da/dafny/package.nix
@@ -38,35 +38,31 @@ let
in
buildDotnetModule rec {
pname = "Dafny";
- version = "4.10.0";
+ version = "4.11.0";
src = fetchFromGitHub {
owner = "dafny-lang";
repo = "dafny";
tag = "v${version}";
- hash = "sha256-aPOjt4bwalhJUTJm4+pGqN88LwDP5zrVtakF26b3K4s=";
+ hash = "sha256-oM8dKDZ5FCmKq24taQ6Sr2eTeNAMSq8MY0U1AFvS6D4=";
};
- postPatch =
- let
- runtimeJarVersion = "4.10.0";
- in
- ''
- cp ${writeScript "fake-gradlew-for-dafny" ''
- mkdir -p build/libs/
- javac $(find -name "*.java" | grep "^./src/main") -d classes
- jar cf build/libs/DafnyRuntime-${runtimeJarVersion}.jar -C classes dafny
- ''} Source/DafnyRuntime/DafnyRuntimeJava/gradlew
+ postPatch = ''
+ cp ${writeScript "fake-gradlew-for-dafny" ''
+ mkdir -p build/libs/
+ javac $(find -name "*.java" | grep "^./src/main") -d classes
+ jar cf build/libs/DafnyRuntime-${version}.jar -C classes dafny
+ ''} Source/DafnyRuntime/DafnyRuntimeJava/gradlew
- # Needed to fix
- # "error NETSDK1129: The 'Publish' target is not supported without
- # specifying a target framework. The current project targets multiple
- # frameworks, you must specify the framework for the published
- # application."
- substituteInPlace Source/DafnyRuntime/DafnyRuntime.csproj \
- --replace-fail TargetFrameworks TargetFramework \
- --replace-fail "netstandard2.0;net452" net8.0
- '';
+ # Needed to fix
+ # "error NETSDK1129: The 'Publish' target is not supported without
+ # specifying a target framework. The current project targets multiple
+ # frameworks, you must specify the framework for the published
+ # application."
+ substituteInPlace Source/DafnyRuntime/DafnyRuntime.csproj \
+ --replace-fail TargetFrameworks TargetFramework \
+ --replace-fail "netstandard2.0;net452" net8.0
+ '';
dotnet-sdk = dotnetCorePackages.sdk_8_0;
nativeBuildInputs = [ jdk11 ];
@@ -82,8 +78,15 @@ buildDotnetModule rec {
executables = [ "Dafny" ];
- # Help Dafny find z3
- makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ z3 ]}" ];
+ # Help Dafny find z3 and dotnet SDK (needed for dafny run)
+ makeWrapperArgs = [
+ "--prefix PATH : ${
+ lib.makeBinPath [
+ z3
+ dotnet-sdk
+ ]
+ }"
+ ];
postFixup = ''
ln -s "$out/bin/Dafny" "$out/bin/dafny" || true
diff --git a/pkgs/by-name/da/davmail/package.nix b/pkgs/by-name/da/davmail/package.nix
index c4f3f442cdaa..426b710f7faa 100644
--- a/pkgs/by-name/da/davmail/package.nix
+++ b/pkgs/by-name/da/davmail/package.nix
@@ -7,27 +7,27 @@
glib,
gtk2,
gtk3,
- jdk11,
+ jdk,
libXtst,
coreutils,
gnugrep,
- zulu11,
+ zulu,
preferGtk3 ? true,
preferZulu ? true,
}:
let
- rev = 3627;
- jre' = (if preferZulu then zulu11 else jdk11).override { enableJavaFX = true; };
+ rev = 3755;
+ jre' = (if preferZulu then zulu else jdk).override { enableJavaFX = true; };
gtk' = if preferGtk3 then gtk3 else gtk2;
in
stdenv.mkDerivation rec {
pname = "davmail";
- version = "6.3.0";
+ version = "6.4.0";
src = fetchzip {
url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}-${toString rev}.zip";
- hash = "sha256-zJMwCFX/uJnLeThj6/t2usBRM+LIuamZt0EFLG3N+8k=";
+ hash = "sha256-cGuAxSIkhkcpRXlv5f3utH/1zZ1aYbLQN/OLuN80JdM=";
stripRoot = false;
};
diff --git a/pkgs/by-name/db/dbgate/package.nix b/pkgs/by-name/db/dbgate/package.nix
index ae73dc0c1137..2c25cecd5073 100644
--- a/pkgs/by-name/db/dbgate/package.nix
+++ b/pkgs/by-name/db/dbgate/package.nix
@@ -8,25 +8,25 @@
let
pname = "dbgate";
- version = "6.6.3";
+ version = "6.6.4";
src =
fetchurl
{
aarch64-linux = {
url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_arm64.AppImage";
- hash = "sha256-/Ouoo+ygEcj5u597+peqxQ0BFAi6Dp1Dy5BEJbHjo/s=";
+ hash = "sha256-pwG+muAEVmyIK9eiCrydZ0glxPK5FGl7b3ps/8xeFgE=";
};
x86_64-linux = {
url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_x86_64.AppImage";
- hash = "sha256-FUwRXpuIPubtVAendCDTiXNJ5TQ1LBB5MD25hH5EzGE=";
+ hash = "sha256-4xsxYbVbbfxJ70CaB3z/reRoPgBom/XX6/YfT30uDpY=";
};
x86_64-darwin = {
url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_x64.dmg";
- hash = "sha256-UgdSHW5Gs0cat6leIFJtp3OspgQRV2AHnk/sZ1b7z/U=";
+ hash = "sha256-plG9n/JtPmyUcJoP4kcAttKpzpT7ytt2M82CT0zZ4tA=";
};
aarch64-darwin = {
url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_universal.dmg";
- hash = "sha256-mvONm929IG2ViH0h7u/7fRZ6ghDaPsy7cqpqIp/JgM4=";
+ hash = "sha256-cId3K8m+XRlYHD4NyjSEyFR6c4Yvk6UzGAkdHt0bQUs=";
};
}
.${stdenv.hostPlatform.system} or (throw "dbgate: ${stdenv.hostPlatform.system} is unsupported.");
diff --git a/pkgs/by-name/de/deck/package.nix b/pkgs/by-name/de/deck/package.nix
index e0a451765bac..c9049708c5f7 100644
--- a/pkgs/by-name/de/deck/package.nix
+++ b/pkgs/by-name/de/deck/package.nix
@@ -9,13 +9,13 @@
buildGoModule rec {
pname = "deck";
- version = "1.51.1";
+ version = "1.52.0";
src = fetchFromGitHub {
owner = "Kong";
repo = "deck";
tag = "v${version}";
- hash = "sha256-r7nqPsFXLhTg0gctNc8dYLv5L02J3YWw6AOfqHTsXIw=";
+ hash = "sha256-fKcI40DqQwVw4YzPXVOXdij4LAwRkCp2U+TpjYmIO8I=";
};
nativeBuildInputs = [ installShellFiles ];
@@ -28,7 +28,7 @@ buildGoModule rec {
];
proxyVendor = true; # darwin/linux hash mismatch
- vendorHash = "sha256-5JSMw73Vo59OMpkQcakYodd9HySmPPaJIi3x85npd6Y=";
+ vendorHash = "sha256-h7wtQDw8kixqGK5RE9YQ6a/I3yRO1k/6qcHX/K4M6fc=";
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd deck \
diff --git a/pkgs/by-name/de/decker/package.nix b/pkgs/by-name/de/decker/package.nix
index bd6379da4e5b..f79359bad575 100644
--- a/pkgs/by-name/de/decker/package.nix
+++ b/pkgs/by-name/de/decker/package.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "decker";
- version = "1.59";
+ version = "1.60";
src = fetchFromGitHub {
owner = "JohnEarnest";
repo = "Decker";
rev = "v${version}";
- hash = "sha256-56yIbIKMppO1eyvnlHvqkQvIT3x5t3W1KQ4M2HWRU3U=";
+ hash = "sha256-A8lsQs3fZm8XREHx2IPRNWZp4tTZ4Jya30+gBT6xME8=";
};
buildInputs = [
diff --git a/pkgs/development/libraries/dee/0001-Fix-build-with-Vala-0.54.patch b/pkgs/by-name/de/dee/0001-Fix-build-with-Vala-0.54.patch
similarity index 100%
rename from pkgs/development/libraries/dee/0001-Fix-build-with-Vala-0.54.patch
rename to pkgs/by-name/de/dee/0001-Fix-build-with-Vala-0.54.patch
diff --git a/pkgs/development/libraries/dee/default.nix b/pkgs/by-name/de/dee/package.nix
similarity index 100%
rename from pkgs/development/libraries/dee/default.nix
rename to pkgs/by-name/de/dee/package.nix
diff --git a/pkgs/by-name/de/deltachat-desktop/package.nix b/pkgs/by-name/de/deltachat-desktop/package.nix
index f725fc4a95a8..d0421fc51324 100644
--- a/pkgs/by-name/de/deltachat-desktop/package.nix
+++ b/pkgs/by-name/de/deltachat-desktop/package.nix
@@ -19,17 +19,17 @@
let
deltachat-rpc-server' = deltachat-rpc-server.overrideAttrs rec {
- version = "2.11.0";
+ version = "2.15.0";
src = fetchFromGitHub {
owner = "chatmail";
repo = "core";
tag = "v${version}";
- hash = "sha256-W1DEG72Fk98pp0lm5+AyVb9zcpE5c2mqElOHFpofx58=";
+ hash = "sha256-sFAE90ptPBzT/w4wlGgQe1ERMD2ZAvf4pZ8YW8NEkLU=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
pname = "chatmail-core";
inherit version src;
- hash = "sha256-P/wIat9sflXfloboMdN15EGo1cqxgPZ0OBDYF/iB/7A=";
+ hash = "sha256-MmSjIn4x3b2gpagJnl2r4Z5DXSufZMoohvAf0v5VUbE=";
};
};
electron = electron_37;
@@ -37,19 +37,19 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "deltachat-desktop";
- version = "2.11.0";
+ version = "2.15.0";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-desktop";
tag = "v${finalAttrs.version}";
- hash = "sha256-M/QqD+g85o4xHF8BmusqU2sNIk9NFzOtCnz+MAk9/74=";
+ hash = "sha256-7AERqu2M/WeTDw62SF921vXROttZyvC1LmRZG3+aDPI=";
};
pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) pname version src;
fetcherVersion = 1;
- hash = "sha256-2EKu0ju/TTyVTYPjmStXsGoFdJEq5NkHqtQZggY2xbE=";
+ hash = "sha256-wdexath7r2roBVw1SSpJcMp8LSs/X5QNiLNHxQF60Lg=";
};
nativeBuildInputs = [
@@ -66,6 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
env = {
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
+ SKIP_FUSES = true; # EACCES: permission denied
VERSION_INFO_GIT_REF = finalAttrs.src.tag;
};
diff --git a/pkgs/by-name/de/deniseemu/package.nix b/pkgs/by-name/de/deniseemu/package.nix
new file mode 100644
index 000000000000..dfc536f64bec
--- /dev/null
+++ b/pkgs/by-name/de/deniseemu/package.nix
@@ -0,0 +1,50 @@
+{
+ lib,
+ stdenv,
+ fetchFromBitbucket,
+ cmake,
+ freetype,
+ pkg-config,
+ pulseaudio,
+ gtk3,
+ libxkbcommon,
+ udev,
+ libuuid,
+ wrapGAppsHook3,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "deniseemu";
+ version = "2.6";
+
+ src = fetchFromBitbucket {
+ owner = "piciji";
+ repo = "denise";
+ rev = "v${finalAttrs.version}";
+ hash = "sha256-+PJtYuiZ1eawuVCTo1kqtCmIoBjNKOGRDnbuH3KRpNM=";
+ };
+
+ buildInputs = [
+ gtk3
+ udev
+ libuuid
+ libxkbcommon
+ freetype
+ pulseaudio
+ ];
+
+ nativeBuildInputs = [
+ cmake
+ pkg-config
+ wrapGAppsHook3
+ ];
+
+ meta = {
+ homepage = "https://bitbucket.org/piciji/denise";
+ downloadPage = "https://sourceforge.net/projects/deniseemu/";
+ description = "C64 / Amiga Emulator";
+ license = [ lib.licenses.gpl3Plus ];
+ maintainers = [ lib.maintainers.matthewcroughan ];
+ platforms = lib.platforms.linux;
+ };
+})
diff --git a/pkgs/by-name/df/dftd4/python.nix b/pkgs/by-name/df/dftd4/python.nix
new file mode 100644
index 000000000000..6ed63ca10492
--- /dev/null
+++ b/pkgs/by-name/df/dftd4/python.nix
@@ -0,0 +1,45 @@
+{
+ buildPythonPackage,
+ meson-python,
+ ninja,
+ setuptools,
+ pkg-config,
+ dftd4,
+ cffi,
+ numpy,
+}:
+
+buildPythonPackage {
+ inherit (dftd4)
+ pname
+ version
+ src
+ meta
+ ;
+
+ pyproject = true;
+
+ buildInputs = [ dftd4 ];
+
+ nativeBuildInputs = [
+ pkg-config
+ ninja
+ ];
+
+ build-system = [
+ meson-python
+ setuptools
+ ];
+
+ dependencies = [
+ cffi
+ numpy
+ ];
+
+ preConfigure = ''
+ cd python
+ '';
+
+ pythonImportsCheck = [ "dftd4" ];
+ doCheck = true;
+}
diff --git a/pkgs/by-name/dh/dht/package.nix b/pkgs/by-name/dh/dht/package.nix
index e8df700e31e8..821131430596 100644
--- a/pkgs/by-name/dh/dht/package.nix
+++ b/pkgs/by-name/dh/dht/package.nix
@@ -7,14 +7,14 @@
stdenv.mkDerivation {
pname = "dht";
- version = "0.27";
+ version = "0.27-unstable-2025-05-01";
src = fetchFromGitHub {
# Use transmission fork from post-0.27-transmission branch
owner = "transmission";
repo = "dht";
- rev = "015585510e402a057ec17142711ba2b568b5fd62";
- sha256 = "m4utcxqE3Mn5L4IQ9UfuJXj2KkXXnqKBGqh7kHHGMJQ=";
+ rev = "38c9f261d9b58b76b9eaf85f84ec1b35151a1eac";
+ hash = "sha256-Y6CQhHnXS0YiL9K2VQtHeksuqgqYj7yvGYQr5nVC+yc=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/tools/graphics/directx-shader-compiler/default.nix b/pkgs/by-name/di/directx-shader-compiler/package.nix
similarity index 100%
rename from pkgs/tools/graphics/directx-shader-compiler/default.nix
rename to pkgs/by-name/di/directx-shader-compiler/package.nix
diff --git a/pkgs/by-name/dn/dnf5/package.nix b/pkgs/by-name/dn/dnf5/package.nix
index 414f8dcf8d5b..77e4458d1073 100644
--- a/pkgs/by-name/dn/dnf5/package.nix
+++ b/pkgs/by-name/dn/dnf5/package.nix
@@ -113,8 +113,6 @@ stdenv.mkDerivation (finalAttrs: {
--replace-fail "/etc/bash_completion.d" "$out/etc/bash_completion.d"
'';
- dontFixCmake = true;
-
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
preVersionCheck = ''
diff --git a/pkgs/by-name/do/docopt_cpp/package.nix b/pkgs/by-name/do/docopt_cpp/package.nix
index 37c50283f698..a46d051f6750 100644
--- a/pkgs/by-name/do/docopt_cpp/package.nix
+++ b/pkgs/by-name/do/docopt_cpp/package.nix
@@ -2,7 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
- fetchpatch,
+ fetchpatch2,
cmake,
python3,
}:
@@ -19,10 +19,15 @@ stdenv.mkDerivation rec {
};
patches = [
- (fetchpatch {
+ (fetchpatch2 {
name = "python3-for-tests";
- url = "https://github.com/docopt/docopt.cpp/commit/b3d909dc952ab102a4ad5a1541a41736f35b92ba.patch";
- hash = "sha256-JJR09pbn3QhYaZAIAjs+pe28+g1VfgHUKspWorHzr8o=";
+ url = "https://github.com/docopt/docopt.cpp/commit/b3d909dc952ab102a4ad5a1541a41736f35b92ba.patch?full_index=1";
+ hash = "sha256-LXnN36/JuHsCeLnjuPFa42dT52iOcnJd4NGYx96Z5c0=";
+ })
+ (fetchpatch2 {
+ name = "Increase-cmake_minimum_required-to-3.5";
+ url = "https://github.com/docopt/docopt.cpp/commit/05d507da0d153faff381f44968833ebffdc03447.patch?full_index=1";
+ hash = "sha256-bwKkhU3+GZFIUH0Ig0l9zcTtox9som3DY+ZApWrWl80=";
})
];
diff --git a/pkgs/by-name/do/doctest/package.nix b/pkgs/by-name/do/doctest/package.nix
index 793a4af00f58..590252b0fdad 100644
--- a/pkgs/by-name/do/doctest/package.nix
+++ b/pkgs/by-name/do/doctest/package.nix
@@ -8,21 +8,22 @@
stdenv.mkDerivation rec {
pname = "doctest";
- version = "2.4.11";
+ version = "2.4.12";
src = fetchFromGitHub {
owner = "doctest";
repo = "doctest";
- rev = "v${version}";
- sha256 = "sha256-hotO6QVpPn8unYTaQHFgi40A3oLUd++I3aTe293e4Aw=";
+ tag = "v${version}";
+ hash = "sha256-Fxs1EWydhqN9whx+Cn4fnZ4fhCEQvFgL5e9TUiXlnq8=";
};
patches = [
- # Suppress unsafe buffer usage warnings with clang 16, which are treated as errors due to `-Werror`.
- # https://github.com//doctest/doctest/pull/768
+ # Fix the build with Clang.
(fetchpatch {
- url = "https://github.com/doctest/doctest/commit/9336c9bd86e3fc2e0c36456cad8be3b4e8829a22.patch";
- hash = "sha256-ZFCVk5qvgfixRm7ZFr7hyNCSEvrT6nB01G/CBshq53o=";
+ name = "doctest-disable-warnings.patch";
+ url = "https://github.com/doctest/doctest/commit/c8d9ed2398d45aa5425d913bd930f580560df30d.patch";
+ excludes = [ ".github/workflows/main.yml" ];
+ hash = "sha256-kOBy0om6MPM2vLXZjNLXiezZqVgNr/viBI7mXrOZts8=";
})
];
@@ -30,6 +31,18 @@ stdenv.mkDerivation rec {
doCheck = true;
+ # Fix the build with LLVM 21 / GCC 15.
+ #
+ # See:
+ #
+ # *
+ # *
+ # *
+ env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [
+ "-Wno-error=nrvo"
+ "-Wno-error=missing-noreturn"
+ ];
+
meta = with lib; {
homepage = "https://github.com/doctest/doctest";
description = "Fastest feature-rich C++11/14/17/20 single-header testing framework";
diff --git a/pkgs/by-name/do/doctl/package.nix b/pkgs/by-name/do/doctl/package.nix
index 5c3014750cb3..b7108cc4109f 100644
--- a/pkgs/by-name/do/doctl/package.nix
+++ b/pkgs/by-name/do/doctl/package.nix
@@ -9,7 +9,7 @@
buildGoModule rec {
pname = "doctl";
- version = "1.142.0";
+ version = "1.145.0";
vendorHash = null;
@@ -42,7 +42,7 @@ buildGoModule rec {
owner = "digitalocean";
repo = "doctl";
tag = "v${version}";
- hash = "sha256-wbOO9jdGfy39GeGEwLURLpxhXt17sk6gQRUbz6ysSXc=";
+ hash = "sha256-JeIpx+i1JDVfJqCKTZMTJ7rDMGO4yA/eR56C3qr08zg=";
};
meta = {
diff --git a/pkgs/by-name/do/dolphin-emu/package.nix b/pkgs/by-name/do/dolphin-emu/package.nix
index ad023d50a0d6..afa43c77c80b 100644
--- a/pkgs/by-name/do/dolphin-emu/package.nix
+++ b/pkgs/by-name/do/dolphin-emu/package.nix
@@ -17,7 +17,7 @@
curl,
enet,
ffmpeg,
- fmt_10,
+ fmt,
gtest,
hidapi,
libXdmcp,
@@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
curl
enet
ffmpeg
- fmt_10
+ fmt
gtest
hidapi
libXdmcp
@@ -132,6 +132,8 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeFeature "DISTRIBUTOR" "NixOS")
(lib.cmakeFeature "DOLPHIN_WC_DESCRIBE" finalAttrs.version)
(lib.cmakeFeature "DOLPHIN_WC_BRANCH" "master")
+ # Fix building v2509, should be removed in the future
+ "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
(lib.cmakeBool "OSX_USE_DEFAULT_SEARCH_PATH" true)
diff --git a/pkgs/by-name/do/double-conversion/package.nix b/pkgs/by-name/do/double-conversion/package.nix
index 11e87a0546c0..a377165483f0 100644
--- a/pkgs/by-name/do/double-conversion/package.nix
+++ b/pkgs/by-name/do/double-conversion/package.nix
@@ -2,6 +2,7 @@
stdenv,
lib,
fetchFromGitHub,
+ fetchpatch,
cmake,
enableStatic ? stdenv.hostPlatform.isStatic,
}:
@@ -17,6 +18,20 @@ stdenv.mkDerivation rec {
sha256 = "sha256-M80H+azCzQYa4/gBLWv5GNNhEuHsH7LbJ/ajwmACnrM=";
};
+ patches = [
+ # Fix the build with CMake 4.
+ (fetchpatch {
+ name = "double-conversion-fix-cmake-4-1.patch";
+ url = "https://github.com/google/double-conversion/commit/101e1ba89dc41ceb75090831da97c43a76cd2906.patch";
+ hash = "sha256-VRmuNXdzt/I+gWbz5mwWkx5IGn8Vsl9WkdwRsuwZdkU=";
+ })
+ (fetchpatch {
+ name = "double-conversion-fix-cmake-4-2.patch";
+ url = "https://github.com/google/double-conversion/commit/0604b4c18815aadcf7f4b78dfa6bfcb91a634ed7.patch";
+ hash = "sha256-cJBp1ou1O/bMQ/7kvcX52dWbUdhmPfQ9aWmEhQdyhis=";
+ })
+ ];
+
nativeBuildInputs = [ cmake ];
cmakeFlags = lib.optional (!enableStatic) "-DBUILD_SHARED_LIBS=ON";
diff --git a/pkgs/by-name/dr/dreamchess/package.nix b/pkgs/by-name/dr/dreamchess/package.nix
index 21622ff9aefb..25ad30bef91b 100644
--- a/pkgs/by-name/dr/dreamchess/package.nix
+++ b/pkgs/by-name/dr/dreamchess/package.nix
@@ -6,6 +6,7 @@
bison,
flex,
gettext,
+ makeWrapper,
SDL2,
SDL2_image,
SDL2_mixer,
@@ -48,6 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
bison
flex
gettext
+ makeWrapper
];
cmakeFlags = [
(lib.cmakeBool "CMAKE_VERBOSE_MAKEFILE" true)
@@ -55,10 +57,18 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeFeature "CMAKE_INSTALL_DATAROOTDIR" "${placeholder "out"}/share")
];
+ # This makes sure the default engine (dreamer) will be called from
+ # the /nix/store/ as well when starting a new game
+ postFixup = ''
+ wrapProgram $out/bin/dreamchess \
+ --prefix PATH : $out/bin
+ '';
+
doInstallCheck = true;
postInstallCheck = ''
stat "''${!outputBin}/bin/${finalAttrs.meta.mainProgram}"
+ stat "''${!outputBin}/bin/dreamer"
'';
meta = {
diff --git a/pkgs/by-name/dy/dynarmic/package.nix b/pkgs/by-name/dy/dynarmic/package.nix
index 446cd544b346..800e38b15588 100644
--- a/pkgs/by-name/dy/dynarmic/package.nix
+++ b/pkgs/by-name/dy/dynarmic/package.nix
@@ -110,10 +110,6 @@ stdenv.mkDerivation (finalAttrs: {
oaknut
];
- # This changes `ir/opt` to `ir/var/empty` in `CMakeLists.txt`
- # making the build fail, as that path does not exist
- dontFixCmake = true;
-
cmakeFlags = [
(lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
(lib.cmakeBool "DYNARMIC_TESTS" finalAttrs.finalPackage.doCheck)
diff --git a/pkgs/by-name/ea/easyeffects/package.nix b/pkgs/by-name/ea/easyeffects/package.nix
index b3d361149720..9b1bf57d2051 100644
--- a/pkgs/by-name/ea/easyeffects/package.nix
+++ b/pkgs/by-name/ea/easyeffects/package.nix
@@ -35,7 +35,7 @@
rubberband,
soundtouch,
speexdsp,
- tbb,
+ onetbb,
wrapGAppsHook4,
zam-plugins,
zita-convolver,
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
rubberband
soundtouch
speexdsp'
- tbb
+ onetbb
zita-convolver
];
diff --git a/pkgs/by-name/eb/ebook_tools/package.nix b/pkgs/by-name/eb/ebook_tools/package.nix
index 8f09811d83fb..63941366f0ca 100644
--- a/pkgs/by-name/eb/ebook_tools/package.nix
+++ b/pkgs/by-name/eb/ebook_tools/package.nix
@@ -17,6 +17,16 @@ stdenv.mkDerivation rec {
sha256 = "1bi7wsz3p5slb43kj7lgb3r6lb91lvb6ldi556k4y50ix6b5khyb";
};
+ # Fix the build with CMake 4.
+ #
+ # See:
+ postPatch = ''
+ substituteInPlace CMakeLists.txt \
+ --replace-fail \
+ 'cmake_minimum_required(VERSION 2.4.0)' \
+ 'cmake_minimum_required(VERSION 3.10)'
+ '';
+
nativeBuildInputs = [
cmake
pkg-config
diff --git a/pkgs/by-name/ec/ecdsautils/package.nix b/pkgs/by-name/ec/ecdsautils/package.nix
index ee4560b82c0a..3c90fcd5c8ba 100644
--- a/pkgs/by-name/ec/ecdsautils/package.nix
+++ b/pkgs/by-name/ec/ecdsautils/package.nix
@@ -1,7 +1,12 @@
{
lib,
stdenv,
- pkgs,
+ fetchFromGitHub,
+ fetchpatch,
+ cmake,
+ pkg-config,
+ doxygen,
+ libuecc,
}:
let
@@ -11,19 +16,26 @@ in
stdenv.mkDerivation {
inherit pname version;
- src = pkgs.fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "freifunk-gluon";
repo = "ecdsautils";
rev = "v${version}";
sha256 = "sha256-vGHLAX/XOtePvdT/rljCOdlILHVO20mCt6p+MUi13dg=";
};
- nativeBuildInputs = with pkgs; [
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/freifunk-gluon/ecdsautils/commit/19f096f9c10264f4efe4b926fe83126e85642cba.patch";
+ hash = "sha256-oJv47NckFHFONPcG3WfHwgaHRqrz2eWXzbr5SQr+kX4=";
+ })
+ ];
+
+ nativeBuildInputs = [
cmake
pkg-config
doxygen
];
- buildInputs = with pkgs; [ libuecc ];
+ buildInputs = [ libuecc ];
meta = with lib; {
description = "Tiny collection of programs used for ECDSA (keygen, sign, verify)";
diff --git a/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json b/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json
index 798d81961ceb..bcffd1a9c494 100644
--- a/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json
+++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json
@@ -37,16 +37,16 @@
"jar": "sha256-a9QQVOJuuuiLDaWNxj7BEKcO+tXxLYcESTRwx8VJcZA=",
"pom": "sha256-uFQ5wq04pYG40n+nWy+zC3HN4dT8A8ZE4yMvhN8kWqE="
},
- "io/freefair/gradle#lombok-plugin/8.14.2": {
- "jar": "sha256-RIQV1/8vImNj813kxhix6Tr78NdFBRUUu0cbIvm1jy4=",
- "module": "sha256-QIzhHR3PUEV4oli/obkCfo0zRgScjdqxQ6wtebqKAJE=",
- "pom": "sha256-l7zUYFZjH9+YzMEwgxFkf71USZWWLXAoZLGmJn9/0XQ="
+ "io/freefair/gradle#lombok-plugin/9.0.0": {
+ "jar": "sha256-ztdLsqK5Eze6lAo1h7uXFujWXlUp49JEqlo8cOXED7Q=",
+ "module": "sha256-9FXPosuixaovzcBl0zcaRAKsxf/Jlfrq67a3IrQLd0Q=",
+ "pom": "sha256-Wx4uVjwtS7zUTDZNBfTQEV63SCsI/VA2NeyNfEW0Knk="
},
"io/freefair/jsass-java#io.freefair.jsass-java.gradle.plugin/6.5.0.2": {
"pom": "sha256-hoEYwHzaHj3q/o0bF3HzOgyN0lEIEAu/pjFl3hzTvmg="
},
- "io/freefair/lombok#io.freefair.lombok.gradle.plugin/8.14.2": {
- "pom": "sha256-OKIER1//te7+8mJmN+ZtdKjo5reqEZ3SRXpwcZ3oVvU="
+ "io/freefair/lombok#io.freefair.lombok.gradle.plugin/9.0.0": {
+ "pom": "sha256-s5rb7ywLx0jun0EFww8MhaElzsdorWrNDp+UKogG2w8="
},
"jakarta/platform#jakarta.jakartaee-bom/9.1.0": {
"pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ="
@@ -168,13 +168,13 @@
"org/gradle/toolchains/foojay-resolver-convention#org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/1.0.0": {
"pom": "sha256-8TMkmhh1Suah0nAdANhJsa+6ewaD3bX8GxinAHHOwvo="
},
- "org/gradlex#extra-java-module-info/1.13": {
- "jar": "sha256-EIqHsSfToameWdHmEEo+kdCx/5aWGM+1s54+J/H+r20=",
- "module": "sha256-1kT0XN5oN003+pNhhJWZK6ZBHyJFhklk50VlHpffJhE=",
- "pom": "sha256-sYMue36yP41a32LHkXcuPp/IhIMUnKjd5QIbsQPUQlo="
+ "org/gradlex#extra-java-module-info/1.13.1": {
+ "jar": "sha256-u7wZoNvtKQxcMt17/vhxh+Qn/yGBqKfkcA3XtXrOQbM=",
+ "module": "sha256-lQeTGglcI3ZzTFxnOo/zK7qBerkAQAivjFdihR1/YaY=",
+ "pom": "sha256-i4Q6pFeUxi2dsJOBdGrchkKKphFx++KSAqld7WzYN6A="
},
- "org/gradlex/extra-java-module-info#org.gradlex.extra-java-module-info.gradle.plugin/1.13": {
- "pom": "sha256-ll4caPhrb0fP4cqP2rYTPRxz0w4eerkuTHirvGnFs4c="
+ "org/gradlex/extra-java-module-info#org.gradlex.extra-java-module-info.gradle.plugin/1.13.1": {
+ "pom": "sha256-ho1RzTt31f/rmHPol6rnYlphPx2wP60fTiHtBti4vDQ="
},
"org/jsonschema2pojo#org.jsonschema2pojo.gradle.plugin/1.2.2": {
"pom": "sha256-OS098xRtN26kokx+XtNhLennIcfT6+T3vzq5oiSVhds="
@@ -365,22 +365,15 @@
"jar": "sha256-JMkjNyxY410LnxagKJKbua7cd1IYZ8J08r0HNd9bofU=",
"pom": "sha256-TKWjXWEjXhZUmsNG0eNFUc3w/ifoSqV+A8vrJV6k5do="
},
- "com/google/errorprone#error_prone_annotations/2.36.0": {
- "jar": "sha256-d0QOJwsLyaJJkDxaB2w2pyLEiGyk9CZ18pA6HFPtYaU=",
- "pom": "sha256-15z9N8hfdta3VMdQHuHchEe3smQsI4LXeCUhZr0zHpw="
- },
- "com/google/errorprone#error_prone_annotations/2.38.0": {
- "jar": "sha256-ZmHVM1CQpfxh3YadIJW8bB4hVuOqR6bkq6vfZMmaeIk=",
- "pom": "sha256-MAe++K/zro6hLYHD/qy08Vl5ss9cPjj8kYmpjeoUEWc="
+ "com/google/errorprone#error_prone_annotations/2.41.0": {
+ "jar": "sha256-pW54K1tQgRrCBAc6NVoh2RWiEH/OE+xxEzGtA29mD8w=",
+ "pom": "sha256-oVHfHi4LSGGNiwahgHSKKbOrs5sbI5b2och5pydIjG4="
},
"com/google/errorprone#error_prone_parent/2.27.0": {
"pom": "sha256-+oGCnQSVWd9pJ/nJpv1rvQn4tQ5tRzaucsgwC2w9dlQ="
},
- "com/google/errorprone#error_prone_parent/2.36.0": {
- "pom": "sha256-Okz8imvtYetI6Wl5b8MeoNJwtj5nBZmUamGIOttwlNw="
- },
- "com/google/errorprone#error_prone_parent/2.38.0": {
- "pom": "sha256-5iRYpqPmMIG8fFezwPrJ8E92zjL2BlMttp/is9R7k0w="
+ "com/google/errorprone#error_prone_parent/2.41.0": {
+ "pom": "sha256-xTg4jXYKXByY3PBvbtPP5fEaZRgn21y9LtgojHlcrUI="
},
"com/google/guava#failureaccess/1.0.3": {
"jar": "sha256-y/w5BrGbj1XdfP1t/gqkUy6DQlDX8IC9jSEaPiRrWcs=",
@@ -392,13 +385,13 @@
"com/google/guava#guava-parent/33.4.0-android": {
"pom": "sha256-ciDt5hAmWW+8cg7kuTJG+i0U8ygFhTK1nvBT3jl8fYM="
},
- "com/google/guava#guava-parent/33.4.8-jre": {
- "pom": "sha256-oDxRmaG+FEQ99/1AuoZzscaq4E3u9miM59Vz6kieOiA="
+ "com/google/guava#guava-parent/33.5.0-jre": {
+ "pom": "sha256-aHGeaHxuTJ/z4P7L73vSCJbw9PezFHQ+0zxy+WJWghU="
},
- "com/google/guava#guava/33.4.8-jre": {
- "jar": "sha256-89f1f2f9Yi9NRo391pKzpeOQkkbCgBesMmNAXw/mF+0=",
- "module": "sha256-WKM1cwMGmiGTDnuf6bhk3ov7i9RgdDPb5IJjRZYgz/w=",
- "pom": "sha256-BDZdS27yLIz5NJ/mKAafw+gaLIODUUAu9OlfnnV77rw="
+ "com/google/guava#guava/33.5.0-jre": {
+ "jar": "sha256-HjAfDFKsJIsLFP3D0SKDx3JS1Nb0hSHVcufYxMLMSsc=",
+ "module": "sha256-d+1CyMiyzru5OsngdUP/ZBiqJL24UXWAz1Mk6aZRCVY=",
+ "pom": "sha256-BHj6eKkIs8Mf5td76ZeKqmIeKhgduEAH49OzdCSirGE="
},
"com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": {
"jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=",
@@ -474,16 +467,16 @@
"module": "sha256-iNmRuo7VjChtey18CPn2Mg/5novWYXPDaDkhAEb8f2I=",
"pom": "sha256-oYHFieNi4sRp6IRc/PIKFaiQ9ISUoPny4T9ZSglq0Kk="
},
- "io/freefair/gradle#lombok-plugin/8.14.2": {
- "jar": "sha256-RIQV1/8vImNj813kxhix6Tr78NdFBRUUu0cbIvm1jy4=",
- "module": "sha256-QIzhHR3PUEV4oli/obkCfo0zRgScjdqxQ6wtebqKAJE=",
- "pom": "sha256-l7zUYFZjH9+YzMEwgxFkf71USZWWLXAoZLGmJn9/0XQ="
+ "io/freefair/gradle#lombok-plugin/9.0.0": {
+ "jar": "sha256-ztdLsqK5Eze6lAo1h7uXFujWXlUp49JEqlo8cOXED7Q=",
+ "module": "sha256-9FXPosuixaovzcBl0zcaRAKsxf/Jlfrq67a3IrQLd0Q=",
+ "pom": "sha256-Wx4uVjwtS7zUTDZNBfTQEV63SCsI/VA2NeyNfEW0Knk="
},
"io/freefair/jsass-java#io.freefair.jsass-java.gradle.plugin/6.5.0.2": {
"pom": "sha256-1C1ePfUKHTe6qhRrpb0ai7I5YZksPt9Fw6M5zqCTLd8="
},
- "io/freefair/lombok#io.freefair.lombok.gradle.plugin/8.14.2": {
- "pom": "sha256-KVgYYy7l/xiWwKYPuI2ghuPXyFHGxIUcQU/VSETWfYI="
+ "io/freefair/lombok#io.freefair.lombok.gradle.plugin/9.0.0": {
+ "pom": "sha256-xWt36BjHjUZoXWbQ/2UJ85G5KE3+hrueEnARHrwBJYI="
},
"io/github/classgraph#classgraph/4.8.181": {
"jar": "sha256-YqZDbWlxDvX6tuwkN4HOTFspkEftGEG1+SdGroUs5UU=",
@@ -507,10 +500,10 @@
"io/projectreactor#reactor-bom/Bismuth-SR7": {
"pom": "sha256-8V34qRAvk+7YOr1Aw5XxauNsUKmmB+llR0KUKr49NDk="
},
- "io/reactivex/rxjava3#rxjava/3.1.11": {
- "jar": "sha256-bipWqYGdD8L+DXjv7NPXyBpjxjneM8qlY5KTvP/umXo=",
- "module": "sha256-tDIZwIxsAgw+sN8lRtrqd5IZP4lgRtVcozqZhfvajuc=",
- "pom": "sha256-fpMFhj0zE0zUpy0It/Evre4hda2ef3Jzi0nIptw8BVA="
+ "io/reactivex/rxjava3#rxjava/3.1.12": {
+ "jar": "sha256-GAikM+9V3MKWVSPlEquRSl0NcnIoomg+11WdfMz0Tjc=",
+ "module": "sha256-2jn02k/u133+ELmAnVyysvO0Ra6nG2nhUjKkJpiThzs=",
+ "pom": "sha256-chJrr7gKEse1WFJNCRkj5pYSODxHQay34Aw1ybBUazQ="
},
"io/sentry#sentry/8.20.0": {
"jar": "sha256-G5KZBtERVbA9gwY1XrEGlWL2elwljF0R0h0vnT1GMbQ=",
@@ -558,22 +551,16 @@
"jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=",
"pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ="
},
- "net/bytebuddy#byte-buddy-agent/1.17.6": {
- "jar": "sha256-ioCVlGW7CYSM1BqJMBSQxVudlA3G7DDYq6wPY7Of1dA=",
- "pom": "sha256-Zw0Cz7w5b05+ZhTd3PSghC+vF/l5k3PX4Mt7aq3Njm8="
+ "net/bytebuddy#byte-buddy-agent/1.17.7": {
+ "jar": "sha256-qbqIfcolKtYbfVFTKU805vO99LJzawQ3PRNhWmlfwP8=",
+ "pom": "sha256-gU7kLWsBF/S40etrHWLBbbTAtZfYOzrY2qV4HrFF19w="
},
- "net/bytebuddy#byte-buddy-parent/1.15.11": {
- "pom": "sha256-jcUZ16PnkhEqfNhB6vvsTwDbxjPQha3SDEXwq0dspJY="
+ "net/bytebuddy#byte-buddy-parent/1.17.7": {
+ "pom": "sha256-ilfiDczgDaccM+8+GdndhY/p0gQsouK8onhxcA1SaYw="
},
- "net/bytebuddy#byte-buddy-parent/1.17.6": {
- "pom": "sha256-3RX5X9VgUmPwZdncuOzuzEjr5NZmw3KY/0RgAUlCQL0="
- },
- "net/bytebuddy#byte-buddy/1.15.11": {
- "pom": "sha256-IFuLJUGWcX6B2tZyu4aacZr8lt8pf5fYEe/+H0NlPa4="
- },
- "net/bytebuddy#byte-buddy/1.17.6": {
- "jar": "sha256-0mOCqDnLJtXGKgsPBHFbzvVaUx+WrGzkDeRSocBTnnA=",
- "pom": "sha256-UExH3b8VsOc8ymO52woBwSp83n+LM6DF2dW1BtGUaz4="
+ "net/bytebuddy#byte-buddy/1.17.7": {
+ "jar": "sha256-NXXcuKmPr5Q9PBWVxHoWBHxPzoqD67smJi8aL2dUY1c=",
+ "pom": "sha256-7n+6hWnDu1wekeWBL9n0oPMb4n5WjVNU4a39GRGfl7M="
},
"net/java#jvnet-parent/1": {
"pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78="
@@ -584,13 +571,13 @@
"net/java#jvnet-parent/5": {
"pom": "sha256-GvaZ+Nndq2f5oNIC+9eRXrA2Klpt/V/8VMr6NGXJywo="
},
- "net/java/dev/jna#jna-platform/5.17.0": {
- "jar": "sha256-t+PUbIe60utAmw5wSRa82BIGFo41cxLf3dDiU2ec2eA=",
- "pom": "sha256-CjC3l622giFH75jLJJ7z+/SiQ1QqqGv59C+tnmgwWkQ="
+ "net/java/dev/jna#jna-platform/5.18.0": {
+ "jar": "sha256-eH7Jywp2Eh/1TTVI8GKNsJAB8TVSHj7b+/rJV953qzw=",
+ "pom": "sha256-4zkW2g+tjn0EZgihqx3/6RzJ4trVsUqY4LpkD//iP58="
},
- "net/java/dev/jna#jna/5.17.0": {
- "jar": "sha256-s6lAjnxR4I7w47/MCPRD9uwPYZG6jNfBjVPSsi5b28A=",
- "pom": "sha256-UBoP8F2EpK0Q9t4lvpT0k5i3CjG+jzoO2fTGtE++/uQ="
+ "net/java/dev/jna#jna/5.18.0": {
+ "jar": "sha256-/ifB5eNKasqEy0TaXxUnHNaQabHPcBq1unMgxXxVxDk=",
+ "pom": "sha256-SIq1HOC+VwAYcI0M0VtfpPp9Kx022BzvdTfVG9TXsDs="
},
"net/rdrei/android/buildtimetracker#gradle-plugin/0.11.1": {
"jar": "sha256-VTLp3rXka/R3KpkXFRrW4TqRLj8jZH8ffuoi/DsLTsg=",
@@ -698,10 +685,10 @@
"org/apache/logging#logging-parent/11.3.0": {
"pom": "sha256-pcmFtW/hxYQzOTtQkabznlufeFGN2PySE0aQWZtk19A="
},
- "org/apache/logging/log4j#log4j-api/2.25.1": {
- "jar": "sha256-ILnHfAqeVNEGOjnlUdyvmMfY56SZRkj4TQueFMcfchU=",
- "module": "sha256-6tMmKCISCzyfiiDNDZnVY1lg1SeyBD1n//Zr6HeDHJo=",
- "pom": "sha256-up6JUpGBShh506YMLUEReZMk64R5seASpHs1GjeIMcM="
+ "org/apache/logging/log4j#log4j-api/2.25.2": {
+ "jar": "sha256-n9Zsn+C+oG+pZmwUeYmkbK+qkrSoh1NpfTlFzEMzjLs=",
+ "module": "sha256-WPeF66u6zDA/Ow5aSF91X9qzKQ9p5JsDT4lj0ngjZV4=",
+ "pom": "sha256-CVYJaiUCQIyVioMXTytqV9yy5bB7uRTISHMrRLirvcM="
},
"org/apache/logging/log4j#log4j-bom/2.10.0": {
"pom": "sha256-8CEjRUmwLxK23xRaaw5ixrl4FCfjDjckmgX2XF3R7WY="
@@ -712,11 +699,11 @@
"org/apache/logging/log4j#log4j-bom/2.24.3": {
"pom": "sha256-sXq38yj0WGt+cfjJT8NaXaK86AcFpdYwBAIsGSiDNVg="
},
- "org/apache/logging/log4j#log4j-bom/2.25.1": {
- "pom": "sha256-uKwjMoSXEbL3R0QVk3vbuWfSuTAO9M/+PzW+Oxqhik4="
+ "org/apache/logging/log4j#log4j-bom/2.25.2": {
+ "pom": "sha256-Tym32cLZcP0qZpcXa/fd3EFQifYNaW0ov98xsk6S8Rw="
},
- "org/apache/logging/log4j#log4j/2.25.1": {
- "pom": "sha256-CuZl9wnhMQboIwM2+GzYMrgbytXAWQlyXD/3dD3U/10="
+ "org/apache/logging/log4j#log4j/2.25.2": {
+ "pom": "sha256-HYBXBY0LBcj3clyhrbpoc5y+rHWJjsoGpIymEVRsA+w="
},
"org/apache/pdfbox#fontbox/2.0.26": {
"jar": "sha256-lGdMfRDqRdmw3BA4eJJjf8jvtcadLnJpTxxm/rm7btc=",
@@ -762,9 +749,9 @@
"module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=",
"pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA="
},
- "org/assertj#assertj-core/3.27.4": {
- "jar": "sha256-zGmqhPeTVstjXD+f8/ht/w+djufve2hKLJqZgE/0UAg=",
- "pom": "sha256-nLMcgATISEPShMQCqBRTvupFCb+neP9CKmcvfny/Ygw="
+ "org/assertj#assertj-core/3.27.6": {
+ "jar": "sha256-snhysEmryI4jyFPOWReUXdV9Q70xF12FLjlB0qb9AjE=",
+ "pom": "sha256-sPgJRcedY8PDPWEL2HVNXppUNpVfev1oPQFg2GErquw="
},
"org/controlsfx#controlsfx/11.2.2": {
"jar": "sha256-BDwGYtUmljR9r4T8aQJ0xhIuD4CjFXo1St086oPA3qk=",
@@ -913,17 +900,17 @@
"org/mockito#mockito-bom/4.11.0": {
"pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo="
},
- "org/mockito#mockito-core/5.19.0": {
- "jar": "sha256-2HX/I0pLcuDu3+Fw3YBHl6S4e6THYgfJZZ1vRrUnh3s=",
- "pom": "sha256-NlnpFp4TwLUT6D7c1R6vqlcdYMYq9YGOzQkhqi0M0Bg="
+ "org/mockito#mockito-core/5.20.0": {
+ "jar": "sha256-0altJSEo06QkfP2KLnZBLvo8wQOXe+F5M8lCEXok83Q=",
+ "pom": "sha256-mQPiB1XAxIh6q5xPEAYft/ERUdOp+t2WTp+6QnIm0TU="
},
"org/mockito#mockito-inline/5.2.0": {
"jar": "sha256-7lLhwpmmMhhPuidKk3CZPgkUBCn15RbmxVcP1ldLKX8=",
"pom": "sha256-cG00cOVtMaO1YwaY0Qeb79uYMUWwGE5LorhNo4eo9oQ="
},
- "org/mockito#mockito-junit-jupiter/5.19.0": {
- "jar": "sha256-fPu3qcEZgFPGmcZjR5/Ug2rMIsJlAAPI3uIOf7xVplo=",
- "pom": "sha256-x+4XLR/ALo/I/I8EPIfHGzXLfXR+kJNGQ9SSCTrXoUs="
+ "org/mockito#mockito-junit-jupiter/5.20.0": {
+ "jar": "sha256-/WxwPCsAuRTzrbwnsYB3pwjz1pkvGSQsRE5zfGzOAk4=",
+ "pom": "sha256-gaVJ/8nISoefwe5k1jAHqwClOk75avtTaQ8oRWker5g="
},
"org/objenesis#objenesis-parent/3.3": {
"pom": "sha256-MFw4SqLx4cf+U6ltpBw+w1JDuX1CjSSo93mBjMEL5P8="
@@ -1024,9 +1011,9 @@
"jar": "sha256-j4ds4qmqTpWx8ZUpUCVRA+JIdCUFCmVPMoVEe6YBwVQ=",
"pom": "sha256-dVdRq2w3oaMa+1ueSllcDdLv0rUNcDshJVuCfFDtYVM="
},
- "org/projectlombok#lombok/1.18.38": {
- "jar": "sha256-Hh5CfDb/Y8RP0w7yktnnc+oxVEYKtiZdP+1+b1vFD7k=",
- "pom": "sha256-gWXuhymafa8GmnyYG3u4YENCE7mvyqurC0abO6v0jm0="
+ "org/projectlombok#lombok/1.18.40": {
+ "jar": "sha256-t2TDobDIZ0jJ4ugNZOA9RUAs4+3rYx+oHjCla/+m2vM=",
+ "pom": "sha256-1nxojbairP4dHNGr2cCKgSec4IFnu6k5gG+CqijxcF8="
},
"org/rauschig#jarchivelib/0.6.0": {
"jar": "sha256-u/9XGPF0HRYkJreWaPJKznhTPHicnEBJtbewxTF39BQ=",
diff --git a/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix
index 9760b78020ad..e9aa6d571cf9 100644
--- a/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix
+++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix
@@ -2,8 +2,8 @@
stdenv,
lib,
fetchFromGitHub,
- gradle,
- jdk24,
+ gradle_9,
+ jdk25,
wrapGAppsHook3,
libXxf86vm,
libXtst,
@@ -16,15 +16,18 @@
makeDesktopItem,
writeScript,
}:
+let
+ gradle = gradle_9;
+in
stdenv.mkDerivation rec {
pname = "ed-odyssey-materials-helper";
- version = "3.0.1";
+ version = "3.0.6";
src = fetchFromGitHub {
owner = "jixxed";
repo = "ed-odyssey-materials-helper";
tag = version;
- hash = "sha256-tdpt0/TO7K1bK6OMCR9s5TbN1/v1ZywCzO/IvdOfsSA=";
+ hash = "sha256-4VxaQF1kmBo/9M0psr7jvshy1XhS02zUSMSuWvyEcoo=";
};
nativeBuildInputs = [
@@ -63,7 +66,7 @@ stdenv.mkDerivation rec {
};
gradleFlags = [
- "-Dorg.gradle.java.home=${jdk24}"
+ "-Dorg.gradle.java.home=${jdk25}"
"--stacktrace"
];
diff --git a/pkgs/by-name/ed/ed/package.nix b/pkgs/by-name/ed/ed/package.nix
index a789749cb5dc..46e352ef2c68 100644
--- a/pkgs/by-name/ed/ed/package.nix
+++ b/pkgs/by-name/ed/ed/package.nix
@@ -14,11 +14,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ed";
- version = "1.21.1";
+ version = "1.22.2";
src = fetchurl {
url = "mirror://gnu/ed/ed-${finalAttrs.version}.tar.lz";
- hash = "sha256-1tDHGSsCsFGckCqTcZBT6GWt5aeEo7Mn2T2IhFeyPEs=";
+ hash = "sha256-9Y0VJCBW4Vr3bxPzTGDYkPoqLVywq++RwRXk2DeU/+M=";
};
nativeBuildInputs = [ lzip ];
diff --git a/pkgs/by-name/ed/edencommon/package.nix b/pkgs/by-name/ed/edencommon/package.nix
index 0eaa0c65fa5f..2dbf5e9fbb2c 100644
--- a/pkgs/by-name/ed/edencommon/package.nix
+++ b/pkgs/by-name/ed/edencommon/package.nix
@@ -20,7 +20,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "edencommon";
- version = "2025.04.21.00";
+ version = "2025.09.15.00";
outputs = [
"out"
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "facebookexperimental";
repo = "edencommon";
tag = "v${finalAttrs.version}";
- hash = "sha256-WlLQb4O4rGhXp+bQrJA12CvrwcIS6vzO4W6bX04vKMM=";
+ hash = "sha256-KyJAosCLGnpEG968GV9BOyOrsoHS7BbRatTfBqzTelU=";
};
patches = [
diff --git a/pkgs/by-name/ed/edgetx/package.nix b/pkgs/by-name/ed/edgetx/package.nix
index 42dd8342713b..4cb6662c086c 100644
--- a/pkgs/by-name/ed/edgetx/package.nix
+++ b/pkgs/by-name/ed/edgetx/package.nix
@@ -114,15 +114,12 @@ stdenv.mkDerivation (finalAttrs: {
};
dontUseCmakeConfigure = true;
- # We invoke cmakeConfigurePhase multiple times, but only need this once.
- dontFixCmake = true;
inherit targetsToBuild;
__structuredAttrs = true; # To pass targetsToBuild as an array.
configurePhase = ''
runHook preConfigure
prependToVar cmakeFlags "-GNinja"
- fixCmakeFiles .
runHook postConfigure
'';
diff --git a/pkgs/by-name/ed/editline/package.nix b/pkgs/by-name/ed/editline/package.nix
index 7df7fe83936e..5942578b4896 100644
--- a/pkgs/by-name/ed/editline/package.nix
+++ b/pkgs/by-name/ed/editline/package.nix
@@ -4,7 +4,6 @@
fetchFromGitHub,
autoreconfHook,
nix-update-script,
- fetchpatch,
ncurses ? null,
# Enable `termcap` (`ncurses`) support.
@@ -17,40 +16,14 @@ assert lib.assertMsg (
stdenv.mkDerivation (finalAttrs: {
pname = "editline";
- version = "1.17.1";
+ version = "1.17.1-unstable-2025-05-24";
src = fetchFromGitHub {
owner = "troglobit";
repo = "editline";
- rev = finalAttrs.version;
- sha256 = "sha256-0FeDUVCUahbweH24nfaZwa7j7lSfZh1TnQK7KYqO+3g=";
+ rev = "f735e4d1d566cac3caa4a5e248179d07f0babefd";
+ sha256 = "sha256-MUXxSmhpQd8CZdGGC6Ln9eci85E+GBhlNk28VHUvjaU=";
};
- patches = [
- (fetchpatch {
- name = "fix-for-home-end-in-tmux.patch";
- url = "https://github.com/troglobit/editline/commit/265c1fb6a0b99bedb157dc7c320f2c9629136518.patch";
- sha256 = "sha256-9fhQH0hT8BcykGzOUoT18HBtWjjoXnePSGDJQp8GH30=";
- })
-
- # Pending autoconf-2.72 upstream support:
- # https://github.com/troglobit/editline/pull/64
- (fetchpatch {
- name = "autoconf-2.72.patch";
- url = "https://github.com/troglobit/editline/commit/f444a316f5178b8e20fe31e7b2d979e651da077e.patch";
- hash = "sha256-m3jExTkPvE+ZBwHzf/A+ugzzfbLmeWYn726l7Po7f10=";
- })
-
- # Recognize `Alt-Left` and `Alt-Right` for navigating by words in more
- # terminals/shells/platforms.
- #
- # See: https://github.com/troglobit/editline/pull/70
- (fetchpatch {
- name = "alt-left-alt-right-word-navigation.patch";
- url = "https://github.com/troglobit/editline/commit/fb4d7268de024ed31ad2417f533cc0cbc2cd9b29.diff";
- hash = "sha256-5zMsmpU5zFoffRUwFhI/vP57pEhGotcMPgn9AfI1SNg=";
- })
- ];
-
configureFlags = [
# Enable SIGSTOP (Ctrl-Z) behavior.
(lib.enableFeature true "sigstop")
diff --git a/pkgs/by-name/ej/ejsonkms/package.nix b/pkgs/by-name/ej/ejsonkms/package.nix
index 13a7281cee88..9aec4ac36228 100644
--- a/pkgs/by-name/ej/ejsonkms/package.nix
+++ b/pkgs/by-name/ej/ejsonkms/package.nix
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "ejsonkms";
- version = "0.2.7";
+ version = "0.2.8";
src = fetchFromGitHub {
owner = "envato";
repo = "ejsonkms";
rev = "v${version}";
- hash = "sha256-G2rUcAjFSXnkRaQiu3WK5WRwNeQ0vyxj1Ql+vaRUUeM=";
+ hash = "sha256-qsPn9opDyahyYSOXO9GB2RSHNZupXlAUIxPJRyVgqQo=";
};
- vendorHash = "sha256-ulocGcRnkWBLnkoimkxrppO2i9lowFChlMYl0+kVXCo=";
+ vendorHash = "sha256-DovbNZBdJxLpdggaxbe90pqHjl4fp4D7IZT9Z/j3yLI=";
ldflags = [
"-X main.version=v${version}"
diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/by-name/el/elinks/package.nix
similarity index 100%
rename from pkgs/applications/networking/browsers/elinks/default.nix
rename to pkgs/by-name/el/elinks/package.nix
diff --git a/pkgs/by-name/el/ell/package.nix b/pkgs/by-name/el/ell/package.nix
index 54da5b9b3af4..57ced639540a 100644
--- a/pkgs/by-name/el/ell/package.nix
+++ b/pkgs/by-name/el/ell/package.nix
@@ -11,7 +11,7 @@
stdenv.mkDerivation rec {
pname = "ell";
- version = "0.78";
+ version = "0.79";
outputs = [
"out"
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
src = fetchgit {
url = "https://git.kernel.org/pub/scm/libs/ell/ell.git";
rev = version;
- hash = "sha256-1kw0oiYkEydoMWrECehI5M6VbcL+Y340Pu5QU2F3sbQ=";
+ hash = "sha256-5NqzuUDimairQJjHsSy0sbpqiDfNDvrt3BEV9e1bF1E=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/el/elmerfem/package.nix b/pkgs/by-name/el/elmerfem/package.nix
index e78ffe1d7320..20731100f670 100644
--- a/pkgs/by-name/el/elmerfem/package.nix
+++ b/pkgs/by-name/el/elmerfem/package.nix
@@ -12,7 +12,7 @@
libGLU,
opencascade-occt,
qt6Packages,
- tbb,
+ onetbb,
vtkWithQt6,
llvmPackages,
}:
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
libGL
libGLU
opencascade-occt
- tbb
+ onetbb
vtkWithQt6
]
++ lib.optional stdenv.cc.isClang llvmPackages.openmp;
diff --git a/pkgs/development/libraries/embree/default.nix b/pkgs/by-name/em/embree/package.nix
similarity index 94%
rename from pkgs/development/libraries/embree/default.nix
rename to pkgs/by-name/em/embree/package.nix
index 140a0d82e4bc..eb4519e13742 100644
--- a/pkgs/development/libraries/embree/default.nix
+++ b/pkgs/by-name/em/embree/package.nix
@@ -5,7 +5,7 @@
cmake,
pkg-config,
ispc,
- tbb,
+ onetbb,
glfw,
openimageio,
libjpeg,
@@ -38,8 +38,8 @@ stdenv.mkDerivation (finalAttrs: {
cmakeFlags = [
"-DEMBREE_TUTORIALS=OFF"
"-DEMBREE_RAY_MASK=ON"
- "-DTBB_ROOT=${tbb}"
- "-DTBB_INCLUDE_DIR=${tbb.dev}/include"
+ "-DTBB_ROOT=${onetbb}"
+ "-DTBB_INCLUDE_DIR=${onetbb.dev}/include"
];
nativeBuildInputs = [
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
cmake
];
buildInputs = [
- tbb
+ onetbb
glfw
openimageio
libjpeg
diff --git a/pkgs/data/fonts/emojione/default.nix b/pkgs/by-name/em/emojione/package.nix
similarity index 100%
rename from pkgs/data/fonts/emojione/default.nix
rename to pkgs/by-name/em/emojione/package.nix
diff --git a/pkgs/by-name/en/envision/package.nix b/pkgs/by-name/en/envision/package.nix
index 3e3c27576298..8c8ae5197fbc 100644
--- a/pkgs/by-name/en/envision/package.nix
+++ b/pkgs/by-name/en/envision/package.nix
@@ -63,7 +63,7 @@ buildFHSEnv {
libepoxy
lz4
lz4.dev
- tbb
+ onetbb
libxkbcommon
librealsense
boost
diff --git a/pkgs/by-name/en/envoy-bin/package.nix b/pkgs/by-name/en/envoy-bin/package.nix
index e126368babdc..641c61bd5f21 100644
--- a/pkgs/by-name/en/envoy-bin/package.nix
+++ b/pkgs/by-name/en/envoy-bin/package.nix
@@ -8,7 +8,7 @@
versionCheckHook,
}:
let
- version = "1.35.2";
+ version = "1.35.3";
inherit (stdenv.hostPlatform) system;
throwSystem = throw "envoy-bin is not available for ${system}.";
@@ -21,8 +21,8 @@ let
hash =
{
- aarch64-linux = "sha256-XfV0d4l8yTsEF9hDXAFnd0wgtu+Hm6VaEfPfXHF9wdE=";
- x86_64-linux = "sha256-6Uo9Gya7lpkb5GAiB8yxIX81Yw1BWurBUF1ooDuJc9w=";
+ aarch64-linux = "sha256-NN5VDwIYLTHSYpVljAQQOdRjQavNGn5BLmpOK+Azg18=";
+ x86_64-linux = "sha256-JBwXAvDtHA26MTOauqtCKQakKVzJJkD1uDLBMe44V2c=";
}
.${system} or throwSystem;
in
diff --git a/pkgs/by-name/en/enzyme/package.nix b/pkgs/by-name/en/enzyme/package.nix
index 8558132a7f25..9a980e79477b 100644
--- a/pkgs/by-name/en/enzyme/package.nix
+++ b/pkgs/by-name/en/enzyme/package.nix
@@ -7,13 +7,13 @@
}:
llvmPackages.stdenv.mkDerivation rec {
pname = "enzyme";
- version = "0.0.201";
+ version = "0.0.203";
src = fetchFromGitHub {
owner = "EnzymeAD";
repo = "Enzyme";
rev = "v${version}";
- hash = "sha256-TUGWQImDtXOOkEt20719OheKlPgWjEVdqTh/ET/c1cs=";
+ hash = "sha256-PfV50pGDGWx4Ih8x8V0ib+Oti71oH90ODepiDN+q4tU=";
};
postPatch = ''
diff --git a/pkgs/by-name/eq/equibop/package.nix b/pkgs/by-name/eq/equibop/package.nix
index 0a083416cbea..932a3174d7b5 100644
--- a/pkgs/by-name/eq/equibop/package.nix
+++ b/pkgs/by-name/eq/equibop/package.nix
@@ -20,13 +20,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "equibop";
- version = "2.1.6";
+ version = "2.1.7";
src = fetchFromGitHub {
owner = "Equicord";
repo = "Equibop";
tag = "v${finalAttrs.version}";
- hash = "sha256-0OtCxz7g1xMmnkDke34deaS3dx5b8bGOC0Vbq6BIObg=";
+ hash = "sha256-wvg06YSQOZvP/NHl3WPfnI9F0+KN0cJ2CBwaZD8Xpfk=";
};
pnpmDeps = pnpm_10.fetchDeps {
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
patches
;
fetcherVersion = 1;
- hash = "sha256-MDqAncWdU2rIQAGF/wx2gWxDf74P3fp3w4nA8b6AITw=";
+ hash = "sha256-HQxQIMbj2xsxD1jwj/itfAW6KHxX81Eu60ouzxQDu44=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/eq/equicord/package.nix b/pkgs/by-name/eq/equicord/package.nix
index a24af9cc138c..7127edef1e46 100644
--- a/pkgs/by-name/eq/equicord/package.nix
+++ b/pkgs/by-name/eq/equicord/package.nix
@@ -18,19 +18,19 @@ stdenv.mkDerivation (finalAttrs: {
# the Equicord repository. Dates as tags (and automatic releases) were the compromise
# we came to with upstream. Please do not change the version schema (e.g., to semver)
# unless upstream changes the tag schema from dates.
- version = "2025-09-12";
+ version = "2025-10-05";
src = fetchFromGitHub {
owner = "Equicord";
repo = "Equicord";
tag = "${finalAttrs.version}";
- hash = "sha256-915HW2cGGKtbRGghHP/Em0Wyeit6d1oSUmaZLQOH/Lc=";
+ hash = "sha256-29akM1A7wFI+uZJ2r6K+2djYoZ6zI/rcYROU++x4j8k=";
};
pnpmDeps = pnpm_10.fetchDeps {
inherit (finalAttrs) pname version src;
fetcherVersion = 1;
- hash = "sha256-xVnryPA7+gnRvpMzuFJl4YeEPOky2+iOu76V3Rf6bow=";
+ hash = "sha256-SsvkIgIXKYBgiHOMt9+IX8pXSYvXr8ESgHJm0mzBWlU=";
};
nativeBuildInputs = [
diff --git a/pkgs/servers/etcd/3_4/default.nix b/pkgs/by-name/et/etcd_3_4/package.nix
similarity index 100%
rename from pkgs/servers/etcd/3_4/default.nix
rename to pkgs/by-name/et/etcd_3_4/package.nix
diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix
index 927b9c5839b3..fe7955aa8b43 100644
--- a/pkgs/by-name/ev/evcc/package.nix
+++ b/pkgs/by-name/ev/evcc/package.nix
@@ -17,16 +17,16 @@
}:
let
- version = "0.208.1";
+ version = "0.209.1";
src = fetchFromGitHub {
owner = "evcc-io";
repo = "evcc";
tag = version;
- hash = "sha256-l7whf2NhvPHZOfXy4PdZq8ZyAKaiLuBlX9s7ffJQoWg=";
+ hash = "sha256-cIUc7+mQy9Q+monXOXO6tBmwwAjF+HLgbfo3VnJT9Dk=";
};
- vendorHash = "sha256-qp7kSh6pOecXa2qAmKXdJAgAZ4O3pnX0/nMUhwR2cFA=";
+ vendorHash = "sha256-Is6hv2nkTQhugSj+CqcTiwAPvIBtNNAvWZLLWm0jU/8=";
commonMeta = with lib; {
license = licenses.mit;
@@ -52,7 +52,7 @@ buildGo125Module rec {
npmDeps = fetchNpmDeps {
inherit src;
- hash = "sha256-q+ft9dzs/M+ZYCQy/OnqTmpgKXxrD5cfaqrvsxh730w=";
+ hash = "sha256-0pjYFgF4PqWibIQvklZx116V+uDg+MIC7hmQxlCKSvc=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/ex/expat/package.nix b/pkgs/by-name/ex/expat/package.nix
index e8ead2467c64..ba5a46d034f8 100644
--- a/pkgs/by-name/ex/expat/package.nix
+++ b/pkgs/by-name/ex/expat/package.nix
@@ -18,7 +18,7 @@
# files.
let
- version = "2.7.1";
+ version = "2.7.2";
tag = "R_${lib.replaceStrings [ "." ] [ "_" ] version}";
in
stdenv.mkDerivation (finalAttrs: {
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
url =
with finalAttrs;
"https://github.com/libexpat/libexpat/releases/download/${tag}/${pname}-${version}.tar.xz";
- hash = "sha256-NUVSVEuPmQEuUGL31XDsd/FLQSo/9cfY0NrmLA0hfDA=";
+ hash = "sha256-Ibd4s07IN8KsKFrvNA+ftfoGOoEbIepNJBKpcCyImVw=";
};
strictDeps = true;
diff --git a/pkgs/by-name/f3/f3/package.nix b/pkgs/by-name/f3/f3/package.nix
index dacee40225d1..736ead2fb5dc 100644
--- a/pkgs/by-name/f3/f3/package.nix
+++ b/pkgs/by-name/f3/f3/package.nix
@@ -59,7 +59,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [
makefu
- evils
];
};
}
diff --git a/pkgs/by-name/f3/f3d/package.nix b/pkgs/by-name/f3/f3d/package.nix
index b24c155673d9..f79b09b643c7 100644
--- a/pkgs/by-name/f3/f3d/package.nix
+++ b/pkgs/by-name/f3/f3d/package.nix
@@ -8,7 +8,7 @@
gzip,
libXt,
openusd,
- tbb,
+ onetbb,
vtk,
autoPatchelfHook,
python3Packages,
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
++ lib.optionals withUsd [
libXt
openusd
- tbb
+ onetbb
];
cmakeFlags = [
diff --git a/pkgs/development/interpreters/falcon/default.nix b/pkgs/by-name/fa/falcon/package.nix
similarity index 100%
rename from pkgs/development/interpreters/falcon/default.nix
rename to pkgs/by-name/fa/falcon/package.nix
diff --git a/pkgs/by-name/fa/fast-float/package.nix b/pkgs/by-name/fa/fast-float/package.nix
index c4b7ca10efaf..e9a5948fbdc4 100644
--- a/pkgs/by-name/fa/fast-float/package.nix
+++ b/pkgs/by-name/fa/fast-float/package.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "fast-float";
- version = "8.0.2";
+ version = "8.1.0";
src = fetchFromGitHub {
owner = "fastfloat";
repo = "fast_float";
rev = "v${finalAttrs.version}";
- hash = "sha256-lKEzRYKdpjsqixC9WBoILccqB2ZkUtPUzT4Q4+j0oac=";
+ hash = "sha256-kTLmk+mxfdN/+vKdyohcaNSeoAkhJf3uesaBOz123ag=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/fa/fasttext/package.nix b/pkgs/by-name/fa/fasttext/package.nix
index d8989f98e011..6b6665438beb 100644
--- a/pkgs/by-name/fa/fasttext/package.nix
+++ b/pkgs/by-name/fa/fasttext/package.nix
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
+ fetchurl,
cmake,
}:
@@ -16,6 +17,15 @@ stdenv.mkDerivation {
hash = "sha256-lSIah4T+QqZwCRpeI3mxJ7PZT6pSHBO26rcEFfK8DSk=";
};
+ patches = [
+ # Fix build with CMake 4
+ # Upstream repo is archived, so we take a patch from Debian
+ (fetchurl {
+ url = "https://salsa.debian.org/science-team/fasttext/-/raw/b2a0e52d302b32b6786b1a8fb9c0b21ca23e2be9/debian/patches/fix-ftbfs-cmake4.patch";
+ hash = "sha256-I5w+/4SNyp2FtHGYBWU2Fi76vmJpG4nbgsb0akVddAs=";
+ })
+ ];
+
nativeBuildInputs = [ cmake ];
meta = with lib; {
diff --git a/pkgs/by-name/fa/faudio/package.nix b/pkgs/by-name/fa/faudio/package.nix
index 4f3836e9fe00..f593d90a5d6c 100644
--- a/pkgs/by-name/fa/faudio/package.nix
+++ b/pkgs/by-name/fa/faudio/package.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "faudio";
- version = "25.09";
+ version = "25.10";
src = fetchFromGitHub {
owner = "FNA-XNA";
repo = "FAudio";
tag = finalAttrs.version;
- hash = "sha256-vrqUyoihbOJcTzKYP6RqoiIUtaG2LUsq6tWi1pczET8=";
+ hash = "sha256-WcMjzXlDoHfFpZdrkbVwRS11MvTlIMDCkn34+tSdGi4=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/fb/fb303/package.nix b/pkgs/by-name/fb/fb303/package.nix
index 834f700df656..6c5017bde61b 100644
--- a/pkgs/by-name/fb/fb303/package.nix
+++ b/pkgs/by-name/fb/fb303/package.nix
@@ -19,7 +19,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "fb303";
- version = "2025.04.21.00";
+ version = "2025.09.15.00";
outputs = [
"out"
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "facebook";
repo = "fb303";
tag = "v${finalAttrs.version}";
- hash = "sha256-Cgr+uuUl+tlyWdAvBCVMK/mInYu+M5N9QLMTvvJ3oEk=";
+ hash = "sha256-6suO1SE8+WASQiHLtiieu3nrjEYqSPnKxw7nHkQ4br0=";
};
patches = [
diff --git a/pkgs/by-name/fb/fblog/package.nix b/pkgs/by-name/fb/fblog/package.nix
index 8260cdc8dbfb..a7ed02781531 100644
--- a/pkgs/by-name/fb/fblog/package.nix
+++ b/pkgs/by-name/fb/fblog/package.nix
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "fblog";
- version = "4.15.0";
+ version = "4.16.0";
src = fetchFromGitHub {
owner = "brocode";
repo = "fblog";
rev = "v${version}";
- hash = "sha256-IPT/1k8bs2NBbq5KthvcJY7eBwbnFop8cO0OiLgRZg4=";
+ hash = "sha256-SWwk7qNe2R1aBYGBFqltUZjeOvr4jG1P7/CPIAfHCc8=";
};
- cargoHash = "sha256-puZN1ao+Grw9nWQvNfqAwmY9Lb6+z13EPv/cZlueYxc=";
+ cargoHash = "sha256-du9FXuUNqQm1AMqcCFqeso5OPrPCxzTVl5e7kR0rpwc=";
meta = with lib; {
description = "Small command-line JSON log viewer";
diff --git a/pkgs/by-name/fb/fbthrift/glog-0.7.patch b/pkgs/by-name/fb/fbthrift/glog-0.7.patch
index 23cff743614c..482815161012 100644
--- a/pkgs/by-name/fb/fbthrift/glog-0.7.patch
+++ b/pkgs/by-name/fb/fbthrift/glog-0.7.patch
@@ -1,17 +1,17 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c6b2b2a810..1813c88e42 100644
+index 492bcccd9a..9c907a87a8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -106,7 +106,7 @@ endif ()
+@@ -108,7 +108,7 @@
# Find required dependencies for thrift/lib
if (THRIFT_LIB_ONLY OR build_all)
find_package(Gflags REQUIRED)
- find_package(Glog REQUIRED)
+ find_package(Glog CONFIG REQUIRED)
- find_package(folly CONFIG REQUIRED)
find_package(fizz CONFIG REQUIRED)
find_package(wangle CONFIG REQUIRED)
-@@ -119,7 +119,6 @@ if (THRIFT_LIB_ONLY OR build_all)
+ find_package(ZLIB REQUIRED)
+@@ -120,7 +120,6 @@
find_package(Threads)
include_directories(
${LIBGFLAGS_INCLUDE_DIR}
@@ -23,7 +23,7 @@ diff --git a/thrift/example/cpp2/CMakeLists.txt b/thrift/example/cpp2/CMakeLists
index afa28dad61..318860b3d6 100644
--- a/thrift/example/cpp2/CMakeLists.txt
+++ b/thrift/example/cpp2/CMakeLists.txt
-@@ -28,7 +28,7 @@ target_link_libraries(
+@@ -28,7 +28,7 @@
thriftcpp2
chatroom-cpp2
${LIBGFLAGS_LIBRARY}
@@ -33,10 +33,10 @@ index afa28dad61..318860b3d6 100644
install(
TARGETS example_server
diff --git a/thrift/lib/cpp/CMakeLists.txt b/thrift/lib/cpp/CMakeLists.txt
-index 6461588a86..8b6ed1b030 100644
+index 2c65e1f0a8..1e80060100 100644
--- a/thrift/lib/cpp/CMakeLists.txt
+++ b/thrift/lib/cpp/CMakeLists.txt
-@@ -45,7 +45,7 @@ target_link_libraries(
+@@ -43,7 +43,7 @@
PUBLIC
Folly::folly
${LIBGFLAGS_LIBRARY}
@@ -45,7 +45,7 @@ index 6461588a86..8b6ed1b030 100644
)
add_library(
-@@ -121,7 +121,7 @@ target_link_libraries(
+@@ -121,7 +121,7 @@
Boost::boost
Folly::folly
wangle::wangle
@@ -54,7 +54,7 @@ index 6461588a86..8b6ed1b030 100644
${OPENSSL_LIBRARIES}
)
-@@ -137,7 +137,7 @@ target_link_libraries(
+@@ -137,7 +137,7 @@
thriftprotocol
transport
Folly::folly
@@ -64,10 +64,10 @@ index 6461588a86..8b6ed1b030 100644
set(THRIFT1_HEADER_DIRS
diff --git a/thrift/lib/cpp2/CMakeLists.txt b/thrift/lib/cpp2/CMakeLists.txt
-index f941688ab0..b3609bbc62 100644
+index 03216f5d6f..5f31fc0c64 100644
--- a/thrift/lib/cpp2/CMakeLists.txt
+++ b/thrift/lib/cpp2/CMakeLists.txt
-@@ -75,7 +75,7 @@ target_link_libraries(
+@@ -75,7 +75,7 @@
Folly::folly
thriftmetadata
thriftprotocol
@@ -76,7 +76,7 @@ index f941688ab0..b3609bbc62 100644
${LIBGFLAGS_LIBRARY}
)
-@@ -206,7 +206,7 @@ target_link_libraries(
+@@ -207,7 +207,7 @@
thrift
Folly::folly
wangle::wangle
diff --git a/pkgs/by-name/fb/fbthrift/package.nix b/pkgs/by-name/fb/fbthrift/package.nix
index 8d6ab8df0fb0..71e759c7def1 100644
--- a/pkgs/by-name/fb/fbthrift/package.nix
+++ b/pkgs/by-name/fb/fbthrift/package.nix
@@ -25,7 +25,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "fbthrift";
- version = "2025.04.21.00";
+ version = "2025.09.15.00";
outputs = [
# Trying to split this up further into `bin`, `out`, and `dev`
@@ -39,25 +39,19 @@ stdenv.mkDerivation (finalAttrs: {
owner = "facebook";
repo = "fbthrift";
tag = "v${finalAttrs.version}";
- hash = "sha256-W86jBqq0wC8ZYcE7MQ76rV3axPf7efXieEot6ahonUI=";
+ hash = "sha256-4u3SbbmSgtvnW3/VH3CfQrEddAlkQuUl9dmnGGKL4mE=";
};
patches = [
+ # Map `$NIX_BUILD_TOP` to `/build` in the Thrift compiler output to
+ # avoid reproducibility issues on Darwin.
+ ./scrub-build-directory-from-output.patch
+
# Remove a line that breaks the build due to the CMake classic of
# incorrect path concatenation.
./remove-cmake-install-rpath.patch
./glog-0.7.patch
-
- # Backport upstream build system fixes. Remove on next update.
- (fetchpatch {
- url = "https://github.com/facebook/fbthrift/commit/638384afb83e5fae29a6483d20f9443b2342ca0b.patch";
- hash = "sha256-q0VgaQtwAEgDHZ6btOLSnKfkP2cXstFPxPNdX1wcdCg=";
- })
- (fetchpatch {
- url = "https://github.com/facebook/fbthrift/commit/350955beef40abec1e9d13112c9d2b7f95c29022.patch";
- hash = "sha256-SaCZ0iczj8He2wujWN08QpizsTsK6OhreroOHY9f0BA=";
- })
];
nativeBuildInputs = [
@@ -101,6 +95,33 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeFeature "CMAKE_SHARED_LINKER_FLAGS" "-Wl,-undefined,dynamic_lookup")
];
+ # Fix a typo introduced by the following commit that causes hundreds
+ # of pointless rebuilds when installing:
+ #
+ postPatch = ''
+ substituteInPlace ThriftLibrary.cmake \
+ --replace-fail .tcch .tcc
+ '';
+
+ # Copied from Homebrew; fixes the following build error:
+ #
+ # [ERROR:/nix/var/nix/b/5f3kn8spg6j0z0xlags8va6sq7/source/thrift/lib/thrift/RpcMetadata.thrift:1] unordered_map::at: key not found
+ #
+ # See:
+ #
+ # *
+ # *
+ # *
+ #
+ # I don’t know why we didn’t need this before the bump to 202
+ # to 2025.09.08.00 when we’d been on LLVM 19 for an entire release
+ # cycle already, or why we’re getting different errors to those
+ # reports, or why this fixes the build anyway. Most of what I do to
+ # maintain these packages is copy compilation flags from Homebrew
+ # that scare me. I don’t have very much fun with these libraries, to
+ # be honest with you.
+ env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-fno-assume-unique-vtables";
+
passthru.updateScript = nix-update-script { };
meta = {
diff --git a/pkgs/by-name/fb/fbthrift/scrub-build-directory-from-output.patch b/pkgs/by-name/fb/fbthrift/scrub-build-directory-from-output.patch
new file mode 100644
index 000000000000..9fdfc77f2ead
--- /dev/null
+++ b/pkgs/by-name/fb/fbthrift/scrub-build-directory-from-output.patch
@@ -0,0 +1,36 @@
+diff --git a/thrift/compiler/generate/t_mstch_cpp2_generator.cc b/thrift/compiler/generate/t_mstch_cpp2_generator.cc
+index d232df5158..96d15efbda 100644
+--- a/thrift/compiler/generate/t_mstch_cpp2_generator.cc
++++ b/thrift/compiler/generate/t_mstch_cpp2_generator.cc
+@@ -1116,6 +1116,13 @@
+ mstch::node autogen_path() {
+ std::string path = service_->program()->path();
+ std::replace(path.begin(), path.end(), '\\', '/');
++ // Ensure output reproducibility for Nix builds.
++ if (auto nix_build_top = std::getenv("NIX_BUILD_TOP")) {
++ auto prefix = std::string(nix_build_top) + "/";
++ if (path.starts_with(prefix)) {
++ path.replace(0, prefix.length(), "/build/");
++ }
++ }
+ return path;
+ }
+ mstch::node cpp_includes() {
+diff --git a/thrift/compiler/generate/t_whisker_generator.cc b/thrift/compiler/generate/t_whisker_generator.cc
+index 99a6ac14af..fa91a05247 100644
+--- a/thrift/compiler/generate/t_whisker_generator.cc
++++ b/thrift/compiler/generate/t_whisker_generator.cc
+@@ -572,6 +572,13 @@
+ // use posix path separators, even on windows, for autogen comment
+ // to avoid spurious fixture regen diffs
+ std::replace(path.begin(), path.end(), '\\', '/');
++ // Ensure output reproducibility for Nix builds.
++ if (auto nix_build_top = std::getenv("NIX_BUILD_TOP")) {
++ auto prefix = std::string(nix_build_top) + "/";
++ if (path.starts_with(prefix)) {
++ path.replace(0, prefix.length(), "/build/");
++ }
++ }
+ return path;
+ });
+ def.property("namespaces", [&](const t_program& self) -> map::ptr {
diff --git a/pkgs/tools/misc/fclones/default.nix b/pkgs/by-name/fc/fclones/package.nix
similarity index 100%
rename from pkgs/tools/misc/fclones/default.nix
rename to pkgs/by-name/fc/fclones/package.nix
diff --git a/pkgs/by-name/fi/filebeat8/package.nix b/pkgs/by-name/fi/filebeat8/package.nix
index 89d3b95ec2ec..000e13f985f3 100644
--- a/pkgs/by-name/fi/filebeat8/package.nix
+++ b/pkgs/by-name/fi/filebeat8/package.nix
@@ -8,18 +8,18 @@
buildGoModule rec {
pname = "filebeat";
- version = "8.19.3";
+ version = "8.19.4";
src = fetchFromGitHub {
owner = "elastic";
repo = "beats";
tag = "v${version}";
- hash = "sha256-bw/qWsNT4tG+hUjeb+DXaTxDY6HEL/A9iANFLdbyi5E=";
+ hash = "sha256-qY6itgYoAL93HoVDvADayjfRtsZcxTQbOVJZsFeU1Zk=";
};
proxyVendor = true; # darwin/linux hash mismatch
- vendorHash = "sha256-t+rCXm2eIG2a5xW1E8SjRAb/w9OuFKC/PyCGpJP8Szc=";
+ vendorHash = "sha256-kDlYPnAXohmPHbeRlhrjcDwDkd0AB5VYKhpe99o/XIA=";
subPackages = [ "filebeat" ];
diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix
index e211784bace8..765f6860e3b7 100644
--- a/pkgs/by-name/fi/files-cli/package.nix
+++ b/pkgs/by-name/fi/files-cli/package.nix
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "files-cli";
- version = "2.15.104";
+ version = "2.15.111";
src = fetchFromGitHub {
repo = "files-cli";
owner = "files-com";
rev = "v${version}";
- hash = "sha256-7HXLDFTLKHKOhjs01lUPSIW3btvCnffiJZ2VKgHwGiY=";
+ hash = "sha256-M6SVLloMn/6AmIpfZ0Ib0yUQ33hC9MFjbFTxOlN7kqs=";
};
- vendorHash = "sha256-I829gWaDUgbMhnp99p5SvtBRePefCZ86iztHqtWEEzs=";
+ vendorHash = "sha256-fxh9YOO0xnYo04HwJyctspipSXgWcDoUu40UwhDf8Uk=";
ldflags = [
"-s"
diff --git a/pkgs/by-name/fi/findup/package.nix b/pkgs/by-name/fi/findup/package.nix
index 41e60f6df5ad..9f10c1f2130e 100644
--- a/pkgs/by-name/fi/findup/package.nix
+++ b/pkgs/by-name/fi/findup/package.nix
@@ -3,20 +3,23 @@
stdenv,
fetchFromGitHub,
testers,
- zig_0_14,
+ zig_0_15,
}:
+let
+ zig = zig_0_15;
+in
stdenv.mkDerivation (finalAttrs: {
pname = "findup";
- version = "1.1.3";
+ version = "2.0.0";
src = fetchFromGitHub {
owner = "booniepepper";
repo = "findup";
- rev = "v${finalAttrs.version}";
- hash = "sha256-ZrwEOWoXo1RnujroQDGAv4vqRD0ZSyzo8MEnIbHFrY4=";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-6/rQ4xNfzJQwJgrpvFRuirqlx6fVn7sLXfVRFsG3fUw=";
};
- nativeBuildInputs = [ zig_0_14.hook ];
+ nativeBuildInputs = [ zig.hook ];
passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
diff --git a/pkgs/by-name/fi/firefly-iii/package.nix b/pkgs/by-name/fi/firefly-iii/package.nix
index 0fb3df084bdd..cc0d673ec4a6 100644
--- a/pkgs/by-name/fi/firefly-iii/package.nix
+++ b/pkgs/by-name/fi/firefly-iii/package.nix
@@ -13,13 +13,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "firefly-iii";
- version = "6.4.0";
+ version = "6.4.2";
src = fetchFromGitHub {
owner = "firefly-iii";
repo = "firefly-iii";
tag = "v${finalAttrs.version}";
- hash = "sha256-X/rihS5iOVAFJsqTG2Bq1V/G1ITFxxJIS+YDI0TKfE4=";
+ hash = "sha256-nGXFFGVw0TCXSBwMExk6wn0Es0HwCnY4P+nbJki+R6A=";
};
buildInputs = [ php84 ];
@@ -38,13 +38,13 @@ stdenvNoCC.mkDerivation (finalAttrs: {
composerNoScripts = true;
composerStrictValidation = true;
strictDeps = true;
- vendorHash = "sha256-ICoOD0cJrsSphJ9Ke86qO9/cOZst30pwAXDjerV+Ds4=";
+ vendorHash = "sha256-siLLtF/B2eNsRaazq5zOXnFeFPlEeoSAIXYKEsrHv28=";
};
npmDeps = fetchNpmDeps {
inherit (finalAttrs) src;
name = "${finalAttrs.pname}-npm-deps";
- hash = "sha256-6SMXXc1aJiHpWloRuY6Rd6NhuS5xQ0QuInlu5fLUHvk=";
+ hash = "sha256-WV1MsCbYxEHUEw0yYqD8b9jracyLVbpndWuHY0ZbaEM=";
};
preInstall = ''
diff --git a/pkgs/by-name/fi/firefoxpwa/package.nix b/pkgs/by-name/fi/firefoxpwa/package.nix
index 1a4e71e9411a..d3211f897137 100644
--- a/pkgs/by-name/fi/firefoxpwa/package.nix
+++ b/pkgs/by-name/fi/firefoxpwa/package.nix
@@ -29,19 +29,19 @@
rustPlatform.buildRustPackage rec {
pname = "firefoxpwa";
- version = "2.16.0";
+ version = "2.17.0";
src = fetchFromGitHub {
owner = "filips123";
repo = "PWAsForFirefox";
rev = "v${version}";
- hash = "sha256-kFhnlWiNCbs0arJfQRRWubnIrdXKrwyJNLAN1KlDHoc=";
+ hash = "sha256-GKK5PYWSO+rWtuZuHgDQx3V7f8bEX8JHvvFK8sQRli4=";
};
sourceRoot = "${src.name}/native";
buildFeatures = [ "immutable-runtime" ];
- cargoHash = "sha256-3o/Ub452PbiicmgyW6z9BP2PaECfFYN+Tx24/Go2N2M=";
+ cargoHash = "sha256-aV6Wvv+GzPLsWtdsS3ki82ju1Fh4IgFnIOF4OTEV7uQ=";
preConfigure = ''
sed -i 's;version = "0.0.0";version = "${version}";' Cargo.toml
diff --git a/pkgs/by-name/fi/firezone-server/0000-add-mua.patch b/pkgs/by-name/fi/firezone-server/0000-add-mua.patch
index 68d8a9ba47ab..cee9e1ef64fc 100644
--- a/pkgs/by-name/fi/firezone-server/0000-add-mua.patch
+++ b/pkgs/by-name/fi/firezone-server/0000-add-mua.patch
@@ -1,8 +1,8 @@
diff --git a/elixir/apps/domain/lib/domain/config/definitions.ex b/elixir/apps/domain/lib/domain/config/definitions.ex
-index 8cd2e8d0f..92e18b10b 100644
+index 3bf383eac..ed0521045 100644
--- a/elixir/apps/domain/lib/domain/config/definitions.ex
+++ b/elixir/apps/domain/lib/domain/config/definitions.ex
-@@ -584,6 +590,7 @@ defmodule Domain.Config.Definitions do
+@@ -619,6 +619,7 @@ defmodule Domain.Config.Definitions do
Swoosh.Adapters.Mailgun,
Swoosh.Adapters.Mailjet,
Swoosh.Adapters.Mandrill,
@@ -10,33 +10,11 @@ index 8cd2e8d0f..92e18b10b 100644
Swoosh.Adapters.Postmark,
Swoosh.Adapters.ProtonBridge,
Swoosh.Adapters.SMTP,
-diff --git a/elixir/config/runtime.exs b/elixir/config/runtime.exs
-index 15037e0a3..475c4ddfb 100644
---- a/elixir/config/runtime.exs
-+++ b/elixir/config/runtime.exs
-@@ -226,8 +228,15 @@ if config_env() == :prod do
- config :domain,
- Domain.Mailer,
- [
-- adapter: compile_config!(:outbound_email_adapter),
-- from_email: compile_config!(:outbound_email_from)
-+ adapter: compile_config!(:outbound_email_adapter),
-+ from_email: compile_config!(:outbound_email_from),
-+ protocol: String.to_atom(System.get_env("OUTBOUND_EMAIL_SMTP_PROTOCOL")),
-+ relay: System.get_env("OUTBOUND_EMAIL_SMTP_HOST"),
-+ port: String.to_integer(System.get_env("OUTBOUND_EMAIL_SMTP_PORT")),
-+ auth: [
-+ username: System.get_env("OUTBOUND_EMAIL_SMTP_USERNAME"),
-+ password: System.get_env("OUTBOUND_EMAIL_SMTP_PASSWORD")
-+ ]
- ] ++ compile_config!(:outbound_email_adapter_opts)
-
- config :workos, WorkOS.Client,
diff --git a/elixir/mix.exs b/elixir/mix.exs
-index 12782d631..dee1245d2 100644
+index df90739df..5c53e4383 100644
--- a/elixir/mix.exs
+++ b/elixir/mix.exs
-@@ -47,7 +47,9 @@ defmodule Firezone.MixProject do
+@@ -50,7 +50,9 @@ defmodule Firezone.MixProject do
# Formatter doesn't track dependencies of children applications
{:phoenix, "~> 1.7.0"},
{:phoenix_live_view, "~> 1.0.0-rc.0"},
@@ -48,20 +26,21 @@ index 12782d631..dee1245d2 100644
end
diff --git a/elixir/mix.lock b/elixir/mix.lock
-index 8c4b65959..3d2f9faca 100644
+index 0b03b58d0..eefb202f4 100644
--- a/elixir/mix.lock
+++ b/elixir/mix.lock
-@@ -50,11 +50,13 @@
+@@ -49,11 +49,13 @@
"junit_formatter": {:hex, :junit_formatter, "3.4.0", "d0e8db6c34dab6d3c4154c3b46b21540db1109ae709d6cf99ba7e7a2ce4b1ac2", [:mix], [], "hexpm", "bb36e2ae83f1ced6ab931c4ce51dd3dbef1ef61bb4932412e173b0cfa259dacd"},
- "libcluster": {:hex, :libcluster, "3.3.3", "a4f17721a19004cfc4467268e17cff8b1f951befe428975dd4f6f7b84d927fe0", [:mix], [{:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "7c0a2275a0bb83c07acd17dab3c3bfb4897b145106750eeccc62d302e3bdfee5"},
- "logger_json": {:hex, :logger_json, "6.2.0", "13e2e9f5f7b195865c5c3ef3d296c3ad50e7ecb038d899433702a79e979b91d7", [:mix], [{:ecto, "~> 3.11", [hex: :ecto, repo: "hexpm", optional: true]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:plug, "~> 1.15", [hex: :plug, repo: "hexpm", optional: true]}, {:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm", "98366d02bedbb56e41b25a6d248d566d4f4bc224bae2b1e982df00ed04ba9219"},
+ "libcluster": {:hex, :libcluster, "3.5.0", "5ee4cfde4bdf32b2fef271e33ce3241e89509f4344f6c6a8d4069937484866ba", [:mix], [{:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.3", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "ebf6561fcedd765a4cd43b4b8c04b1c87f4177b5fb3cbdfe40a780499d72f743"},
+ "logger_json": {:hex, :logger_json, "7.0.4", "e315f2b9a755504658a745f3eab90d88d2cd7ac2ecfd08c8da94d8893965ab5c", [:mix], [{:decimal, ">= 0.0.0", [hex: :decimal, repo: "hexpm", optional: true]}, {:ecto, "~> 3.11", [hex: :ecto, repo: "hexpm", optional: true]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: true]}, {:plug, "~> 1.15", [hex: :plug, repo: "hexpm", optional: true]}, {:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm", "d1369f8094e372db45d50672c3b91e8888bcd695fdc444a37a0734e96717c45c"},
+ "mail": {:hex, :mail, "0.3.1", "cb0a14e4ed8904e4e5a08214e686ccf6f9099346885db17d8c309381f865cc5c", [:mix], [], "hexpm", "1db701e89865c1d5fa296b2b57b1cd587587cca8d8a1a22892b35ef5a8e352a6"},
"metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm", "69b09adddc4f74a40716ae54d140f93beb0fb8978d8636eaded0c31b6f099f16"},
- "mime": {:hex, :mime, "2.0.6", "8f18486773d9b15f95f4f4f1e39b710045fa1de891fada4516559967276e4dc2", [:mix], [], "hexpm", "c9945363a6b26d747389aac3643f8e0e09d30499a138ad64fe8fd1d13d9b153e"},
- "mimerl": {:hex, :mimerl, "1.3.0", "d0cd9fc04b9061f82490f6581e0128379830e78535e017f7780f37fea7545726", [:rebar3], [], "hexpm", "a1e15a50d1887217de95f0b9b0793e32853f7c258a5cd227650889b38839fe9d"},
+ "mime": {:hex, :mime, "2.0.7", "b8d739037be7cd402aee1ba0306edfdef982687ee7e9859bee6198c1e7e2f128", [:mix], [], "hexpm", "6171188e399ee16023ffc5b76ce445eb6d9672e2e241d2df6050f3c771e80ccd"},
+ "mimerl": {:hex, :mimerl, "1.4.0", "3882a5ca67fbbe7117ba8947f27643557adec38fa2307490c4c4207624cb213b", [:rebar3], [], "hexpm", "13af15f9f68c65884ecca3a3891d50a7b57d82152792f3e19d88650aa126b144"},
"mint": {:hex, :mint, "1.6.2", "af6d97a4051eee4f05b5500671d47c3a67dac7386045d87a904126fd4bbcea2e", [:mix], [{:castore, "~> 0.1.0 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:hpax, "~> 0.1.1 or ~> 0.2.0 or ~> 1.0", [hex: :hpax, repo: "hexpm", optional: false]}], "hexpm", "5ee441dffc1892f1ae59127f74afe8fd82fda6587794278d924e4d90ea3d63f9"},
- "mix_audit": {:hex, :mix_audit, "2.1.4", "0a23d5b07350cdd69001c13882a4f5fb9f90fbd4cbf2ebc190a2ee0d187ea3e9", [:make, :mix], [{:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:yaml_elixir, "~> 2.11", [hex: :yaml_elixir, repo: "hexpm", optional: false]}], "hexpm", "fd807653cc8c1cada2911129c7eb9e985e3cc76ebf26f4dd628bb25bbcaa7099"},
+ "mix_audit": {:hex, :mix_audit, "2.1.5", "c0f77cee6b4ef9d97e37772359a187a166c7a1e0e08b50edf5bf6959dfe5a016", [:make, :mix], [{:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:yaml_elixir, "~> 2.11", [hex: :yaml_elixir, repo: "hexpm", optional: false]}], "hexpm", "87f9298e21da32f697af535475860dc1d3617a010e0b418d2ec6142bc8b42d69"},
+ "mua": {:hex, :mua, "0.2.4", "a9172ab0a1ac8732cf2699d739ceac3febcb9b4ffc540260ad2e32c0b6632af9", [:mix], [{:castore, "~> 0.1.0 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}], "hexpm", "e7e4dacd5ad65f13e3542772e74a159c00bd2d5579e729e9bb72d2c73a266fb7"},
"multipart": {:hex, :multipart, "0.4.0", "634880a2148d4555d050963373d0e3bbb44a55b2badd87fa8623166172e9cda0", [:mix], [{:mime, "~> 1.2 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}], "hexpm", "3c5604bc2fb17b3137e5d2abdf5dacc2647e60c5cc6634b102cf1aef75a06f0a"},
- "nimble_csv": {:hex, :nimble_csv, "1.2.0", "4e26385d260c61eba9d4412c71cea34421f296d5353f914afe3f2e71cce97722", [:mix], [], "hexpm", "d0628117fcc2148178b034044c55359b26966c6eaa8e2ce15777be3bbc91b12a"},
+ "nimble_csv": {:hex, :nimble_csv, "1.3.0", "b7f998dc62b222bce9596e46f028c7a5af04cb5dde6df2ea197c583227c54971", [:mix], [], "hexpm", "41ccdc18f7c8f8bb06e84164fc51635321e80d5a3b450761c4997d620925d619"},
"nimble_options": {:hex, :nimble_options, "1.1.1", "e3a492d54d85fc3fd7c5baf411d9d2852922f66e69476317787a7b2bb000a61b", [:mix], [], "hexpm", "821b2470ca9442c4b6984882fe9bb0389371b8ddec4d45a9504f00a66f650b44"},
+
diff --git a/pkgs/by-name/fi/firezone-server/package.nix b/pkgs/by-name/fi/firezone-server/package.nix
index d1f835531a88..706d21b353ab 100644
--- a/pkgs/by-name/fi/firezone-server/package.nix
+++ b/pkgs/by-name/fi/firezone-server/package.nix
@@ -14,14 +14,14 @@
beamPackages.mixRelease rec {
pname = "firezone-server-${mixReleaseName}";
- version = "0-unstable-2025-03-15";
+ version = "0-unstable-2025-08-31";
src = "${
fetchFromGitHub {
owner = "firezone";
repo = "firezone";
- rev = "09fb5f927410503b0d6e7fc6cf6a2ba06cb5a281";
- hash = "sha256-1CZBFhOwX0DfXykPQ9tzn4tHg2tSnByXEPtlZleHK5k=";
+ rev = "f86719db19b848ab757995361032c1f2b7927d13";
+ hash = "sha256-YvPxLEE6pdILrABWCZs7ebf6i3Inm1k/YkotZgI7A2k=";
# This is necessary to allow sending mails via SMTP, as the default
# SMTP adapter is current broken: https://github.com/swoosh/swoosh/issues/785
@@ -35,7 +35,7 @@ beamPackages.mixRelease rec {
inherit pname version;
src = "${src}/apps/web/assets";
fetcherVersion = 1;
- hash = "sha256-ejyBppFtKeyVhAWmssglbpLleOnbw9d4B+iM5Vtx47A=";
+ hash = "sha256-40vtQIBhJNnzdxkAOVAcPN57IuD0IB6LFxGICo68AbQ=";
};
pnpmRoot = "apps/web/assets";
@@ -70,7 +70,7 @@ beamPackages.mixRelease rec {
mixFodDeps = beamPackages.fetchMixDeps {
pname = "mix-deps-${pname}-${version}";
inherit src version;
- hash = "sha256-2Y9u5+o8+RG+c8Z6V7Vex5K1odI7a/WYj5fC0xWbVRo=";
+ hash = "sha256-h3l7HK9dxNmkHWfJyCOCXmCvFOK+mZtmszhRv0zxqoo=";
};
passthru.tests = {
diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix
index 06091fb1427d..217c4ae371ff 100644
--- a/pkgs/by-name/fi/fish/package.nix
+++ b/pkgs/by-name/fi/fish/package.nix
@@ -152,13 +152,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "fish";
- version = "4.1.1";
+ version = "4.1.2";
src = fetchFromGitHub {
owner = "fish-shell";
repo = "fish-shell";
tag = finalAttrs.version;
- hash = "sha256-3VwDwRjYo9/ifkl2Vt9pTmLabt+XyS0FXi0el+YgC/A=";
+ hash = "sha256-oNRC1NWYE0LEK2a/7nHtlmp20f8hn/1FZgaySqzwSbg=";
};
env = {
@@ -169,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: {
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) src patches;
- hash = "sha256-WZdfon6mnM+5caWW6yInQx5B1GjCxQ0XLbJlbvHa3Zc=";
+ hash = "sha256-7mYWCHH6DBWTIJV8GPRjjf6QulwlYjwv0slablDvBF8=";
};
patches = [
diff --git a/pkgs/by-name/fi/fizz/package.nix b/pkgs/by-name/fi/fizz/package.nix
index b100518c0e0d..b56562148195 100644
--- a/pkgs/by-name/fi/fizz/package.nix
+++ b/pkgs/by-name/fi/fizz/package.nix
@@ -13,6 +13,7 @@
zstd,
gflags,
libevent,
+ darwinMinVersionHook,
folly,
libsodium,
@@ -25,7 +26,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "fizz";
- version = "2025.04.21.00";
+ version = "2025.09.15.00";
outputs = [
"bin"
@@ -37,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "facebookincubator";
repo = "fizz";
tag = "v${finalAttrs.version}";
- hash = "sha256-khaUbxcD8+9zznH0DE/BpweZeDKafTnr4EqPbmOpckU=";
+ hash = "sha256-8j8Nt8XCbMGui7bELhvP+o8E2bqYobkXLhvZVkzCMzU=";
};
patches = [
@@ -56,6 +57,9 @@ stdenv.mkDerivation (finalAttrs: {
zstd
gflags
libevent
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ (darwinMinVersionHook "13.3")
];
propagatedBuildInputs = [
diff --git a/pkgs/by-name/fl/flare/engine.nix b/pkgs/by-name/fl/flare/engine.nix
index d466f032dd8c..bfa24d0e9469 100644
--- a/pkgs/by-name/fl/flare/engine.nix
+++ b/pkgs/by-name/fl/flare/engine.nix
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
+ fetchpatch,
cmake,
SDL2,
SDL2_image,
@@ -20,7 +21,16 @@ stdenv.mkDerivation rec {
hash = "sha256-DIzfTqwZJ8NAPB/TWzvPjepHb7hIbIr+Kk+doXJmpLc=";
};
- patches = [ ./desktop.patch ];
+ patches = [
+ ./desktop.patch
+
+ # cmake-4 compatibility patch
+ (fetchpatch {
+ name = "cmake-4.patch";
+ url = "https://github.com/flareteam/flare-engine/commit/9500379f886484382bba2f893faf49865de9f2c0.patch";
+ hash = "sha256-nUn54ZBEvvFkIhzE/UBbsvF0rFC9JAeQACTAPtsc1VI=";
+ })
+ ];
nativeBuildInputs = [ cmake ];
buildInputs = [
diff --git a/pkgs/by-name/fl/flare/game.nix b/pkgs/by-name/fl/flare/game.nix
index e726d3a290e0..59bd9a52d19d 100644
--- a/pkgs/by-name/fl/flare/game.nix
+++ b/pkgs/by-name/fl/flare/game.nix
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
+ fetchpatch,
cmake,
}:
@@ -16,6 +17,15 @@ stdenv.mkDerivation rec {
hash = "sha256-tINIwxyQn8eeJCHwRmAMo2TYRgrgJlGaUrnrgbmM3Jo=";
};
+ patches = [
+ # cmake-4 compatibility patch
+ (fetchpatch {
+ name = "cmake-4.patch";
+ url = "https://github.com/flareteam/flare-game/commit/5b61dfd69f4ecbaca6439caa9ae41b3168e4d21a.patch";
+ hash = "sha256-5Um6LWAWQyialzO3KSebmLju0VOuz1S5dzavO9EWlLE=";
+ })
+ ];
+
nativeBuildInputs = [ cmake ];
meta = {
diff --git a/pkgs/by-name/fl/fluidsynth/package.nix b/pkgs/by-name/fl/fluidsynth/package.nix
index cde0b245e18d..28c8b9ef066f 100644
--- a/pkgs/by-name/fl/fluidsynth/package.nix
+++ b/pkgs/by-name/fl/fluidsynth/package.nix
@@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "fluidsynth";
- version = "2.4.7";
+ version = "2.4.8";
src = fetchFromGitHub {
owner = "FluidSynth";
repo = "fluidsynth";
tag = "v${finalAttrs.version}";
- hash = "sha256-z7DIX8KpPdtEHEMoxH7ewW32aXm27gfmWPZawwITyRQ=";
+ hash = "sha256-rOPoRV0NWrlFZohqQ76gnXvt4/ryEI4nSlX+mNW+qf8=";
};
outputs = [
diff --git a/pkgs/by-name/fl/fly/package.nix b/pkgs/by-name/fl/fly/package.nix
index 087f3bc7e927..af9f062beec0 100644
--- a/pkgs/by-name/fl/fly/package.nix
+++ b/pkgs/by-name/fl/fly/package.nix
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "fly";
- version = "7.14.1";
+ version = "7.14.2";
src = fetchFromGitHub {
owner = "concourse";
repo = "concourse";
rev = "v${version}";
- hash = "sha256-Q+j41QhhibyE+a7iOgMKm2SeXhNV8ek97P014Wje9NQ=";
+ hash = "sha256-lm4l+9hYOFKt12KaOs/5R4zymya82Tb4q1k3leyG2UA=";
};
vendorHash = "sha256-2busKAFaQYE82XKCAx8BGOMjjs8WzqIxdpz+J45maoc=";
diff --git a/pkgs/by-name/fo/folly/fix-__type_pack_element.patch b/pkgs/by-name/fo/folly/fix-__type_pack_element.patch
new file mode 100644
index 000000000000..8a43c6805b2a
--- /dev/null
+++ b/pkgs/by-name/fo/folly/fix-__type_pack_element.patch
@@ -0,0 +1,34 @@
+From acccee8947977178f36d117cd9d3240cbdb5f018 Mon Sep 17 00:00:00 2001
+From: ihb2032 <1355790728@qq.com>
+Date: Wed, 10 Sep 2025 17:31:41 +0800
+Subject: [PATCH] fix(folly): Replace `__type_pack_element` in
+ `ForeachTest.cpp` to support GCC 14
+
+The use of the `__type_pack_element` compiler builtin directly in function signatures in `folly/container/test/ForeachTest.cpp` causes a build failure with GCC 14. This is because the builtin is not intended for use in contexts that affect name mangling.
+
+This commit resolves the issue by replacing the direct usage of `__type_pack_element_t` with `std::tuple_element_t`. This is a standards-compliant library trait that provides the same functionality and is safe to use in function signatures.
+
+This change ensures that `ForeachTest` continues to compile successfully with newer versions of GCC, maintaining compiler compatibility.
+
+Signed-off-by: lyd1992
+
+Signed-off-by: ihb2032 <1355790728@qq.com>
+---
+ folly/container/test/ForeachTest.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/folly/container/test/ForeachTest.cpp b/folly/container/test/ForeachTest.cpp
+index c055f26effe..3adec1a7371 100644
+--- a/folly/container/test/ForeachTest.cpp
++++ b/folly/container/test/ForeachTest.cpp
+@@ -314,8 +314,8 @@ TEST(ForEach, FetchTestPreferIterator) {
+ template
+ struct LargeTuple {};
+ template
+-type_pack_element_t& get(LargeTuple&) {
+- static type_pack_element_t elem;
++std::tuple_element_t>& get(LargeTuple&) {
++ static std::tuple_element_t> elem;
+ return elem;
+ }
+ namespace std {
diff --git a/pkgs/by-name/fo/folly/fix-stdexcept-include.patch b/pkgs/by-name/fo/folly/fix-stdexcept-include.patch
new file mode 100644
index 000000000000..c13632abf599
--- /dev/null
+++ b/pkgs/by-name/fo/folly/fix-stdexcept-include.patch
@@ -0,0 +1,22 @@
+From dc06cc3162afb148c19cd0931d8fe489d639217a Mon Sep 17 00:00:00 2001
+From: Uilian Ries
+Date: Tue, 9 Sep 2025 16:48:26 +0200
+Subject: [PATCH] Add missing header for std::runtime_error
+
+Signed-off-by: Uilian Ries
+---
+ folly/hash/Checksum.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/folly/hash/Checksum.cpp b/folly/hash/Checksum.cpp
+index 1d42d6a6e5f..aeafdb20b1b 100644
+--- a/folly/hash/Checksum.cpp
++++ b/folly/hash/Checksum.cpp
+@@ -17,6 +17,7 @@
+ #include
+
+ #include
++#include
+
+ #include
+
diff --git a/pkgs/by-name/fo/folly/install-test-certs.patch b/pkgs/by-name/fo/folly/install-test-certs.patch
new file mode 100644
index 000000000000..59b981d2dbd8
--- /dev/null
+++ b/pkgs/by-name/fo/folly/install-test-certs.patch
@@ -0,0 +1,18 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ecc11a7961..67a2b82b4b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -489,8 +489,12 @@
+ ${FOLLY_DIR}/test/DeterministicSchedule.cpp
+ ${FOLLY_DIR}/json/JsonTestUtil.cpp
+ )
++auto_sources(test_certs "*.pem" "${FOLLY_DIR}/io/async/test/certs")
++install(FILES ${test_certs}
++ DESTINATION "${LIB_INSTALL_DIR}/folly/test-certs"
++)
+ target_compile_definitions(folly_test_util PUBLIC
+- FOLLY_CERTS_DIR="${FOLLY_DIR}/io/async/test/certs"
++ FOLLY_CERTS_DIR="${LIB_INSTALL_DIR}/folly/test-certs"
+ )
+ set_property(TARGET folly_test_util PROPERTY VERSION ${PACKAGE_VERSION})
+ target_link_libraries(folly_test_util
diff --git a/pkgs/by-name/fo/folly/package.nix b/pkgs/by-name/fo/folly/package.nix
index 569696bf9f7e..cce2c4aee1c9 100644
--- a/pkgs/by-name/fo/folly/package.nix
+++ b/pkgs/by-name/fo/folly/package.nix
@@ -21,10 +21,12 @@
zstd,
libiberty,
libunwind,
+ darwinMinVersionHook,
boost,
- fmt_11,
- jemalloc,
+ fmt,
+
+ ctestCheckHook,
gtest,
@@ -39,7 +41,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "folly";
- version = "2025.04.21.00";
+ version = "2025.09.15.00";
# split outputs to reduce downstream closure sizes
outputs = [
@@ -51,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "facebook";
repo = "folly";
tag = "v${finalAttrs.version}";
- hash = "sha256-P2saSFVRBWt5xjAWlKmcPJT9MFV9CXFmA18dIDCO84o=";
+ hash = "sha256-//gx081nMFXAcUgkHQToiFHhECfLW22Fl0eXEsObxUs=";
};
nativeBuildInputs = [
@@ -75,16 +77,19 @@ stdenv.mkDerivation (finalAttrs: {
zstd
libiberty
libunwind
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ (darwinMinVersionHook "13.3")
];
propagatedBuildInputs = [
# `folly-config.cmake` pulls these in.
boost
- fmt_11
- ]
- ++ lib.optionals stdenv.hostPlatform.isLinux [
- # jemalloc headers are required in include/folly/portability/Malloc.h
- jemalloc
+ fmt
+ ];
+
+ nativeCheckInputs = [
+ ctestCheckHook
];
checkInputs = [
@@ -121,7 +126,14 @@ stdenv.mkDerivation (finalAttrs: {
|| stdenv.hostPlatform.isPower64
|| stdenv.hostPlatform.isRiscV64;
+ dontUseNinjaCheck = true;
+
patches = [
+ # Install the certificate files used by `libfolly_test_util` rather
+ # than leaving a dangling reference to the build directory in the
+ # `dev` output’s CMake files.
+ ./install-test-certs.patch
+
# The base template for std::char_traits has been removed in LLVM 19
# https://releases.llvm.org/19.1.0/projects/libcxx/docs/ReleaseNotes.html
./char_traits.patch
@@ -132,6 +144,30 @@ stdenv.mkDerivation (finalAttrs: {
url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-cmake-find-glog.patch?h=folly&id=4b68f47338d4b20111e3ffa1291433120bb899f0";
hash = "sha256-QGNpS5UNEm+0PW9+agwUVILzpK9t020KXDGyP03OAwE=";
})
+
+ # Fix an upstream regression with libstdc++.
+ #
+ # See:
+ #
+ # *
+ # *
+ # *
+ # *
+ ./fix-stdexcept-include.patch
+
+ # Fix a GCC‐incompatible use of a private trait.
+ #
+ # Per Folly’s own documentation:
+ #
+ # /// Under gcc, the builtin is available but does not mangle. Therefore, this
+ # /// trait must not be used anywhere it might be subject to mangling, such as in
+ # /// a return-type expression.
+ #
+ # See:
+ #
+ # *
+ # *
+ ./fix-__type_pack_element.patch
];
# https://github.com/NixOS/nixpkgs/issues/144170
@@ -145,53 +181,42 @@ stdenv.mkDerivation (finalAttrs: {
'@CMAKE_INSTALL_FULL_INCLUDEDIR@'
'';
- # TODO: Figure out why `GTEST_FILTER` doesn’t work to skip these.
- checkPhase = ''
- runHook preCheck
+ disabledTests = [
+ "io_async_ssl_session_test.SSLSessionTest.BasicTest"
+ "io_async_ssl_session_test.SSLSessionTest.NullSessionResumptionTest"
+ "singleton_thread_local_test.SingletonThreadLocalDeathTest.Overload"
- ctest -j $NIX_BUILD_CORES --output-on-failure --exclude-regex ${
- lib.escapeShellArg (
- lib.concatMapStringsSep "|" (test: "^${lib.escapeRegex test}$") (
- [
- "concurrency_concurrent_hash_map_test.*/ConcurrentHashMapTest/*.StressTestReclamation"
- "io_async_ssl_session_test.SSLSessionTest.BasicTest"
- "io_async_ssl_session_test.SSLSessionTest.NullSessionResumptionTest"
- "singleton_thread_local_test.SingletonThreadLocalDeathTest.Overload"
+ # very strict timing constraints, will fail under load
+ "io_async_hh_wheel_timer_test.HHWheelTimerTest.CancelTimeout"
+ "io_async_hh_wheel_timer_test.HHWheelTimerTest.DefaultTimeout"
+ "io_async_hh_wheel_timer_test.HHWheelTimerTest.DeleteWheelInTimeout"
+ "io_async_hh_wheel_timer_test.HHWheelTimerTest.DestroyTimeoutSet"
+ "io_async_hh_wheel_timer_test.HHWheelTimerTest.FireOnce"
+ "io_async_hh_wheel_timer_test.HHWheelTimerTest.GetTimeRemaining"
+ "io_async_hh_wheel_timer_test.HHWheelTimerTest.IntrusivePtr"
+ "io_async_hh_wheel_timer_test.HHWheelTimerTest.Level1"
+ "io_async_hh_wheel_timer_test.HHWheelTimerTest.NegativeTimeout"
+ "io_async_hh_wheel_timer_test.HHWheelTimerTest.ReschedTest"
+ "io_async_hh_wheel_timer_test.HHWheelTimerTest.SlowFast"
- # very strict timing constraints, will fail under load
- "io_async_hh_wheel_timer_test.HHWheelTimerTest.CancelTimeout"
- "io_async_hh_wheel_timer_test.HHWheelTimerTest.DefaultTimeout"
- "io_async_hh_wheel_timer_test.HHWheelTimerTest.DeleteWheelInTimeout"
- "io_async_hh_wheel_timer_test.HHWheelTimerTest.DestroyTimeoutSet"
- "io_async_hh_wheel_timer_test.HHWheelTimerTest.FireOnce"
- "io_async_hh_wheel_timer_test.HHWheelTimerTest.GetTimeRemaining"
- "io_async_hh_wheel_timer_test.HHWheelTimerTest.IntrusivePtr"
- "io_async_hh_wheel_timer_test.HHWheelTimerTest.Level1"
- "io_async_hh_wheel_timer_test.HHWheelTimerTest.NegativeTimeout"
- "io_async_hh_wheel_timer_test.HHWheelTimerTest.ReschedTest"
- "io_async_hh_wheel_timer_test.HHWheelTimerTest.SlowFast"
- ]
- ++ lib.optionals stdenv.hostPlatform.isLinux [
- "concurrency_cache_locality_test.CacheLocality.BenchmarkSysfs"
- "concurrency_cache_locality_test.CacheLocality.LinuxActual"
- "futures_future_test.Future.NoThrow"
- "futures_retrying_test.RetryingTest.largeRetries"
- ]
- ++ lib.optionals stdenv.hostPlatform.isDarwin [
- "buffered_atomic_test.BufferedAtomic.singleThreadUnguardedAccess"
- "io_async_notification_queue_test.NotificationQueueTest.UseAfterFork"
- "container_heap_vector_types_test.HeapVectorTypes.SimpleSetTes"
- ]
- )
- )
- }
-
- runHook postCheck
- '';
+ # In file included from /build/source/folly/lang/test/BitsTest.cpp:17:
+ # In member function 'constexpr bool folly::get_bit_at_fn::operator()(const Uint*, std::size_t) const [with Uint = short unsigned int]',
+ # inlined from 'void folly::BitsAllUintsTest_GetBitAtLE_Test::TestBody() [with gtest_TypeParam_ = short unsigned int]' at /build/source/folly/lang/test/BitsTest.cpp:640:5:
+ # /build/source/folly/lang/Bits.h:494:10: warning: 'in' is used uninitialized [-Wuninitialized]
+ "lang_bits_test.BitsAllUintsTest/*.GetBitAtLE"
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isLinux [
+ "concurrency_cache_locality_test.CacheLocality.BenchmarkSysfs"
+ "concurrency_cache_locality_test.CacheLocality.LinuxActual"
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ # No idea why these fail.
+ "logging_xlog_test.XlogTest.perFileCategoryHandling"
+ "futures_future_test.Future.makeFutureFromMoveOnlyException"
+ ];
passthru = {
- inherit boost;
- fmt = fmt_11;
+ inherit boost fmt;
updateScript = nix-update-script { };
diff --git a/pkgs/by-name/fo/fortanix-sgx-tools/package.nix b/pkgs/by-name/fo/fortanix-sgx-tools/package.nix
index 7100f5a51aa5..1916af6c65ed 100644
--- a/pkgs/by-name/fo/fortanix-sgx-tools/package.nix
+++ b/pkgs/by-name/fo/fortanix-sgx-tools/package.nix
@@ -8,7 +8,7 @@
}:
rustPlatform.buildRustPackage rec {
pname = "fortanix-sgx-tools";
- version = "0.5.1";
+ version = "0.6.1";
nativeBuildInputs = [
pkg-config
protobuf
@@ -16,10 +16,10 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl_3 ];
src = fetchCrate {
inherit pname version;
- hash = "sha256-F0lZG1neAPVvyOxUtDPv0t7o+ZC+aQRtpFeq55QwcmE=";
+ hash = "sha256-IVkmZs3imzj8uN8kqEzN/Oio3H+Nqzu8ORjARNx1TpQ=";
};
- cargoHash = "sha256-FNMNHn1M0JzsgFqxXLUU3sEn7VB+YHVsWQCYVSxbUEg=";
+ cargoHash = "sha256-jYd9KRZgdBoVepmV4x4E3Y7h1SzSLv2clB0uPSWv8tE=";
meta = {
description = "Tools for building and running enclaves for the Fortanix SGX ABI";
homepage = "https://github.com/fortanix/rust-sgx";
diff --git a/pkgs/by-name/fo/fosrl-olm/package.nix b/pkgs/by-name/fo/fosrl-olm/package.nix
index 2ea4efd1c053..f27e7d50aed8 100644
--- a/pkgs/by-name/fo/fosrl-olm/package.nix
+++ b/pkgs/by-name/fo/fosrl-olm/package.nix
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "olm";
- version = "1.1.2";
+ version = "1.1.3";
src = fetchFromGitHub {
owner = "fosrl";
repo = "olm";
tag = version;
- hash = "sha256-9QqVfq7tYOtPsKMgH0YAhpiwMHh+yJT4npF0f9yl5wU=";
+ hash = "sha256-Lv04rPZUz2thSs6/CgIj16YNKgRzeb4M4uGKGhAS4Kc=";
};
vendorHash = "sha256-4j7l1vvorcdbHE4XXOUH2MaOSIwS70l8w7ZBmp3a/XQ=";
diff --git a/pkgs/by-name/fo/foundationdb/fix-toml11-4.0.patch b/pkgs/by-name/fo/foundationdb/fix-toml11-4.0.patch
new file mode 100644
index 000000000000..320a2eff7bf2
--- /dev/null
+++ b/pkgs/by-name/fo/foundationdb/fix-toml11-4.0.patch
@@ -0,0 +1,39 @@
+From d4b022955e049793a5eac573f6eb2931686a81ab Mon Sep 17 00:00:00 2001
+From: Emily
+Date: Mon, 15 Sep 2025 22:09:00 +0100
+Subject: [PATCH] Fix the build with toml11 4.0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In toml11 3.0, comments were discarded by default, so this declaration
+was redundant. In toml11 ≥ 4.0, they are preserved by default,
+but opting out is more baroque. It doesn’t seem clear to me why
+discarding comments is specifically relevant here, so I’ve opted
+to simplify the code by using the default uniformly, but a version
+conditional would be possible if this is important.
+
+Many major Linux distributions have already moved to toml11 ≥ 4.0,
+so this simplifies packaging.
+
+(cherry picked from commit 432a9562573828cc45e3475e53feba48c79a8342)
+---
+ fdbserver/SimulatedCluster.actor.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/fdbserver/SimulatedCluster.actor.cpp b/fdbserver/SimulatedCluster.actor.cpp
+index 89d4508ad..4cc11a7bf 100644
+--- a/fdbserver/SimulatedCluster.actor.cpp
++++ b/fdbserver/SimulatedCluster.actor.cpp
+@@ -116,7 +116,7 @@ bool destructed = false;
+ // environment details
+ class TestConfig : public BasicTestConfig {
+ class ConfigBuilder {
+- using value_type = toml::basic_value;
++ using value_type = toml::value;
+ using base_variant = std::
+ variant, std::vector, ConfigDBType>;
+ using types =
+--
+2.51.0
+
diff --git a/pkgs/by-name/fo/foundationdb/package.nix b/pkgs/by-name/fo/foundationdb/package.nix
index 06fb2e1d85f0..4e7b7ee201ab 100644
--- a/pkgs/by-name/fo/foundationdb/package.nix
+++ b/pkgs/by-name/fo/foundationdb/package.nix
@@ -28,7 +28,7 @@ let
isOdd patch;
in
stdenv.mkDerivation rec {
- name = "foundationdb";
+ pname = "foundationdb";
version = "7.3.42";
src = fetchFromGitHub {
@@ -41,6 +41,8 @@ stdenv.mkDerivation rec {
patches = [
./disable-flowbench.patch
./don-t-use-static-boost-libs.patch
+ #
+ ./fix-toml11-4.0.patch
# GetMsgpack: add 4+ versions of upstream
# https://github.com/apple/foundationdb/pull/10935
(fetchpatch {
@@ -92,7 +94,6 @@ stdenv.mkDerivation rec {
];
separateDebugInfo = true;
- dontFixCmake = true;
cmakeFlags = [
"-DFDB_RELEASE=TRUE"
diff --git a/pkgs/by-name/fr/freefilesync/package.nix b/pkgs/by-name/fr/freefilesync/package.nix
index c71d6aae4146..f9ec4d5035f0 100644
--- a/pkgs/by-name/fr/freefilesync/package.nix
+++ b/pkgs/by-name/fr/freefilesync/package.nix
@@ -4,7 +4,6 @@
fetchurl,
replaceVars,
fetchDebianPatch,
- fetchFromGitHub,
copyDesktopItems,
pkg-config,
wrapGAppsHook3,
@@ -15,43 +14,31 @@
libidn2,
libssh2,
openssl,
- wxGTK32,
+ wxwidgets_3_3,
makeDesktopItem,
}:
let
- wxwidgets_3_3 = wxGTK32.overrideAttrs (
+ wxwidgets_3_3' = wxwidgets_3_3.overrideAttrs (
finalAttrs: previousAttrs: {
- version = "3.3.0-unstable-2025-02-02";
- src = fetchFromGitHub {
- owner = "wxWidgets";
- repo = "wxWidgets";
- rev = "969c5a46b5c1da57836f721a4ce5df9feaa437f9";
- fetchSubmodules = true;
- hash = "sha256-ODPE896xc5RxdyfIzdPB5fsTeBm3O+asYJd99fuW6AY=";
- };
patches = [
./wxcolorhook.patch
];
- configureFlags = lib.subtractLists [
- "--disable-compat28"
- "--enable-unicode"
- ] previousAttrs.configureFlags;
}
);
in
stdenv.mkDerivation (finalAttrs: {
pname = "freefilesync";
- version = "14.4";
+ version = "14.5";
src = fetchurl {
url = "https://freefilesync.org/download/FreeFileSync_${finalAttrs.version}_Source.zip";
# The URL only redirects to the file on the second attempt
postFetch = ''
- rm -f $out
- tryDownload "$url"
+ rm -f "$out"
+ tryDownload "$url" "$out"
'';
- hash = "sha256-Jx/Q/RsCTy06kJfJeatqrEoTMz7wLZvPQ3bzFClvKWc=";
+ hash = "sha256-+qfj1zf3V5xxtvXgCa0QDDRhEPQ3Qzii5eKiMySuUUY=";
};
sourceRoot = ".";
@@ -87,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
libidn2
libssh2
openssl
- wxwidgets_3_3
+ wxwidgets_3_3'
];
env.NIX_CFLAGS_COMPILE = toString [
diff --git a/pkgs/by-name/fr/freeglut/package.nix b/pkgs/by-name/fr/freeglut/package.nix
index 5a1ef392ff06..e112d25a82fe 100644
--- a/pkgs/by-name/fr/freeglut/package.nix
+++ b/pkgs/by-name/fr/freeglut/package.nix
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchurl,
+ fetchpatch,
libICE,
libXext,
libXi,
@@ -22,6 +23,14 @@ stdenv.mkDerivation (finalAttrs: {
sha256 = "sha256-nD1NZRb7+gKA7ck8d2mPtzA+RDwaqvN9Jp4yiKbD6lI=";
};
+ patches = [
+ (fetchpatch {
+ name = "freeglut-fix-cmake-4.patch";
+ url = "https://github.com/freeglut/freeglut/commit/2294389397912c9a6505a88221abb7dca0a4fb79.patch";
+ hash = "sha256-buNhlVUbDekklnar6KFWN/GUKE+jMEqTGrY3LY0LwVs=";
+ })
+ ];
+
outputs = [
"out"
"dev"
diff --git a/pkgs/by-name/fr/freeimage/package.nix b/pkgs/by-name/fr/freeimage/package.nix
index 62206be74b30..e541840df2b5 100644
--- a/pkgs/by-name/fr/freeimage/package.nix
+++ b/pkgs/by-name/fr/freeimage/package.nix
@@ -164,7 +164,7 @@ stdenv.mkDerivation (finalAttrs: {
"CVE-2019-12214"
"CVE-2019-12212"
];
- maintainers = with lib.maintainers; [ l-as ];
+ maintainers = [ ];
platforms = with lib.platforms; unix;
};
})
diff --git a/pkgs/by-name/fs/fsautocomplete/deps.json b/pkgs/by-name/fs/fsautocomplete/deps.json
index 4078a2c8a143..a2725fb90ca0 100644
--- a/pkgs/by-name/fs/fsautocomplete/deps.json
+++ b/pkgs/by-name/fs/fsautocomplete/deps.json
@@ -51,8 +51,8 @@
},
{
"pname": "Expecto",
- "version": "10.2.1",
- "hash": "sha256-DgwHFsPMySlnMag4kPTviTwrNOD7uPnnJLi9DCZif5s="
+ "version": "10.2.3",
+ "hash": "sha256-klv7QbGwd0ClMSe+wJ38URVmIawV2ksyrjzQbGhVUPg="
},
{
"pname": "Expecto.Diff",
@@ -469,6 +469,11 @@
"version": "17.12.0",
"hash": "sha256-rf8Sh0fQq44Sneuvs64unkkIHg8kOjDGWE35j9iLx5I="
},
+ {
+ "pname": "Microsoft.TestPlatform.TranslationLayer",
+ "version": "17.13.0",
+ "hash": "sha256-F9s0dPTsmtHN+Khn4F0ybvjdJptH0M3sRE3oJDO1TBs="
+ },
{
"pname": "Microsoft.VisualStudio.SolutionPersistence",
"version": "1.0.28",
@@ -504,6 +509,16 @@
"version": "2.11.79",
"hash": "sha256-1bzibVcSH8LJMR8Nb6Q0q/7fieTgxRnVY4C1RvRbrrI="
},
+ {
+ "pname": "NETStandard.Library",
+ "version": "2.0.0",
+ "hash": "sha256-Pp7fRylai8JrE1O+9TGfIEJrAOmnWTJRLWE+qJBahK0="
+ },
+ {
+ "pname": "NETStandard.Library",
+ "version": "2.0.3",
+ "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="
+ },
{
"pname": "Newtonsoft.Json",
"version": "13.0.3",
@@ -659,6 +674,11 @@
"version": "4.1.0",
"hash": "sha256-r89nJ5JE5uZlsRrfB8QJQ1byVVfCWQbySKQ/m9PYj0k="
},
+ {
+ "pname": "Serilog.Extensions.Logging",
+ "version": "8.0.0",
+ "hash": "sha256-GoWxCpkdahMvYd7ZrhwBxxTyjHGcs9ENNHJCp0la6iA="
+ },
{
"pname": "Serilog.Sinks.Async",
"version": "2.1.0",
diff --git a/pkgs/by-name/fs/fsautocomplete/package.nix b/pkgs/by-name/fs/fsautocomplete/package.nix
index d337fa4cb467..0aad9b17f73c 100644
--- a/pkgs/by-name/fs/fsautocomplete/package.nix
+++ b/pkgs/by-name/fs/fsautocomplete/package.nix
@@ -9,13 +9,13 @@
buildDotnetModule (finalAttrs: {
pname = "fsautocomplete";
- version = "0.78.5";
+ version = "0.79.2";
src = fetchFromGitHub {
owner = "fsharp";
repo = "FsAutoComplete";
tag = "v${finalAttrs.version}";
- hash = "sha256-4Y3QUq5oa01a1S5+h3ccdeqjPfkUe8GaqxHjh9VFhXE=";
+ hash = "sha256-GJ2ld2RF7utrgHszgrG8RCWimPJ2Za+kZzQOOu/qUqA=";
};
nugetDeps = ./deps.json;
diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/by-name/fs/fswatch/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/fswatch/default.nix
rename to pkgs/by-name/fs/fswatch/package.nix
diff --git a/pkgs/by-name/fu/fuzzylite/package.nix b/pkgs/by-name/fu/fuzzylite/package.nix
index 3bdc571d12c5..ac8d5ab4b268 100644
--- a/pkgs/by-name/fu/fuzzylite/package.nix
+++ b/pkgs/by-name/fu/fuzzylite/package.nix
@@ -5,19 +5,19 @@
cmake,
ninja,
useFloat ? false,
+ unstableGitUpdater,
}:
stdenv.mkDerivation rec {
pname = "fuzzylite";
- version = "6.0";
+ version = "6.0-unstable-2025-08-30";
src = fetchFromGitHub {
owner = "fuzzylite";
repo = "fuzzylite";
- rev = "v${version}";
- hash = "sha256-i1txeUE/ZSRggwLDtpS8dd4uuZfHX9w3zRH0gBgGXnk=";
+ rev = "fe62b61ad0e301fbd8868d5fc3d76d7590c59636";
+ hash = "sha256-p3ikdY3kfC8N7XsHHa3HzWI0blciWoxCHiEOOUt2yLY=";
};
- sourceRoot = "${src.name}/fuzzylite";
outputs = [
"out"
@@ -39,6 +39,9 @@ stdenv.mkDerivation rec {
"-DFL_USE_FLOAT:BOOL=${if useFloat then "ON" else "OFF"}"
];
+ # use unstable as latest release does not yet support cmake-4
+ passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; };
+
meta = with lib; {
description = "Fuzzy logic control library in C++";
mainProgram = "fuzzylite";
diff --git a/pkgs/by-name/fw/fw-ectool/package.nix b/pkgs/by-name/fw/fw-ectool/package.nix
index bd1bc0bfea98..fd5bc5e87814 100644
--- a/pkgs/by-name/fw/fw-ectool/package.nix
+++ b/pkgs/by-name/fw/fw-ectool/package.nix
@@ -20,6 +20,12 @@ stdenv.mkDerivation {
hash = "sha256-j0Z2Uo1LBXlHZVHPm4Xjx3LZaI6Qq0nSdViyC/CjWC8=";
};
+ postPatch = ''
+ substituteInPlace CMakeLists.txt --replace-fail \
+ 'cmake_minimum_required(VERSION 3.1)' \
+ 'cmake_minimum_required(VERSION 4.0)'
+ '';
+
nativeBuildInputs = [
cmake
pkg-config
diff --git a/pkgs/by-name/fw/fwupd-efi/package.nix b/pkgs/by-name/fw/fwupd-efi/package.nix
index 8e6427d6fa39..1f30eec83957 100644
--- a/pkgs/by-name/fw/fwupd-efi/package.nix
+++ b/pkgs/by-name/fw/fwupd-efi/package.nix
@@ -12,13 +12,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "fwupd-efi";
- version = "1.7";
+ version = "1.8";
src = fetchFromGitHub {
owner = "fwupd";
repo = "fwupd-efi";
rev = "${finalAttrs.version}";
- hash = "sha256-PcVqnnFrxedkhYgm+8EUF2I65R5gTXqbVrk69Pw1m1g=";
+ hash = "sha256-resmgi+t1YahXWxt1ZPgAXW3L0ejBclwcA8W8AS31is=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/fz/fzf-git-sh/package.nix b/pkgs/by-name/fz/fzf-git-sh/package.nix
index b5542c7dd1f9..4b2ed57354b3 100644
--- a/pkgs/by-name/fz/fzf-git-sh/package.nix
+++ b/pkgs/by-name/fz/fzf-git-sh/package.nix
@@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "fzf-git-sh";
- version = "0-unstable-2025-09-17";
+ version = "0-unstable-2025-10-05";
src = fetchFromGitHub {
owner = "junegunn";
repo = "fzf-git.sh";
- rev = "93bc471fcf37358ef4094ffed41dc8002d767a5d";
- hash = "sha256-PAOHLUqwGn9/ERmu2izYT0+/5U0nDbTR/i8K3ZPM/Fo=";
+ rev = "90d80420f679af6d120d34b6c9ceb2225dbd9649";
+ hash = "sha256-/9NhKkPdOtV3LbxPZ3FQEqpzqWZqlkh7La3ND+zZXyg=";
};
dontBuild = true;
diff --git a/pkgs/by-name/ga/gallery-dl/package.nix b/pkgs/by-name/ga/gallery-dl/package.nix
index 0873dab3f363..29979a51e3b3 100644
--- a/pkgs/by-name/ga/gallery-dl/package.nix
+++ b/pkgs/by-name/ga/gallery-dl/package.nix
@@ -8,7 +8,7 @@
let
pname = "gallery-dl";
- version = "1.30.8";
+ version = "1.30.9";
in
python3Packages.buildPythonApplication {
inherit pname version;
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication {
owner = "mikf";
repo = "gallery-dl";
tag = "v${version}";
- hash = "sha256-jetfEjKwAtJwOLKRZfnnnlb7G5YCDUzeHIASqJS3gcI=";
+ hash = "sha256-y+xMKrYwqpMMxw5FoYmM1RurH/WNhU+7kIN5i1rmEW0=";
};
build-system = [ python3Packages.setuptools ];
diff --git a/pkgs/by-name/ga/gammu/package.nix b/pkgs/by-name/ga/gammu/package.nix
index 95e6d79598a2..9a112787d3b4 100644
--- a/pkgs/by-name/ga/gammu/package.nix
+++ b/pkgs/by-name/ga/gammu/package.nix
@@ -44,6 +44,11 @@ stdenv.mkDerivation rec {
cmake
];
+ cmakeFlags = [
+ # Fix build with CMake 4
+ (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10")
+ ];
+
strictDeps = true;
buildInputs = [
diff --git a/pkgs/by-name/ga/gat/package.nix b/pkgs/by-name/ga/gat/package.nix
index 8f7bd428662a..8805a6a58c33 100644
--- a/pkgs/by-name/ga/gat/package.nix
+++ b/pkgs/by-name/ga/gat/package.nix
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "gat";
- version = "0.25.2";
+ version = "0.25.3";
src = fetchFromGitHub {
owner = "koki-develop";
repo = "gat";
tag = "v${version}";
- hash = "sha256-pfR7sjN1LrZ9+x3uqMyOAWMRQSSzlUa/q918yFaY17M=";
+ hash = "sha256-LQr3iC4yXrs8Bdfznu2fR2jjeQh/ZAwlo6zoMwvjlL4=";
};
- vendorHash = "sha256-amF8TQ+BEZN9A0c43pDTKaJ1FcfZ1FzRdfKRlpocPr8=";
+ vendorHash = "sha256-287u3zjlEOuc45stq7k1v5IINRUASw83sw6Dmqv9aUs=";
env.CGO_ENABLED = 0;
diff --git a/pkgs/by-name/gc/gcli/package.nix b/pkgs/by-name/gc/gcli/package.nix
index 42dc4698e2fe..65dbcb1e2419 100644
--- a/pkgs/by-name/gc/gcli/package.nix
+++ b/pkgs/by-name/gc/gcli/package.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "gcli";
- version = "2.9.0";
+ version = "2.9.1";
src = fetchFromGitHub {
owner = "herrhotzenplotz";
repo = "gcli";
rev = "v${version}";
- hash = "sha256-iWNVDKa8O1hAC8SBQqhQaRX7T81c4/+piOSkHb46hpw=";
+ hash = "sha256-Y6wAGg32ZnPAoFB9uzkPyeSAWATHpkBvNASZQ8S+SYc=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/gd/gdbm/freebsd-patch-src-lock-c.patch b/pkgs/by-name/gd/gdbm/freebsd-patch-src-lock-c.patch
deleted file mode 100644
index 4312cf998d60..000000000000
--- a/pkgs/by-name/gd/gdbm/freebsd-patch-src-lock-c.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://github.com/freebsd/freebsd-ports/blob/e198aef78afa4fd78ddc62fb5d0f7caa1b076bb0/databases/gdbm/files/patch-src_lock.c
-
---- a/src/lock.c.orig 2025-03-06 16:24:09 UTC
-+++ b/src/lock.c
-@@ -73,15 +73,10 @@ try_lock_flock (GDBM_FILE dbf, int nb)
- {
- return TRY_LOCK_OK;
- }
-- else if (errno == EWOULDBLOCK)
-+ else if (errno == EWOULDBLOCK || errno == EINTR)
- {
- return TRY_LOCK_FAIL;
- }
-- else if (errno == EINTR)
-- {
-- errno = ETIME;
-- return TRY_LOCK_FAIL;
-- }
- #endif
- return TRY_LOCK_NEXT;
- }
-@@ -116,7 +111,6 @@ try_lock_lockf (GDBM_FILE dbf, int nb)
- switch (errno)
- {
- case EINTR:
-- errno = ETIME;
- case EACCES:
- case EAGAIN:
- case EDEADLK:
-@@ -162,7 +156,6 @@ try_lock_fcntl (GDBM_FILE dbf, int nb)
- switch (errno)
- {
- case EINTR:
-- errno = ETIME;
- case EACCES:
- case EAGAIN:
- case EDEADLK:
diff --git a/pkgs/by-name/gd/gdbm/package.nix b/pkgs/by-name/gd/gdbm/package.nix
index 67fe4953ed20..a31390c4ea3b 100644
--- a/pkgs/by-name/gd/gdbm/package.nix
+++ b/pkgs/by-name/gd/gdbm/package.nix
@@ -1,7 +1,6 @@
{
lib,
fetchurl,
- fetchpatch,
stdenv,
testers,
updateAutotoolsGnuConfigScriptsHook,
@@ -9,23 +8,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gdbm";
- version = "1.25";
+ version = "1.26";
src = fetchurl {
url = "mirror://gnu/gdbm/gdbm-${finalAttrs.version}.tar.gz";
- hash = "sha256-0C2zxZJu2Hf4gXuBzR+S9T73TKjG21Q/u6AnGzTzk+w=";
+ hash = "sha256-aiRQShTeSnRBA9y5Nr6Xbfb76IzP8mBl5UwcR5RvSl4=";
};
- patches = [
- # Remove on next release.
- ./upstream-darwin-clock-nanosleep-fix.patch
- ./upstream-lockwait-test-fixes.patch
- ./upstream-musl-ssize_t-fix.patch
- ]
- ++ lib.optionals stdenv.hostPlatform.isFreeBSD [
- ./freebsd-patch-src-lock-c.patch
- ];
-
nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ];
hardeningDisable = [ "strictflexarrays3" ];
diff --git a/pkgs/by-name/gd/gdbm/upstream-darwin-clock-nanosleep-fix.patch b/pkgs/by-name/gd/gdbm/upstream-darwin-clock-nanosleep-fix.patch
deleted file mode 100644
index cbc1045305b7..000000000000
--- a/pkgs/by-name/gd/gdbm/upstream-darwin-clock-nanosleep-fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ed0a865345681982ea02c6159c0f3d7702c928a1 Mon Sep 17 00:00:00 2001
-From: Sergey Poznyakoff
-Date: Thu, 27 Mar 2025 20:29:10 +0200
-Subject: Use nanosleep instead of clock_nanosleep
-
-The latter is not available on macOS
----
- src/lock.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/lock.c b/src/lock.c
-index a43d9c3..cf28478 100644
---- a/src/lock.c
-+++ b/src/lock.c
-@@ -291,7 +291,7 @@ _gdbm_lockwait_retry (GDBM_FILE dbf, struct timespec const *ts,
- if (timespec_cmp (&ttw, iv) < 0)
- break;
- timespec_sub (&ttw, iv);
-- if (clock_nanosleep (CLOCK_REALTIME, 0, iv, &r))
-+ if (nanosleep (iv, &r))
- {
- if (errno == EINTR)
- timespec_add (&ttw, &r);
---
-cgit v1.2.3
-
diff --git a/pkgs/by-name/gd/gdbm/upstream-lockwait-test-fixes.patch b/pkgs/by-name/gd/gdbm/upstream-lockwait-test-fixes.patch
deleted file mode 100644
index 1bf42fde28fb..000000000000
--- a/pkgs/by-name/gd/gdbm/upstream-lockwait-test-fixes.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-From 5be83b4c5da7c6a68817908b19f8925af09e9b2c Mon Sep 17 00:00:00 2001
-From: Sergey Poznyakoff
-Date: Thu, 10 Apr 2025 17:31:56 +0300
-Subject: Fix timeout calculation in lockwait signal test.
-
-* tests/t_lockwait.c (runtest_signal): mark start time right
-after setting alarm, not before it.
----
- tests/t_lockwait.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/tests/t_lockwait.c b/tests/t_lockwait.c
-index a5e74c8..3547af7 100644
---- a/tests/t_lockwait.c
-+++ b/tests/t_lockwait.c
-@@ -323,9 +323,6 @@ runtest_signal (struct timespec *ts)
- struct sigaction act;
- struct timeval now;
-
-- gettimeofday (&now, NULL);
-- start = tv_to_ms (&now);
--
- if (pipe (sig_fd))
- {
- perror ("pipe");
-@@ -341,6 +338,8 @@ runtest_signal (struct timespec *ts)
- return -1;
- }
- alarm (ts_to_ms (&ts[1]) / MILLI);
-+ gettimeofday (&now, NULL);
-+ start = tv_to_ms (&now);
- }
-
- op.lock_wait = GDBM_LOCKWAIT_SIGNAL;
---
-cgit v1.2.3
-
-From 6f165a8e1745dbd9b88f6fb6882dff7997cfdf74 Mon Sep 17 00:00:00 2001
-From: Sergey Poznyakoff
-Date: Thu, 10 Apr 2025 21:07:41 +0300
-Subject: More fixes to lockwait test
-
-* tests/t_lockwait.c (sighan): Close fd.
-(runtest_signal): compensate for alarm(2) second precision
----
- tests/t_lockwait.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/tests/t_lockwait.c b/tests/t_lockwait.c
-index 3547af7..b378819 100644
---- a/tests/t_lockwait.c
-+++ b/tests/t_lockwait.c
-@@ -170,6 +170,7 @@ static void
- sighan (int sig)
- {
- write (sig_fd[1], &sig, sizeof (sig));
-+ close (sig_fd[1]);
- }
-
- static int runtest_retry (struct timespec *ts);
-@@ -364,7 +365,8 @@ runtest_signal (struct timespec *ts)
-
- pfd.fd = sig_fd[0];
- pfd.events = POLLIN;
-- switch (poll (&pfd, 1, ts_to_ms (&ts[1]) - tv_to_ms (&now) + start)) {
-+ switch (poll (&pfd, 1,
-+ ts_to_ms (&ts[1]) - tv_to_ms (&now) + start + MILLI)) {
- case 1:
- break;
-
---
-cgit v1.2.3
-
-From aa9baca52ad155ae501ba586ff7b08f4b08e5434 Mon Sep 17 00:00:00 2001
-From: Sergey Poznyakoff
-Date: Fri, 11 Apr 2025 07:53:58 +0300
-Subject: Adjust timeouts for setitimer interface in lockwait test.
-
-* tests/t_lockwait.c: Setitimer (at least on some systems) restarts
-the timer set by alarm(2). To calculate the ETA of SIGALRM, call
-alarm after gdbm_open_ext returns.
----
- tests/t_lockwait.c | 66 ++++++++++++++++++++++++++++++++----------------------
- 1 file changed, 39 insertions(+), 27 deletions(-)
-
-diff --git a/tests/t_lockwait.c b/tests/t_lockwait.c
-index b378819..dfae838 100644
---- a/tests/t_lockwait.c
-+++ b/tests/t_lockwait.c
-@@ -322,7 +322,6 @@ runtest_signal (struct timespec *ts)
- if (!(ts[1].tv_sec == 0 && ts[1].tv_nsec == 0))
- {
- struct sigaction act;
-- struct timeval now;
-
- if (pipe (sig_fd))
- {
-@@ -338,9 +337,6 @@ runtest_signal (struct timespec *ts)
- fprintf (stderr, "%s: sigaction: %s", progname, strerror (errno));
- return -1;
- }
-- alarm (ts_to_ms (&ts[1]) / MILLI);
-- gettimeofday (&now, NULL);
-- start = tv_to_ms (&now);
- }
-
- op.lock_wait = GDBM_LOCKWAIT_SIGNAL;
-@@ -354,42 +350,58 @@ runtest_signal (struct timespec *ts)
- }
- gdbm_close (dbf);
-
-- if (start > 0)
-+ if (!(ts[1].tv_sec == 0 && ts[1].tv_nsec == 0))
- {
- struct pollfd pfd;
- struct timeval now;
-- int sig;
-+ int n, t, sig;
-
-- restart:
-+ alarm (ts_to_ms (&ts[1]) / MILLI);
- gettimeofday (&now, NULL);
-+ start = tv_to_ms (&now);
-
- pfd.fd = sig_fd[0];
- pfd.events = POLLIN;
-- switch (poll (&pfd, 1,
-- ts_to_ms (&ts[1]) - tv_to_ms (&now) + start + MILLI)) {
-- case 1:
-- break;
-
-- case 0:
-- fprintf (stderr, "%s: failed waiting for alarm\n", progname);
-- return 1;
--
-- default:
-- if (errno == EINTR) goto restart;
-- fprintf (stderr, "%s: poll: %s\n", progname, strerror (errno));
-- return 1;
-- }
--
-- if (read (sig_fd[0], &sig, sizeof (sig)) != sizeof (sig))
-+ do
- {
-- fprintf (stderr, "%s: read: %s\n", progname, strerror (errno));
-- return 1;
-+ gettimeofday (&now, NULL);
-+ t = ts_to_ms (&ts[1]) - tv_to_ms (&now) + start + MILLI;
-+ if (t < 0)
-+ {
-+ n = 0;
-+ break;
-+ }
- }
-- close (sig_fd[0]);
-- if (sig != SIGALRM)
-+ while ((n = poll (&pfd, 1, t)) == -1 && errno == EINTR);
-+
-+ switch (n)
- {
-- fprintf (stderr, "%s: unexpected data read\n", progname);
-+ case 1:
-+ if (read (sig_fd[0], &sig, sizeof (sig)) != sizeof (sig))
-+ {
-+ fprintf (stderr, "%s: read: %s\n", progname, strerror (errno));
-+ return 1;
-+ }
-+ close (sig_fd[0]);
-+ if (sig != SIGALRM)
-+ {
-+ fprintf (stderr, "%s: unexpected data read\n", progname);
-+ return 1;
-+ }
-+ break;
-+
-+ case 0:
-+ fprintf (stderr, "%s: failed waiting for alarm\n", progname);
- return 1;
-+
-+ default:
-+ if (errno != EINTR)
-+ {
-+ fprintf (stderr, "%s: poll: %s\n",
-+ progname, strerror (errno));
-+ return 1;
-+ }
- }
- }
-
---
-cgit v1.2.3
-
diff --git a/pkgs/by-name/gd/gdbm/upstream-musl-ssize_t-fix.patch b/pkgs/by-name/gd/gdbm/upstream-musl-ssize_t-fix.patch
deleted file mode 100644
index 79f5b3b16eef..000000000000
--- a/pkgs/by-name/gd/gdbm/upstream-musl-ssize_t-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 39ef0347f78ef691c9ad815360198f577043ce4c Mon Sep 17 00:00:00 2001
-From: Sergey Poznyakoff
-Date: Mon, 24 Mar 2025 07:56:00 +0200
-Subject: Add missing include
-
-* tools/gdbmapp.h: Include sys/types.h
----
- tools/gdbmapp.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tools/gdbmapp.h b/tools/gdbmapp.h
-index 3ea826b..e20253a 100644
---- a/tools/gdbmapp.h
-+++ b/tools/gdbmapp.h
-@@ -16,6 +16,7 @@
-
- #include
- #include
-+#include
- #include "gettext.h"
- #ifdef HAVE_LOCALE_H
- # include
---
-cgit v1.1
-
diff --git a/pkgs/by-name/gd/gdevelop/darwin.nix b/pkgs/by-name/gd/gdevelop/darwin.nix
index 59b3204c7aae..fa1663659417 100644
--- a/pkgs/by-name/gd/gdevelop/darwin.nix
+++ b/pkgs/by-name/gd/gdevelop/darwin.nix
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
src = fetchurl {
url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}-universal-mac.zip";
- hash = "sha256-zp5BiOhld/M5Boje4RCi27fWkkGFExcUhVLdtRse7WA=";
+ hash = "sha256-XSDzvh8zjrmKOP7YXjXG5+3qCzGQEJp1+RmwmRd4oOs=";
};
sourceRoot = ".";
diff --git a/pkgs/by-name/gd/gdevelop/linux.nix b/pkgs/by-name/gd/gdevelop/linux.nix
index e0c37d0c10a1..bf5bb8805f20 100644
--- a/pkgs/by-name/gd/gdevelop/linux.nix
+++ b/pkgs/by-name/gd/gdevelop/linux.nix
@@ -13,7 +13,7 @@ let
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}.AppImage";
- hash = "sha256-We5VDTgtc0pso8a8+9jXMPUtEwg2437Ps5t84ZdgJjc=";
+ hash = "sha256-TkJyq6WyHTXoCvGSiV6w/IYoLCxAvbrS1oFdsgbfl5s=";
}
else
throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";
diff --git a/pkgs/by-name/gd/gdevelop/package.nix b/pkgs/by-name/gd/gdevelop/package.nix
index a6f0daceba9f..ebf2955d54e1 100644
--- a/pkgs/by-name/gd/gdevelop/package.nix
+++ b/pkgs/by-name/gd/gdevelop/package.nix
@@ -4,7 +4,7 @@
callPackage,
}:
let
- version = "5.5.241";
+ version = "5.5.242";
pname = "gdevelop";
meta = {
description = "Graphical Game Development Studio";
diff --git a/pkgs/by-name/ge/gemini-cli-bin/package.nix b/pkgs/by-name/ge/gemini-cli-bin/package.nix
index 0925a0a919b0..88421d39c918 100644
--- a/pkgs/by-name/ge/gemini-cli-bin/package.nix
+++ b/pkgs/by-name/ge/gemini-cli-bin/package.nix
@@ -8,11 +8,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "gemini-cli-bin";
- version = "0.6.1";
+ version = "0.8.0";
src = fetchurl {
url = "https://github.com/google-gemini/gemini-cli/releases/download/v${finalAttrs.version}/gemini.js";
- hash = "sha256-gTd+uw5geR7W87BOiE6YmDDJ4AiFlYxbuLE2GWgg0kw=";
+ hash = "sha256-Xb9cE5Gz6V//dOe6AbQ2y9MFk0yeBuvcOoK5Z1L62s0=";
};
phases = [
diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix
index a075a7377e82..3269b59c3702 100644
--- a/pkgs/by-name/ge/gemini-cli/package.nix
+++ b/pkgs/by-name/ge/gemini-cli/package.nix
@@ -1,12 +1,14 @@
{
lib,
+ stdenv,
buildNpmPackage,
fetchFromGitHub,
- nix-update-script,
- ripgrep,
jq,
pkg-config,
+ clang_20,
libsecret,
+ ripgrep,
+ nix-update-script,
}:
buildNpmPackage (finalAttrs: {
@@ -25,7 +27,8 @@ buildNpmPackage (finalAttrs: {
nativeBuildInputs = [
jq
pkg-config
- ];
+ ]
+ ++ lib.optionals stdenv.isDarwin [ clang_20 ]; # clang_21 breaks @vscode/vsce's optionalDependencies keytar
buildInputs = [
ripgrep
diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/by-name/ge/geos/package.nix
similarity index 100%
rename from pkgs/development/libraries/geos/default.nix
rename to pkgs/by-name/ge/geos/package.nix
diff --git a/pkgs/development/libraries/geos/tests.nix b/pkgs/by-name/ge/geos/tests.nix
similarity index 100%
rename from pkgs/development/libraries/geos/tests.nix
rename to pkgs/by-name/ge/geos/tests.nix
diff --git a/pkgs/by-name/ge/gerbera/package.nix b/pkgs/by-name/ge/gerbera/package.nix
index 9d0fa9389025..53b70d049588 100644
--- a/pkgs/by-name/ge/gerbera/package.nix
+++ b/pkgs/by-name/ge/gerbera/package.nix
@@ -13,7 +13,7 @@
spdlog,
sqlite,
zlib,
- fmt_11,
+ fmt,
# options
enableMysql ? false,
libmysqlclient,
@@ -161,7 +161,7 @@ stdenv.mkDerivation rec {
spdlog
sqlite
zlib
- fmt_11
+ fmt
]
++ flatten (builtins.catAttrs "packages" (builtins.filter (e: e.enable) options));
diff --git a/pkgs/by-name/ge/gersemi/package.nix b/pkgs/by-name/ge/gersemi/package.nix
index 963030083e9f..85cb52ef8b4f 100644
--- a/pkgs/by-name/ge/gersemi/package.nix
+++ b/pkgs/by-name/ge/gersemi/package.nix
@@ -6,14 +6,14 @@
python3Packages.buildPythonApplication rec {
pname = "gersemi";
- version = "0.22.2";
+ version = "0.22.3";
format = "pyproject";
src = fetchFromGitHub {
owner = "BlankSpruce";
repo = "gersemi";
tag = version;
- hash = "sha256-VxpKhNpJiDRRlp+yM5vSNCuVWOu/r+v/De7Uh9ivRTs=";
+ hash = "sha256-B45+j53p61+LTAw7C1h+9icc27zhoYittdxn7iDmZCo=";
};
build-system = with python3Packages; [
diff --git a/pkgs/by-name/gf/gf/package.nix b/pkgs/by-name/gf/gf/package.nix
index 512738906806..74154e93ccc6 100644
--- a/pkgs/by-name/gf/gf/package.nix
+++ b/pkgs/by-name/gf/gf/package.nix
@@ -16,13 +16,13 @@
stdenv.mkDerivation {
pname = "gf";
- version = "0-unstable-2025-09-21";
+ version = "0-unstable-2025-10-05";
src = fetchFromGitHub {
repo = "gf";
owner = "nakst";
- rev = "5fc7f422c8344277601860646c6ff6e72c8e7041";
- hash = "sha256-YdeF4pBKLn3r3xM7ppX30D196RmO/P8WDj0Zsh7Vdmc=";
+ rev = "1c988881798263c58ead08bb74b14b6861853c64";
+ hash = "sha256-EodC+kxfyNdW9r9DiX1SwiyOUbv1wBfiftMm7m4BFLI=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/gf/gflags/package.nix b/pkgs/by-name/gf/gflags/package.nix
index b01b862804e3..331aa6087332 100644
--- a/pkgs/by-name/gf/gflags/package.nix
+++ b/pkgs/by-name/gf/gflags/package.nix
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
+ fetchpatch,
cmake,
enableShared ? !stdenv.hostPlatform.isStatic,
}:
@@ -17,6 +18,15 @@ stdenv.mkDerivation rec {
sha256 = "147i3md3nxkjlrccqg4mq1kyzc7yrhvqv5902iibc7znkvzdvlp0";
};
+ patches = [
+ # Fix the build with CMake 4.
+ (fetchpatch {
+ name = "gflags-fix-cmake-4.patch";
+ url = "https://github.com/gflags/gflags/commit/70c01a642f08734b7bddc9687884844ca117e080.patch";
+ hash = "sha256-TYdroBbF27Wvvm/rOahBEvhezuKCcxbtgh/ZhpA5ESo=";
+ })
+ ];
+
nativeBuildInputs = [ cmake ];
# This isn't used by the build and breaks the CMake build on case-insensitive filesystems (e.g., on Darwin)
diff --git a/pkgs/by-name/gh/gh-dash/package.nix b/pkgs/by-name/gh/gh-dash/package.nix
index e56a7c2f369c..40dbd6c8c9c3 100644
--- a/pkgs/by-name/gh/gh-dash/package.nix
+++ b/pkgs/by-name/gh/gh-dash/package.nix
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "gh-dash";
- version = "4.16.2";
+ version = "4.17.0";
src = fetchFromGitHub {
owner = "dlvhdr";
repo = "gh-dash";
rev = "v${version}";
- hash = "sha256-LMKY7UpJtCrlMaui+fllc6mwVYQyVkuIM8bb6fop1Bc=";
+ hash = "sha256-uQc5s5CLR5uKieD1+YMzahKNBqsddLwX+CTThzWPnwY=";
};
- vendorHash = "sha256-AeDGtEh+8sAczm0hBebvMdK/vTDzQsSXcB0xIYcQd8o=";
+ vendorHash = "sha256-IsEz6hA8jnWP+2ELkZ6V5Y0/rpTz1tAzaYJvzgPQQCo=";
ldflags = [
"-s"
@@ -25,6 +25,11 @@ buildGoModule rec {
"-X github.com/dlvhdr/gh-dash/v4/cmd.Version=${version}"
];
+ checkFlags = [
+ # requires network
+ "-skip=TestFullOutput"
+ ];
+
passthru.tests = {
version = testers.testVersion { package = gh-dash; };
};
diff --git a/pkgs/by-name/gh/gh2md/package.nix b/pkgs/by-name/gh/gh2md/package.nix
index 8683047dffdc..eb378f4c4feb 100644
--- a/pkgs/by-name/gh/gh2md/package.nix
+++ b/pkgs/by-name/gh/gh2md/package.nix
@@ -6,12 +6,12 @@
python3Packages.buildPythonApplication rec {
pname = "gh2md";
- version = "2.3.1";
+ version = "2.5.1";
format = "pyproject";
src = fetchPypi {
inherit pname version;
- hash = "sha256-B7IB1TWfZ0StH2zo/tXfDAaPlgLvr4ciIv7B8EQyp8w=";
+ hash = "sha256-01r/x9SrxCUN/wrEAWopHDAEEJdwKiWL9mERylaNAlA=";
};
build-system = with python3Packages; [
diff --git a/pkgs/by-name/gh/ghostscript/package.nix b/pkgs/by-name/gh/ghostscript/package.nix
index 9fac60a8c5f7..70512dcc9f65 100644
--- a/pkgs/by-name/gh/ghostscript/package.nix
+++ b/pkgs/by-name/gh/ghostscript/package.nix
@@ -64,13 +64,13 @@ let
in
stdenv.mkDerivation rec {
pname = "ghostscript${lib.optionalString x11Support "-with-X"}";
- version = "10.05.1";
+ version = "10.06.0";
src = fetchurl {
url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${
lib.replaceStrings [ "." ] [ "" ] version
}/ghostscript-${version}.tar.xz";
- hash = "sha256-IvK9yhXCiDDJcVzdxcKW6maJi/2rC2BKTgvP6wOvbK0=";
+ hash = "sha256-ZDUmSMLAgcip+xoS3Bll4B6tfFf1i3LRtU9u8c7zxWE=";
};
patches = [
@@ -82,6 +82,13 @@ stdenv.mkDerivation rec {
url = "https://salsa.debian.org/debian/ghostscript/-/raw/01e895fea033cc35054d1b68010de9818fa4a8fc/debian/patches/2010_add_build_timestamp_setting.patch";
hash = "sha256-XTKkFKzMR2QpcS1YqoxzJnyuGk/l/Y2jdevsmbMtCXA=";
})
+ ]
+ ++ lib.optionals stdenv.hostPlatform.is32bit [
+ # 32 bit compat. conditional as to not cause rebuilds
+ (fetchpatch2 {
+ url = "https://github.com/ArtifexSoftware/ghostpdl/commit/3c0be6e4fcffa63e4a5a1b0aec057cebc4d2562f.patch?full_index=1";
+ hash = "sha256-NrL4lI19x+OHaSIwV93Op/I9k2MWXxSWgbkwSGU7R6A=";
+ })
];
outputs = [
diff --git a/pkgs/by-name/gh/ghostty-bin/package.nix b/pkgs/by-name/gh/ghostty-bin/package.nix
index 2a2f3ab9ef69..e94eced89922 100644
--- a/pkgs/by-name/gh/ghostty-bin/package.nix
+++ b/pkgs/by-name/gh/ghostty-bin/package.nix
@@ -8,11 +8,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "ghostty-bin";
- version = "1.2.0";
+ version = "1.2.1";
src = fetchurl {
url = "https://release.files.ghostty.org/${finalAttrs.version}/Ghostty.dmg";
- hash = "sha256-QyHKQ00iRxWS6GwPfRAi9RDSlgX/50N0+MASmnPGAo4=";
+ hash = "sha256-rFXYJxz6UPE8KKhrPLvksLLvxUdlZzvoxLGhIF3hTGM=";
};
sourceRoot = ".";
diff --git a/pkgs/by-name/gh/ghostty/deps.nix b/pkgs/by-name/gh/ghostty/deps.nix
index df9f1db94c5c..eee5fe335be8 100644
--- a/pkgs/by-name/gh/ghostty/deps.nix
+++ b/pkgs/by-name/gh/ghostty/deps.nix
@@ -169,11 +169,11 @@ linkFarm name [
};
}
{
- name = "N-V-__8AANodAwDnyHwhlOv5cVRn2rx_dTvija-wy5YtTw1B";
+ name = "N-V-__8AALIsAwDyo88G5mGJGN2lSVmmFMx4YePfUvp_2o3Y";
path = fetchZigArtifact {
name = "iterm2_themes";
- url = "https://deps.files.ghostty.org/ghostty-themes-20250915-162204-b1fe546.tgz";
- hash = "sha256-6rKNFpaUvSbvNZ0/+u0h4I/RRaV5V7xIPQ9y7eNVbCA=";
+ url = "https://github.com/mbadolato/iTerm2-Color-Schemes/releases/download/release-20251002-142451-4a5043e/ghostty-themes.tgz";
+ hash = "sha256-GsEWVt4wMzp6+7N5I+QVuhCVJ70cFrdADwUds59AKnw=";
};
}
{
diff --git a/pkgs/by-name/gh/ghostty/package.nix b/pkgs/by-name/gh/ghostty/package.nix
index f50a5da721d6..d4271ad2c16d 100644
--- a/pkgs/by-name/gh/ghostty/package.nix
+++ b/pkgs/by-name/gh/ghostty/package.nix
@@ -20,10 +20,8 @@
pandoc,
pkg-config,
removeReferencesTo,
- util-linux,
versionCheckHook,
wrapGAppsHook4,
- writeShellApplication,
zig_0_14,
# Usually you would override `zig.hook` with this, but we do that internally
@@ -34,49 +32,13 @@
let
zig = zig_0_14;
- # HACK:
- # Work around a Zig bug where embedding a large enough file could crash
- # the compiler when too many cores are used, which causes Hydra builds to
- # reliably fail. See these links for more info:
- #
- # * https://github.com/ziglang/zig/issues/25297
- # * https://github.com/ziglang/zig/issues/22867
- # * https://github.com/ghostty-org/ghostty/discussions/8676
- #
- # Note that the `-j` parameter does NOT fix this. It seems like the faulty
- # intern pool logic always depends on the full amount of available cores
- # instead of the value of `-j`, so we have to use `taskset` to trick Zig
- # into thinking it only has access to a limited amount of cores.
- zigWithLimitedCores = writeShellApplication {
- name = "zig";
- passthru = {
- inherit (zig) version meta;
- };
- runtimeInputs = [
- zig
- util-linux
- ];
- text = ''
- maxCores=$(nproc)
- # 32 cores seem to be the upper limit through empiric testing
- coreLimit=$((maxCores < 32 ? maxCores : 32))
- # Also take NIX_BUILD_CORES into account so the build respects the `--cores` argument
- effectiveCores=$((NIX_BUILD_CORES > coreLimit ? coreLimit : NIX_BUILD_CORES))
- taskset -c "0-$((effectiveCores - 1))" zig "$@"
- '';
+ zig_hook = zig.hook.overrideAttrs {
+ zig_default_flags = "-Dcpu=baseline -Doptimize=${optimizeLevel} --color off";
};
-
- zig_hook =
- (zig.hook.override {
- zig = zigWithLimitedCores;
- }).overrideAttrs
- {
- zig_default_flags = "-Dcpu=baseline -Doptimize=${optimizeLevel} --color off";
- };
in
stdenv.mkDerivation (finalAttrs: {
pname = "ghostty";
- version = "1.2.0";
+ version = "1.2.1";
outputs = [
"out"
@@ -90,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "ghostty-org";
repo = "ghostty";
tag = "v${finalAttrs.version}";
- hash = "sha256-Z6lndpkEqBwgsjIeZhmVIQ5D7YdQSH/fG6NCY+YWEAo=";
+ hash = "sha256-LIJ8ZzOzpZMwgJOlOE/n6yiJ/mVKHI4pt/1Bm93gbG8=";
};
deps = callPackage ./deps.nix {
diff --git a/pkgs/by-name/gi/gildas/package.nix b/pkgs/by-name/gi/gildas/package.nix
index b228e67460c4..f3aab87e1997 100644
--- a/pkgs/by-name/gi/gildas/package.nix
+++ b/pkgs/by-name/gi/gildas/package.nix
@@ -24,8 +24,8 @@ let
in
stdenv.mkDerivation rec {
- srcVersion = "sep25a";
- version = "20250901_a";
+ srcVersion = "oct25a";
+ version = "20251001_a";
pname = "gildas";
src = fetchurl {
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
"http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz"
"http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz"
];
- hash = "sha256-W2l2n6W8L5Gr7taw9ZUvVVp9sZvjne56sjtUU91U0oE=";
+ hash = "sha256-n1IQajRXIHWkaFpLOtctlm4P+2vrxTWdyQiD3caQd3A=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/gi/gitlab-ci-ls/package.nix b/pkgs/by-name/gi/gitlab-ci-ls/package.nix
index c8bb2b1dba2d..fa479241b0eb 100644
--- a/pkgs/by-name/gi/gitlab-ci-ls/package.nix
+++ b/pkgs/by-name/gi/gitlab-ci-ls/package.nix
@@ -8,15 +8,15 @@
rustPlatform.buildRustPackage rec {
pname = "gitlab-ci-ls";
- version = "1.2.1";
+ version = "1.2.2";
src = fetchFromGitHub {
owner = "alesbrelih";
repo = "gitlab-ci-ls";
rev = "${version}";
- hash = "sha256-WVwRV5STQlyPhUESHV8ICnQFJfa2TCvOW5HFtuDfTRw=";
+ hash = "sha256-ZpLkiTJP3pofDcXrQPdl5Vm6SKsp6DecwSfXWC9h2qI=";
};
- cargoHash = "sha256-d8X4EuXJjgQ4vPhqMJR+w/pSu/muqYtpoNXKxvPLUkA=";
+ cargoHash = "sha256-wDu89bhyR4a0U9KDF0iasdYrc1GUGlYH1y6D8+NKPy4=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
diff --git a/pkgs/by-name/gj/gjs/disable-umlaut-test.patch b/pkgs/by-name/gj/gjs/disable-umlaut-test.patch
new file mode 100644
index 000000000000..b4f4be0f16aa
--- /dev/null
+++ b/pkgs/by-name/gj/gjs/disable-umlaut-test.patch
@@ -0,0 +1,13 @@
+diff --git a/installed-tests/js/testGIMarshalling.js b/installed-tests/js/testGIMarshalling.js
+index b94aa7c8..8f79fe71 100644
+--- a/installed-tests/js/testGIMarshalling.js
++++ b/installed-tests/js/testGIMarshalling.js
+@@ -2931,7 +2931,7 @@ describe('Filename tests', function () {
+ });
+
+ it('various types of path existing', function () {
+- const paths = ['foo-2', 'öäü-3'];
++ const paths = ['foo-2'];
+ for (const path of paths) {
+ const file = workdir.get_child(path);
+ const stream = file.create(Gio.FileCreateFlags.NONE, null);
diff --git a/pkgs/by-name/gj/gjs/package.nix b/pkgs/by-name/gj/gjs/package.nix
index 691575c5a93c..f9b1f3c1ffa3 100644
--- a/pkgs/by-name/gj/gjs/package.nix
+++ b/pkgs/by-name/gj/gjs/package.nix
@@ -64,6 +64,12 @@ stdenv.mkDerivation (finalAttrs: {
# Disable introspection test in installed tests
# (minijasmine:1317): GLib-GIO-WARNING **: 17:33:39.556: Error creating IO channel for /proc/self/mountinfo: No such file or directory (g-io-error-quark, 1)
./disable-introspection-test.patch
+
+ # The reason is unclear, but a test that creates a file named "öäü-3" fails only on ZFS filesystems:
+ # 24/78 gjs:JS / GIMarshalling FAIL 0.59s 726/727 subtests passed
+ # not ok 796 Filename tests various types of path existing
+ # Message: Error opening file “/build/.UGHEA3/öäü-3”: Invalid or incomplete multibyte or wide character in /build/gjs-1.84.2/build/../installed-tests/js/testGIMarshalling.js (line 2937)
+ ./disable-umlaut-test.patch
];
nativeBuildInputs = [
diff --git a/pkgs/by-name/gl/glooctl/package.nix b/pkgs/by-name/gl/glooctl/package.nix
index 17071abb3af8..e47a690b006c 100644
--- a/pkgs/by-name/gl/glooctl/package.nix
+++ b/pkgs/by-name/gl/glooctl/package.nix
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "glooctl";
- version = "1.20.0";
+ version = "1.20.1";
src = fetchFromGitHub {
owner = "solo-io";
repo = "gloo";
rev = "v${version}";
- hash = "sha256-cEfCpTn72HviKwqSUVv2S8kcCSxivE+a4tvozvAm6F4=";
+ hash = "sha256-jSF2B9dbyJ9S4PHt6CKANC40MgXIuVF3uh4Ze0F0jZU=";
};
vendorHash = "sha256-zJmp3UWzZSI7G54DTOEOEo2ZIKjM6GZ0Cf5/BukaB4o=";
diff --git a/pkgs/by-name/gn/gn/package.nix b/pkgs/by-name/gn/gn/package.nix
index 988151f91b12..17f0b7daea27 100644
--- a/pkgs/by-name/gn/gn/package.nix
+++ b/pkgs/by-name/gn/gn/package.nix
@@ -11,11 +11,11 @@
version ?
# This is a workaround for update-source-version to be able to update this
let
- _version = "0-unstable-2025-06-19";
+ _version = "0-unstable-2025-07-29";
in
_version,
- rev ? "97b68a0bb62b7528bc3491c7949d6804223c2b82",
- hash ? "sha256-gwptzuirIdPAV9XCaAT09aM/fY7d6xgBU7oSu9C4tmE=",
+ rev ? "3a4f5cea73eca32e9586e8145f97b04cbd4a1aee",
+ hash ? "sha256-Z7bTto8BHnJzjvmKmcVAZ0/BrXimcAETV6YGKNTorQw=",
}:
stdenv.mkDerivation {
diff --git a/pkgs/by-name/gn/gnome-menus/package.nix b/pkgs/by-name/gn/gnome-menus/package.nix
index 247f7a529214..3efd6f8a698b 100644
--- a/pkgs/by-name/gn/gnome-menus/package.nix
+++ b/pkgs/by-name/gn/gnome-menus/package.nix
@@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "gnome-menus";
- version = "3.36.0";
+ version = "3.38.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "07xvaf8s0fiv0035nk8zpzymn5www76w2a1vflrgqmp9plw8yd6r";
+ sha256 = "EZipHNvc+yMt+U5x71QnYX0mAp4ye+P4YMOwkhxEgRg=";
};
makeFlags = [
diff --git a/pkgs/by-name/go/go-judge/package.nix b/pkgs/by-name/go/go-judge/package.nix
index 64592b1b6d20..24877f211833 100644
--- a/pkgs/by-name/go/go-judge/package.nix
+++ b/pkgs/by-name/go/go-judge/package.nix
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "go-judge";
- version = "1.9.6";
+ version = "1.9.8";
src = fetchFromGitHub {
owner = "criyle";
repo = "go-judge";
rev = "v${version}";
- hash = "sha256-hD33oD2JHabeVF5sHhud5czFQUC9gZEb1gri/JUFYK8=";
+ hash = "sha256-hBOH5FDqzUGiCXucbTPBPXdEnHPq7fL0SYlY5b3OMHY=";
};
- vendorHash = "sha256-JmRAFNmmEADVsV0zpctIVRlXc4DYyXX3RrBQW0MP8ow=";
+ vendorHash = "sha256-dUJpNGJvvmIJuA6GSWhL4weQEwn5iM9k+y8clHdxhvY=";
tags = [
"nomsgpack"
diff --git a/pkgs/development/mobile/gomobile/default.nix b/pkgs/by-name/go/gomobile/package.nix
similarity index 100%
rename from pkgs/development/mobile/gomobile/default.nix
rename to pkgs/by-name/go/gomobile/package.nix
diff --git a/pkgs/by-name/go/goreleaser/package.nix b/pkgs/by-name/go/goreleaser/package.nix
index b114dfc8e426..d30a09c70ea8 100644
--- a/pkgs/by-name/go/goreleaser/package.nix
+++ b/pkgs/by-name/go/goreleaser/package.nix
@@ -10,16 +10,16 @@
}:
buildGo125Module rec {
pname = "goreleaser";
- version = "2.12.0";
+ version = "2.12.5";
src = fetchFromGitHub {
owner = "goreleaser";
repo = "goreleaser";
rev = "v${version}";
- hash = "sha256-z3yYC6NQ6Y5NbsFsvYnx/+X1rU7Gs8dSXaQZ0KCyiis=";
+ hash = "sha256-EHJ1ARzk6BD5D121u+1UTe90oLOovKKD+LQWLIj81Jk=";
};
- vendorHash = "sha256-GcG/VkX9XkAkNAwt5XX14FWAZutSuSOOyl7/Yjwxrfk=";
+ vendorHash = "sha256-J/OwvPxC8wz/91sWWUBNkW5E71m8EPjTq3h/MOxT/3k=";
ldflags = [
"-s"
diff --git a/pkgs/by-name/gp/gperftools/package.nix b/pkgs/by-name/gp/gperftools/package.nix
index 5875bf80311c..5dc08804834a 100644
--- a/pkgs/by-name/gp/gperftools/package.nix
+++ b/pkgs/by-name/gp/gperftools/package.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gperftools";
- version = "2.17";
+ version = "2.17.2";
src = fetchFromGitHub {
owner = "gperftools";
repo = "gperftools";
tag = "gperftools-${finalAttrs.version}";
- sha256 = "sha256-Tm+sYKwFSHAxOALgr9UGv7vBMlWqUymXsvNu7Sku6Kk=";
+ hash = "sha256-WCEuiSjNIX/KhEBWndyVhrKlWs7H60mcHoPlWd7YWC4=";
};
patches = [
diff --git a/pkgs/by-name/gq/gql/package.nix b/pkgs/by-name/gq/gql/package.nix
index 549dde094d52..708fcf107ded 100644
--- a/pkgs/by-name/gq/gql/package.nix
+++ b/pkgs/by-name/gq/gql/package.nix
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "gql";
- version = "0.40.0";
+ version = "0.41.0";
src = fetchFromGitHub {
owner = "AmrDeveloper";
repo = "GQL";
rev = version;
- hash = "sha256-i6UbgtSWKXd/qqn1eBUoHo1kLTIybu2bnbrNn6aTAos=";
+ hash = "sha256-iczBVix56aKbvOksxYmZ8WPgngnTDn9MIlVnZ2nA5Ts=";
};
- cargoHash = "sha256-z2AXJGwzMYpGLqXkw8OpqJ++H7GpLbSdPoiA9RpMbKE=";
+ cargoHash = "sha256-vblQuUSpTK93UEYdiEPq1C3N+E3WCTZHoLJDWG4rZNs=";
nativeBuildInputs = [
pkg-config
diff --git a/pkgs/by-name/gr/grafana-alloy/package.nix b/pkgs/by-name/gr/grafana-alloy/package.nix
index dba589bc04c9..4d82c3a9dfc4 100644
--- a/pkgs/by-name/gr/grafana-alloy/package.nix
+++ b/pkgs/by-name/gr/grafana-alloy/package.nix
@@ -17,17 +17,17 @@
buildGoModule rec {
pname = "grafana-alloy";
- version = "1.10.2";
+ version = "1.11.0";
src = fetchFromGitHub {
owner = "grafana";
repo = "alloy";
tag = "v${version}";
- hash = "sha256-7KOnpkpQzqvqyMAuDyUjIzseJAxqmkjEw9ecHD+kI3I=";
+ hash = "sha256-nE8R3llMWr5OqqFUoGP9alCgJVEvCeE8Ea2+g3d3fAk=";
};
proxyVendor = true;
- vendorHash = "sha256-/G00ZJnAQoAFR66sYkO3bqhnWXvGmronjFnk7m8ogYA=";
+ vendorHash = "sha256-8n1r2Wun5ZSvjsU2Vl/fSRoQnTfKbrcQI6a7YDX/HZA=";
nativeBuildInputs = [
fixup-yarn-lock
diff --git a/pkgs/by-name/gr/graphite-cli/package-lock.json b/pkgs/by-name/gr/graphite-cli/package-lock.json
index aaf0d83d72e5..c846f44400a1 100644
--- a/pkgs/by-name/gr/graphite-cli/package-lock.json
+++ b/pkgs/by-name/gr/graphite-cli/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "@withgraphite/graphite-cli",
- "version": "1.6.8",
+ "version": "1.7.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "@withgraphite/graphite-cli",
- "version": "1.6.8",
+ "version": "1.7.0",
"hasInstallScript": true,
"license": "None",
"dependencies": {
diff --git a/pkgs/by-name/gr/graphite-cli/package.nix b/pkgs/by-name/gr/graphite-cli/package.nix
index 5100d7d69180..0eb51e8db8d4 100644
--- a/pkgs/by-name/gr/graphite-cli/package.nix
+++ b/pkgs/by-name/gr/graphite-cli/package.nix
@@ -9,14 +9,14 @@
buildNpmPackage rec {
pname = "graphite-cli";
- version = "1.6.8";
+ version = "1.7.0";
src = fetchurl {
url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-${version}.tgz";
- hash = "sha256-HkxhPx38FjwrwPGhXSWw21mizjuWblcPxWFLYUU7Oys=";
+ hash = "sha256-RoFzv4edmX4j6vl5K70fK38uZiXwqcbIvCdNcvumnRE=";
};
- npmDepsHash = "sha256-28jOlUaVo8HN5HF1EvcPAu9qYJOsby5gt9rCGbIOMRU=";
+ npmDepsHash = "sha256-OpX0FpOGtsVgIsIsEPSTkNQ6z2basOf0OTboSBcrdOI=";
postPatch = ''
ln -s ${./package-lock.json} package-lock.json
diff --git a/pkgs/by-name/gr/grpc/package.nix b/pkgs/by-name/gr/grpc/package.nix
index 71eda06acd59..f52a2cdfb1a5 100644
--- a/pkgs/by-name/gr/grpc/package.nix
+++ b/pkgs/by-name/gr/grpc/package.nix
@@ -25,7 +25,7 @@
# nixpkgs-update: no auto update
stdenv.mkDerivation rec {
pname = "grpc";
- version = "1.74.0"; # N.B: if you change this, please update:
+ version = "1.75.0"; # N.B: if you change this, please update:
# pythonPackages.grpcio
# pythonPackages.grpcio-channelz
# pythonPackages.grpcio-health-checking
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
owner = "grpc";
repo = "grpc";
tag = "v${version}";
- hash = "sha256-97+llHIubNYwULSD0KxEcGN+T8bQWufaEH6QT9oTgwg=";
+ hash = "sha256-2SeL/O6FaAnrPXMHAPKCSzx3hlcKLuC5y+ljJ1gewkE=";
fetchSubmodules = true;
};
diff --git a/pkgs/by-name/gs/gscreenshot/package.nix b/pkgs/by-name/gs/gscreenshot/package.nix
index 99488bd9307f..d7f5b0cc7899 100644
--- a/pkgs/by-name/gs/gscreenshot/package.nix
+++ b/pkgs/by-name/gs/gscreenshot/package.nix
@@ -19,14 +19,14 @@
python3Packages.buildPythonApplication rec {
pname = "gscreenshot";
- version = "3.9.2";
+ version = "3.10.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "thenaterhood";
repo = "gscreenshot";
tag = "v${version}";
- sha256 = "sha256-u60wxtWE7VaAE/xKlcY9vE7Chs5TPd0BTe5zy1D7ZAQ=";
+ sha256 = "sha256-y5G2eJ5G6FpH01n1/YTcjPh6u58N0nJO6gcC9yEr+84=";
};
# needed for wrapGAppsHook3 to function
diff --git a/pkgs/by-name/gs/gsm/package.nix b/pkgs/by-name/gs/gsm/package.nix
index 85dc7b187ce5..3cefc80a637a 100644
--- a/pkgs/by-name/gs/gsm/package.nix
+++ b/pkgs/by-name/gs/gsm/package.nix
@@ -13,11 +13,11 @@ in
stdenv.mkDerivation rec {
pname = "gsm";
- version = "1.0.22";
+ version = "1.0.23";
src = fetchurl {
url = "https://www.quut.com/gsm/${pname}-${version}.tar.gz";
- sha256 = "sha256-8Acukfa7hah4svbb9KC3yFDE3rgEnVVMZTQLO/ad8Kw=";
+ sha256 = "sha256-i3WRqFrJrc6FjyBTAF5rLrIMI7i4qGjf+ylpZF+jI8A=";
};
patchPhase = ''
diff --git a/pkgs/development/libraries/gsmlib/default.nix b/pkgs/by-name/gs/gsmlib/package.nix
similarity index 100%
rename from pkgs/development/libraries/gsmlib/default.nix
rename to pkgs/by-name/gs/gsmlib/package.nix
diff --git a/pkgs/by-name/ha/halftone/package.nix b/pkgs/by-name/ha/halftone/package.nix
index 18489cb40954..b7130ea50bd9 100644
--- a/pkgs/by-name/ha/halftone/package.nix
+++ b/pkgs/by-name/ha/halftone/package.nix
@@ -16,13 +16,13 @@
python3Packages.buildPythonApplication rec {
pname = "halftone";
- version = "0.7.0";
+ version = "0.7.2";
src = fetchFromGitHub {
owner = "tfuxu";
repo = "halftone";
tag = version;
- hash = "sha256-UpYdOYQa98syDI353+c/JN9/68PraQ8bg05GES46C+A=";
+ hash = "sha256-5hT6ulmUlOrFVL4nV0tfvgkKdYGusp+1rBINQy3ZvpI=";
};
format = "other";
diff --git a/pkgs/by-name/ha/halibut/package.nix b/pkgs/by-name/ha/halibut/package.nix
index 730fc63aa748..564348024143 100644
--- a/pkgs/by-name/ha/halibut/package.nix
+++ b/pkgs/by-name/ha/halibut/package.nix
@@ -4,6 +4,7 @@
fetchurl,
cmake,
perl,
+ fetchpatch2,
}:
stdenv.mkDerivation rec {
@@ -15,6 +16,14 @@ stdenv.mkDerivation rec {
sha256 = "0ciikn878vivs4ayvwvr63nnhpcg12m8023xv514zxqpdxlzg85a";
};
+ patches = [
+ (fetchpatch2 {
+ name = "fix-charset-cmakelists.patch";
+ url = "https://git.tartarus.org/?p=simon/halibut.git;a=blobdiff_plain;f=charset/CMakeLists.txt;h=4613cb4d02959db051dd82b25d6bfd82a50455d7;hp=06eae7703d3e52aa50d5309624ec93a7684f73d8;hb=570407a40bdde2a9bb50c16aa47711202ade8923;hpb=ce14e373b7e6532c0dfa1908fe6030c5667cf79a";
+ hash = "sha256-YdLxbXc3C2UxWp0CUzvmJ8mgzqaWJ5Br4VfRU7YjBYE=";
+ })
+ ];
+
nativeBuildInputs = [
cmake
perl
diff --git a/pkgs/by-name/ha/haproxy/package.nix b/pkgs/by-name/ha/haproxy/package.nix
index 176ac5855649..c352baf14319 100644
--- a/pkgs/by-name/ha/haproxy/package.nix
+++ b/pkgs/by-name/ha/haproxy/package.nix
@@ -6,6 +6,7 @@
stdenv,
lib,
fetchurl,
+ fetchpatch,
nixosTests,
zlib,
libxcrypt,
@@ -42,11 +43,11 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "haproxy";
- version = "3.2.5";
+ version = "3.2.6";
src = fetchurl {
url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz";
- hash = "sha256-dzFqPhtsOSRbwR71j01trdBjwBTBuuyPDYF5jFGeBys=";
+ hash = "sha256-rWMLawtz4dEYrM5Fj+wb8efQ5ClTDyZo7FgvT4u3jmU=";
};
buildInputs = [
diff --git a/pkgs/by-name/ha/harmonoid/package.nix b/pkgs/by-name/ha/harmonoid/package.nix
new file mode 100644
index 000000000000..599b30fe749c
--- /dev/null
+++ b/pkgs/by-name/ha/harmonoid/package.nix
@@ -0,0 +1,103 @@
+{
+ lib,
+ stdenv,
+ fetchurl,
+ undmg,
+ autoPatchelfHook,
+ makeWrapper,
+ cairo,
+ gdk-pixbuf,
+ gtk3,
+ libz,
+ pango,
+ harfbuzz,
+ atkmm,
+ libcxx,
+ mpv-unwrapped,
+}:
+let
+ version = "0.3.10";
+ 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";
+ x86_64-darwin = "${url_base}/harmonoid-macos-universal.dmg";
+ aarch64-darwin = x86_64-darwin;
+ }
+ .${stdenv.hostPlatform.system}
+ or (throw "${stdenv.hostPlatform.system} is an unsupported platform");
+ hash =
+ rec {
+ x86_64-linux = "sha256-GTF9KrcTolCc1w/WT0flwlBCBitskFPaJuNUdxCW9gs=";
+ x86_64-darwin = "sha256-7qcUnYBasUqisEW56fq4JGgojBmfqycrDIMpCCWLxlc=";
+ aarch64-darwin = x86_64-darwin;
+ }
+ .${stdenv.hostPlatform.system};
+in
+stdenv.mkDerivation (finalAttrs: {
+ pname = "harmonoid";
+ inherit version;
+
+ src = fetchurl {
+ inherit url hash;
+ };
+
+ nativeBuildInputs = [
+ makeWrapper
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isLinux [
+ autoPatchelfHook
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ undmg
+ ];
+
+ buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+ cairo
+ gdk-pixbuf
+ gtk3
+ libz
+ pango
+ harfbuzz
+ atkmm
+ libcxx
+ ];
+
+ installPhase = ''
+ runHook preInstall
+ ''
+ + lib.optionalString stdenv.hostPlatform.isLinux ''
+ mkdir -p $out
+ cp -r bin $out
+ mkdir -p $out
+ cp -r share $out
+ wrapProgram $out/bin/harmonoid --prefix LD_LIBRARY_PATH : $out/share/harmonoid/lib:${
+ lib.makeLibraryPath [ mpv-unwrapped ]
+ }
+ ''
+ + lib.optionalString stdenv.hostPlatform.isDarwin ''
+ mkdir -p $out/Applications
+ cp -r . $out/Applications/Harmonoid.app
+ ''
+ + ''
+ runHook postInstall
+ '';
+
+ meta = {
+ description = "Plays & manages your music library";
+ homepage = "https://harmonoid.com/";
+ changelog = "https://github.com/harmonoid/harmonoid/releases/tag/v${finalAttrs.version}";
+ maintainers = with lib.maintainers; [ ivyfanchiang ];
+ platforms = [
+ "x86_64-linux"
+ "x86_64-darwin"
+ "aarch64-darwin"
+ ];
+ license = {
+ fullName = "PolyForm Strict License 1.0.0";
+ url = "https://polyformproject.org/licenses/strict/1.0.0/";
+ free = false;
+ };
+ sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+ };
+})
diff --git a/pkgs/by-name/ha/havn/package.nix b/pkgs/by-name/ha/havn/package.nix
index c81a18208a6d..81a35be7cf46 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.1";
+ version = "0.3.2";
src = fetchFromGitHub {
owner = "mrjackwills";
repo = "havn";
tag = "v${finalAttrs.version}";
- hash = "sha256-IPCV7rpnoZfmkMepdbsbKm3s8PsA+Nn3h4ZmubwkR5E=";
+ hash = "sha256-T4/mhHt5qe1b9/BzMbecMBjDWXpft5xfyjzST3OV/38=";
};
- cargoHash = "sha256-0a8p7mC/abltpxEpk1KwGYQ14Kk8HJNL9wY6601+qgE=";
+ cargoHash = "sha256-YFgfTOBY1MsTvar0G2zdpDiTya8P++VlAP94hYKpBYc=";
checkFlags = [
# Skip tests that require network access
diff --git a/pkgs/by-name/hc/hcloud/package.nix b/pkgs/by-name/hc/hcloud/package.nix
index 3ccfe9d337b5..9cd1c77baebf 100644
--- a/pkgs/by-name/hc/hcloud/package.nix
+++ b/pkgs/by-name/hc/hcloud/package.nix
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "hcloud";
- version = "1.53.0";
+ version = "1.54.0";
src = fetchFromGitHub {
owner = "hetznercloud";
repo = "cli";
tag = "v${version}";
- hash = "sha256-jeiiBnid+s4y6h9Q9NdsbqYQpSrEzHysDq0wcNX50XY=";
+ hash = "sha256-PpCEdhEjfd7d8DdU2ABAjL8O98cLR20xWwhcESJK4uI=";
};
- vendorHash = "sha256-sqqzFFgLdVsQMOaJEwX2ixLVFj3YpuJSG5r7xc+NgvI=";
+ vendorHash = "sha256-tJwd/qLs0QvnjKi0B2NBTosGt7qCzJCHxZ5LYJB4vjA=";
ldflags = [
"-s"
diff --git a/pkgs/servers/headscale/default.nix b/pkgs/by-name/he/headscale/package.nix
similarity index 100%
rename from pkgs/servers/headscale/default.nix
rename to pkgs/by-name/he/headscale/package.nix
diff --git a/pkgs/by-name/he/heisenbridge/package.nix b/pkgs/by-name/he/heisenbridge/package.nix
index 18c80d69b3f6..5b23a814b16d 100644
--- a/pkgs/by-name/he/heisenbridge/package.nix
+++ b/pkgs/by-name/he/heisenbridge/package.nix
@@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "heisenbridge";
- version = "1.15.3";
+ version = "1.15.4";
format = "pyproject";
src = fetchFromGitHub {
owner = "hifi";
repo = "heisenbridge";
tag = "v${version}";
- sha256 = "sha256-wH3IZcY4CtawEicKCkFMh055SM0chYHsPKxYess9II0=";
+ sha256 = "sha256-Aan3dtixy1xT9kPU/XxgbUvri9NS/WKiO/atmpPY/m8=";
};
postPatch = ''
diff --git a/pkgs/by-name/he/heptabase/package.nix b/pkgs/by-name/he/heptabase/package.nix
index 2217cfda1d5a..33c13f98bb17 100644
--- a/pkgs/by-name/he/heptabase/package.nix
+++ b/pkgs/by-name/he/heptabase/package.nix
@@ -5,10 +5,10 @@
}:
let
pname = "heptabase";
- version = "1.73.7";
+ version = "1.74.3";
src = fetchurl {
url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage";
- hash = "sha256-oF83i7huPrsBYuN2nWtrW2TDHZArHHUr63RMNNz4+a4=";
+ hash = "sha256-PzWQmDNji3dl24U9yIKelW7ge9w4rosgjj55RbCHI/Q=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };
diff --git a/pkgs/by-name/he/heynote/package.nix b/pkgs/by-name/he/heynote/package.nix
index 4662e2647716..7c3333def150 100644
--- a/pkgs/by-name/he/heynote/package.nix
+++ b/pkgs/by-name/he/heynote/package.nix
@@ -7,11 +7,11 @@
}:
let
pname = "heynote";
- version = "2.5.0";
+ version = "2.6.1";
src = fetchurl {
url = "https://github.com/heyman/heynote/releases/download/v${version}/Heynote_${version}_x86_64.AppImage";
- sha256 = "sha256-01GWQxauMKwqEp3kbegCwn2lpsobtRjO+6I90wiH9wU=";
+ sha256 = "sha256-NA7oKutjxj1Chv7EJ0V7L0uF1oMSZqh97Ly6UYbzhuQ=";
};
appimageContents = appimageTools.extractType2 {
diff --git a/pkgs/by-name/hm/hm/package.nix b/pkgs/by-name/hm/hm/package.nix
index 4870331c1100..fc3f01a56a66 100644
--- a/pkgs/by-name/hm/hm/package.nix
+++ b/pkgs/by-name/hm/hm/package.nix
@@ -44,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals stdenv.cc.isClang [
"-Wno-error=bitwise-instead-of-logical"
"-Wno-error=missing-braces"
+ "-Wno-error=nontrivial-memcall"
]
);
diff --git a/pkgs/by-name/ho/holos/package.nix b/pkgs/by-name/ho/holos/package.nix
index 99294bb8537c..bca93c687423 100644
--- a/pkgs/by-name/ho/holos/package.nix
+++ b/pkgs/by-name/ho/holos/package.nix
@@ -10,13 +10,13 @@
}:
buildGoModule rec {
pname = "holos";
- version = "0.105.0";
+ version = "0.105.1";
src = fetchFromGitHub {
owner = "holos-run";
repo = "holos";
rev = "v${version}";
- hash = "sha256-6DUsJWD5dNMG0tCmnIdjgAaStfyLkySml1VwRCaqbrI=";
+ hash = "sha256-waQ08HJ7SjVX6qgAiMWNVf7VDhgF+uecEjus5wUc+18=";
};
vendorHash = "sha256-iK0jilQtbU+mlh6oxWTLgdMlTysGtusWe7jjrCYxN0M=";
diff --git a/pkgs/by-name/ho/homer/0001-build-enable-specifying-custom-sass-compiler-path-by.patch b/pkgs/by-name/ho/homer/0001-build-enable-specifying-custom-sass-compiler-path-by.patch
deleted file mode 100644
index 19e2ee66e681..000000000000
--- a/pkgs/by-name/ho/homer/0001-build-enable-specifying-custom-sass-compiler-path-by.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From 0f77537ce2ba5c1a23d5c2a154bdc77450d1e0e5 Mon Sep 17 00:00:00 2001
-From: Christoph Heiss
-Date: Tue, 26 Aug 2025 10:23:14 +0200
-Subject: [PATCH] build: enable specifying custom sass compiler path by env-var
-
-Signed-off-by: Christoph Heiss
----
- package.json | 5 ++++-
- patches/sass-embedded.patch | 15 +++++++++++++++
- pnpm-lock.yaml | 27 ++++++++++++++++-----------
- 3 files changed, 35 insertions(+), 12 deletions(-)
- create mode 100644 patches/sass-embedded.patch
-
-diff --git a/package.json b/package.json
-index a67d2c6..17f17b1 100644
---- a/package.json
-+++ b/package.json
-@@ -32,6 +32,9 @@
- "license": "Apache-2.0",
- "packageManager": "pnpm@10.14.0+sha512.ad27a79641b49c3e481a16a805baa71817a04bbe06a38d17e60e2eaee83f6a146c6a688125f5792e48dd5ba30e7da52a5cda4c3992b9ccf333f9ce223af84748",
- "pnpm": {
-- "neverBuiltDependencies": []
-+ "neverBuiltDependencies": [],
-+ "patchedDependencies": {
-+ "sass-embedded": "patches/sass-embedded.patch"
-+ }
- }
- }
-diff --git a/patches/sass-embedded.patch b/patches/sass-embedded.patch
-new file mode 100644
-index 0000000..5e02bed
---- /dev/null
-+++ b/patches/sass-embedded.patch
-@@ -0,0 +1,15 @@
-+diff --git a/dist/lib/src/compiler-path.js b/dist/lib/src/compiler-path.js
-+index ae33aa3028e1a120d9e84b043bb19a71f1083b96..7a49d16a54982312ad638632d6750d7bec670f02 100644
-+--- a/dist/lib/src/compiler-path.js
-++++ b/dist/lib/src/compiler-path.js
-+@@ -8,6 +8,10 @@ const p = require("path");
-+ const compiler_module_1 = require("./compiler-module");
-+ /** The full command for the embedded compiler executable. */
-+ exports.compilerCommand = (() => {
-++ const binPath = process.env.SASS_EMBEDDED_BIN_PATH;
-++ if (binPath) {
-++ return [binPath];
-++ }
-+ try {
-+ return [
-+ require.resolve(`${compiler_module_1.compilerModule}/dart-sass/src/dart` +
-diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
-index 8f98554..44d1691 100644
---- a/pnpm-lock.yaml
-+++ b/pnpm-lock.yaml
-@@ -4,6 +4,11 @@ settings:
- autoInstallPeers: true
- excludeLinksFromLockfile: false
-
-+patchedDependencies:
-+ sass-embedded:
-+ hash: 24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20
-+ path: patches/sass-embedded.patch
-+
- importers:
-
- .:
-@@ -29,7 +34,7 @@ importers:
- version: 9.32.0
- '@vitejs/plugin-vue':
- specifier: ^6.0.1
-- version: 6.0.1(vite@7.0.6(sass-embedded@1.90.0)(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.18)
-+ version: 6.0.1(vite@7.0.6(sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20))(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.18)
- '@vue/eslint-config-prettier':
- specifier: ^10.2.0
- version: 10.2.0(eslint@9.32.0)(prettier@3.6.2)
-@@ -50,13 +55,13 @@ importers:
- version: 3.6.2
- sass-embedded:
- specifier: ^1.90.0
-- version: 1.90.0
-+ version: 1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20)
- vite:
- specifier: ^7.0.6
-- version: 7.0.6(sass-embedded@1.90.0)(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1)
-+ version: 7.0.6(sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20))(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1)
- vite-plugin-pwa:
- specifier: ^1.0.2
-- version: 1.0.2(vite@7.0.6(sass-embedded@1.90.0)(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1))(workbox-build@7.3.0)(workbox-window@7.3.0)
-+ version: 1.0.2(vite@7.0.6(sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20))(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1))(workbox-build@7.3.0)(workbox-window@7.3.0)
-
- packages:
-
-@@ -3634,10 +3639,10 @@ snapshots:
-
- '@types/trusted-types@2.0.7': {}
-
-- '@vitejs/plugin-vue@6.0.1(vite@7.0.6(sass-embedded@1.90.0)(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.18)':
-+ '@vitejs/plugin-vue@6.0.1(vite@7.0.6(sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20))(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.18)':
- dependencies:
- '@rolldown/pluginutils': 1.0.0-beta.29
-- vite: 7.0.6(sass-embedded@1.90.0)(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1)
-+ vite: 7.0.6(sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20))(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1)
- vue: 3.5.18
-
- '@vue/compiler-core@3.5.18':
-@@ -4869,7 +4874,7 @@ snapshots:
- sass-embedded-win32-x64@1.90.0:
- optional: true
-
-- sass-embedded@1.90.0:
-+ sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20):
- dependencies:
- '@bufbuild/protobuf': 2.6.3
- buffer-builder: 0.2.0
-@@ -5184,18 +5189,18 @@ snapshots:
-
- varint@6.0.0: {}
-
-- vite-plugin-pwa@1.0.2(vite@7.0.6(sass-embedded@1.90.0)(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1))(workbox-build@7.3.0)(workbox-window@7.3.0):
-+ vite-plugin-pwa@1.0.2(vite@7.0.6(sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20))(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1))(workbox-build@7.3.0)(workbox-window@7.3.0):
- dependencies:
- debug: 4.4.1
- pretty-bytes: 6.1.1
- tinyglobby: 0.2.14
-- vite: 7.0.6(sass-embedded@1.90.0)(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1)
-+ vite: 7.0.6(sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20))(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1)
- workbox-build: 7.3.0
- workbox-window: 7.3.0
- transitivePeerDependencies:
- - supports-color
-
-- vite@7.0.6(sass-embedded@1.90.0)(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1):
-+ vite@7.0.6(sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20))(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1):
- dependencies:
- esbuild: 0.25.8
- fdir: 6.4.6(picomatch@4.0.3)
-@@ -5206,7 +5211,7 @@ snapshots:
- optionalDependencies:
- fsevents: 2.3.3
- sass: 1.90.0
-- sass-embedded: 1.90.0
-+ sass-embedded: 1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20)
- terser: 5.43.1
- yaml: 2.8.1
-
---
-2.50.1
-
diff --git a/pkgs/by-name/ho/homer/package.nix b/pkgs/by-name/ho/homer/package.nix
index 79c4cffde305..b1c8f9999a7b 100644
--- a/pkgs/by-name/ho/homer/package.nix
+++ b/pkgs/by-name/ho/homer/package.nix
@@ -11,12 +11,12 @@
stdenvNoCC.mkDerivation rec {
pname = "homer";
- version = "25.08.1";
+ version = "25.09.1";
src = fetchFromGitHub {
owner = "bastienwirtz";
repo = "homer";
rev = "v${version}";
- hash = "sha256-DA2gdh6o67QDC4y+N5DVG0ktjt/ORNbycU/y2cUjUE0=";
+ hash = "sha256-MwDDnfp21MoQ9hh0+cjUo+sc+u69rx1K9ATbBB6RX78=";
};
pnpmDeps = pnpm_10.fetchDeps {
@@ -24,15 +24,12 @@ stdenvNoCC.mkDerivation rec {
pname
version
src
- patches
+
;
fetcherVersion = 2;
- hash = "sha256-y/4f/39NOVV46Eg3h7fw8K43/kUIBqtiokTRRlX7398=";
+ hash = "sha256-2cozIe70PGo1WRUeWrY8W1B6U2QYLbWYcwN5WllRwkg=";
};
- # Enables specifying a custom Sass compiler binary path via `SASS_EMBEDDED_BIN_PATH` environment variable.
- patches = [ ./0001-build-enable-specifying-custom-sass-compiler-path-by.patch ];
-
nativeBuildInputs = [
nodejs
dart-sass
@@ -42,7 +39,9 @@ stdenvNoCC.mkDerivation rec {
buildPhase = ''
runHook preBuild
- export SASS_EMBEDDED_BIN_PATH="${dart-sass}/bin/sass"
+ # force the sass npm dependency to use our own sass binary instead of the bundled one
+ substituteInPlace node_modules/sass-embedded/dist/lib/src/compiler-path.js \
+ --replace-fail 'compilerCommand = (() => {' 'compilerCommand = (() => { return ["${lib.getExe dart-sass}"];'
pnpm build
runHook postBuild
@@ -54,6 +53,10 @@ stdenvNoCC.mkDerivation rec {
mkdir -p $out
cp -R dist/* $out/
+ # Remove sample/demo files from output
+ rm -f $out/assets/*.yml.dist
+ rm -f $out/assets/*.css.sample
+
runHook postInstall
'';
diff --git a/pkgs/by-name/ho/hoppscotch/package.nix b/pkgs/by-name/ho/hoppscotch/package.nix
index 9d99b17eaf52..121e3603bc0d 100644
--- a/pkgs/by-name/ho/hoppscotch/package.nix
+++ b/pkgs/by-name/ho/hoppscotch/package.nix
@@ -8,22 +8,22 @@
let
pname = "hoppscotch";
- version = "25.8.1-0";
+ version = "25.9.1-0";
src =
fetchurl
{
aarch64-darwin = {
url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_aarch64.dmg";
- hash = "sha256-Jf0pQCcjcRjs3wgRLG5deBO4dyz97Mnkfiy45hqWXdU=";
+ hash = "sha256-mV/k+9NgHp9fyc8i0trewobvk3Fcu4JnRofHGV7dp70=";
};
x86_64-darwin = {
url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_x64.dmg";
- hash = "sha256-qKRglYUdue8axNcJMkSoNoR4jGibTj9KRqRkfFeJ1Vg=";
+ hash = "sha256-5UMZw3n7lINJSWf0SKmux7s8ISKGn+GppXbK1gcbeVs=";
};
x86_64-linux = {
url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_linux_x64.AppImage";
- hash = "sha256-MXLBvYyLzftb57al6hk/59fEvh5k0S9iTrp2FtiCiVs=";
+ hash = "sha256-aW83wSbIV31sakiZxOaUd2QjxOwK2tcnaEMF9jrvrHg=";
};
}
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
diff --git a/pkgs/by-name/ho/houdini/package.nix b/pkgs/by-name/ho/houdini/package.nix
index a0e7c9a723b3..0efde5272233 100644
--- a/pkgs/by-name/ho/houdini/package.nix
+++ b/pkgs/by-name/ho/houdini/package.nix
@@ -36,7 +36,7 @@ buildFHSEnv {
libdrm
libxkbcommon
libudev0-shim
- tbb
+ onetbb
xwayland
qt5.qtwayland
net-tools # needed by licensing tools
diff --git a/pkgs/by-name/hp/hpipm/package.nix b/pkgs/by-name/hp/hpipm/package.nix
index 534697dd1983..d818a4c05140 100644
--- a/pkgs/by-name/hp/hpipm/package.nix
+++ b/pkgs/by-name/hp/hpipm/package.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "hpipm";
#version = "0.1.3"; not building, use master instead
- version = "0-unstable-2024-07-30";
+ version = "0.1.3-unstable-2025-07-25";
src = fetchFromGitHub {
owner = "giaf";
repo = "hpipm";
- rev = "3ab7d6059d9d7da31ec9ff6a8ca84fd8ec5ab5e2";
- hash = "sha256-TRNHjW2/YDfGJHTG9sy2nmHyk6+HlBGIabPm87TETE8=";
+ rev = "00c2a084e059e2e1b79877f668e282d0c4282110";
+ hash = "sha256-Lg7po7xTs9jc8FiYFMbNFJooTjOpzBFiyd5f+TPMWQA=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/ht/html-tidy/package.nix b/pkgs/by-name/ht/html-tidy/package.nix
index c75bfdbb1f7e..fa5c7f20a965 100644
--- a/pkgs/by-name/ht/html-tidy/package.nix
+++ b/pkgs/by-name/ht/html-tidy/package.nix
@@ -26,6 +26,11 @@ stdenv.mkDerivation rec {
sha256 = "sha256-Q2GjinNBWLL+HXUtslzDJ7CJSTflckbjweiSMCnIVwg=";
}
);
+ # https://github.com/htacg/tidy-html5/issues/1139
+ postPatch = ''
+ substituteInPlace CMakeLists.txt \
+ --replace-fail 'cmake_minimum_required (VERSION 2.8.12)' 'cmake_minimum_required(VERSION 3.5)'
+ '';
nativeBuildInputs = [
cmake
diff --git a/pkgs/by-name/ht/httm/package.nix b/pkgs/by-name/ht/httm/package.nix
index 40eb54d392bd..855773eb8328 100644
--- a/pkgs/by-name/ht/httm/package.nix
+++ b/pkgs/by-name/ht/httm/package.nix
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "httm";
- version = "0.48.5";
+ version = "0.48.6";
src = fetchFromGitHub {
owner = "kimono-koans";
repo = "httm";
rev = version;
- hash = "sha256-d/yARvzoNkepI4nR22Z0UVBwqRymrmh9oY7ff9g3Lio=";
+ hash = "sha256-A/4nf5DKGf8IjQvvNSJMONoRmEBul8/RS+e4OLU1VYQ=";
};
- cargoHash = "sha256-ZUQ4Q7W6rB17U5mrZWI6UwyfuYLzRk+zm4MpuYU/oAE=";
+ cargoHash = "sha256-/iAeR0HmIaoSX03bvTypyvKWgjhfhAzc/ikpiCuXEcs=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/ht/https-dns-proxy/package.nix b/pkgs/by-name/ht/https-dns-proxy/package.nix
index a37168689b58..31a4462f349e 100644
--- a/pkgs/by-name/ht/https-dns-proxy/package.nix
+++ b/pkgs/by-name/ht/https-dns-proxy/package.nix
@@ -5,13 +5,10 @@
cmake,
gtest,
c-ares,
- curlHTTP3,
+ curl,
libev,
}:
-let
- curl' = curlHTTP3;
-in
stdenv.mkDerivation rec {
pname = "https-dns-proxy";
# there are no stable releases (yet?)
@@ -38,7 +35,7 @@ stdenv.mkDerivation rec {
buildInputs = [
c-ares
- curl'
+ curl
libev
];
diff --git a/pkgs/by-name/hw/hwdata/package.nix b/pkgs/by-name/hw/hwdata/package.nix
index 729918d9f25d..b0a26d17b091 100644
--- a/pkgs/by-name/hw/hwdata/package.nix
+++ b/pkgs/by-name/hw/hwdata/package.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "hwdata";
- version = "0.398";
+ version = "0.399";
src = fetchFromGitHub {
owner = "vcrhonek";
repo = "hwdata";
rev = "v${finalAttrs.version}";
- hash = "sha256-rHpXkltESdfBDZ/dySzPgoLPs3l5jyBfNFaZYlALfnk=";
+ hash = "sha256-7IhOMl0o5dyevklvOSZrTbNMkMy/Sp/MtxaPdeqpHJg=";
};
doCheck = false; # this does build machine-specific checks (e.g. enumerates PCI bus)
diff --git a/pkgs/by-name/hy/hydrasect/package.nix b/pkgs/by-name/hy/hydrasect/package.nix
new file mode 100644
index 000000000000..b3d5840b5bbe
--- /dev/null
+++ b/pkgs/by-name/hy/hydrasect/package.nix
@@ -0,0 +1,27 @@
+{
+ lib,
+ rustPlatform,
+ fetchFromGitHub,
+}:
+
+rustPlatform.buildRustPackage {
+ pname = "hydrasect";
+ version = "0.1.0-unstable-2025-08-27";
+
+ src = fetchFromGitHub {
+ owner = "blitz";
+ repo = "hydrasect";
+ rev = "88161c6d8dce16bf832599cf8ab544bbe5857c00";
+ hash = "sha256-Na7MlT+OXHZBtCKqJ0IzK4k3XfvQhsY+lnUJFG66YDU=";
+ };
+
+ cargoHash = "sha256-muqG74Ze6aUURPutuKlXvq5ayglJ7TGAzeji89lsoLk=";
+
+ meta = {
+ description = "Tool that makes bisecting nixpkgs pleasant";
+ homepage = "https://github.com/blitz/hydrasect";
+ license = lib.licenses.eupl12;
+ maintainers = with lib.maintainers; [ kiara ];
+ mainProgram = "hydrasect";
+ };
+}
diff --git a/pkgs/by-name/hy/hygg/package.nix b/pkgs/by-name/hy/hygg/package.nix
new file mode 100644
index 000000000000..ff1901af28cd
--- /dev/null
+++ b/pkgs/by-name/hy/hygg/package.nix
@@ -0,0 +1,54 @@
+{
+ lib,
+ pkgs,
+ fetchFromGitHub,
+ rustPlatform,
+ nix-update-script,
+ versionCheckHook,
+ writableTmpDirAsHomeHook,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+ pname = "hygg";
+ version = "0.1.19";
+
+ src = fetchFromGitHub {
+ owner = "kruseio";
+ repo = "hygg";
+ tag = "${finalAttrs.version}";
+ hash = "sha256-wxgHlRqe/g9LppWWTzft9hTA8heuFvGkKvA7nG2PsxA=";
+ };
+
+ cargoHash = "sha256-JqM7e/xfqZnN3FuXPSEaQRH4yh5hqp2HGYM0YIcnaW4=";
+
+ nativeBuildInputs = [
+ writableTmpDirAsHomeHook
+ ];
+ checkFlags = [
+ # e2e test fails since it cant find the input pdf file
+ "--skip=tests::test_end_to_end"
+ "--skip=test_epub_processing"
+ ];
+
+ doInstallCheck = true;
+ nativeInstallCheckInputs = [ versionCheckHook ];
+ passthru.updateScript = nix-update-script { };
+
+ meta = {
+ description = "Minimalistic Vim-like TUI document reader";
+ longDescription = ''
+ Hygg provides universal document support for PDF,EPUB DOCX amongst others
+ It also comes with:
+ * keyboard based navigation - Vim-inspired keybindings
+ * Powerful search - Find anything instantly, highlight important passages, add bookmarks
+ * Never lose your place - Automatic progress saving
+ * Extensible workflows - Execute commands directly from copied text
+ * Respects your privacy - Run locally without server, or selfhost the sync server
+ '';
+ homepage = "https://terminaltrove.com/hygg";
+ downloadPage = "https://github.com/kruseio/hygg";
+ license = lib.licenses.agpl3Only;
+ platforms = lib.platforms.linux ++ [ "aarch64-darwin" ];
+ maintainers = [ lib.maintainers.FKouhai ];
+ };
+})
diff --git a/pkgs/by-name/hy/hyprls/package.nix b/pkgs/by-name/hy/hyprls/package.nix
index a22bd0ff2214..ba7051ca4974 100644
--- a/pkgs/by-name/hy/hyprls/package.nix
+++ b/pkgs/by-name/hy/hyprls/package.nix
@@ -6,16 +6,16 @@
}:
buildGoModule rec {
pname = "hyprls";
- version = "0.8.0";
+ version = "0.9.1";
src = fetchFromGitHub {
owner = "hyprland-community";
repo = "hyprls";
rev = "v${version}";
- hash = "sha256-txJSqXIkIYmjg/k5enChHHwJaoAhJ2c6hMHjS/i4v5c=";
+ hash = "sha256-7bexF3j8xf68V8sWmf1uJrHhAn7+efZX8W6AWfUb/mE=";
};
- vendorHash = "sha256-a2OdESOXrinALzC2AJ0cudMsDwzdi1Jl2kckI0OratA=";
+ vendorHash = "sha256-QJyG3Kz/lSuuHpGLGDW8fjdhLZK6Pt7PtSPA8EY0ATM=";
checkFlags = [
# Not yet implemented
diff --git a/pkgs/by-name/hy/hyprshell/package.nix b/pkgs/by-name/hy/hyprshell/package.nix
index 9a7b6fecc9c6..4f8324668b57 100644
--- a/pkgs/by-name/hy/hyprshell/package.nix
+++ b/pkgs/by-name/hy/hyprshell/package.nix
@@ -7,6 +7,8 @@
gtk4,
gtk4-layer-shell,
hyprland,
+ gcc,
+ pixman,
}:
rustPlatform.buildRustPackage (finalAttrs: {
@@ -32,6 +34,21 @@ rustPlatform.buildRustPackage (finalAttrs: {
gtk4-layer-shell
];
+ preFixup = ''
+ gappsWrapperArgs+=(
+ --prefix PATH : '${lib.makeBinPath [ gcc ]}'
+ --prefix CPATH : '${
+ lib.makeIncludePath (
+ hyprland.buildInputs
+ ++ [
+ hyprland
+ pixman
+ ]
+ )
+ }'
+ )
+ '';
+
meta = {
description = "Modern GTK4-based window switcher and application launcher for Hyprland";
mainProgram = "hyprshell";
diff --git a/pkgs/by-name/im/imhex/package.nix b/pkgs/by-name/im/imhex/package.nix
index 5fbc9e98ab53..1ee656cdc5c5 100644
--- a/pkgs/by-name/im/imhex/package.nix
+++ b/pkgs/by-name/im/imhex/package.nix
@@ -98,8 +98,11 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeBool "USE_SYSTEM_LLVM" true)
(lib.cmakeBool "USE_SYSTEM_NLOHMANN_JSON" true)
(lib.cmakeBool "USE_SYSTEM_YARA" true)
+ (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5")
];
+ env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
+
# Comment out fixup_bundle in PostprocessBundle.cmake as we are not building a standalone application
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace cmake/modules/PostprocessBundle.cmake \
@@ -139,6 +142,7 @@ stdenv.mkDerivation (finalAttrs: {
kashw2
cafkafk
govanify
+ ryand56
];
platforms = with lib.platforms; linux ++ darwin;
};
diff --git a/pkgs/by-name/in/industrializer/package.nix b/pkgs/by-name/in/industrializer/package.nix
index ec16b8b80101..0d6b8916697c 100644
--- a/pkgs/by-name/in/industrializer/package.nix
+++ b/pkgs/by-name/in/industrializer/package.nix
@@ -6,6 +6,7 @@
audiofile,
autoconf,
automake,
+ autoreconfHook,
gettext,
gnome2,
gtk2,
@@ -30,6 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
pkg-config
autoconf
automake
+ autoreconfHook
gettext # autopoint
libxml2 # AM_PATH_XML2
alsa-lib # AM_PATH_ALSA
@@ -49,7 +51,13 @@ stdenv.mkDerivation (finalAttrs: {
strictDeps = true;
- preConfigure = "./autogen.sh";
+ postPatch = ''
+ # Replace obsolete AM_PATH_XML2 with PKG_CHECK_MODULES
+ substituteInPlace configure.ac \
+ --replace-fail 'AM_PATH_XML2(2.6.0, [], AC_MSG_ERROR(Fatal error: Need libxml2 >= 2.6.0))' \
+ 'PKG_CHECK_MODULES([XML], [libxml-2.0 >= 2.6.0])' \
+ --replace-fail 'XML_CPPFLAGS' 'XML_CFLAGS'
+ '';
# jack.c:190:5: error: initialization of 'const gchar * (*)(int)' {aka 'const char * (*)(int)'} from incompatible pointer type 'const char * (*)(int * (*)())
env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
diff --git a/pkgs/by-name/in/inetutils/package.nix b/pkgs/by-name/in/inetutils/package.nix
index 20f5519a6d7d..655d43a187d3 100644
--- a/pkgs/by-name/in/inetutils/package.nix
+++ b/pkgs/by-name/in/inetutils/package.nix
@@ -27,6 +27,10 @@ stdenv.mkDerivation rec {
patches = [
# https://git.congatec.com/yocto/meta-openembedded/commit/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3
./inetutils-1_9-PATH_PROCNET_DEV.patch
+ ]
+ # FIXME: apply unconditionally
+ ++ lib.optionals (stdenv.isAarch64 && stdenv.isLinux) [
+ ./tests-libls.sh.patch
];
strictDeps = true;
diff --git a/pkgs/by-name/in/inetutils/tests-libls.sh.patch b/pkgs/by-name/in/inetutils/tests-libls.sh.patch
new file mode 100644
index 000000000000..d3fc7c68fae5
--- /dev/null
+++ b/pkgs/by-name/in/inetutils/tests-libls.sh.patch
@@ -0,0 +1,12 @@
+tests: Remove bogus test for unsorted file listing
+
+Minimized from what Debian applies:
+https://git.hadrons.org/cgit/debian/pkgs/inetutils.git/tree/debian/patches/local/0006-tests-Remove-bogus-test-for-unsorted-file-listing.patch?id=8ab7f49fe5cf194e989ae6ae6a78eb65397c5778
+--- a/tests/libls.sh
++++ b/tests/libls.sh
+@@ -91,1 +91,0 @@
+-REPLY_Cf=`$LS -Cf $LSDIR`
+@@ -130,3 +129,0 @@
+-test x"$REPLY_C" != x"$REPLY_Cf" ||
+- { errno=1; echo >&2 'Failed to disable sorting with "-f".'; }
+-
diff --git a/pkgs/by-name/in/infrastructure-agent/package.nix b/pkgs/by-name/in/infrastructure-agent/package.nix
index 2f33fbb459f8..53ad47608461 100644
--- a/pkgs/by-name/in/infrastructure-agent/package.nix
+++ b/pkgs/by-name/in/infrastructure-agent/package.nix
@@ -6,16 +6,16 @@
}:
buildGoModule rec {
pname = "infrastructure-agent";
- version = "1.68.0";
+ version = "1.69.0";
src = fetchFromGitHub {
owner = "newrelic";
repo = "infrastructure-agent";
rev = version;
- hash = "sha256-x/1X7BPIYBpjITIcapGy8B8dhdls1/ycFcOWhfvVCkQ=";
+ hash = "sha256-6yoHx1fVDaJZsQKFSfOCau/BrB6zcT52yrLbPp8ZiKQ=";
};
- vendorHash = "sha256-Bo/NfqTlEOBBjrEuxpc2OBEWRLuFWyx+bBQBa28XcfM=";
+ vendorHash = "sha256-KBzckYxiQ4/nhm7ZfGQDGi5uN652oZgdc9i0UexMr24=";
ldflags = [
"-s"
diff --git a/pkgs/by-name/in/innoextract/package.nix b/pkgs/by-name/in/innoextract/package.nix
index 644c57812260..158571b48e6f 100644
--- a/pkgs/by-name/in/innoextract/package.nix
+++ b/pkgs/by-name/in/innoextract/package.nix
@@ -1,8 +1,7 @@
{
lib,
stdenv,
- fetchurl,
- fetchpatch,
+ fetchFromGitHub,
cmake,
makeWrapper,
boost,
@@ -10,27 +9,20 @@
libiconv,
withGog ? false,
unar ? null,
+ unstableGitUpdater,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "innoextract";
- version = "1.9";
+ version = "1.9-unstable-2025-02-06";
- src = fetchurl {
- url = "https://constexpr.org/innoextract/files/innoextract-${version}.tar.gz";
- sha256 = "09l1z1nbl6ijqqwszdwch9mqr54qb7df0wp2sd77v17dq6gsci33";
+ src = fetchFromGitHub {
+ owner = "dscharrer";
+ repo = "innoextract";
+ rev = "6e9e34ed0876014fdb46e684103ef8c3605e382e";
+ hash = "sha256-bgACPDo1phjIiwi336JEB1UAJKyL2NmCVOhyZxBFLJo=";
};
- patches = [
- # Fix boost-1.86 build:
- # https://github.com/dscharrer/innoextract/pull/169
- (fetchpatch {
- name = "boost-1.86.patch";
- url = "https://github.com/dscharrer/innoextract/commit/264c2fe6b84f90f6290c670e5f676660ec7b2387.patch";
- hash = "sha256-QYwrqLXC7FE4oYi6G1erpX/RUUtS5zNBv7/fO7AdZQg=";
- })
- ];
-
buildInputs = [
xz
boost
@@ -53,6 +45,9 @@ stdenv.mkDerivation rec {
--prefix PATH : ${lib.makeBinPath [ unar ]}
'';
+ # use unstable as latest release does not yet support cmake-4
+ passthru.updateScript = unstableGitUpdater { };
+
meta = with lib; {
description = "Tool to unpack installers created by Inno Setup";
homepage = "https://constexpr.org/innoextract/";
diff --git a/pkgs/by-name/in/intel-graphics-compiler/bump-cmake.patch b/pkgs/by-name/in/intel-graphics-compiler/bump-cmake.patch
new file mode 100644
index 000000000000..518accce964e
--- /dev/null
+++ b/pkgs/by-name/in/intel-graphics-compiler/bump-cmake.patch
@@ -0,0 +1,77 @@
+From bc76a7087e4621269bdf9080581088a6c8f6b3a6 Mon Sep 17 00:00:00 2001
+From: Chris Mayo
+Date: Tue, 20 May 2025 19:27:57 +0100
+Subject: [PATCH] Raise minimum CMake version to 3.5
+
+For compatibility with CMake 4.0, which also removes CMP0043 OLD - there
+are no uses of COMPILE_DEFINITIONS_.
+
+Signed-off-by: Chris Mayo
+---
+ IGC/MDAutogen/CMakeLists.txt | 2 +-
+ external/SPIRV-Tools/CMakeLists.txt | 2 +-
+ visa/CMakeLists.txt | 7 +------
+ visa/iga/GEDLibrary/GED_external/CMakeLists.txt | 6 +-----
+ 4 files changed, 4 insertions(+), 13 deletions(-)
+
+diff --git a/IGC/MDAutogen/CMakeLists.txt b/IGC/MDAutogen/CMakeLists.txt
+index c9522feea29d..0a79b3c8e32b 100644
+--- a/igc/IGC/MDAutogen/CMakeLists.txt
++++ b/igc/IGC/MDAutogen/CMakeLists.txt
+@@ -6,7 +6,7 @@
+ #
+ #============================ end_copyright_notice =============================
+
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 3.5)
+
+ set(_autogenScript "${IGC_SOURCE_DIR}/common/autogen.py")
+ set(_autogenSource "${IGC_SOURCE_DIR}/common/MDFrameWork.h")
+diff --git a/external/SPIRV-Tools/CMakeLists.txt b/external/SPIRV-Tools/CMakeLists.txt
+index d2e3f63fb0d3..75f013409990 100644
+--- a/igc/external/SPIRV-Tools/CMakeLists.txt
++++ b/igc/external/SPIRV-Tools/CMakeLists.txt
+@@ -6,7 +6,7 @@
+ #
+ #============================ end_copyright_notice =============================
+
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 3.5)
+
+ message(STATUS "============================ SPIRV-Tools project ============================")
+
+diff --git a/visa/CMakeLists.txt b/visa/CMakeLists.txt
+index a96924e907c5..1e4b57516ce8 100644
+--- a/igc/visa/CMakeLists.txt
++++ b/igc/visa/CMakeLists.txt
+@@ -74,12 +74,7 @@ if (WIN32 OR UNIX)
+ add_subdirectory(iga/IGAExe)
+ endif (WIN32 OR UNIX)
+
+-if(WIN32)
+- cmake_minimum_required(VERSION 3.1)
+- cmake_policy(SET CMP0043 OLD)
+-else()
+- cmake_minimum_required(VERSION 2.8.12)
+-endif(WIN32)
++cmake_minimum_required(VERSION 3.5)
+
+ # In the case where this is the IGC build we need to add a dummy custom target check_headers
+ add_custom_target(check_headers)
+diff --git a/visa/iga/GEDLibrary/GED_external/CMakeLists.txt b/visa/iga/GEDLibrary/GED_external/CMakeLists.txt
+index e40313fc1944..275fff1114a6 100644
+--- a/igc/visa/iga/GEDLibrary/GED_external/CMakeLists.txt
++++ b/igc/visa/iga/GEDLibrary/GED_external/CMakeLists.txt
+@@ -7,11 +7,7 @@
+ #============================ end_copyright_notice =============================
+
+ # GEDLibrary/GED
+-if(WIN32)
+- cmake_minimum_required(VERSION 3.1)
+-else()
+- cmake_minimum_required(VERSION 2.8.12)
+-endif(WIN32)
++cmake_minimum_required(VERSION 3.5)
+
+ project(GEDLibrary)
+
diff --git a/pkgs/by-name/in/intel-graphics-compiler/package.nix b/pkgs/by-name/in/intel-graphics-compiler/package.nix
index d30b7b783e7b..2c3e65dcf9fe 100644
--- a/pkgs/by-name/in/intel-graphics-compiler/package.nix
+++ b/pkgs/by-name/in/intel-graphics-compiler/package.nix
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
+ fetchpatch,
cmake,
ninja,
git,
@@ -58,6 +59,13 @@ stdenv.mkDerivation rec {
})
];
+ patches = [
+ # Raise minimum CMake version to 3.5
+ # https://github.com/intel/intel-graphics-compiler/commit/4f0123a7d67fb716b647f0ba5c1ab550abf2f97d
+ # https://github.com/intel/intel-graphics-compiler/pull/364
+ ./bump-cmake.patch
+ ];
+
sourceRoot = ".";
cmakeDir = "../igc";
diff --git a/pkgs/by-name/in/intel-media-driver/cmake4.patch b/pkgs/by-name/in/intel-media-driver/cmake4.patch
new file mode 100644
index 000000000000..9cd8cdb82bce
--- /dev/null
+++ b/pkgs/by-name/in/intel-media-driver/cmake4.patch
@@ -0,0 +1,156 @@
+diff --git a/Tools/MediaDriverTools/GenDmyHex/CMakeLists.txt b/Tools/MediaDriverTools/GenDmyHex/CMakeLists.txt
+index 2c72d282d2b..025b9354254 100644
+--- a/Tools/MediaDriverTools/GenDmyHex/CMakeLists.txt
++++ b/Tools/MediaDriverTools/GenDmyHex/CMakeLists.txt
+@@ -18,7 +18,7 @@
+ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ # OTHER DEALINGS IN THE SOFTWARE.
+
+-cmake_minimum_required (VERSION 2.8)
++cmake_minimum_required(VERSION 3.5)
+ project(IntelGenDmyHexTool)
+ add_compile_options(-std=c++11)
+
+diff --git a/Tools/MediaDriverTools/GenKrnBin/CMakeLists.txt b/Tools/MediaDriverTools/GenKrnBin/CMakeLists.txt
+index cc586ba766d..519ca954d33 100644
+--- a/Tools/MediaDriverTools/GenKrnBin/CMakeLists.txt
++++ b/Tools/MediaDriverTools/GenKrnBin/CMakeLists.txt
+@@ -18,7 +18,7 @@
+ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ # OTHER DEALINGS IN THE SOFTWARE.
+
+-cmake_minimum_required(VERSION 2.6)
++cmake_minimum_required(VERSION 3.5)
+
+ project(GenKrnBin)
+
+diff --git a/Tools/MediaDriverTools/KernelBinToSource/CMakeLists.txt b/Tools/MediaDriverTools/KernelBinToSource/CMakeLists.txt
+index 713d08600ec..91eacf15d8b 100644
+--- a/Tools/MediaDriverTools/KernelBinToSource/CMakeLists.txt
++++ b/Tools/MediaDriverTools/KernelBinToSource/CMakeLists.txt
+@@ -18,7 +18,7 @@
+ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ # OTHER DEALINGS IN THE SOFTWARE.
+
+-cmake_minimum_required (VERSION 2.8)
++cmake_minimum_required(VERSION 3.5)
+ project(IntelKernelBinToSourceTool)
+ add_compile_options(-std=c++11)
+
+diff --git a/Tools/MediaDriverTools/KrnToHex/CMakeLists.txt b/Tools/MediaDriverTools/KrnToHex/CMakeLists.txt
+index a3cb7341c6e..e2bfde5e884 100644
+--- a/Tools/MediaDriverTools/KrnToHex/CMakeLists.txt
++++ b/Tools/MediaDriverTools/KrnToHex/CMakeLists.txt
+@@ -18,7 +18,7 @@
+ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ # OTHER DEALINGS IN THE SOFTWARE.
+
+-cmake_minimum_required (VERSION 2.8)
++cmake_minimum_required(VERSION 3.5)
+ project(KrnToHexTool)
+ add_compile_options(-std=c++11)
+
+diff --git a/Tools/MediaDriverTools/KrnToHex_IGA/CMakeLists.txt b/Tools/MediaDriverTools/KrnToHex_IGA/CMakeLists.txt
+index af622be19cb..40e4eba171e 100644
+--- a/Tools/MediaDriverTools/KrnToHex_IGA/CMakeLists.txt
++++ b/Tools/MediaDriverTools/KrnToHex_IGA/CMakeLists.txt
+@@ -18,7 +18,7 @@
+ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ # OTHER DEALINGS IN THE SOFTWARE.
+
+-cmake_minimum_required(VERSION 2.6)
++cmake_minimum_required(VERSION 3.5)
+
+ project(KrnToHex_IGA)
+
+diff --git a/cmrtlib/CMakeLists.txt b/cmrtlib/CMakeLists.txt
+index 9ecb1e4e10a..54f907b3772 100644
+--- a/cmrtlib/CMakeLists.txt
++++ b/cmrtlib/CMakeLists.txt
+@@ -19,7 +19,7 @@
+ # OTHER DEALINGS IN THE SOFTWARE.
+
+ set(BUILD_ALL $ENV{BUILD_ALL})
+-cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 3.5)
+ project(CM_RT)
+ add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/linux)
+
+diff --git a/cmrtlib/linux/CMakeLists.txt b/cmrtlib/linux/CMakeLists.txt
+index b066138d9df..df02bab2a69 100644
+--- a/cmrtlib/linux/CMakeLists.txt
++++ b/cmrtlib/linux/CMakeLists.txt
+@@ -18,7 +18,7 @@
+ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ # OTHER DEALINGS IN THE SOFTWARE.
+
+-cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 3.5)
+ include (${CMAKE_CURRENT_LIST_DIR}/cmrt_utils.cmake)
+
+
+diff --git a/media_driver/linux/ult/CMakeLists.txt b/media_driver/linux/ult/CMakeLists.txt
+index 9fb5b39ee42..f06b490110b 100644
+--- a/media_driver/linux/ult/CMakeLists.txt
++++ b/media_driver/linux/ult/CMakeLists.txt
+@@ -17,7 +17,7 @@
+ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ # OTHER DEALINGS IN THE SOFTWARE.
+-cmake_minimum_required(VERSION 3.1)
++cmake_minimum_required(VERSION 3.5)
+
+ if ("${BUILD_TYPE}" STREQUAL "debug")
+ set(CMAKE_BUILD_TYPE "Debug")
+diff --git a/media_driver/linux/ult/libdrm_mock/CMakeLists.txt b/media_driver/linux/ult/libdrm_mock/CMakeLists.txt
+index 438715a91c3..e5d2c88ed5b 100644
+--- a/media_driver/linux/ult/libdrm_mock/CMakeLists.txt
++++ b/media_driver/linux/ult/libdrm_mock/CMakeLists.txt
+@@ -17,7 +17,7 @@
+ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ # OTHER DEALINGS IN THE SOFTWARE.
+-cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 3.5)
+
+ project(libdrm_mock)
+
+diff --git a/media_driver/linux/ult/ult_app/CMakeLists.txt b/media_driver/linux/ult/ult_app/CMakeLists.txt
+index 1b24fed7fc5..64217b9fe65 100644
+--- a/media_driver/linux/ult/ult_app/CMakeLists.txt
++++ b/media_driver/linux/ult/ult_app/CMakeLists.txt
+@@ -17,7 +17,7 @@
+ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ # OTHER DEALINGS IN THE SOFTWARE.
+-cmake_minimum_required(VERSION 3.1)
++cmake_minimum_required(VERSION 3.5)
+
+ project(devult)
+
+diff --git a/media_driver/linux/ult/ult_app/googletest/CMakeLists.txt b/media_driver/linux/ult/ult_app/googletest/CMakeLists.txt
+index 6b1f7433596..bba044a97d8 100644
+--- a/media_driver/linux/ult/ult_app/googletest/CMakeLists.txt
++++ b/media_driver/linux/ult/ult_app/googletest/CMakeLists.txt
+@@ -17,7 +17,7 @@
+ # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ # OTHER DEALINGS IN THE SOFTWARE.
+-cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 3.5)
+
+ project(devult)
+
+diff --git a/os_release_info.cmake b/os_release_info.cmake
+index b4a84e2c5cb..a3b879d8545 100644
+--- a/os_release_info.cmake
++++ b/os_release_info.cmake
+@@ -29,7 +29,7 @@ set(_os_release_info TRUE)
+ # of the local cmake environment.
+
+ # Set cmake policies for at least this level:
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 3.5)
+
+
+ # Function get_os_release_info - Determine and return OS name and version
diff --git a/pkgs/by-name/in/intel-media-driver/package.nix b/pkgs/by-name/in/intel-media-driver/package.nix
index cfd020f9ec27..c6e2bc6f8e44 100644
--- a/pkgs/by-name/in/intel-media-driver/package.nix
+++ b/pkgs/by-name/in/intel-media-driver/package.nix
@@ -37,6 +37,9 @@ stdenv.mkDerivation rec {
url = "https://salsa.debian.org/multimedia-team/intel-media-driver-non-free/-/raw/7376a99f060c26d6be8e56674da52a61662617b9/debian/patches/0002-Remove-settings-based-on-ARCH.patch";
hash = "sha256-57yePuHWYb3XXrB4MjYO2h6jbqfs4SGTLlLG91el8M4=";
})
+
+ # cmake 4 compatibility, upstream PR: https://github.com/intel/media-driver/pull/1919
+ ./cmake4.patch
];
cmakeFlags = [
diff --git a/pkgs/by-name/io/iosevka-bin/package.nix b/pkgs/by-name/io/iosevka-bin/package.nix
index 69a3b7b1c887..3ef3cbd5f879 100644
--- a/pkgs/by-name/io/iosevka-bin/package.nix
+++ b/pkgs/by-name/io/iosevka-bin/package.nix
@@ -17,7 +17,7 @@ let
in
stdenv.mkDerivation rec {
pname = "${name}-bin";
- version = "33.3.0";
+ version = "33.3.1";
src = fetchurl {
url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip";
diff --git a/pkgs/by-name/io/iosevka-bin/variants.nix b/pkgs/by-name/io/iosevka-bin/variants.nix
index 63efb8b9eb86..a8d4c8cdd651 100644
--- a/pkgs/by-name/io/iosevka-bin/variants.nix
+++ b/pkgs/by-name/io/iosevka-bin/variants.nix
@@ -1,93 +1,93 @@
# This file was autogenerated. DO NOT EDIT!
{
- Iosevka = "0r6zs5a7ryishfa18dlgzifkdjbwgn9p0g0ma6sssmiz5c4h81rm";
- IosevkaAile = "0kry26cy7h6awmcyn9q2anz4654gz7gjniamdlfy27qwjzd01g6i";
- IosevkaCurly = "11zvpdg8kf1fh0ymrj7zpzfqmxp6njx5c9zb0sxkkp9hza22dg61";
- IosevkaCurlySlab = "0dpkk161wbprx7a706jk9zizcbp7fvkknxgc8d10qg3rj7y0rih1";
- IosevkaEtoile = "0whpdbwwqdk4qk6n324q7hy4va5qa8w208szzqjyl56mf8n6xxcc";
- IosevkaSlab = "1j6manjf5kb348c94jqzwgypym1wcvhhncc97fkcvy2fh7v23pjx";
- IosevkaSS01 = "1hbnaf2wr7svzl24a5vfxzwz5zpy202acm0bjr814jyfczrvjfcf";
- IosevkaSS02 = "0zn7zz12ai9jvlnj7zi2mpaw29xsaabf1mrx40kydbr71i155dx2";
- IosevkaSS03 = "1w4shz9q89h1fgqmd0wxd7cnfr5s22h0dwl1ksqbc6cx86p503b9";
- IosevkaSS04 = "041ldyblwiz7yp19xbsqhpyq78ln61406h9i907686zhs16c9ikv";
- IosevkaSS05 = "15lryq5km6b3l81xra04vcvapdssbx5yy03a0sdr1d78z4x8wgfp";
- IosevkaSS06 = "1ba5alcfwrhxcdy1wjjhwmx82dlll6ihqw54c6m5g4z79l36zq3x";
- IosevkaSS07 = "1gj1ksg2yhq5g55v7xsdis706ahc5gf6gdxd3svkklngd5rhnx3p";
- IosevkaSS08 = "1y72hpss830l6a86w8r311s86ph4qdwcljfjpr5fp49hi1k564ia";
- IosevkaSS09 = "0xwb59ybr0c8bx3861xq1f5k4vf5ddrgdrdjfwph56x3m9imx5k0";
- IosevkaSS10 = "0j2iwg3bb5xpmkj8618k89ns4rs9qwpkzw5hak1lyg6ig87mqk6n";
- IosevkaSS11 = "0mn30rvj337n4nl9iqmy7jqvvdydylrzfdzxpbcy6idps59s0517";
- IosevkaSS12 = "0x0mnmayl232clk57wfbq0xyg7g4vgy7wrmp616b851pb1zaai4f";
- IosevkaSS13 = "1mjf5x2vzibmm3m4dfn56c963xkickc9xnzi4i5kvi6f0za2kjq3";
- IosevkaSS14 = "0d38sjq53lh97walsn6d6m3icabw800wsyb856l34hbzlnnakk80";
- IosevkaSS15 = "0vap4g5gf8qmczwbnvav865cjpa12j6p44bl0ysn34mizjzsyrbv";
- IosevkaSS16 = "1m8p6hjxlcmvi8h4zpn1iad5wa6kmq4hd5l9hjffr5l8bmkbmdh4";
- IosevkaSS17 = "1nw0zqqhwzw1p08rrz1ysz6fbvmya5h5wmx89bgl8h0dd9p146pl";
- IosevkaSS18 = "12k9g1fkvgvlmr8m6n51wwk442cazqn5zxl226prvrxzwl0xj9l3";
- SGr-Iosevka = "1ynx1gyix09dpfs91r4f8npjr04wgnag9i1bsgy0jlyg1nvcx8fy";
- SGr-IosevkaCurly = "0ghhmx9irag648yisgiyyjy780z6m98w9qmgfqa3z65cdarfwq69";
- SGr-IosevkaCurlySlab = "1j3cf4wzdrh38q8h8hznvk6qnn34dj4b02qxfpaqfy7l2br13nab";
- SGr-IosevkaFixed = "122kk6g0ssav7yxb58lvdjphzan78ibhqx2qh7fak7g54dlrcylg";
- SGr-IosevkaFixedCurly = "004y15p731474mzy2ka0vphnsm3jc51i6qbkna1a6i6ak1vkyv4k";
- SGr-IosevkaFixedCurlySlab = "1ljlfb9ibvzs4wylcw2bydnsgf4gbkgav43hg0izlyqhjdcmdbay";
- SGr-IosevkaFixedSlab = "01gmivrgc95nj8y6y3ybf32kpy0va50g93f3magb1l0pkc6lh6vv";
- SGr-IosevkaFixedSS01 = "0kjg4syns6zlgrwvmqdmk0sxwhs1vmp2h8jnm7mgdfnjh2cma86s";
- SGr-IosevkaFixedSS02 = "0h6c65i65kb3yhb34vl7svnflp2h4vr6ryvla4wcdfg8ngjrsg9s";
- SGr-IosevkaFixedSS03 = "1i4p0lwlyjfvk49zhhldzv1zzvaf9xrm7dzm1y1hmhlwr91kmshr";
- SGr-IosevkaFixedSS04 = "0mfn44ir8249v24ff2n6yswpagfb56qymvjc0grb27rhhfjabbn4";
- SGr-IosevkaFixedSS05 = "0gfqcckvl0an43sv7qgq0j1sq2zhiwpkrnxbxqvsdyv45jqdz9r2";
- SGr-IosevkaFixedSS06 = "0i1khrq8f4155chs90a3cyn5w152926n731a84yzn6ra07cvvcz1";
- SGr-IosevkaFixedSS07 = "1w5lh2hka9vlyhizs4v0liqzrdvxpvd9aaa6fmdpyqr35n9p020i";
- SGr-IosevkaFixedSS08 = "1pvfgk6yjj1dcjk3i4hy4bisnlalsamk2wfy86k0lr0aq4v6d2cn";
- SGr-IosevkaFixedSS09 = "1g5d3nsd2ygcm2y3lf8z36hfn8rj0rmxyd7yxkfrxj18vf8wis62";
- SGr-IosevkaFixedSS10 = "1dd691j239mbkls645qz5gdlsk1s7pdfrz9dk3bz42adbbm0hv3p";
- SGr-IosevkaFixedSS11 = "053jh582wpy0wcc0biz2xdxn0gb6vrbk5vw150cnqgsjlc5b4d95";
- SGr-IosevkaFixedSS12 = "1czvzna8jgr3ily4cqcxjni4564p3bxb5ikr8m3k8alf80caiisw";
- SGr-IosevkaFixedSS13 = "1x0237dmqi48iw4zq698ckiv9ws31dj5y4b3s6iabrq045p7bl9y";
- SGr-IosevkaFixedSS14 = "15icwz59s4qjk5csm4lwlsr037xhiv5z5yfshzw391hfd16ig8hb";
- SGr-IosevkaFixedSS15 = "1gipnaxvwdzx6x2y0angcs5fszr3n382ji2n1wlvd5wmbhs4jkcv";
- SGr-IosevkaFixedSS16 = "1z5snpz6isaxl7dxkmizapvnyh9hh2brr8wf6jl0xbsywxkycvms";
- SGr-IosevkaFixedSS17 = "18v955bfdk3z7a948j0yk7yyggf3p2mv09mcyqw9a1qq5if1v379";
- SGr-IosevkaFixedSS18 = "18a2237rilcdy19i059x6vqg6vrk278nsgbp8iaga8l2zzxl79mc";
- SGr-IosevkaSlab = "1f2fb6kk4znjy06nd9kqgfrvq4l6bsk4grkz96jg4kpb4igqjni1";
- SGr-IosevkaSS01 = "1qzhka3h050951p3bbv909kh1dp2c85j6s91vhqws4glz4d2z7vs";
- SGr-IosevkaSS02 = "01d54j2rn6xcqgksdjfyj22ckajw9ll72pxn23n4qnllmg4nmxl4";
- SGr-IosevkaSS03 = "18aj878yqkz589dn5f23zdm18gmysgvfnhsk3rx72z8ar0mrx55j";
- SGr-IosevkaSS04 = "1ar1ll18zsjxn330bacfdlk64fgmabiabhvp9xldkwsawln5ryv6";
- SGr-IosevkaSS05 = "0sr103h2b43a47afqmnna0sn8aqqkjxdl4rwnrk5y3acsa5d1scp";
- SGr-IosevkaSS06 = "0zc80cqppc7harlj6kb6h6l8jd8zs3v6m8wi8v33ci98gzm2y4vg";
- SGr-IosevkaSS07 = "0jjdhq0r233658l9nzxxifrlfs06sx8jnwsbiwcd39vp1nvwsckx";
- SGr-IosevkaSS08 = "028pd4wfqq9md84c5d1vw327yi60n6ivkv0sbad95xfnsahjgx1y";
- SGr-IosevkaSS09 = "139n85ihavm9kab8ahr7pmnzfqdz0kr50a0d6ivqzrkh1nj28y4a";
- SGr-IosevkaSS10 = "0mh8nj8443syhqsh96qgkhj3mgm4bzfx1gpcjqdkpwfqmb8m1ml7";
- SGr-IosevkaSS11 = "0pligc0f7p7ngwvjf9mddhicr0yh543g45jfwi6x907ji175sicl";
- SGr-IosevkaSS12 = "1021r7mbpgqz4hrjpzbgspxxb37s7m9kbb1mcal1i0xjwvggmxn2";
- SGr-IosevkaSS13 = "14ss50hvfwqiyb5b98s8iyxnjnnbr5x6shq4wbfbcn236xhal0q6";
- SGr-IosevkaSS14 = "0mzbfyq89zdvawdcra03b6fvnq8x3d0b6k8l227m5ahc0vim2rz7";
- SGr-IosevkaSS15 = "1wnx1ax1i1ci3vxw0qv2z3abi58n1r8hxsnlw497ppp5gdr1zh44";
- SGr-IosevkaSS16 = "1a7sqx87cf86r763h0yb4fbpz80997fwn10ns9dlx5fm1rb2h06p";
- SGr-IosevkaSS17 = "17yf8wpxpfpd1fsixbpp7a3hgvgzvbfcfh9rzi3msr2hkaphj3bf";
- SGr-IosevkaSS18 = "07mspvlxjlybb52hdj95hbwllvmgmb3zsb3kmknigvi4m6fj2zr4";
- SGr-IosevkaTerm = "01zhh4f2p4dg62zfb731psfr1ib4w8pl3ab7nddwsk9wbjq7rmy7";
- SGr-IosevkaTermCurly = "17v5bqpbvab5v4xa2x76f2mpmp2af8g3vz8nmck5gjj3cqcx3ghm";
- SGr-IosevkaTermCurlySlab = "01h2whgpcmpaxk1jq0gsd0dxa24ycjlq4niqvlns046j07byly1g";
- SGr-IosevkaTermSlab = "0psvjam1qikqf3jxi5xiy9khl8qzipal0w887dxd5gq5kv0zp0hs";
- SGr-IosevkaTermSS01 = "1f2r6miwshv3wlxbvkxf6np957iyz8ix63c3qd16vna79f1jjv7a";
- SGr-IosevkaTermSS02 = "0yjx8aawsdl0dzj7n2rmfhx8bqinw7zqcrqy7ydzs3fn6iifk0zb";
- SGr-IosevkaTermSS03 = "13a1xclfh2r4yrlh5xi7ffgn8qmp8qzll8g4nlndnw851j62760y";
- SGr-IosevkaTermSS04 = "0ryll83zmfrw6g6pbkhal9raz7cnq4jqf7i5f5ikld5dm7nl59d7";
- SGr-IosevkaTermSS05 = "0l7yp8q0i8vch6y52vvnh9dmglkkplnqvy387d3i5mnr6ssnsf90";
- SGr-IosevkaTermSS06 = "0ivw03ipj6dy3zj9qkb0j3v45hdp7z41fnqjcalnmkx44shb8dlh";
- SGr-IosevkaTermSS07 = "1ji75nijfigsk3gmzga0ky7g9laajdzzl6f3lxq7xdr60w4k130q";
- SGr-IosevkaTermSS08 = "14dm6mp9shmm133vcjlvv21lva6za4zngb67h4ih5y4nmzfwbf72";
- SGr-IosevkaTermSS09 = "1fnxqknid5lbp73pp1fa06rh35pavx8v1jksqsdgyxp8ix026y9p";
- SGr-IosevkaTermSS10 = "1r1h5jbs3w510mj3id9i9g65pwf8iy5wp99l7n98mzfs099f17x2";
- SGr-IosevkaTermSS11 = "1y9jzcpazxz7df5gjb5233y3xn315wkwbmdlq3kvkb33qh71h1zm";
- SGr-IosevkaTermSS12 = "1g9aavid6awzafkw4qx43f6iw3dfkqb83xfmmk64nsqamk68mznv";
- SGr-IosevkaTermSS13 = "1is4wzcpbwqbykdb0vsfgzd7qrrr9jh6pskniz9y8hi95jrvmbc5";
- SGr-IosevkaTermSS14 = "04jd8479rjri3lvps5d0parxyy92zzfjz1cyiz1ddapfkkgsjf01";
- SGr-IosevkaTermSS15 = "1xxhl8w492qmrhaixzgjmialb3v4w1yrscnvhw1340qc27k2xhyi";
- SGr-IosevkaTermSS16 = "0xlpnq2m2vinbcy33myag1l7y14zav19hdnvqhlvzry20nda1iap";
- SGr-IosevkaTermSS17 = "0d04nv9kw35plrywq4pb1h40j4ws2kgddh4h2zwy1kjykvl8kjbd";
- SGr-IosevkaTermSS18 = "182zcqxczrlkk3i5slq8ihfq30977rrzl7n9ql6gk0i5gn008zfw";
+ Iosevka = "0p8f9z9ribn9zvbr0klg9q37w7z4v6r6gwz9kqc3cml6q0x4lv2n";
+ IosevkaAile = "1f18pnbp8vnsjzax43gijc95z1nx54l0vc2lqiqm9xvddhpam7ww";
+ IosevkaCurly = "01gzyqlg6n0fzi5kvwrz1slcr8pkdlg6yd61i059kzmw9sw8g7m5";
+ IosevkaCurlySlab = "0vxc3mb7ncvm4x7flrvlfkw1lw2pcv50344ias97j96gzaafr0mr";
+ IosevkaEtoile = "1qalf37fm3lxbg3y8ias92vyz19rhf20rjyn7zq9prmrx412sglv";
+ IosevkaSlab = "1kggrmkga333jknycbr27bziwaa6maw83wrkh60w7a78mp32a2fc";
+ IosevkaSS01 = "0yaly4pkilrrd7knqvv43976rnjvp2s2wd4c8zczc4fhmjw2b7j6";
+ IosevkaSS02 = "0h1hdynqfqmw6v49qnvspqw6y2ihqysrkcivjc9fvx4w876clr86";
+ IosevkaSS03 = "1mvn6ix5944kxmr1byx200ydzm9ny9qafv14nmssfqx7rhn71r29";
+ IosevkaSS04 = "0x0sfbd4g6rb5vndddxvqvjjhr43dnbywybb8n67sh40x22jcf5b";
+ IosevkaSS05 = "0fsscv5z9dn7934547cgq5082v25n94kcx8zdk5n99n7mnbc7gfy";
+ IosevkaSS06 = "1yyhvnxqbdmry6knd8jakz0jqhnphfip2a4rgb5l07vq1nrcb566";
+ IosevkaSS07 = "1w50ma10fzw4gy6im009i20dgvxlj3m4iasmj074k5mxfmazjcyv";
+ IosevkaSS08 = "1mh7h8dlk02rijlxbml5zpha2hvkhvir7j8hk6fd0pihzj3ybn0i";
+ IosevkaSS09 = "08mxsa67gpdzygj9vr0m6a6pz397ffbg77rfik5c46gqknd2y7mf";
+ IosevkaSS10 = "1k6xks2q7szmz3zsy9dd6bn7j6g60hf1whvp3c6j65m5rhi87z6v";
+ IosevkaSS11 = "1r8fk9m32kakclxxxingy6k1dwgvfizr0c68miqp2g6189mkz1lw";
+ IosevkaSS12 = "0amgwwq0yik9xhh7d12fmn7inimqzpmsmcjwnw1dsghrvf0mwdsa";
+ IosevkaSS13 = "1agaihxccj0k5wg7bd1lm5ix0mwdhj387i2wypc76q6az116a4ln";
+ IosevkaSS14 = "106fw5d3kqc389cnvcv00zfcfbzvavfym8mjhqrn0h23fpfy5na2";
+ IosevkaSS15 = "15rjgg8bi2ichisg5ri9hqr5rikfcvwdx2smw93vazn3shzzkn45";
+ IosevkaSS16 = "0ipdh5avia6gj1pb78ihhfydg9dn334kv0pir9h136f0bwxibjp0";
+ IosevkaSS17 = "08grkzyd4ssjzkkyljzc2mlnhrchxbw7y9425sgz8cq026f5cvd5";
+ IosevkaSS18 = "1052s4ijqhvb4h81nvx6m9sdlk3d51n7zqr0cr78ydl13g1qvdh9";
+ SGr-Iosevka = "0p7nd7x4zq4bfhdrvjhn0j5y6w217w8nlai9nc0flrwjh4qf14ih";
+ SGr-IosevkaCurly = "1qjv7zrr7113v2qq0fnkrxcslv2wy0x5nv8mjal5b710q9gppxfr";
+ SGr-IosevkaCurlySlab = "0bavl9z4j9n7hxch8acw89j8f070vwir1f15af1xb76q09ihi5r2";
+ SGr-IosevkaFixed = "0kgyn4da6a58fa6k9aqm1ndzlzjpbwip13pyb60jasrqf7wqm66z";
+ SGr-IosevkaFixedCurly = "1mzszgwp3xbkjvhqlsmwrr6mhv3czmsiz4vgxr615sfhyl24cjb7";
+ SGr-IosevkaFixedCurlySlab = "1dzww7084clp8ivsd74r638rh41zw6b5la0fif4xz01kvsz67wc6";
+ SGr-IosevkaFixedSlab = "11cc5gm7a69693b9j0lckbvwn0pnfhklrdvqa719m43d39wqhgas";
+ SGr-IosevkaFixedSS01 = "0bh62hlxc05wd33mf0ql3f8dxc6xriv4jzr8qcz6a64qiy12j6c0";
+ SGr-IosevkaFixedSS02 = "1z3yy7zv1iml3d2dj418aias4wgh4sk07gk6fsk068mxg2mlcpys";
+ SGr-IosevkaFixedSS03 = "1fdp7897m039r6qj40jq17gn602cfx5l9jkgfh29ghk7l6kh0za5";
+ SGr-IosevkaFixedSS04 = "0gamh519mrw4qvzs28r4gpsyfqwibbvwckfcsmm4i7g9idnwmmwn";
+ SGr-IosevkaFixedSS05 = "09bp6nxcc54s2g0s4icd1zlcjar87hqdyp2chys5agk69l1j9p2a";
+ SGr-IosevkaFixedSS06 = "160di7qxp8blyzjnakdqvkxy2dpiy7fxc5518hnk0jswg2d90ydp";
+ SGr-IosevkaFixedSS07 = "004hk72g086xhkb0rrpmk5kxf032j24is2r2lbp9hizrmw9x3dl0";
+ SGr-IosevkaFixedSS08 = "0i7k3bissz76idgwf5cpbk3s0ynhlgza07v3lwyvyxhgvyj9hp56";
+ SGr-IosevkaFixedSS09 = "1lih2kq9gnigchidibpdd2ym12hjpjlb42fbfzdc1s9fs7700d8i";
+ SGr-IosevkaFixedSS10 = "04paymx35g3dii4cgnsljdxi8778vn60jkqjx28bx5lvd9hkzc9k";
+ SGr-IosevkaFixedSS11 = "023mkvqvajpm59q5807snwyc9mqqvsmrzxa33mrgr0v2qs6zxsnm";
+ SGr-IosevkaFixedSS12 = "01d55hi9y5y1szd39ij7hiswkyzazb9k97wsh09sdx0442d1aydc";
+ SGr-IosevkaFixedSS13 = "1dxyj0pqxs4795ksmaw56dndj8s6s9isv6kmj8520cl6wmrgm5k7";
+ SGr-IosevkaFixedSS14 = "0hl6lmndcf13jm16n0hxn3w0qf4abddrmhq7im9l2zsplm241dz0";
+ SGr-IosevkaFixedSS15 = "1sz33rnxx288hasd0g3y2cid6v8vck8yrwallhpbs81sraj50nn9";
+ SGr-IosevkaFixedSS16 = "0fx6fwzmcx48ndfly0a7kks2ml6v0hfkvqm5qijwaxysz5cbzk4z";
+ SGr-IosevkaFixedSS17 = "03vyl438fx8zqdslhxsy2q86rkgl0dccvvy2hk7jniaswnxj5p69";
+ SGr-IosevkaFixedSS18 = "02z2m7qn9qkrkk9c9nk14d56j4kl8advpkgajmxn5nzlp35a4pc8";
+ SGr-IosevkaSlab = "1m06ylahl5ql2918cn44nr541lfaipyry4ihm059xx0skmm2qk6p";
+ SGr-IosevkaSS01 = "1z3ba34q3m8p6yp1qvsrh1hqvk263gg2dd0vz39nz6slm2h6qb9r";
+ SGr-IosevkaSS02 = "1wxflbh1b03q4dqqf0snr7w39vmnm26bpnpmx99ms7lj5p3390c1";
+ SGr-IosevkaSS03 = "128lj2kbc0kskq8ylr8713bh49rd3ms63vpgbgp82dnhfza5ql76";
+ SGr-IosevkaSS04 = "1gr8y0p1sqg87v2g6wk6ysbj88m3jmqbx2bczl1piwbl32mccci0";
+ SGr-IosevkaSS05 = "1g36pzz30jd1zihrwvkpm77cql34xk2bv4xangf19imnibp753dl";
+ SGr-IosevkaSS06 = "1aacbijz06rgphbxlv68ds3i8qkw32y9sa4a4fg2fni0naq0c05w";
+ SGr-IosevkaSS07 = "0kyg9cp95rw7c4wlpssf0y71c9nbg9nm5y3bzjh48mn5hgpzp762";
+ SGr-IosevkaSS08 = "0k6siq14r5gka50x99cily3v39slj9by2cxlsjd8nnvax3ar59ys";
+ SGr-IosevkaSS09 = "1gsxbi28jw21915aqn6qfydxh8f0xkxgnh6fmwk8qxb73bqwh9nf";
+ SGr-IosevkaSS10 = "0jm5mr0mf30qkfwqff7lgzfa25scafgfkg7w697qb6qz3bvka09n";
+ SGr-IosevkaSS11 = "0n7xmxgg4sg7japz8ajxdprqwx6shrh0y2vmp205aqw5lm6lc4g3";
+ SGr-IosevkaSS12 = "0mwcxg2ls8d8463ykc4byvk938ygaca0wc65gllr5jkccwfk5lxs";
+ SGr-IosevkaSS13 = "12gjkrvy1850dxmbhibgp49rdxj7bb8b8vliydxk4a0k48zn6bqc";
+ SGr-IosevkaSS14 = "090i5rhhqcc65k6b9sgbj2w5vs9jrd6qnmm99lp18akpsspm2w3r";
+ SGr-IosevkaSS15 = "1c96pckim333bmfqpj0v9jcklsi8az81m6jhzvy3b153p2di29r9";
+ SGr-IosevkaSS16 = "0xvv55zmjyly00ykaycndac3lyn2w7y2gvr908kql17lpnw3x0ya";
+ SGr-IosevkaSS17 = "1kilxf5f51fzxwpy4xjrb5jcrmdb70h3z04j9f1cpaccc8h654wk";
+ SGr-IosevkaSS18 = "0vyqa0b935js0i0fhaj071yjlgkxkdr2pybn8z2g4pv3ixyk6msh";
+ SGr-IosevkaTerm = "0pxa3zcnhfl1gpynx5mn3h21r6cr45lmax09vk8x6z23adxcgkrd";
+ SGr-IosevkaTermCurly = "1nv1xqsf9zf2j9xrrqlcjzy764mnfhmjp4xwsq391fl8vy7pwdbl";
+ SGr-IosevkaTermCurlySlab = "0nblg2ql79wi7vnn3akz7pm26mwjvqg3wgh6kwqbr1rvs4n7krwp";
+ SGr-IosevkaTermSlab = "12cav088hsml2x81ihpbnr0pcwargkh1kn7ijacqv3mgirdhfp52";
+ SGr-IosevkaTermSS01 = "056bs4r7ry7k2h7iwrldfkrani79bxkb2y38ibn15hdvmbw5k7xg";
+ SGr-IosevkaTermSS02 = "1f2ywnqz97i6pjg4na5344k4p4d0mvc9s30ylc6a2nwq64wl48wf";
+ SGr-IosevkaTermSS03 = "08l939ar4z1yw1pwsdfjkfymi476ms7738yvkgz7ycf5nifpp1w1";
+ SGr-IosevkaTermSS04 = "0jgkbdv9kjg7028f3lk4h4ph6i5icv80dmhkxi7r430khfdgq0h9";
+ SGr-IosevkaTermSS05 = "0n6zf2s8can1sknc5gnr2fhs86dnswrhjx6fk2n06grkf97srmzx";
+ SGr-IosevkaTermSS06 = "0krq3kp3ydxv2y5yi15gy517w8kwarxw3lkw0vwjlf5qplpl4s7b";
+ SGr-IosevkaTermSS07 = "1pm5ckgyr18mj13ih548n1awipbsaiqcvzgjgyg8jhydpvv25f1d";
+ SGr-IosevkaTermSS08 = "1qq19fz9ybk6wwj80vb2pcpaklr0nk3a9brc5iqzli4v42bvqqar";
+ SGr-IosevkaTermSS09 = "13ki9125qz5fszcg4mdmkcgz2w9p6w06n6d6aa96m4cvxf9b38g7";
+ SGr-IosevkaTermSS10 = "161cxv8my2g0yg5amawy0mp8hsdf3zwcvf4pb2w9wdm19k7pdgsy";
+ SGr-IosevkaTermSS11 = "0c2rrcnbp4wh2xwqzrvj2fxzz7ph2hz0j89p72a46lp939wjqllm";
+ SGr-IosevkaTermSS12 = "1wyih90ilpvms0w6s1hyqwvclhli1gwxbhc61qgnvkz4lf57j1aw";
+ SGr-IosevkaTermSS13 = "1jk7z6cbfkm4ljslvxysq1w95xv9573lgcb1lznzkd41p3vss9hy";
+ SGr-IosevkaTermSS14 = "1nv18klmp3npl70q5ffc1p59hqa2d60w677jqjvjl51q8cksms8y";
+ SGr-IosevkaTermSS15 = "1gjydq5zvcbjp55kgc19shjy5v8427m7kdv5wxf808kdm0cyl9cf";
+ SGr-IosevkaTermSS16 = "1v4cyci25bdpid1cag84yif38mkqz1d6bssdvw62y9p9xb4x1g4b";
+ SGr-IosevkaTermSS17 = "0nr9hrjgy3dhlacbdr8j5gxh6qbiy9l1m1c25dl9dqym7h9i2a2z";
+ SGr-IosevkaTermSS18 = "1k66xsw3c5izc334v24wf8xvpbxh3dikawghrgfqbkdd7ilp6y7a";
}
diff --git a/pkgs/by-name/io/iosevka/package.nix b/pkgs/by-name/io/iosevka/package.nix
index 0b404132c52d..6bbd714f5f05 100644
--- a/pkgs/by-name/io/iosevka/package.nix
+++ b/pkgs/by-name/io/iosevka/package.nix
@@ -56,16 +56,16 @@ assert (extraParameters != null) -> set != null;
buildNpmPackage rec {
pname = "Iosevka${toString set}";
- version = "33.3.0";
+ version = "33.3.1";
src = fetchFromGitHub {
owner = "be5invis";
repo = "iosevka";
rev = "v${version}";
- hash = "sha256-6Ys9OzZ9/k8VOD9rbU7QBbJumJMWKq/GFHtPWJGqJ+M=";
+ hash = "sha256-qbC1FVhnkVlsT+lOSeM6wDbKV2c5iTHgBxZENGEBnUI=";
};
- npmDepsHash = "sha256-UGEl+RFNPZ+3Cnp6vtxbcuZbs86T3VDgDAF0J++83/w=";
+ npmDepsHash = "sha256-/HxMh5v3CfCpPCF8cf8Z2NXDBovJFvMaQfYFZvuyNX0=";
nativeBuildInputs = [
remarshal
diff --git a/pkgs/by-name/ir/ironbar/package.nix b/pkgs/by-name/ir/ironbar/package.nix
index 1d13cc0acc98..f514156cb732 100644
--- a/pkgs/by-name/ir/ironbar/package.nix
+++ b/pkgs/by-name/ir/ironbar/package.nix
@@ -33,16 +33,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "ironbar";
- version = "0.17.0";
+ version = "0.17.1";
src = fetchFromGitHub {
owner = "JakeStanger";
repo = "ironbar";
rev = "v${version}";
- hash = "sha256-8Ol/EvG7BPNyrJ3SdwSYtJcTLCr4TRmsMczKXD6Wuws=";
+ hash = "sha256-aph9onWsaEYJqz1bcBNijEexnH0MPLtoblpU9KSbksA=";
};
- cargoHash = "sha256-nBoe4Xq1MAKNUyf61WSA2r83nNJeZiBXL0PJRc+XXpc=";
+ cargoHash = "sha256-puBoRdCd1A8FmEu5PmczgYAdPdTA8FA1CWsh7qWjHzQ=";
buildInputs = [
gtk3
diff --git a/pkgs/by-name/is/isle-portable/package.nix b/pkgs/by-name/is/isle-portable/package.nix
index ec4f768f4ad4..f693f1aeea14 100644
--- a/pkgs/by-name/is/isle-portable/package.nix
+++ b/pkgs/by-name/is/isle-portable/package.nix
@@ -29,13 +29,13 @@
stdenv.mkDerivation (finalAttrs: {
strictDeps = true;
name = "isle-portable";
- version = "0-unstable-2025-09-13";
+ version = "0-unstable-2025-09-24";
src = fetchFromGitHub {
owner = "isledecomp";
repo = "isle-portable";
- rev = "7eb16922908f69af9ab4451e8037b9f5ef4c01d2";
- hash = "sha256-Z0CcUJCIvwioEpTOYRQFp5bYUBwlI9oKuj6/jxCMhw4=";
+ rev = "d890e3db58a898dbcea9ae801f5346308b4b62ea";
+ hash = "sha256-LRpyO7XoIJuMf6KzCNWBRkRxxUu5+kru0ufYLl0zDcM=";
fetchSubmodules = true;
};
diff --git a/pkgs/by-name/is/ispc/package.nix b/pkgs/by-name/is/ispc/package.nix
index 99e0d9d6f710..3d0b3dc76cf1 100644
--- a/pkgs/by-name/is/ispc/package.nix
+++ b/pkgs/by-name/is/ispc/package.nix
@@ -10,7 +10,7 @@
flex,
llvmPackages,
ncurses,
- tbb,
+ onetbb,
# the default test target is sse4, but that is not supported by all Hydra agents
testedTargets ?
if stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32 then
@@ -23,8 +23,6 @@ stdenv.mkDerivation rec {
pname = "ispc";
version = "1.28.2";
- dontFixCmake = true; # https://github.com/NixOS/nixpkgs/pull/232522#issuecomment-2133803566
-
src = fetchFromGitHub {
owner = "ispc";
repo = "ispc";
@@ -40,7 +38,7 @@ stdenv.mkDerivation rec {
flex
python3
llvmPackages.libllvm.dev
- tbb
+ onetbb
];
buildInputs = with llvmPackages; [
diff --git a/pkgs/by-name/is/issue2md/package.nix b/pkgs/by-name/is/issue2md/package.nix
index a696311f3f7a..8ccd32577397 100644
--- a/pkgs/by-name/is/issue2md/package.nix
+++ b/pkgs/by-name/is/issue2md/package.nix
@@ -6,13 +6,13 @@
buildGoModule (finalAttrs: {
pname = "issue2md";
- version = "1.3.0";
+ version = "1.3.1";
src = fetchFromGitHub {
owner = "bigwhite";
repo = "issue2md";
tag = "v${finalAttrs.version}";
- hash = "sha256-bbID2yJkVdzWJ+LcQCTTeoMsQpJdT4op9PhTDwr+D+A=";
+ hash = "sha256-IwjG6APsl3iZXlb3+SA0wzxE0um/T1oEe5JROJYlfRk=";
};
vendorHash = null;
diff --git a/pkgs/by-name/ja/jameica/package.nix b/pkgs/by-name/ja/jameica/package.nix
index 882932324ade..a1a1c983726b 100644
--- a/pkgs/by-name/ja/jameica/package.nix
+++ b/pkgs/by-name/ja/jameica/package.nix
@@ -9,14 +9,14 @@
ant,
jdk,
jre,
- gtk2,
+ gtk3,
glib,
libXtst,
}:
let
- _version = "2.10.4";
- _build = "487";
+ _version = "2.10.5";
+ _build = "488";
version = "${_version}-${_build}";
swtSystem =
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
owner = "willuhn";
repo = "jameica";
rev = "V_${builtins.replaceStrings [ "." ] [ "_" ] _version}_BUILD_${_build}";
- hash = "sha256-MSVSd5DyVL+dcfTDv1M99hxickPwT2Pt6QGNsu6DGZI=";
+ hash = "sha256-xzSyq5Cse/TCzyb/eQNZyQS/I3mcPsvzWk3VjZg95gE=";
};
nativeBuildInputs = [
@@ -61,8 +61,9 @@ stdenv.mkDerivation rec {
makeWrapper
stripJavaArchivesHook
];
+
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
- gtk2
+ gtk3
glib
libXtst
];
@@ -112,20 +113,20 @@ stdenv.mkDerivation rec {
"''${gappsWrapperArgs[@]}"
'';
- meta = with lib; {
+ meta = {
homepage = "https://www.willuhn.de/products/jameica/";
description = "Free Runtime Environment for Java Applications";
longDescription = ''
Runtime Environment for plugins like Hibiscus (HBCI Online Banking),
SynTAX (accounting) and JVerein (club management).
'';
- sourceProvenance = with sourceTypes; [
+ sourceProvenance = with lib.sourceTypes; [
fromSource
binaryBytecode # source bundles dependencies as jars
];
- license = licenses.gpl2Plus;
- platforms = platforms.unix;
- maintainers = with maintainers; [
+ license = lib.licenses.gpl2Plus;
+ platforms = lib.platforms.unix;
+ maintainers = with lib.maintainers; [
flokli
r3dl3g
];
diff --git a/pkgs/by-name/ja/jansson/package.nix b/pkgs/by-name/ja/jansson/package.nix
index 1478f46feae7..b16e87636424 100644
--- a/pkgs/by-name/ja/jansson/package.nix
+++ b/pkgs/by-name/ja/jansson/package.nix
@@ -10,7 +10,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "jansson";
- version = "2.14";
+ version = "2.14.1";
outputs = [
"dev"
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "akheron";
repo = "jansson";
rev = "v${finalAttrs.version}";
- hash = "sha256-FQgy2+g3AyRVJeniqPQj0KNeHgPdza2pmEIXqSyYry4=";
+ hash = "sha256-ct/EzRDrHkZrCcm98XGCbjbOM2h3AAMldPoTWA5+dAE=";
};
nativeBuildInputs = [
@@ -33,6 +33,12 @@ stdenv.mkDerivation (finalAttrs: {
# networkmanager relies on libjansson.so:
# https://github.com/NixOS/nixpkgs/pull/176302#issuecomment-1150239453
"-DJANSSON_BUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}"
+
+ # Fix the build with CMake 4.
+ #
+ # Remove on next release; upstream fix is coupled with additional
+ # changes in .
+ "-DCMAKE_POLICY_VERSION_MINIMUM=3.10"
];
postFixup = ''
diff --git a/pkgs/by-name/ja/jasper/package.nix b/pkgs/by-name/ja/jasper/package.nix
index 1e761aadda71..90972a50e03d 100644
--- a/pkgs/by-name/ja/jasper/package.nix
+++ b/pkgs/by-name/ja/jasper/package.nix
@@ -15,13 +15,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "jasper";
- version = "4.2.6";
+ version = "4.2.8";
src = fetchFromGitHub {
owner = "jasper-software";
repo = "jasper";
rev = "version-${finalAttrs.version}";
- hash = "sha256-tq27ANDDRdP224E12UeQnvE6BFZRk7KczH4Dq+yt0nY=";
+ hash = "sha256-p/xqDsYivhG/21808hdMKFMWl4DfQ0huAHiftVjOdJM=";
};
outputs = [
diff --git a/pkgs/by-name/je/jellyfin-ffmpeg/package.nix b/pkgs/by-name/je/jellyfin-ffmpeg/package.nix
index 1c40b4fca43d..fc197af49aae 100644
--- a/pkgs/by-name/je/jellyfin-ffmpeg/package.nix
+++ b/pkgs/by-name/je/jellyfin-ffmpeg/package.nix
@@ -1,6 +1,7 @@
{
ffmpeg_7-full,
fetchFromGitHub,
+ fetchpatch2,
lib,
}:
@@ -26,7 +27,13 @@ in
];
# Clobber upstream patches as they don't apply to the Jellyfin fork
- patches = [ ];
+ patches = [
+ (fetchpatch2 {
+ name = "lcevcdec-4.0.0-compat.patch";
+ url = "https://code.ffmpeg.org/FFmpeg/FFmpeg/commit/fa23202cc7baab899894e8d22d82851a84967848.patch";
+ hash = "sha256-Ixkf1xzuDGk5t8J/apXKtghY0X9cfqSj/q987zrUuLQ=";
+ })
+ ];
postPatch = ''
for file in $(cat debian/patches/series); do
diff --git a/pkgs/by-name/ji/jitterentropy/package.nix b/pkgs/by-name/ji/jitterentropy/package.nix
index bf5a6409a6f5..0c23a9204a98 100644
--- a/pkgs/by-name/ji/jitterentropy/package.nix
+++ b/pkgs/by-name/ji/jitterentropy/package.nix
@@ -3,6 +3,7 @@
stdenv,
cmake,
fetchFromGitHub,
+ fetchpatch,
}:
stdenv.mkDerivation rec {
@@ -16,6 +17,14 @@ stdenv.mkDerivation rec {
hash = "sha256-A7a0kg9JRiNNKJbLJu5Fbu6ZgCwv3+3oDhZr3jwNXmM=";
};
+ patches = [
+ # cmake 4 compatibility
+ (fetchpatch {
+ url = "https://github.com/smuellerDD/jitterentropy-library/commit/047beb1bf9ef7a14e63f3e4f2d4e79f673baa7ec.patch";
+ hash = "sha256-m/cfI7s7sdjkZjkKL/w/rNZzP/t3eimbVryMW5+crw4=";
+ })
+ ];
+
nativeBuildInputs = [ cmake ];
outputs = [
diff --git a/pkgs/by-name/jn/jna/package.nix b/pkgs/by-name/jn/jna/package.nix
index 642dbfc3d3c3..2f676c76419e 100644
--- a/pkgs/by-name/jn/jna/package.nix
+++ b/pkgs/by-name/jn/jna/package.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "jna";
- version = "5.18.0";
+ version = "5.18.1";
src = fetchFromGitHub {
owner = "java-native-access";
repo = "jna";
rev = finalAttrs.version;
- hash = "sha256-7ErF/AQntDfxXdHr9HUCM4JoFBNX3sXhJvKE/kzrZZg=";
+ hash = "sha256-S0magEmA/Gw/26ZdjVnRTOJxBmRiw8DLQg49pRmaUU4=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/js/json-glib/package.nix b/pkgs/by-name/js/json-glib/package.nix
index 465138840e90..1d94f5c32aec 100644
--- a/pkgs/by-name/js/json-glib/package.nix
+++ b/pkgs/by-name/js/json-glib/package.nix
@@ -23,7 +23,7 @@
stdenv.mkDerivation rec {
pname = "json-glib";
- version = "1.10.6";
+ version = "1.10.8";
outputs = [
"out"
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- hash = "sha256-d/S8v5M5Uo8Wa4BzRYaT8KILd7cFnbwtthdGoZKLApM=";
+ hash = "sha256-VcXBQaVkJFuPj752mGY8h6RaczPCosVvBvgRq3OyEt0=";
};
patches = [
diff --git a/pkgs/by-name/js/json_c/package.nix b/pkgs/by-name/js/json_c/package.nix
index b224da20070f..04022602426d 100644
--- a/pkgs/by-name/js/json_c/package.nix
+++ b/pkgs/by-name/js/json_c/package.nix
@@ -23,6 +23,10 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ cmake ];
+ cmakeFlags = [
+ (lib.cmakeBool "BUILD_APPS" false)
+ ];
+
meta = with lib; {
description = "JSON implementation in C";
longDescription = ''
diff --git a/pkgs/by-name/ju/julius/cmake4.patch b/pkgs/by-name/ju/julius/cmake4.patch
new file mode 100644
index 000000000000..40d58f3514fc
--- /dev/null
+++ b/pkgs/by-name/ju/julius/cmake4.patch
@@ -0,0 +1,10 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b725e9a..f5ffa5f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.1)
++cmake_minimum_required(VERSION 3.10)
+ include(CMakeDependentOption)
+
+ set(TARGET_PLATFORM "default" CACHE STRING "Platform to cross-compile for. Options: vita switch android ios emscripten. Leave blank for no cross compilation")
diff --git a/pkgs/by-name/ju/julius/package.nix b/pkgs/by-name/ju/julius/package.nix
index 9a9147c04f78..be56dc23ea97 100644
--- a/pkgs/by-name/ju/julius/package.nix
+++ b/pkgs/by-name/ju/julius/package.nix
@@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
};
patches = [
+ # This fixes the build with cmake 4
+ ./cmake4.patch
# This fixes the darwin bundle generation, sets min. deployment version
# and patches SDL2_mixer include
./darwin-fixes.patch
diff --git a/pkgs/by-name/ju/just-lsp/package.nix b/pkgs/by-name/ju/just-lsp/package.nix
index eea54bd07b22..dfc8d6de3428 100644
--- a/pkgs/by-name/ju/just-lsp/package.nix
+++ b/pkgs/by-name/ju/just-lsp/package.nix
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "just-lsp";
- version = "0.2.6";
+ version = "0.2.7";
src = fetchFromGitHub {
owner = "terror";
repo = "just-lsp";
tag = finalAttrs.version;
- hash = "sha256-IcNPtyYXNLWtZDeVPWfLzKeVv6PGHYTb/mvVQ5uAiTE=";
+ hash = "sha256-lsVd4CUH1DD6tDYNwfAxOACI0zPvUUaen26GJG6THHc=";
};
- cargoHash = "sha256-epFrVie97VUGGlr4cNKzZCbUpxCgG/kmJPd1JWen6j0=";
+ cargoHash = "sha256-DRJ+TtGMduU3dDy+BKA9XauzYZMGPDS19DB5VvOIBjI=";
passthru = {
updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ju/justbuild/package.nix b/pkgs/by-name/ju/justbuild/package.nix
index bd44c3ccebc2..c376c56ad1d4 100644
--- a/pkgs/by-name/ju/justbuild/package.nix
+++ b/pkgs/by-name/ju/justbuild/package.nix
@@ -3,7 +3,7 @@
fetchFromGitHub,
fetchurl,
- fmt_10,
+ fmt,
nlohmann_json,
cli11,
microsoft-gsl,
@@ -63,12 +63,7 @@ stdenv.mkDerivation rec {
# Dependencies of just
cli11
- # Using fmt 10 because this is the same version upstream currently
- # uses for bundled builds
- # For future updates: The currently used version can be found in the file
- # etc/repos.in.json: https://github.com/just-buildsystem/justbuild/blob/master/etc/repos.in.json
- # under the key .repositories.fmt
- fmt_10
+ fmt
microsoft-gsl
nlohmann_json
diff --git a/pkgs/by-name/ka/kaminpar/package.nix b/pkgs/by-name/ka/kaminpar/package.nix
index 9b9cfac2a474..b93eea19c8db 100644
--- a/pkgs/by-name/ka/kaminpar/package.nix
+++ b/pkgs/by-name/ka/kaminpar/package.nix
@@ -7,7 +7,7 @@
numactl,
mpi,
sparsehash,
- tbb_2022,
+ onetbb,
gtest,
mpiCheckPhaseHook,
}:
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
propagatedBuildInputs = [
mpi
sparsehash
- tbb_2022
+ onetbb
];
cmakeFlags = [
diff --git a/pkgs/by-name/kb/kbd/package.nix b/pkgs/by-name/kb/kbd/package.nix
index 75e20132fe86..5e89ce36d19b 100644
--- a/pkgs/by-name/kb/kbd/package.nix
+++ b/pkgs/by-name/kb/kbd/package.nix
@@ -23,16 +23,16 @@
withVlock ? true,
}:
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
pname = "kbd";
- version = "2.8.0-unstable-2025-08-12";
+ version = "2.9.0";
__structuredAttrs = true;
src = fetchgit {
url = "https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git";
- rev = "46295167a55643e941c8cdcfd2cb76bd138c851c";
- hash = "sha256-m1aVfsEme/BnyJogOPvGcOrSJfli8B/TrGxOm4POt0w=";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-uUECxFdm/UhoHKLHLFe6/ygCQ+4mrQOZExKl+ReaTNw=";
};
# vlock is moved into its own output, since it depends on pam. This
@@ -146,4 +146,4 @@ stdenv.mkDerivation {
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ davidak ];
};
-}
+})
diff --git a/pkgs/development/tools/misc/kdbg/default.nix b/pkgs/by-name/kd/kdbg/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/kdbg/default.nix
rename to pkgs/by-name/kd/kdbg/package.nix
diff --git a/pkgs/by-name/ki/kine/package.nix b/pkgs/by-name/ki/kine/package.nix
index 7db1854882e7..686f11b19a82 100644
--- a/pkgs/by-name/ki/kine/package.nix
+++ b/pkgs/by-name/ki/kine/package.nix
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "kine";
- version = "0.14.2";
+ version = "0.14.3";
src = fetchFromGitHub {
owner = "k3s-io";
repo = "kine";
rev = "v${version}";
- hash = "sha256-0qT5/kZ4jRBRxzsm7oC7ymRPtxOeAYt5IN66Qlby0XI=";
+ hash = "sha256-Mmtqyc5LTGQ/Ldp/g7nLXi4dX7bWKiVpeWRzYoTsmm0=";
};
- vendorHash = "sha256-OgKwHh4+KRQUPdN6/DBfdxXqWLKGWT0++XvHTex+0EA=";
+ vendorHash = "sha256-NG4hzMXsZmzde/EjQARKE00D13UuIQxm+cpIbHPEpB0=";
ldflags = [
"-s"
diff --git a/pkgs/by-name/ki/kirsch/package.nix b/pkgs/by-name/ki/kirsch/package.nix
index def9b6a38753..7549cb972203 100644
--- a/pkgs/by-name/ki/kirsch/package.nix
+++ b/pkgs/by-name/ki/kirsch/package.nix
@@ -7,11 +7,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "kirsch";
- version = "0.7.0";
+ version = "0.7.1";
src = fetchzip {
url = "https://github.com/molarmanful/kirsch/releases/download/v${finalAttrs.version}/kirsch-release_v${finalAttrs.version}.zip";
- hash = "sha256-VGkZ4pWR83SpDd3osLEmmsSecGpAaHiQ5apRcxa8EhA=";
+ hash = "sha256-10GuvGeiJAdMRnvBdyRojQwJ36CnlJ6cdj2jxcIQbZw=";
};
nativeBuildInputs = [ xorg.mkfontscale ];
diff --git a/pkgs/by-name/ki/kitex/package.nix b/pkgs/by-name/ki/kitex/package.nix
index 577667d9abba..6bedec61cc93 100644
--- a/pkgs/by-name/ki/kitex/package.nix
+++ b/pkgs/by-name/ki/kitex/package.nix
@@ -8,13 +8,13 @@
buildGoModule (finalAttrs: {
pname = "kitex";
- version = "0.15.0";
+ version = "0.15.1";
src = fetchFromGitHub {
owner = "cloudwego";
repo = "kitex";
tag = "v${finalAttrs.version}";
- hash = "sha256-4UN8O4//vFc9HktZflzutVy2KtR/MKQUmD+iqlUV+oU=";
+ hash = "sha256-otTaFW+wYrHdgzuC2ua4sUCTfn6BMmoA4YaWPoYQjK4=";
};
vendorHash = "sha256-9o+9HVC6WRhKhAKnN6suumNBKS2y392A6vQCQYtRsfM=";
diff --git a/pkgs/applications/misc/kjv/default.nix b/pkgs/by-name/kj/kjv/package.nix
similarity index 100%
rename from pkgs/applications/misc/kjv/default.nix
rename to pkgs/by-name/kj/kjv/package.nix
diff --git a/pkgs/by-name/ko/kompute/package.nix b/pkgs/by-name/ko/kompute/package.nix
index a0598a632626..8724169b5c9a 100644
--- a/pkgs/by-name/ko/kompute/package.nix
+++ b/pkgs/by-name/ko/kompute/package.nix
@@ -6,7 +6,7 @@
cmake,
vulkan-headers,
vulkan-loader,
- fmt_10,
+ fmt,
spdlog,
glslang,
ninja,
@@ -43,6 +43,12 @@ stdenv.mkDerivation rec {
url = "https://github.com/KomputeProject/kompute/commit/299b11fb4b8a7607c5d2c27e2735f26b06ae8e29.patch";
sha256 = "sha256-JuoTQ+VjIdyF+I1IcT1ofbBjRS0Ibm2w6F2jrRJlx40=";
})
+
+ # Fix the build with fmt ≥ 11.
+ (fetchpatch {
+ url = "https://github.com/KomputeProject/kompute/commit/e7985da9950bf75f00799f73b0e1d4ea7c24f0b2.patch";
+ hash = "sha256-sZf1lazaGaiRzry0Y+KE6z3FKm79gVKoSFyW0GN3TMM=";
+ })
];
nativeBuildInputs = [
@@ -50,7 +56,7 @@ stdenv.mkDerivation rec {
ninja
];
buildInputs = [
- fmt_10
+ fmt
spdlog
];
propagatedBuildInputs = [
diff --git a/pkgs/by-name/ku/kube-router/package.nix b/pkgs/by-name/ku/kube-router/package.nix
index 8c13258e15b4..607b6154d6b2 100644
--- a/pkgs/by-name/ku/kube-router/package.nix
+++ b/pkgs/by-name/ku/kube-router/package.nix
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "kube-router";
- version = "2.6.0";
+ version = "2.6.1";
src = fetchFromGitHub {
owner = "cloudnativelabs";
repo = "kube-router";
rev = "v${version}";
- hash = "sha256-l4wUS5Yz9mQd3fickrs4nBs9lR9oke0dBpJubf7Y+PQ=";
+ hash = "sha256-lNCp/84T9al7gfZb1PkqZxtsu3XY16b7f6IUVrFSrNQ=";
};
vendorHash = "sha256-fXZ6jRlFdjYPV5wqSdWAMlHj1dkkEpbCtcKMuuoje1U=";
diff --git a/pkgs/by-name/ku/kubectl-ai/package.nix b/pkgs/by-name/ku/kubectl-ai/package.nix
index f567bda5d219..83fc62d0fdc3 100644
--- a/pkgs/by-name/ku/kubectl-ai/package.nix
+++ b/pkgs/by-name/ku/kubectl-ai/package.nix
@@ -6,16 +6,16 @@
buildGoModule (finalAttrs: {
pname = "kubectl-ai";
- version = "0.0.25";
+ version = "0.0.26";
src = fetchFromGitHub {
owner = "GoogleCloudPlatform";
repo = "kubectl-ai";
tag = "v${finalAttrs.version}";
- hash = "sha256-ORCOZ0U8BEpLfKa7s8Z/7spmdKebf+F2IpP252s/vQk=";
+ hash = "sha256-xWZcBTYPsVlv8pywQ12YDx2S3TQ0qXnRvoG5MAV4bdA=";
};
- vendorHash = "sha256-l+KHc5RJKqoXTbCIM8mAbuSWBMofgqLsYltgr0ZgfWM=";
+ vendorHash = "sha256-LWOJhncRZ1f9I5BtPl4LPcEMWYhl8rZDk5pWDuO+2Nk=";
# Build the main command
subPackages = [ "cmd" ];
diff --git a/pkgs/by-name/ku/kubevpn/package.nix b/pkgs/by-name/ku/kubevpn/package.nix
index 4b67b9e492da..f7bd3d678bfb 100644
--- a/pkgs/by-name/ku/kubevpn/package.nix
+++ b/pkgs/by-name/ku/kubevpn/package.nix
@@ -9,13 +9,13 @@
buildGoModule (finalAttrs: {
pname = "kubevpn";
- version = "2.9.8";
+ version = "2.9.9";
src = fetchFromGitHub {
owner = "KubeNetworks";
repo = "kubevpn";
tag = "v${finalAttrs.version}";
- hash = "sha256-fRf7vAA67ZMQABQ4yuK3wnmzACp+dFdCuVwFthj8Hms=";
+ hash = "sha256-iGharffqrN5Vh9GhoajRjh+2R6hevhvrjtH4WIUq8nw=";
};
vendorHash = null;
diff --git a/pkgs/by-name/la/lacy/package.nix b/pkgs/by-name/la/lacy/package.nix
new file mode 100644
index 000000000000..1ddc3fb64f23
--- /dev/null
+++ b/pkgs/by-name/la/lacy/package.nix
@@ -0,0 +1,30 @@
+{
+ lib,
+ fetchFromGitHub,
+ rustPlatform,
+ nix-update-script,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+ pname = "lacy";
+ version = "0.5.1";
+
+ src = fetchFromGitHub {
+ owner = "timothebot";
+ repo = "lacy";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-blQPIw8Ct+TGRuy+ybYr9rdlfOZdvAbhsB8sfwugS/w=";
+ };
+
+ passthru.updateScript = nix-update-script { };
+
+ cargoHash = "sha256-rNTRcQJptVi/ruCd56oHHN9n+Z3NhUNyrvXf27Sovtw=";
+
+ meta = {
+ description = "Fast magical cd alternative for lacy terminal navigators";
+ homepage = "https://github.com/timothebot/lacy";
+ platforms = lib.platforms.all;
+ license = lib.licenses.mit;
+ mainProgram = "lacy";
+ maintainers = with lib.maintainers; [ Srylax ];
+ };
+})
diff --git a/pkgs/by-name/la/lagrange/package.nix b/pkgs/by-name/la/lagrange/package.nix
index 2ca49e4dbcbc..27d8546e615e 100644
--- a/pkgs/by-name/la/lagrange/package.nix
+++ b/pkgs/by-name/la/lagrange/package.nix
@@ -22,13 +22,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lagrange";
- version = "1.19.2";
+ version = "1.19.3";
src = fetchFromGitHub {
owner = "skyjake";
repo = "lagrange";
tag = "v${finalAttrs.version}";
- hash = "sha256-T0xc7y5t359y/jvpekQAD1wmpMl6/lW+LzqlrSwfYv0=";
+ hash = "sha256-GyX4LKe2SHRlHqRfh7yAkOyISo/N3rhpkARevUmuLbc=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/la/last/package.nix b/pkgs/by-name/la/last/package.nix
index 9af741b13067..a2762f99b713 100644
--- a/pkgs/by-name/la/last/package.nix
+++ b/pkgs/by-name/la/last/package.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "last";
- version = "1645";
+ version = "1648";
src = fetchFromGitLab {
owner = "mcfrith";
repo = "last";
rev = "refs/tags/${version}";
- hash = "sha256-oIGs5taAfT448BxXv6/ND+8CXAWgGd2jt7fO+vIXOZU=";
+ hash = "sha256-U1FGP6jzB36HLwTFKm/VMZWPPjo6mVuV/ePhGIkQgpg=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/lc/lcevcdec/package.nix b/pkgs/by-name/lc/lcevcdec/package.nix
index 6ca495b21718..29c6acb14aae 100644
--- a/pkgs/by-name/lc/lcevcdec/package.nix
+++ b/pkgs/by-name/lc/lcevcdec/package.nix
@@ -14,7 +14,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lcevcdec";
- version = "3.3.8";
+ version = "4.0.1";
outputs = [
"out"
@@ -26,16 +26,9 @@ stdenv.mkDerivation (finalAttrs: {
owner = "v-novaltd";
repo = "LCEVCdec";
tag = finalAttrs.version;
- hash = "sha256-s7gY3l5ML+7T7i6DsstC75XXgxQgTWyITfa+8OhHl+w=";
+ hash = "sha256-azY4xle2wwopT9qEHa4+nXPkGzscWz9tYof1qN7Nw8c=";
};
- patches = [
- (fetchpatch {
- url = "https://aur.archlinux.org/cgit/aur.git/plain/010-lcevcdec-fix-pkgconfig-libs.patch?h=lcevcdec&id=a3470fad7d64dfc9d5ebd7ed0c09cb1fb5e2488f";
- hash = "sha256-z65W3k2OA/QDX0jJu4nmXtpi8kTcUFN7cK82PsI4jrQ=";
- })
- ];
-
postPatch = ''
substituteInPlace cmake/tools/version_files.py \
--replace-fail "args.git_version" '"${finalAttrs.version}"' \
@@ -43,20 +36,11 @@ stdenv.mkDerivation (finalAttrs: {
--replace-fail "args.git_date" '"1970-01-01"'
substituteInPlace cmake/templates/lcevc_dec.pc.in \
--replace-fail "@GIT_SHORT_VERSION@" "${finalAttrs.version}"
-
- ''
- + lib.optionalString (!stdenv.hostPlatform.avxSupport) ''
- substituteInPlace cmake/modules/Compiler/GNU.cmake \
- --replace-fail "-mavx" ""
-
- substituteInPlace src/core/decoder/src/common/simd.c \
- --replace-fail "((_xgetbv(kControlRegister) & kOSXSaveMask) == kOSXSaveMask)" "false"
'';
env = {
includedir = "${placeholder "dev"}/include";
libdir = "${placeholder "out"}/lib";
- NIX_CFLAGS_COMPILE = "-Wno-error=unused-variable";
};
nativeBuildInputs = [
@@ -78,6 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeBool "VN_CORE_AVX2" stdenv.hostPlatform.avx2Support)
# Requires avx for checking on runtime
(lib.cmakeBool "VN_CORE_SSE" stdenv.hostPlatform.avxSupport)
+ (lib.cmakeBool "VN_SDK_SIMD" stdenv.hostPlatform.avxSupport)
];
passthru = {
diff --git a/pkgs/by-name/ld/ld64/package.nix b/pkgs/by-name/ld/ld64/package.nix
index 54355735828e..c6e5c7cff969 100644
--- a/pkgs/by-name/ld/ld64/package.nix
+++ b/pkgs/by-name/ld/ld64/package.nix
@@ -6,6 +6,7 @@
fetchFromGitHub,
libtapi,
llvm,
+ libxml2,
meson,
ninja,
openssl,
@@ -113,6 +114,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
llvm
+ libxml2
openssl
xar
];
diff --git a/pkgs/by-name/ld/ld64/patches/0006-Add-Meson-build-system.patch b/pkgs/by-name/ld/ld64/patches/0006-Add-Meson-build-system.patch
index c03f5f5a2fb2..70756685c2f7 100644
--- a/pkgs/by-name/ld/ld64/patches/0006-Add-Meson-build-system.patch
+++ b/pkgs/by-name/ld/ld64/patches/0006-Add-Meson-build-system.patch
@@ -299,7 +299,7 @@ index 0000000..067a69c
+ install : true,
+ sources : [
+ configure_h,
-+ 'UnwindDump.cpp',
++ 'unwinddump.cpp',
+ ],
+)
+install_man(meson.global_source_root() / 'doc/man/man1/unwinddump.1')
diff --git a/pkgs/by-name/ld/ld64/patches/0010-Add-vendored-libtapi-to-the-ld64-build.patch b/pkgs/by-name/ld/ld64/patches/0010-Add-vendored-libtapi-to-the-ld64-build.patch
index df3190da1bd7..d7876def7715 100644
--- a/pkgs/by-name/ld/ld64/patches/0010-Add-vendored-libtapi-to-the-ld64-build.patch
+++ b/pkgs/by-name/ld/ld64/patches/0010-Add-vendored-libtapi-to-the-ld64-build.patch
@@ -50,9 +50,9 @@ index 0000000..9cd1dcc
+llvm_dep = dependency(
+ 'llvm',
+ modules : [
-+ 'Demangle',
-+ 'TargetParser',
-+ 'TextAPI',
++ 'demangle',
++ 'targetparser',
++ 'textapi',
+ ],
+ static : true,
+ version : '>=19.1'
diff --git a/pkgs/by-name/ld/ldacbt/package.nix b/pkgs/by-name/ld/ldacbt/package.nix
index f92c1f564af8..0de3e7468a4b 100644
--- a/pkgs/by-name/ld/ldacbt/package.nix
+++ b/pkgs/by-name/ld/ldacbt/package.nix
@@ -31,6 +31,16 @@ stdenv.mkDerivation rec {
"-DINSTALL_INCLUDEDIR=${placeholder "dev"}/include"
];
+ # Fix the build with CMake 4.
+ #
+ # See:
+ postPatch = ''
+ substituteInPlace CMakeLists.txt \
+ --replace-fail \
+ 'cmake_minimum_required(VERSION 3.0)' \
+ 'cmake_minimum_required(VERSION 3.0...3.10)'
+ '';
+
meta = with lib; {
description = "AOSP libldac dispatcher";
homepage = "https://github.com/EHfive/ldacBT";
diff --git a/pkgs/by-name/le/lemon-graph/cmake_version.patch b/pkgs/by-name/le/lemon-graph/cmake_version.patch
new file mode 100644
index 000000000000..8a8827f65b0b
--- /dev/null
+++ b/pkgs/by-name/le/lemon-graph/cmake_version.patch
@@ -0,0 +1,95 @@
+From 0073156cc16cecc597902e9294e4996dafacc1a3 Mon Sep 17 00:00:00 2001
+From: hiaselhans
+Date: Wed, 21 May 2025 08:12:37 +0200
+Subject: [PATCH] update cmake to work with newer versions
+
+---
+ .gitignore | 1 +
+ CMakeLists.txt | 61 +++++++++-----------------------------------------
+ 2 files changed, 11 insertions(+), 51 deletions(-)
+ create mode 100644 .gitignore
+
+diff --git a/.gitignore b/.gitignore
+new file mode 100644
+index 0000000..c795b05
+--- /dev/null
++++ b/.gitignore
+@@ -0,0 +1 @@
++build
+\ No newline at end of file
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 03e1cc7..26ec718 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,61 +1,20 @@
+-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+-
+-CMAKE_POLICY(SET CMP0048 OLD)
++CMAKE_MINIMUM_REQUIRED(VERSION 3.12...5.0)
+
+ SET(PROJECT_NAME "LEMON")
+-PROJECT(${PROJECT_NAME})
+-
+-INCLUDE(FindPythonInterp)
+-INCLUDE(FindWget)
+
+-IF(EXISTS ${PROJECT_SOURCE_DIR}/cmake/version.cmake)
+- INCLUDE(${PROJECT_SOURCE_DIR}/cmake/version.cmake)
+-ELSEIF(DEFINED ENV{LEMON_VERSION})
++IF(DEFINED ENV{LEMON_VERSION})
+ SET(LEMON_VERSION $ENV{LEMON_VERSION} CACHE STRING "LEMON version string.")
++ELSEIF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/version.cmake)
++ INCLUDE(${CMAKE_SOURCE_DIR}/cmake/version.cmake)
+ ELSE()
+- EXECUTE_PROCESS(
+- COMMAND
+- hg log -r. --template "{latesttag}"
+- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+- OUTPUT_VARIABLE HG_REVISION_TAG
+- ERROR_QUIET
+- OUTPUT_STRIP_TRAILING_WHITESPACE
+- )
+- EXECUTE_PROCESS(
+- COMMAND
+- hg log -r. --template "{latesttagdistance}"
+- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+- OUTPUT_VARIABLE HG_REVISION_DIST
+- ERROR_QUIET
+- OUTPUT_STRIP_TRAILING_WHITESPACE
+- )
+- EXECUTE_PROCESS(
+- COMMAND
+- hg log -r. --template "{node|short}"
+- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+- OUTPUT_VARIABLE HG_REVISION_ID
+- ERROR_QUIET
+- OUTPUT_STRIP_TRAILING_WHITESPACE
+- )
++ MESSAGE(FATAL_ERROR "LEMON_VERSION is not defined. Please set it in the environment")
++ENDIF()
+
+- IF(HG_REVISION_TAG STREQUAL "")
+- SET(HG_REVISION_ID "hg-tip")
+- ELSE()
+- IF(HG_REVISION_TAG STREQUAL "null")
+- SET(HG_REVISION_TAG "trunk")
+- ELSEIF(HG_REVISION_TAG MATCHES "^r")
+- STRING(SUBSTRING ${HG_REVISION_TAG} 1 -1 HG_REVISION_TAG)
+- ENDIF()
+- IF(HG_REVISION_DIST STREQUAL "0")
+- SET(HG_REVISION ${HG_REVISION_TAG})
+- ELSE()
+- SET(HG_REVISION
+- "${HG_REVISION_TAG}+${HG_REVISION_DIST}-${HG_REVISION_ID}")
+- ENDIF()
+- ENDIF()
+
+- SET(LEMON_VERSION ${HG_REVISION} CACHE STRING "LEMON version string.")
+-ENDIF()
++PROJECT(${PROJECT_NAME} VERSION ${LEMON_VERSION})
++
++find_package(Python3 REQUIRED COMPONENTS Interpreter)
++INCLUDE(FindWget)
+
+ SET(PROJECT_VERSION ${LEMON_VERSION})
+
diff --git a/pkgs/by-name/le/lemon-graph/package.nix b/pkgs/by-name/le/lemon-graph/package.nix
index 1d687d237d94..71cd026e7811 100644
--- a/pkgs/by-name/le/lemon-graph/package.nix
+++ b/pkgs/by-name/le/lemon-graph/package.nix
@@ -3,6 +3,7 @@
stdenv,
fetchurl,
cmake,
+ python3,
}:
stdenv.mkDerivation rec {
@@ -14,6 +15,7 @@ stdenv.mkDerivation rec {
sha256 = "1j6kp9axhgna47cfnmk1m7vnqn01hwh7pf1fp76aid60yhjwgdvi";
};
+ buildInputs = [ python3 ];
nativeBuildInputs = [ cmake ];
# error: no viable conversion from ...
@@ -22,6 +24,9 @@ stdenv.mkDerivation rec {
patches = [
# error: ISO C++17 does not allow 'register' storage class specifier
./remove-register.patch
+
+ # fix cmake compatibility. vendored from https://github.com/The-OpenROAD-Project/lemon-graph/pull/2
+ ./cmake_version.patch
];
meta = with lib; {
diff --git a/pkgs/by-name/le/lensfun/package.nix b/pkgs/by-name/le/lensfun/package.nix
index c6d058c55b67..d59644ce0c73 100644
--- a/pkgs/by-name/le/lensfun/package.nix
+++ b/pkgs/by-name/le/lensfun/package.nix
@@ -45,6 +45,16 @@ stdenv.mkDerivation {
mkdir -p data/db
tar xvf $TMPDIR/db/version_1.tar -C data/db
date +%s > data/db/timestamp.txt
+ ''
+ # Backport CMake 4 support
+ # This is already on master, but not yet in a stable release:
+ # https://github.com/lensfun/lensfun/issues/2520
+ # https://github.com/lensfun/lensfun/commit/011de2e85813ff496a85404b30891352555de077
+ + ''
+ substituteInPlace CMakeLists.txt \
+ --replace-fail \
+ 'CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12 FATAL_ERROR )' \
+ 'CMAKE_MINIMUM_REQUIRED(VERSION 3.12 FATAL_ERROR)'
'';
nativeBuildInputs = [
diff --git a/pkgs/by-name/li/lib3mf/package.nix b/pkgs/by-name/li/lib3mf/package.nix
index 54090fdda1da..813138971444 100644
--- a/pkgs/by-name/li/lib3mf/package.nix
+++ b/pkgs/by-name/li/lib3mf/package.nix
@@ -40,6 +40,11 @@ stdenv.mkDerivation (finalAttrs: {
url = "https://github.com/3MFConsortium/lib3mf/pull/421/commits/6d7b5709a4a1cf9bd55ae8b4ae999c9ca014f62c.patch?full_index=1";
hash = "sha256-rGOyXZUZglRNMu1/oVhgSpRdi0pUa/wn5SFHCS9jVOY=";
})
+ (fetchpatch {
+ name = "lib3mf-fix-cmake-4.patch";
+ url = "https://github.com/3MFConsortium/lib3mf/commit/01325a73de25d2ad49e992b5b6294beb32298c92.patch";
+ hash = "sha256-8vv2ydnDgvSKkGjpmk5ng1BGKK0okTMOeAoGwlKcziY=";
+ })
];
nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libapparmor/package.nix b/pkgs/by-name/li/libapparmor/package.nix
index 31e499717224..d549f7a83074 100644
--- a/pkgs/by-name/li/libapparmor/package.nix
+++ b/pkgs/by-name/li/libapparmor/package.nix
@@ -32,13 +32,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libapparmor";
- version = "4.1.1";
+ version = "4.1.2";
src = fetchFromGitLab {
owner = "apparmor";
repo = "apparmor";
tag = "v${finalAttrs.version}";
- hash = "sha256-f9FgowlV4lZKKuddGCirqbajhIGyTUQc7IFHSvqY6eQ=";
+ hash = "sha256-CwWNfH2Ykv4e+8ONytdM7J+aItAMVrq0yYrYzRXAe1w=";
};
sourceRoot = "${finalAttrs.src.name}/libraries/libapparmor";
diff --git a/pkgs/by-name/li/libappimage/package.nix b/pkgs/by-name/li/libappimage/package.nix
index 9e63c725c93b..0356c862aa65 100644
--- a/pkgs/by-name/li/libappimage/package.nix
+++ b/pkgs/by-name/li/libappimage/package.nix
@@ -37,6 +37,23 @@ stdenv.mkDerivation rec {
url = "https://github.com/AppImageCommunity/libappimage/commit/1e0515b23b90588ce406669134feca56ddcbbe43.patch";
hash = "sha256-WIMvXNqC1stgPiBTRpXHWq3edIRnQomtRSW2qO52TRo=";
})
+
+ # we really just want this for cmake 4 compatibility
+ (fetchpatch {
+ name = "libappimage-use-system-gtest.patch";
+ url = "https://github.com/AppImageCommunity/libappimage/commit/7b83b7247fd2d86c330e09f534c9cec1b03f649f.patch";
+ excludes = [
+ "ci/*"
+ "lib/gtest"
+ "tests/*"
+ ];
+ hash = "sha256-H+ph5TfKJPFcAzw2c7pzmqvB9R50HtZP/DbroOxLTVU=";
+ })
+ (fetchpatch {
+ name = "libappimage-fix-cmake-4.patch";
+ url = "https://github.com/AppImageCommunity/libappimage/commit/e5f6ea562611d534dc8e899a12ddf15c50e820be.patch";
+ hash = "sha256-P6fPoiqVX3TrKGrU2EXIMBpQLGl7xNcy41Iq7vRM+n8=";
+ })
];
postPatch = ''
diff --git a/pkgs/by-name/li/libblake3/package.nix b/pkgs/by-name/li/libblake3/package.nix
index ada016a4383e..e9aa97718628 100644
--- a/pkgs/by-name/li/libblake3/package.nix
+++ b/pkgs/by-name/li/libblake3/package.nix
@@ -4,7 +4,7 @@
cmake,
fetchFromGitHub,
fetchpatch,
- tbb_2022,
+ onetbb,
useTBB ? true,
}:
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ cmake ];
propagatedBuildInputs = lib.optionals useTBB [
- tbb_2022
+ onetbb
];
cmakeFlags = [
diff --git a/pkgs/by-name/li/libcbor/package.nix b/pkgs/by-name/li/libcbor/package.nix
index a38b9cafac55..3c48f2b52977 100644
--- a/pkgs/by-name/li/libcbor/package.nix
+++ b/pkgs/by-name/li/libcbor/package.nix
@@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libcbor";
- version = "0.12.0";
+ version = "0.13.0";
src = fetchFromGitHub {
owner = "PJK";
repo = "libcbor";
rev = "v${finalAttrs.version}";
- hash = "sha256-13iwjc1vrTgBhWRg4vpLmlrEoxA9DSuXIOz4R9cXXEc=";
+ hash = "sha256-ePgVR7VHXWKqOShuAEQG3BJ08W2aZS/vfcPUCqTw7X4=";
};
outputs = [
@@ -35,9 +35,9 @@ stdenv.mkDerivation (finalAttrs: {
cmocka # cmake expects cmocka module
];
- # BUILD file already exists in the source
- # TODO: make unconditional on staging.
- cmakeBuildDir = if stdenv.isDarwin then "build.dir" else null;
+ # BUILD file already exists in the source; this causes issues on
+ # case‐insensitive Darwin systems.
+ cmakeBuildDir = "build.dir";
cmakeFlags =
lib.optional finalAttrs.finalPackage.doCheck "-DWITH_TESTS=ON"
diff --git a/pkgs/by-name/li/libccd/package.nix b/pkgs/by-name/li/libccd/package.nix
index 8040dd7adcd6..7e5263de362d 100644
--- a/pkgs/by-name/li/libccd/package.nix
+++ b/pkgs/by-name/li/libccd/package.nix
@@ -26,6 +26,14 @@ stdenv.mkDerivation rec {
})
];
+ # fix for CMake v4
+ # ref https://github.com/danfis/libccd/pull/82, not merged yet
+ postPatch = ''
+ substituteInPlace CMakeLists.txt --replace-fail \
+ "cmake_minimum_required(VERSION 2.8.11)" \
+ "cmake_minimum_required(VERSION 3.12)"
+ '';
+
nativeBuildInputs = [ cmake ];
meta = with lib; {
diff --git a/pkgs/by-name/li/libcint/package.nix b/pkgs/by-name/li/libcint/package.nix
index 0e6fa2408c0a..a85880b587a5 100644
--- a/pkgs/by-name/li/libcint/package.nix
+++ b/pkgs/by-name/li/libcint/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
downloadPage = "https://github.com/sunqm/libcint";
changelog = "https://github.com/sunqm/libcint/blob/master/ChangeLog";
license = licenses.bsd2;
- maintainers = with maintainers; [ drewrisinger ];
+ maintainers = [ ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/networking/libcoap/default.nix b/pkgs/by-name/li/libcoap/package.nix
similarity index 100%
rename from pkgs/applications/networking/libcoap/default.nix
rename to pkgs/by-name/li/libcoap/package.nix
diff --git a/pkgs/by-name/li/libcsptr/package.nix b/pkgs/by-name/li/libcsptr/package.nix
index d055ec74479f..1b1e0ba59ac9 100644
--- a/pkgs/by-name/li/libcsptr/package.nix
+++ b/pkgs/by-name/li/libcsptr/package.nix
@@ -18,6 +18,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
+ cmakeFlags = [
+ (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5")
+ ];
+
meta = with lib; {
description = "Smart pointer constructs for the (GNU) C programming language";
homepage = "https://github.com/Snaipe/libcsptr";
diff --git a/pkgs/by-name/li/libcue/package.nix b/pkgs/by-name/li/libcue/package.nix
index b2daf4d239be..f3d92b40afc2 100644
--- a/pkgs/by-name/li/libcue/package.nix
+++ b/pkgs/by-name/li/libcue/package.nix
@@ -24,6 +24,14 @@ stdenv.mkDerivation rec {
flex
];
+ # Fix the build with CMake 4.
+ postPatch = ''
+ substituteInPlace CMakeLists.txt \
+ --replace-fail \
+ 'CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR)' \
+ 'CMAKE_MINIMUM_REQUIRED(VERSION 3.10 FATAL_ERROR)'
+ '';
+
doCheck = true;
meta = with lib; {
diff --git a/pkgs/by-name/li/libdaq/package.nix b/pkgs/by-name/li/libdaq/package.nix
index 4f01a909114f..a7b2ca1748b7 100644
--- a/pkgs/by-name/li/libdaq/package.nix
+++ b/pkgs/by-name/li/libdaq/package.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libdaq";
- version = "3.0.19";
+ version = "3.0.21";
src = fetchFromGitHub {
owner = "snort3";
repo = "libdaq";
tag = "v${finalAttrs.version}";
- hash = "sha256-ma+M/rIbChqL0pjhE0a1UfJLm/r7I7IvIuSwcnQWvAQ=";
+ hash = "sha256-ifG7Ccuwus+ftTzjTrvgkGDAxEhYT9pJVrILn7K17P8=";
};
nativeBuildInputs = [
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
aycanirican
brianmcgillion
];
- changelog = "https://github.com/snort3/libdaq/releases/tag/v${finalAttrs.version}/changelog.md";
+ changelog = "https://github.com/snort3/libdaq/releases/tag/v${finalAttrs.version}";
license = lib.licenses.gpl2;
outputsToInstall = [
"lib"
diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix
index 7382e1029ac2..bad955e2b75a 100644
--- a/pkgs/by-name/li/libdeltachat/package.nix
+++ b/pkgs/by-name/li/libdeltachat/package.nix
@@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "libdeltachat";
- version = "2.16.0";
+ version = "2.17.0";
src = fetchFromGitHub {
owner = "chatmail";
repo = "core";
tag = "v${version}";
- hash = "sha256-QmDWTQjVc+ZhxQTj89tKcN5he6avriXZmFPN7EuvoUE=";
+ hash = "sha256-jU26H3CeW/V2xJg2R/0xJK5RR81CZUiJDyMGidEISrc=";
};
patches = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
cargoDeps = rustPlatform.fetchCargoVendor {
pname = "chatmail-core";
inherit version src;
- hash = "sha256-nPSWxbGuJ89j6ZfTp1jCF5iqxEgYMEohLxtayKzxGA4=";
+ hash = "sha256-cZIQMkVPcGOhrrQrgEpEMKieoq+6gXxDsevnP3wG+Gc=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libdivsufsort/package.nix b/pkgs/by-name/li/libdivsufsort/package.nix
index 9a229a015875..05f3f629fa8d 100644
--- a/pkgs/by-name/li/libdivsufsort/package.nix
+++ b/pkgs/by-name/li/libdivsufsort/package.nix
@@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DBUILD_DIVSUFSORT64=YES"
+ "-DCMAKE_POLICY_VERSION_MINIMUM=3.10"
];
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/li/libebml/package.nix b/pkgs/by-name/li/libebml/package.nix
index e6bd5d29bca2..54b01be9dfc8 100644
--- a/pkgs/by-name/li/libebml/package.nix
+++ b/pkgs/by-name/li/libebml/package.nix
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
+ fetchpatch,
cmake,
pkg-config,
}:
@@ -17,6 +18,14 @@ stdenv.mkDerivation rec {
sha256 = "sha256-PIVBePTWceMgiENdaL9lvXIL/RQIrtg7l0OG2tO0SU8=";
};
+ patches = [
+ (fetchpatch {
+ name = "libebml-fix-cmake-4.patch";
+ url = "https://github.com/Matroska-Org/libebml/commit/6725c5f0169981cb0bd2ee124fbf0d8ca30b762d.patch";
+ hash = "sha256-q62EWnJmQzBtra1xL0N7rC4RARJZQ/HAVyorzvB7XFY=";
+ })
+ ];
+
nativeBuildInputs = [
cmake
pkg-config
diff --git a/pkgs/by-name/li/libebur128/package.nix b/pkgs/by-name/li/libebur128/package.nix
index c99256063037..283d0dd432d3 100644
--- a/pkgs/by-name/li/libebur128/package.nix
+++ b/pkgs/by-name/li/libebur128/package.nix
@@ -28,6 +28,20 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace ebur128/libebur128.pc.cmake \
--replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@
+ ''
+ # Fix the build with CMake 4.
+ #
+ # See:
+ #
+ # *
+ # *
+ + ''
+ for file in CMakeLists.txt test/CMakeLists.txt; do
+ substituteInPlace "$file" \
+ --replace-fail \
+ 'cmake_minimum_required(VERSION 2.8.12' \
+ 'cmake_minimum_required(VERSION 3.10'
+ done
'';
meta = with lib; {
diff --git a/pkgs/by-name/li/libff/package.nix b/pkgs/by-name/li/libff/package.nix
index da6ee91db807..6aee73ce3b69 100644
--- a/pkgs/by-name/li/libff/package.nix
+++ b/pkgs/by-name/li/libff/package.nix
@@ -29,7 +29,10 @@ stdenv.mkDerivation rec {
"-DUSE_ASM=OFF"
];
- postPatch = lib.optionalString (!enableStatic) ''
+ postPatch = ''
+ substituteInPlace CMakeLists.txt --replace "VERSION 2.8" "VERSION 3.10"
+ ''
+ + lib.optionalString (!enableStatic) ''
substituteInPlace libff/CMakeLists.txt --replace "STATIC" "SHARED"
'';
diff --git a/pkgs/by-name/li/libgcrypt/package.nix b/pkgs/by-name/li/libgcrypt/package.nix
index 19af33a686ad..929628238989 100644
--- a/pkgs/by-name/li/libgcrypt/package.nix
+++ b/pkgs/by-name/li/libgcrypt/package.nix
@@ -17,11 +17,11 @@ assert enableCapabilities -> stdenv.hostPlatform.isLinux;
stdenv.mkDerivation rec {
pname = "libgcrypt";
- version = "1.11.1";
+ version = "1.11.2";
src = fetchurl {
url = "mirror://gnupg/libgcrypt/${pname}-${version}.tar.bz2";
- hash = "sha256-JOkckSOkbFToNx86OiUC8RmPKJP7+/Wa+VvBwhSZsA4=";
+ hash = "sha256-a6Wd0ZInDowdIt20GgfZXc28Hw+wLQPEtUsjWBQzCqw=";
};
outputs = [
diff --git a/pkgs/by-name/li/libheif/package.nix b/pkgs/by-name/li/libheif/package.nix
index 0d5e976c27ff..2ac0eb645df0 100644
--- a/pkgs/by-name/li/libheif/package.nix
+++ b/pkgs/by-name/li/libheif/package.nix
@@ -24,7 +24,7 @@
stdenv.mkDerivation rec {
pname = "libheif";
- version = "1.19.8";
+ version = "1.20.2";
outputs = [
"bin"
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
owner = "strukturag";
repo = "libheif";
rev = "v${version}";
- hash = "sha256-p+VkIJrX/aN2ohSiDmev+6fbS9Lc7Jh14YwW5vLIjJw=";
+ hash = "sha256-PVfdX3/Oe3DXpYU5WMnCSi2p9X4fPszq2X3uuyh8RVU=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libid3tag/package.nix b/pkgs/by-name/li/libid3tag/package.nix
index e287ee6cdcd2..18b8779ad7d3 100644
--- a/pkgs/by-name/li/libid3tag/package.nix
+++ b/pkgs/by-name/li/libid3tag/package.nix
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitea,
+ fetchpatch,
cmake,
gperf,
zlib,
@@ -24,6 +25,15 @@ stdenv.mkDerivation rec {
hash = "sha256-6/49rk7pmIpJRj32WmxC171NtdIOaMNhX8RD7o6Jbzs=";
};
+ patches = [
+ # Fix the build with CMake 4.
+ (fetchpatch {
+ name = "libid3tag-fix-cmake-4.patch";
+ url = "https://codeberg.org/tenacityteam/libid3tag/commit/eee94b22508a066f7b9bc1ae05d2d85982e73959.patch";
+ hash = "sha256-OAdMapNr8qpvXZqNOZ3LUHQ1H79zD1rvzrVksqmz6dU=";
+ })
+ ];
+
postPatch = ''
substituteInPlace packaging/id3tag.pc.in \
--replace-fail "\''${prefix}/@CMAKE_INSTALL_LIBDIR@" "@CMAKE_INSTALL_FULL_LIBDIR@"
diff --git a/pkgs/by-name/li/libimagequant/Cargo.lock b/pkgs/by-name/li/libimagequant/Cargo.lock
index ff75c4e1d8ed..eaed4b693bfe 100644
--- a/pkgs/by-name/li/libimagequant/Cargo.lock
+++ b/pkgs/by-name/li/libimagequant/Cargo.lock
@@ -101,7 +101,7 @@ dependencies = [
[[package]]
name = "imagequant"
-version = "4.3.4"
+version = "4.4.0"
dependencies = [
"arrayvec",
"lodepng",
@@ -113,7 +113,7 @@ dependencies = [
[[package]]
name = "imagequant-sys"
-version = "4.0.4"
+version = "4.1.0"
dependencies = [
"bitflags",
"imagequant",
diff --git a/pkgs/by-name/li/libimagequant/package.nix b/pkgs/by-name/li/libimagequant/package.nix
index b9a4acaf44fe..10be02e685e6 100644
--- a/pkgs/by-name/li/libimagequant/package.nix
+++ b/pkgs/by-name/li/libimagequant/package.nix
@@ -15,13 +15,13 @@
rustPlatform.buildRustPackage rec {
pname = "libimagequant";
- version = "4.3.4";
+ version = "4.4.0";
src = fetchFromGitHub {
owner = "ImageOptim";
repo = "libimagequant";
rev = version;
- hash = "sha256-2P8FiRfOuCHxJrB+rnDDOFsrFjPv5GMBK/5sq7eb32w=";
+ hash = "sha256-c9j0wVwTWtNrPy9UUsc0Gxbe6lP82C3DMXe+k/ZBYEw=";
};
cargoLock = {
diff --git a/pkgs/by-name/li/libipt/package.nix b/pkgs/by-name/li/libipt/package.nix
index 33e01b9d7a83..022f765c0954 100644
--- a/pkgs/by-name/li/libipt/package.nix
+++ b/pkgs/by-name/li/libipt/package.nix
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
+ fetchpatch,
cmake,
freebsd,
}:
@@ -17,6 +18,14 @@ stdenv.mkDerivation rec {
sha256 = "sha256-rO2Mf2/BfKlPh1wHe0qTuyQAyqpSB/j3Q+JWpNDyNm0=";
};
+ patches = [
+ (fetchpatch {
+ name = "libipt-fix-cmake-4.patch";
+ url = "https://github.com/intel/libipt/commit/fa7d42de25be526da532284cc8b771fdeb384f81.patch";
+ hash = "sha256-/jTyoGyKw29Nu27bAXmStpjOdTeGdQYpEX2rb29vSSQ=";
+ })
+ ];
+
nativeBuildInputs = [ cmake ];
buildInputs = lib.optional stdenv.hostPlatform.isFreeBSD freebsd.libstdthreads;
diff --git a/pkgs/by-name/li/libjpeg_turbo/package.nix b/pkgs/by-name/li/libjpeg_turbo/package.nix
index 1499c1378e83..e30ee22edbd5 100644
--- a/pkgs/by-name/li/libjpeg_turbo/package.nix
+++ b/pkgs/by-name/li/libjpeg_turbo/package.nix
@@ -32,13 +32,13 @@ assert !(enableJpeg7 && enableJpeg8); # pick only one or none, not both
stdenv.mkDerivation (finalAttrs: {
pname = "libjpeg-turbo";
- version = "3.1.1";
+ version = "3.1.2";
src = fetchFromGitHub {
owner = "libjpeg-turbo";
repo = "libjpeg-turbo";
tag = finalAttrs.version;
- hash = "sha256-yGCMtAa0IjyeSBv3HxCQfYDSbNSbscj3choU6D2dlp8=";
+ hash = "sha256-tmeWLJxieV42f9ljSpKJoLER4QOYQLsLFC7jW54YZAk=";
};
patches =
@@ -111,6 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://libjpeg-turbo.org/";
description = "Faster (using SIMD) libjpeg implementation";
license = lib.licenses.ijg; # and some parts under other BSD-style licenses
+ changelog = "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/${finalAttrs.version}";
pkgConfigModules = [
"libjpeg"
"libturbojpeg"
diff --git a/pkgs/by-name/li/libjxl/package.nix b/pkgs/by-name/li/libjxl/package.nix
index b1154d5bc69b..af5041e2ca5b 100644
--- a/pkgs/by-name/li/libjxl/package.nix
+++ b/pkgs/by-name/li/libjxl/package.nix
@@ -2,6 +2,7 @@
stdenv,
lib,
fetchFromGitHub,
+ fetchpatch,
brotli,
cmake,
giflib,
@@ -139,6 +140,17 @@ stdenv.mkDerivation rec {
rm -rf third_party/!(sjpeg)/
shopt -u extglob
+ # Fix the build with CMake 4.
+ #
+ # See:
+ #
+ # *
+ # *
+ substituteInPlace third_party/sjpeg/CMakeLists.txt \
+ --replace-fail \
+ 'cmake_minimum_required(VERSION 2.8.7)' \
+ 'cmake_minimum_required(VERSION 3.5...3.10)'
+
substituteInPlace plugins/gdk-pixbuf/jxl.thumbnailer \
--replace '/usr/bin/gdk-pixbuf-thumbnailer' "$out/libexec/gdk-pixbuf-thumbnailer-jxl"
substituteInPlace CMakeLists.txt \
diff --git a/pkgs/by-name/li/libloot/package.nix b/pkgs/by-name/li/libloot/package.nix
index 31e68c17dd7c..83c66c1bd578 100644
--- a/pkgs/by-name/li/libloot/package.nix
+++ b/pkgs/by-name/li/libloot/package.nix
@@ -14,11 +14,11 @@
python3Packages,
boost,
- fmt_11,
+ fmt,
gtest,
icu,
spdlog,
- tbb_2022,
+ onetbb,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -65,11 +65,11 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
boost
- fmt_11
+ fmt
gtest
icu
- (spdlog.override { fmt = fmt_11; })
- tbb_2022
+ spdlog
+ onetbb
finalAttrs.passthru.libloadorder
finalAttrs.passthru.esplugin
diff --git a/pkgs/by-name/li/libmamba/package.nix b/pkgs/by-name/li/libmamba/package.nix
index 7b17f8d312fc..55645cd648db 100644
--- a/pkgs/by-name/li/libmamba/package.nix
+++ b/pkgs/by-name/li/libmamba/package.nix
@@ -3,7 +3,7 @@
lib,
stdenv,
cmake,
- fmt_11,
+ fmt,
spdlog,
tl-expected,
nlohmann_json,
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
];
buildInputs = [
- fmt_11
+ fmt
spdlog
tl-expected
nlohmann_json
diff --git a/pkgs/by-name/li/libmatroska/package.nix b/pkgs/by-name/li/libmatroska/package.nix
index 8de6786dfa64..70d8eff99a4d 100644
--- a/pkgs/by-name/li/libmatroska/package.nix
+++ b/pkgs/by-name/li/libmatroska/package.nix
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
+ fetchpatch,
cmake,
libebml,
nix-update-script,
@@ -27,6 +28,14 @@ stdenv.mkDerivation rec {
hash = "sha256-hfu3Q1lIyMlWFWUM2Pu70Hie0rlQmua7Kq8kSIWnfHE=";
};
+ patches = [
+ (fetchpatch {
+ name = "libmatroska-fix-cmake-4.patch";
+ url = "https://github.com/Matroska-Org/libmatroska/commit/dc80e194e93e6f0e25c8ad3e015d83aca2a99e10.patch";
+ hash = "sha256-2dKRJ6z5rOrLJ5agvXQ6k8TPi5rTMA3H1wCO2F5tBbc=";
+ })
+ ];
+
nativeBuildInputs = [
cmake
pkg-config
diff --git a/pkgs/by-name/li/libmediainfo/package.nix b/pkgs/by-name/li/libmediainfo/package.nix
index 7ab7510f5069..a731de75f91e 100644
--- a/pkgs/by-name/li/libmediainfo/package.nix
+++ b/pkgs/by-name/li/libmediainfo/package.nix
@@ -14,11 +14,11 @@
stdenv.mkDerivation rec {
pname = "libmediainfo";
- version = "25.07.1";
+ version = "25.09";
src = fetchurl {
url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
- hash = "sha256-jm6S8gzyynzoq6U60LWJqJovp9/T55cdOFAQms1JvtU=";
+ hash = "sha256-hWLo6gPir4veJ/ZteaD1c4WbjxMZPsEVq/EPc1sxOhI=";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/security/libmodsecurity/default.nix b/pkgs/by-name/li/libmodsecurity/package.nix
similarity index 100%
rename from pkgs/tools/security/libmodsecurity/default.nix
rename to pkgs/by-name/li/libmodsecurity/package.nix
diff --git a/pkgs/by-name/li/libmysqlconnectorcpp/package.nix b/pkgs/by-name/li/libmysqlconnectorcpp/package.nix
index f4277216bd57..20b43867566d 100644
--- a/pkgs/by-name/li/libmysqlconnectorcpp/package.nix
+++ b/pkgs/by-name/li/libmysqlconnectorcpp/package.nix
@@ -17,6 +17,13 @@ stdenv.mkDerivation rec {
hash = "sha256-NqfJPUoQ0doqLmY2dVnZF0GqDwNivArpQxcc8XcfZhU=";
};
+ postPatch = ''
+ sed '/^cmake_minimum_required/Is/VERSION [0-9]\.[0-9]/VERSION 3.5/' \
+ -i ./cdk/extra/protobuf/CMakeLists.txt \
+ -i ./cdk/extra/lz4/CMakeLists.txt \
+ -i ./cdk/extra/zstd/CMakeLists.txt
+ '';
+
nativeBuildInputs = [
cmake
mysql80
diff --git a/pkgs/by-name/li/libndctl/package.nix b/pkgs/by-name/li/libndctl/package.nix
index 37c1580b7a16..8c5d570d810a 100644
--- a/pkgs/by-name/li/libndctl/package.nix
+++ b/pkgs/by-name/li/libndctl/package.nix
@@ -18,13 +18,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libndctl";
- version = "82";
+ version = "83";
src = fetchFromGitHub {
owner = "pmem";
repo = "ndctl";
tag = "v${finalAttrs.version}";
- hash = "sha256-zTIYGKUVIINeSisSCghImfjtJLdecQGL2i6ftxf8QXc=";
+ hash = "sha256-xhTZyRAQNomVyHCPUBwmM0Uuu1sMngTIJm8MF0gnRLk=";
};
patches = lib.optionals (!stdenv.hostPlatform.isGnu) [
diff --git a/pkgs/by-name/li/libnoise/package.nix b/pkgs/by-name/li/libnoise/package.nix
index c71de90dabb1..14f847fd5900 100644
--- a/pkgs/by-name/li/libnoise/package.nix
+++ b/pkgs/by-name/li/libnoise/package.nix
@@ -16,6 +16,11 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-coazd4yedH69b+TOSTFV1CEzN0ezjoGyOaYR9QBhp2E=";
};
+ # cmake 4 compatibility
+ postPatch = ''
+ substituteInPlace CMakeLists.txt --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
+ '';
+
nativeBuildInputs = [ cmake ];
cmakeFlags = [
diff --git a/pkgs/by-name/li/libopenmpt/package.nix b/pkgs/by-name/li/libopenmpt/package.nix
index 2eece1e4d8a3..599b70009c17 100644
--- a/pkgs/by-name/li/libopenmpt/package.nix
+++ b/pkgs/by-name/li/libopenmpt/package.nix
@@ -17,7 +17,7 @@
stdenv.mkDerivation rec {
pname = "libopenmpt";
- version = "0.8.2";
+ version = "0.8.3";
outputs = [
"out"
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz";
- hash = "sha256-hE5P+Y29mUK75KEEgib5H4vFtGC3vsZInmfO2z4KrDc=";
+ hash = "sha256-JdSGpNqXKIGSdO0JWf15ocY1iVRxDVTBQEfGRXyMqKw=";
};
enableParallelBuilding = true;
diff --git a/pkgs/by-name/li/liboqs/package.nix b/pkgs/by-name/li/liboqs/package.nix
index c00c819de528..c317887a65b9 100644
--- a/pkgs/by-name/li/liboqs/package.nix
+++ b/pkgs/by-name/li/liboqs/package.nix
@@ -40,8 +40,6 @@ stdenv.mkDerivation (finalAttrs: {
"-DOQS_BUILD_ONLY_LIB=ON"
];
- dontFixCmake = true; # fix CMake file will give an error
-
outputs = [
"out"
"dev"
diff --git a/pkgs/by-name/li/libproxy/hardcode-gsettings.patch b/pkgs/by-name/li/libproxy/hardcode-gsettings.patch
index f3c8f3c61e8b..d535bf4bfa93 100644
--- a/pkgs/by-name/li/libproxy/hardcode-gsettings.patch
+++ b/pkgs/by-name/li/libproxy/hardcode-gsettings.patch
@@ -1,8 +1,8 @@
diff --git a/src/backend/plugins/config-gnome/config-gnome.c b/src/backend/plugins/config-gnome/config-gnome.c
-index 6d9bc65..7566c6d 100644
+index d4cea85..9940761 100644
--- a/src/backend/plugins/config-gnome/config-gnome.c
+++ b/src/backend/plugins/config-gnome/config-gnome.c
-@@ -85,11 +85,60 @@ px_config_gnome_init (PxConfigGnome *self)
+@@ -86,11 +86,60 @@ px_config_gnome_init (PxConfigGnome *self)
if (!self->available)
return;
@@ -69,7 +69,7 @@ index 6d9bc65..7566c6d 100644
static void
diff --git a/tests/config-gnome-test.c b/tests/config-gnome-test.c
-index 315ef1b..1ede670 100644
+index f1cde61..a046208 100644
--- a/tests/config-gnome-test.c
+++ b/tests/config-gnome-test.c
@@ -60,11 +60,60 @@ static void
diff --git a/pkgs/by-name/li/libproxy/package.nix b/pkgs/by-name/li/libproxy/package.nix
index f9a6dda577d2..f0f9985a85a3 100644
--- a/pkgs/by-name/li/libproxy/package.nix
+++ b/pkgs/by-name/li/libproxy/package.nix
@@ -24,7 +24,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libproxy";
- version = "0.5.10";
+ version = "0.5.11";
outputs = [
"out"
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "libproxy";
repo = "libproxy";
rev = finalAttrs.version;
- hash = "sha256-40GcyH4Oe9xQh9kXe8HohigtCGmIgqFmSV6/j9yolV4=";
+ hash = "sha256-CSI6GrTDBoYR6RFAQvgNjwzkMk8oXatEMpsv5FYB5eE=";
};
patches = [
diff --git a/pkgs/by-name/li/librashader/package.nix b/pkgs/by-name/li/librashader/package.nix
index 0292eed3d908..3c6009b279b1 100644
--- a/pkgs/by-name/li/librashader/package.nix
+++ b/pkgs/by-name/li/librashader/package.nix
@@ -8,20 +8,20 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "librashader";
- version = "0.8.1";
+ version = "0.9.1";
src = fetchFromGitHub {
owner = "SnowflakePowered";
repo = "librashader";
tag = "librashader-v${finalAttrs.version}";
- hash = "sha256-S0EZES4KLL52UT6ub9GVGl/n2gWxmoxazwZr7oEMTHo=";
+ hash = "sha256-jrx7TzV9Q7JB8se6J5Wfa1iT1RSJnZbjEn7yTZ64zYU=";
};
patches = [
./patches/fix-optional-dep-syntax.patch
];
- cargoHash = "sha256-fKYpRvH8zt7GeiaBf1oZHBY4WSCVQzZ0Ca7Q3ek6QE0=";
+ cargoHash = "sha256-LFub48GklgOLncqazAIn2Bz+tSsXgS4TTnAdfYw7xHk=";
buildPhase = ''
runHook preBuild
diff --git a/pkgs/by-name/li/libre-graph-api-cpp-qt-client/package.nix b/pkgs/by-name/li/libre-graph-api-cpp-qt-client/package.nix
index caff75ff35b1..3bed42f3d324 100644
--- a/pkgs/by-name/li/libre-graph-api-cpp-qt-client/package.nix
+++ b/pkgs/by-name/li/libre-graph-api-cpp-qt-client/package.nix
@@ -19,6 +19,12 @@ stdenv.mkDerivation rec {
sourceRoot = "${src.name}/client";
+ # cmake 4 compatibility
+ postPatch = ''
+ substituteInPlace CMakeLists.txt \
+ --replace-fail "cmake_minimum_required(VERSION 3.4)" "cmake_minimum_required(VERSION 3.10)"
+ '';
+
nativeBuildInputs = [ cmake ];
buildInputs = [ qt6.qtbase ];
dontWrapQtApps = true;
diff --git a/pkgs/by-name/li/librespot-ma/package.nix b/pkgs/by-name/li/librespot-ma/package.nix
new file mode 100644
index 000000000000..f5e86091c206
--- /dev/null
+++ b/pkgs/by-name/li/librespot-ma/package.nix
@@ -0,0 +1,39 @@
+{
+ lib,
+ rustPlatform,
+ fetchFromGitHub,
+ pkg-config,
+ openssl,
+}:
+
+rustPlatform.buildRustPackage {
+ pname = "librespot-ma";
+ version = "0.6.0-unstable-2025-08-10";
+
+ src = fetchFromGitHub {
+ owner = "music-assistant";
+ repo = "librespot";
+ rev = "accecb60a16334013c0c99a5ded553794ee871b7";
+ hash = "sha256-vPiI8llXB6+ahX+iad/Ut81D3iZcTSVmYGDXXwApk/w=";
+ };
+
+ cargoHash = "sha256-Lujz2revTAok9B0hzdl8NVQ5XMRY9ACJzoQHIkIgKMg=";
+
+ nativeBuildInputs = [
+ pkg-config
+ ];
+
+ buildInputs = [ openssl ];
+
+ meta = {
+ description = "Fork of librespot for use in Music Assistant only";
+ homepage = "https://github.com/music-assistant/librespot";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [
+ sweenu
+ emilylange
+ ];
+ mainProgram = "librespot";
+ platforms = lib.platforms.linux;
+ };
+}
diff --git a/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix b/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix
index 10852a04033f..1bd8a3242013 100644
--- a/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix
+++ b/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix
@@ -37,7 +37,7 @@ let
pname = "librewolf-bin-unwrapped";
- version = "143.0-1";
+ version = "143.0.4-1";
in
stdenv.mkDerivation {
@@ -47,9 +47,9 @@ stdenv.mkDerivation {
url = "https://gitlab.com/api/v4/projects/44042130/packages/generic/librewolf/${version}/librewolf-${version}-${arch}-package.tar.xz";
hash =
{
- i686-linux = "sha256-ZDsPexyrK8FgMKAP3TzHnBTvDXLnW50SW6tOTGqWVaI=";
- x86_64-linux = "sha256-jP6PBvh+RNDpgv5OGX7HSR1Lo//vDSVjUFUsayMONTM=";
- aarch64-linux = "sha256-DuCQMjL7ZsHAtu2ppX/46QRL/Dt3acOJaTzGoYGfQuM=";
+ i686-linux = "sha256-GKdnsh7nkXlZh8QYBUhmB003IqfPI1+KxogZCxmyiUY=";
+ x86_64-linux = "sha256-1ZwXfE13K8X/fhBs0ibFaM7A/bRDNbU4hpEGdZIjIRk=";
+ aarch64-linux = "sha256-ICxN/7gqFlqH910DTo+cbrM1AoioY2Jbp2U8AfNxGUg=";
}
.${stdenv.hostPlatform.system} or throwSystem;
};
diff --git a/pkgs/by-name/li/librsvg/package.nix b/pkgs/by-name/li/librsvg/package.nix
index 3fd49e8885d4..fde58ccc80a4 100644
--- a/pkgs/by-name/li/librsvg/package.nix
+++ b/pkgs/by-name/li/librsvg/package.nix
@@ -49,7 +49,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "librsvg";
- version = "2.60.0";
+ version = "2.61.1";
outputs = [
"out"
@@ -61,13 +61,13 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://gnome/sources/librsvg/${lib.versions.majorMinor finalAttrs.version}/librsvg-${finalAttrs.version}.tar.xz";
- hash = "sha256-C2/8zfbnCvyYdogvXSzp/88scTy6rxrZAXDap1Lh7sM=";
+ hash = "sha256-vBu81BkSCwmNsovqVTNdneJHDU5qn27pcge0EPwVhn0=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) src;
name = "librsvg-deps-${finalAttrs.version}";
- hash = "sha256-DMkYsskjw6ARQsaHDRautT0oy8VqW/BJBfBVErxUe88=";
+ hash = "sha256-3DAFyY7uNB5cP8ry28v12QsFdxHtpr1nyLtzhojBq7c=";
dontConfigure = true;
};
diff --git a/pkgs/by-name/li/libserdes/package.nix b/pkgs/by-name/li/libserdes/package.nix
index b735b084f286..ca7cb36d34c5 100644
--- a/pkgs/by-name/li/libserdes/package.nix
+++ b/pkgs/by-name/li/libserdes/package.nix
@@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "libserdes";
- version = "7.9.2";
+ version = "8.0.1";
src = fetchFromGitHub {
owner = "confluentinc";
repo = "libserdes";
rev = "v${version}";
- hash = "sha256-rg4SWa9nIDT6JrnnCDwdiFE1cvpUn0HWHn+bPkXMHQ4=";
+ hash = "sha256-zEBJD7DOhpxfkAPypCZhygA6uaXIdK4yXZtDiuGA5Yg=";
};
outputs = [
diff --git a/pkgs/by-name/li/libsidplayfp/package.nix b/pkgs/by-name/li/libsidplayfp/package.nix
index 563f7ed66f67..233d65da68de 100644
--- a/pkgs/by-name/li/libsidplayfp/package.nix
+++ b/pkgs/by-name/li/libsidplayfp/package.nix
@@ -13,7 +13,6 @@
libgcrypt,
perl,
pkg-config,
- unittest-cpp,
xa,
}:
@@ -53,8 +52,6 @@ stdenv.mkDerivation (finalAttrs: {
libgcrypt
];
- checkInputs = [ unittest-cpp ];
-
enableParallelBuilding = true;
configureFlags = [
diff --git a/pkgs/by-name/li/libsoundio/package.nix b/pkgs/by-name/li/libsoundio/package.nix
index b7c1167cd72c..cfc5a6292000 100644
--- a/pkgs/by-name/li/libsoundio/package.nix
+++ b/pkgs/by-name/li/libsoundio/package.nix
@@ -19,6 +19,11 @@ stdenv.mkDerivation rec {
sha256 = "12l4rvaypv87vigdrmjz48d4d6sq4gfxf5asvnc4adyabxb73i4x";
};
+ # cmake 4 compatibility
+ postPatch = ''
+ substituteInPlace CMakeLists.txt --replace-fail "cmake_minimum_required(VERSION 2.8.5)" "cmake_minimum_required(VERSION 3.10)"
+ '';
+
nativeBuildInputs = [ cmake ];
buildInputs = [
diff --git a/pkgs/by-name/li/libspatialaudio/package.nix b/pkgs/by-name/li/libspatialaudio/package.nix
index ef7275e2076e..d3ff33fb2eab 100644
--- a/pkgs/by-name/li/libspatialaudio/package.nix
+++ b/pkgs/by-name/li/libspatialaudio/package.nix
@@ -3,6 +3,7 @@
stdenv,
cmake,
fetchFromGitHub,
+ fetchpatch,
libmysofa,
zlib,
}:
@@ -18,6 +19,16 @@ stdenv.mkDerivation rec {
hash = "sha256-sPnQPD41AceXM4uGqWXMYhuQv0TUkA6TZP8ChxUFIoI=";
};
+ # Fix the build with CMake 4.
+ #
+ # See:
+ postPatch = ''
+ substituteInPlace CMakeLists.txt \
+ --replace-fail \
+ 'cmake_minimum_required(VERSION 3.1)' \
+ 'cmake_minimum_required(VERSION 3.5)'
+ '';
+
nativeBuildInputs = [ cmake ];
buildInputs = [
libmysofa
@@ -33,7 +44,7 @@ stdenv.mkDerivation rec {
description = "Ambisonic encoding / decoding and binauralization library in C++";
homepage = "https://github.com/videolabs/libspatialaudio";
license = licenses.lgpl21Plus;
- platforms = platforms.linux;
+ platforms = platforms.all;
maintainers = with maintainers; [ krav ];
};
}
diff --git a/pkgs/by-name/li/libssh/package.nix b/pkgs/by-name/li/libssh/package.nix
index ed4aedfd2965..99b19b71e871 100644
--- a/pkgs/by-name/li/libssh/package.nix
+++ b/pkgs/by-name/li/libssh/package.nix
@@ -16,11 +16,11 @@
stdenv.mkDerivation rec {
pname = "libssh";
- version = "0.11.2";
+ version = "0.11.3";
src = fetchurl {
url = "https://www.libssh.org/files/${lib.versions.majorMinor version}/libssh-${version}.tar.xz";
- hash = "sha256-aVKfwY9bYB8Lrw5aRQGivCbfXi8Rb1+PB/Gfr6ptBOc=";
+ hash = "sha256-fYoTYbsJTsP1EZZOeKWk26aJtZhuESr6vk9NDWxhJcM=";
};
outputs = [
diff --git a/pkgs/by-name/li/libtcod/package.nix b/pkgs/by-name/li/libtcod/package.nix
deleted file mode 100644
index fb98b42c47c5..000000000000
--- a/pkgs/by-name/li/libtcod/package.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{
- lib,
- stdenv,
- fetchFromBitbucket,
- cmake,
- SDL,
- libGLU,
- libGL,
- libX11,
- upx,
- zlib,
-}:
-
-stdenv.mkDerivation {
-
- pname = "libtcod";
- version = "1.5.1";
-
- src = fetchFromBitbucket {
- owner = "libtcod";
- repo = "libtcod";
- rev = "1.5.1";
- sha256 = "1ibsnmnim712npxkqklc5ibnd32hgsx2yzyfzzc5fis5mhinbl63";
- };
-
- prePatch = ''
- sed -i CMakeLists.txt \
- -e "s,SET(ROOT_DIR.*,SET(ROOT_DIR $out),g" \
- -e "s,SET(INSTALL_DIR.*,SET(INSTALL_DIR $out),g"
- echo 'INSTALL(DIRECTORY include DESTINATION .)' >> CMakeLists.txt
- '';
-
- cmakeFlags = [ "-DLIBTCOD_SAMPLES=OFF" ];
-
- nativeBuildInputs = [ cmake ];
- buildInputs = [
- SDL
- libGLU
- libGL
- libX11
- upx
- zlib
- ];
-
- env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [
- "-Wno-error=implicit-int"
- "-Wno-error=incompatible-pointer-types"
- ];
-
- meta = {
- description = "API for roguelike games";
- homepage = "http://roguecentral.org/doryen/libtcod/";
- license = lib.licenses.bsd3;
- platforms = lib.platforms.linux;
- maintainers = [ ];
- };
-}
diff --git a/pkgs/by-name/li/libtiff/package.nix b/pkgs/by-name/li/libtiff/package.nix
index 77c4ab63d1bf..7bbb16328344 100644
--- a/pkgs/by-name/li/libtiff/package.nix
+++ b/pkgs/by-name/li/libtiff/package.nix
@@ -2,7 +2,6 @@
lib,
stdenv,
fetchFromGitLab,
- fetchpatch,
nix-update-script,
cmake,
@@ -39,42 +38,19 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libtiff";
- version = "4.7.0";
+ version = "4.7.1";
src = fetchFromGitLab {
owner = "libtiff";
repo = "libtiff";
rev = "v${finalAttrs.version}";
- hash = "sha256-SuK9/a6OUAumEe1kz1itFJGKxJzbmHkBVLMnyXhIwmQ=";
+ hash = "sha256-UiC6s86i7UavW86EKm74oPVlEacvoKmwW7KETjpnNaI=";
};
patches = [
- # Fix test_directory test on big-endian
- # https://gitlab.com/libtiff/libtiff/-/issues/652
- (fetchpatch {
- name = "0001-Update-test_directory-not-to-fail-on-big-endian-machines";
- url = "https://gitlab.com/libtiff/libtiff/-/commit/e8233c42f2e0a0ea7260c3cc7ebbaec8e5cb5e07.patch";
- hash = "sha256-z5odG66j4U+WoUjTUuBIhcVUCGK1GYdvW/cVucawNZI=";
- })
-
# libc++abi 11 has an `#include `, this picks up files name
# `version` in the project's include paths
./rename-version.patch
- (fetchpatch {
- name = "CVE-2024-13978_1.patch";
- url = "https://gitlab.com/libtiff/libtiff/-/commit/7be20ccaab97455f192de0ac561ceda7cd9e12d1.patch";
- hash = "sha256-cpsQyIvyP6LkGeQTlLX73iNd1AcPkvZ6Xqfns7G3JBc=";
- })
- (fetchpatch {
- name = "CVE-2024-13978_2.patch";
- url = "https://gitlab.com/libtiff/libtiff/-/commit/2ebfffb0e8836bfb1cd7d85c059cd285c59761a4.patch";
- hash = "sha256-cZlLTeB7/nvylf5SLzKF7g91aBERhZxpV5fmWEJVrX4=";
- })
- (fetchpatch {
- name = "CVE-2025-9165.patch";
- url = "https://gitlab.com/libtiff/libtiff/-/commit/ed141286a37f6e5ddafb5069347ff5d587e7a4e0.patch";
- hash = "sha256-DIsk8trbHMMTrj6jP5Ae8ciRjHV4CPHdWCN+VbeFnFo=";
- })
];
postPatch = ''
diff --git a/pkgs/by-name/li/libtirpc/package.nix b/pkgs/by-name/li/libtirpc/package.nix
index 1c18d91862d1..b20425cebfd8 100644
--- a/pkgs/by-name/li/libtirpc/package.nix
+++ b/pkgs/by-name/li/libtirpc/package.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "libtirpc";
- version = "1.3.6";
+ version = "1.3.7";
src = fetchurl {
url = "http://git.linux-nfs.org/?p=steved/libtirpc.git;a=snapshot;h=refs/tags/libtirpc-${
lib.replaceStrings [ "." ] [ "-" ] version
};sf=tgz";
- hash = "sha256-pTUfqnfHOQKCV0svKF/lo4hq1GlD/+YFjXP2CNygx9I=";
+ hash = "sha256-VGftEr3xzCp8O3oqCjIZozlq599gxN5IsHBRaG37GP4=";
name = "${pname}-${version}.tar.gz";
};
diff --git a/pkgs/by-name/li/libuchardet/package.nix b/pkgs/by-name/li/libuchardet/package.nix
index 321a1d042576..b2645715dced 100644
--- a/pkgs/by-name/li/libuchardet/package.nix
+++ b/pkgs/by-name/li/libuchardet/package.nix
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchurl,
+ fetchpatch,
cmake,
}:
@@ -21,6 +22,15 @@ stdenv.mkDerivation rec {
sha256 = "sha256-6Xpgz8AKHBR6Z0sJe7FCKr2fp4otnOPz/cwueKNKxfA=";
};
+ patches = [
+ # Fix the build with CMake 4.
+ (fetchpatch {
+ name = "uchardet-cmake-4.patch";
+ url = "https://gitlab.freedesktop.org/uchardet/uchardet/-/commit/6e163c978a7c13a6d3ff64a1e3dd4ba81d2d9e09.patch";
+ hash = "sha256-WXIQEoIpT7b5vELAfQJFEt2hiYrlnGCjV7ILCmd9kqY=";
+ })
+ ];
+
nativeBuildInputs = [ cmake ];
doCheck = !stdenv.hostPlatform.isi686; # tests fail on i686
diff --git a/pkgs/by-name/li/libuecc/package.nix b/pkgs/by-name/li/libuecc/package.nix
index eebb0f2a01c4..becafcf39c36 100644
--- a/pkgs/by-name/li/libuecc/package.nix
+++ b/pkgs/by-name/li/libuecc/package.nix
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchgit,
+ fetchpatch,
cmake,
}:
@@ -15,6 +16,14 @@ stdenv.mkDerivation rec {
sha256 = "1sm05aql75sh13ykgsv3ns4x4zzw9lvzid6misd22gfgf6r9n5fs";
};
+ patches = [
+ # Backport CMake 4 support
+ (fetchpatch {
+ url = "https://github.com/neocturne/libuecc/commit/b3812bf5ab1777193c4b85863311c33997d141f9.patch";
+ hash = "sha256-3h+LC5JlSXNiJlEQxSQzC7+5s+nMp+ll2NQQC5HzTf0=";
+ })
+ ];
+
nativeBuildInputs = [ cmake ];
meta = with lib; {
diff --git a/pkgs/by-name/li/libunarr/package.nix b/pkgs/by-name/li/libunarr/package.nix
index 2ea5d3025a24..bb5d2e88092f 100644
--- a/pkgs/by-name/li/libunarr/package.nix
+++ b/pkgs/by-name/li/libunarr/package.nix
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchurl,
+ fetchpatch,
cmake,
}:
@@ -14,6 +15,16 @@ stdenv.mkDerivation rec {
hash = "sha256-Mo76BOqZbdOJFrEkeozxdqwpuFyvkhdONNMZmN5BdNI=";
};
+ patches = [
+ # cmake-4 compatibility:
+ # https://github.com/selmf/unarr/pull/30
+ (fetchpatch {
+ name = "cmake-4.patch";
+ url = "https://github.com/selmf/unarr/commit/1df8ab3d281409e9fe6bed8bf485976bb47f5bef.patch";
+ hash = "sha256-u3shRgtRcHYxvXAHmYyQH1HLYV1PgWaJBY7BZCOYiL4=";
+ })
+ ];
+
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace CMakeLists.txt \
--replace "-flto" "" \
diff --git a/pkgs/by-name/li/libuvc/package.nix b/pkgs/by-name/li/libuvc/package.nix
index 2d8a99191471..720105974359 100644
--- a/pkgs/by-name/li/libuvc/package.nix
+++ b/pkgs/by-name/li/libuvc/package.nix
@@ -18,6 +18,12 @@ stdenv.mkDerivation {
sha256 = "0kranb0x1k5qad8rwxnn1w9963sbfj2cfzdgpfmlivb04544m2j7";
};
+ # Upstream doesn't yet support CMake 4, remove once fixed
+ postPatch = ''
+ substituteInPlace CMakeLists.txt \
+ --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.5)"
+ '';
+
nativeBuildInputs = [
cmake
pkg-config
diff --git a/pkgs/by-name/li/libvdpau-va-gl/package.nix b/pkgs/by-name/li/libvdpau-va-gl/package.nix
index 7741308d9dc1..b55f73762ac2 100644
--- a/pkgs/by-name/li/libvdpau-va-gl/package.nix
+++ b/pkgs/by-name/li/libvdpau-va-gl/package.nix
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
+ fetchpatch,
cmake,
pkg-config,
libX11,
@@ -26,6 +27,25 @@ stdenv.mkDerivation rec {
sha256 = "0asndybfv8xb0fx73sjjw5kydqrahqkm6n04lh589pbf18s5qlld";
};
+ patches = [
+ # cmake-4 compatibility
+ (fetchpatch {
+ name = "cmake-4-1.patch";
+ url = "https://github.com/i-rinat/libvdpau-va-gl/commit/30c8ac91f3aa2843f7dc1c1d167e09fad447fd91.patch?full_index=1";
+ hash = "sha256-PFEqBg3NE0fVFBAW4zdDbh8eBfKyPX3BZ8P2M15Qq5A=";
+ })
+ (fetchpatch {
+ name = "cmake-4-2.patch";
+ url = "https://github.com/i-rinat/libvdpau-va-gl/commit/38c7d8fddb092824cbcdf2b11af519775930cc8b.patch?full_index=1";
+ hash = "sha256-XsX/GLIS2Ce7obQJ4uVhLDtTI1TrDAGi3ECxEH6oOFI=";
+ })
+ (fetchpatch {
+ name = "cmake-4-3.patch";
+ url = "https://github.com/i-rinat/libvdpau-va-gl/commit/a845e8720d900e4bcc89e7ee16106ce63b44af0.patch?full_index=1";
+ hash = "sha256-lhiZFDR2ytDmo9hQUT35IJS4KL4+nYWAOnxZlj7u3tM=";
+ })
+ ];
+
nativeBuildInputs = [
cmake
pkg-config
diff --git a/pkgs/by-name/li/libversion/package.nix b/pkgs/by-name/li/libversion/package.nix
index c1f1af764b0d..844ec4889c4c 100644
--- a/pkgs/by-name/li/libversion/package.nix
+++ b/pkgs/by-name/li/libversion/package.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "libversion";
- version = "3.0.3";
+ version = "3.0.4";
src = fetchFromGitHub {
owner = "repology";
repo = "libversion";
rev = version;
- hash = "sha256-REmXD0NFd7Af01EU/f2IGoTKiju6ErTI7WUinvrAzaA=";
+ hash = "sha256-USgSwAdRHEepq9ZTDHVWkPsZjljfh9sEWOZRfu0H7Go=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/li/libvncserver/package.nix b/pkgs/by-name/li/libvncserver/package.nix
index 85e83d0b0460..b4c94caccdbb 100644
--- a/pkgs/by-name/li/libvncserver/package.nix
+++ b/pkgs/by-name/li/libvncserver/package.nix
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
+ fetchpatch,
cmake,
libjpeg,
openssl,
@@ -34,6 +35,12 @@ stdenv.mkDerivation (finalAttrs: {
patches = [
# fix generated pkg-config files
./pkgconfig.patch
+
+ (fetchpatch {
+ name = "libvncserver-fix-cmake-4.patch";
+ url = "https://github.com/LibVNC/libvncserver/commit/e64fa928170f22a2e21b5bbd6d46c8f8e7dd7a96.patch";
+ hash = "sha256-AAZ3H34+nLqQggb/sNSx2gIGK96m4zatHX3wpyjNLOA=";
+ })
];
nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libwebsockets/package.nix b/pkgs/by-name/li/libwebsockets/package.nix
index 928764569233..5e5b1d3dda89 100644
--- a/pkgs/by-name/li/libwebsockets/package.nix
+++ b/pkgs/by-name/li/libwebsockets/package.nix
@@ -21,6 +21,14 @@ stdenv.mkDerivation rec {
hash = "sha256-KOAhIVn4G5u0A1TE75Xv7iYO3/i8foqWYecH0kJHdBM=";
};
+ # Updating to 4.4.1 would bring some errors, and the patch doesn't apply cleanly
+ # https://github.com/warmcat/libwebsockets/commit/47efb8c1c2371fa309f85a32984e99b2cc1d614a
+ postPatch = ''
+ for f in $(find . -name CMakeLists.txt); do
+ sed '/^cmake_minimum_required/Is/VERSION [0-9]\.[0-9]/VERSION 3.5/' -i "$f"
+ done
+ '';
+
outputs = [
"out"
"dev"
diff --git a/pkgs/by-name/li/libxc/package.nix b/pkgs/by-name/li/libxc/package.nix
index 81e1224b31e2..85a4867882d4 100644
--- a/pkgs/by-name/li/libxc/package.nix
+++ b/pkgs/by-name/li/libxc/package.nix
@@ -49,6 +49,7 @@ stdenv.mkDerivation rec {
'';
cmakeFlags = [
+ "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
"-DENABLE_FORTRAN=ON"
"-DBUILD_SHARED_LIBS=ON"
"-DENABLE_XHOST=OFF"
diff --git a/pkgs/by-name/li/libxcb-cursor/package.nix b/pkgs/by-name/li/libxcb-cursor/package.nix
new file mode 100644
index 000000000000..8f8a61d6e5d7
--- /dev/null
+++ b/pkgs/by-name/li/libxcb-cursor/package.nix
@@ -0,0 +1,64 @@
+{
+ lib,
+ stdenv,
+ fetchurl,
+ pkg-config,
+ m4,
+ libxcb,
+ libxcb-image,
+ libxcb-render-util,
+ xorgproto,
+ writeScript,
+ testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+ pname = "libxcb-cursor";
+ version = "0.1.5";
+
+ outputs = [
+ "out"
+ "dev"
+ ];
+
+ src = fetchurl {
+ url = "mirror://xorg/individual/lib/xcb-util-cursor-${finalAttrs.version}.tar.xz";
+ hash = "sha256-DK+ZsNYJcPgc5Bx7ppTl6q+DMie7LLzbL23JZmpmPFc=";
+ };
+
+ strictDeps = true;
+
+ nativeBuildInputs = [
+ pkg-config
+ m4
+ ];
+
+ buildInputs = [
+ libxcb
+ libxcb-image
+ libxcb-render-util
+ xorgproto
+ ];
+
+ propagatedBuildInputs = [ libxcb ];
+
+ passthru = {
+ updateScript = writeScript "update-${finalAttrs.pname}" ''
+ #!/usr/bin/env nix-shell
+ #!nix-shell -i bash -p common-updater-scripts
+ version="$(list-directory-versions --pname xcb-util-cursor \
+ --url https://xorg.freedesktop.org/releases/individual/lib/ \
+ | sort -V | tail -n1)"
+ update-source-version ${finalAttrs.pname} "$version"
+ '';
+ tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+ };
+
+ meta = {
+ description = "XCB port of libXcursor";
+ homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor";
+ license = lib.licenses.x11;
+ maintainers = with lib.maintainers; [ lovek323 ];
+ pkgConfigModules = [ "xcb-cursor" ];
+ platforms = lib.platforms.unix;
+ };
+})
diff --git a/pkgs/by-name/li/libxmlb/package.nix b/pkgs/by-name/li/libxmlb/package.nix
index f611cae060d9..868c2dbb9d7d 100644
--- a/pkgs/by-name/li/libxmlb/package.nix
+++ b/pkgs/by-name/li/libxmlb/package.nix
@@ -23,7 +23,7 @@
stdenv.mkDerivation rec {
pname = "libxmlb";
- version = "0.3.23";
+ version = "0.3.24";
outputs = [
"out"
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
owner = "hughsie";
repo = "libxmlb";
rev = version;
- hash = "sha256-hdF1yce9/ztXVV6BYocPGVAjoxJancID77rnHBJsKmM=";
+ hash = "sha256-3Yxq0KZMV9GRmNjZ19eIqGq+UJS4PGyVPS6HBcMEbHo=";
};
patches = [
diff --git a/pkgs/development/libraries/libxslt/77-Use-a-dedicated-node-type-to-maintain-the-list-of-cached-rv-ts.patch b/pkgs/by-name/li/libxslt/77-Use-a-dedicated-node-type-to-maintain-the-list-of-cached-rv-ts.patch
similarity index 100%
rename from pkgs/development/libraries/libxslt/77-Use-a-dedicated-node-type-to-maintain-the-list-of-cached-rv-ts.patch
rename to pkgs/by-name/li/libxslt/77-Use-a-dedicated-node-type-to-maintain-the-list-of-cached-rv-ts.patch
diff --git a/pkgs/development/libraries/libxslt/new-unified-atype-extra.patch b/pkgs/by-name/li/libxslt/new-unified-atype-extra.patch
similarity index 100%
rename from pkgs/development/libraries/libxslt/new-unified-atype-extra.patch
rename to pkgs/by-name/li/libxslt/new-unified-atype-extra.patch
diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/by-name/li/libxslt/package.nix
similarity index 100%
rename from pkgs/development/libraries/libxslt/default.nix
rename to pkgs/by-name/li/libxslt/package.nix
diff --git a/pkgs/by-name/li/lightningcss/package.nix b/pkgs/by-name/li/lightningcss/package.nix
index 21b67ff7e9da..0aa89973b4f1 100644
--- a/pkgs/by-name/li/lightningcss/package.nix
+++ b/pkgs/by-name/li/lightningcss/package.nix
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "lightningcss";
- version = "1.30.1";
+ version = "1.30.2";
src = fetchFromGitHub {
owner = "parcel-bundler";
repo = "lightningcss";
tag = "v${finalAttrs.version}";
- hash = "sha256-imLbsQ2F5CQiepwWSMcXj0Fgyv4liCMmCwA/0SE07Mo=";
+ hash = "sha256-AuMboSZ7fX6UhnPeXjpnBEDGkQdK1EMKSUpw3TPZxRk=";
};
- cargoHash = "sha256-aNho9NavEgY4dwGcNXsLDnlVCB2rODIPae3LnfOwJIA=";
+ cargoHash = "sha256-7oyDnT81G47SaceJ5st+1P3a2fb9Dj5Eu2c0glw8YW4=";
patches = [
# Backport fix for build error for lightningcss-napi
diff --git a/pkgs/by-name/li/limesurvey/package.nix b/pkgs/by-name/li/limesurvey/package.nix
index d8b44edb8470..5fad276e4eda 100644
--- a/pkgs/by-name/li/limesurvey/package.nix
+++ b/pkgs/by-name/li/limesurvey/package.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "limesurvey";
- version = "6.10.2+250127";
+ version = "6.15.14+250924";
src = fetchFromGitHub {
owner = "LimeSurvey";
repo = "LimeSurvey";
- rev = version;
- hash = "sha256-2ZRN2zbrrGWTXgsPeRWsQbg1qw2vVIAwzUI0LWgCL9g=";
+ tag = version;
+ hash = "sha256-xxK6JEgeBVIj8CGb0qSzwfO1Se9+jMtGB9V3rsc9bBU=";
};
phpConfig = writeText "config.php" ''
diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix
index a10bc7303242..fbaad5b4a2a4 100644
--- a/pkgs/by-name/li/limine/package.nix
+++ b/pkgs/by-name/li/limine/package.nix
@@ -42,14 +42,14 @@ in
# as bootloader for various platforms and corresponding binary and helper files.
stdenv.mkDerivation (finalAttrs: {
pname = "limine";
- version = "10.0.1";
+ version = "10.1.0";
# We don't use the Git source but the release tarball, as the source has a
# `./bootstrap` script performing network access to download resources.
# Packaging that in Nix is very cumbersome.
src = fetchurl {
url = "https://codeberg.org/Limine/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
- hash = "sha256-7P8N/HomleQBnoaX6S5V7KwX1GYVIY7XkUYU9Xo9jlk=";
+ hash = "sha256-Hn1njCaHcdCocnKpAZhkcMXG6tAojVQQtVAW4pVUFGI=";
};
enableParallelBuilding = true;
diff --git a/pkgs/by-name/li/linkwarden/01-localfont.patch b/pkgs/by-name/li/linkwarden/01-localfont.patch
new file mode 100644
index 000000000000..459ccc39a8f5
--- /dev/null
+++ b/pkgs/by-name/li/linkwarden/01-localfont.patch
@@ -0,0 +1,42 @@
+diff --git i/apps/web/components/Preservation/ReadableView.tsx w/apps/web/components/Preservation/ReadableView.tsx
+index 64f14186..daff3636 100644
+--- i/apps/web/components/Preservation/ReadableView.tsx
++++ w/apps/web/components/Preservation/ReadableView.tsx
+@@ -20,13 +20,13 @@ import {
+ } from "@linkwarden/router/highlights";
+ import { Highlight } from "@linkwarden/prisma/client";
+ import { useUser } from "@linkwarden/router/user";
+-import { Caveat } from "next/font/google";
+-import { Bentham } from "next/font/google";
++import localFont from "next/font/local";
+ import { Separator } from "../ui/separator";
+ import { Button } from "../ui/button";
+
+-const caveat = Caveat({ subsets: ["latin"] });
+-const bentham = Bentham({ subsets: ["latin"], weight: "400" });
++
++const caveat = localFont({ src: "../../public/caveat.ttf" });
++const bentham = localFont({ src: "../../public/bentham.ttf" });
+
+ type Props = {
+ link: LinkIncludingShortenedCollectionAndTags;
+diff --git i/apps/web/components/TextStyleDropdown.tsx w/apps/web/components/TextStyleDropdown.tsx
+index a84587d9..59a291e4 100644
+--- i/apps/web/components/TextStyleDropdown.tsx
++++ w/apps/web/components/TextStyleDropdown.tsx
+@@ -13,12 +13,11 @@ import {
+ import { Button } from "@/components/ui/button";
+ import { FitWidth, FormatLineSpacing, FormatSize } from "@/components/ui/icons";
+ import { useUpdateUserPreference, useUser } from "@linkwarden/router/user";
+-import { Caveat } from "next/font/google";
+-import { Bentham } from "next/font/google";
++import localFont from "next/font/local";
+ import { useTranslation } from "next-i18next";
+
+-const caveat = Caveat({ subsets: ["latin"] });
+-const bentham = Bentham({ subsets: ["latin"], weight: "400" });
++const caveat = localFont({ src: "../public/caveat.ttf" });
++const bentham = localFont({ src: "../public/bentham.ttf" });
+
+ const fontSizes = [
+ "12px",
diff --git a/pkgs/by-name/li/linkwarden/package.nix b/pkgs/by-name/li/linkwarden/package.nix
new file mode 100644
index 000000000000..626427b4e66b
--- /dev/null
+++ b/pkgs/by-name/li/linkwarden/package.nix
@@ -0,0 +1,205 @@
+{
+ lib,
+ stdenvNoCC,
+ buildNpmPackage,
+ fetchFromGitHub,
+ fetchYarnDeps,
+ makeBinaryWrapper,
+ nixosTests,
+ yarnConfigHook,
+ fetchpatch,
+ # dependencies
+ bash,
+ monolith,
+ nodejs,
+ openssl,
+ google-fonts,
+ playwright-driver,
+ prisma,
+ prisma-engines,
+}:
+
+let
+ # The bcrypt package requires a gyp build and its dev dependencies.
+ # Linkwarden uses yarn for dependencies, bycrypt npm. Mixing the two causes issues.
+ bcrypt = buildNpmPackage rec {
+ pname = "bcrypt";
+ version = "5.1.1";
+
+ src = fetchFromGitHub {
+ owner = "kelektiv";
+ repo = "node.bcrypt.js";
+ tag = "v${version}";
+ hash = "sha256-mgfYEgvgC5JwgUhU8Kn/f1D7n9ljnIODkKotEcxQnDQ=";
+ };
+
+ npmDepsHash = "sha256-CPXZ/yLEjTBIyTPVrgCvb+UGZJ6yRZUJOvBSZpLSABY=";
+
+ npmBuildScript = "install";
+
+ postInstall = ''
+ cp -r lib $out/lib/node_modules/bcrypt/
+ '';
+ };
+
+ google-fonts' = google-fonts.override {
+ fonts = [
+ "Caveat"
+ "Bentham"
+ ];
+ };
+in
+stdenvNoCC.mkDerivation (finalAttrs: {
+ pname = "linkwarden";
+ version = "2.13.0";
+
+ src = fetchFromGitHub {
+ owner = "linkwarden";
+ repo = "linkwarden";
+ tag = "v${finalAttrs.version}";
+ hash = "sha256-zoJ5y2J+lkmfAFdI/7FvFAC6D308IPxaLzpGtj42IrU=";
+ };
+
+ patches = [
+ /*
+ Prevents NextJS from attempting to download fonts during build. The fonts
+ directory will be created in the derivation script.
+
+ See similar patches:
+ pkgs/by-name/cr/crabfit-frontend/01-localfont.patch
+ pkgs/by-name/al/alcom/use-local-fonts.patch
+ pkgs/by-name/ne/nextjs-ollama-llm-ui/0002-use-local-google-fonts.patch
+ */
+ ./01-localfont.patch
+
+ /*
+ https://github.com/linkwarden/linkwarden/pull/1290
+
+ Fixes an issue where linkwarden cannot save a plain HTTP (no TLS) website.
+ */
+ (fetchpatch {
+ url = "https://github.com/linkwarden/linkwarden/commit/327826d760e5b1870c58a25f85501a7c9a468818.patch";
+ hash = "sha256-kq1GIEW0chnPmzvg4eDSS/5WtRyWlrHlk41h4pSCMzg=";
+ })
+ ];
+
+ yarnOfflineCache = fetchYarnDeps {
+ yarnLock = finalAttrs.src + "/yarn.lock";
+ hash = "sha256-Z1EwecQGWHr6RZCDHAy7BA6BEoixj1dbKH3XE8sfeKQ=";
+ };
+
+ nativeBuildInputs = [
+ makeBinaryWrapper
+ nodejs
+ prisma
+ yarnConfigHook
+ ];
+
+ buildInputs = [
+ openssl
+ ];
+
+ env.NODE_ENV = "production";
+
+ postPatch = ''
+ for f in packages/filesystem/*Folder.ts packages/filesystem/*File.ts; do
+ substituteInPlace $f \
+ --replace-fail 'process.cwd(),' "" \
+ --replace-fail '"../..",' ""
+ done
+ '';
+
+ preBuild = ''
+ export PRISMA_CLIENT_ENGINE_TYPE='binary'
+ export PRISMA_QUERY_ENGINE_LIBRARY="${prisma-engines}/lib/libquery_engine.node"
+ export PRISMA_QUERY_ENGINE_BINARY="${prisma-engines}/bin/query-engine"
+ export PRISMA_SCHEMA_ENGINE_BINARY="${prisma-engines}/bin/schema-engine"
+ '';
+
+ buildPhase = ''
+ runHook preBuild
+
+ cp ${google-fonts'}/share/fonts/truetype/Bentham-* ./apps/web/public/bentham.ttf
+ cp ${google-fonts'}/share/fonts/truetype/Caveat* ./apps/web/public/caveat.ttf
+
+ yarn prisma:generate
+ yarn web:build
+
+ runHook postBuild
+ '';
+
+ postBuild = ''
+ substituteInPlace node_modules/next/dist/server/image-optimizer.js \
+ --replace-fail 'this.cacheDir = (0, _path.join)(distDir, "cache", "images");' 'this.cacheDir = (0, _path.join)(process.env.LINKWARDEN_CACHE_DIR, "cache", "images");'
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ # Shrink closure a bit
+ shopt -s extglob
+ rm -rf node_modules/bcrypt node_modules/@next/swc-* node_modules/lightningcss* node_modules/react-native* node_modules/@react-native* \
+ node_modules/expo* node_modules/@expo node_modules/.bin node_modules/zeego/node_modules/.bin node_modules/@react-navigation/native* \
+ node_modules/@react-navigation/*/node_modules/.bin node_modules/@native-html node_modules/jest-expo node_modules/@jsamr/react-native-li \
+ node_modules/lucide-react-native node_modules/@esbuild/!(linux-x64)
+ shopt -u extglob
+
+ ln -s ${bcrypt}/lib/node_modules/bcrypt node_modules/
+ mkdir -p $out/share/linkwarden/apps/web/.next $out/bin
+ cp -r apps/web/.next apps/web/* $out/share/linkwarden/apps/web
+ cp -r apps/worker $out/share/linkwarden/apps/worker
+ cp -r packages $out/share/linkwarden/
+ cp -r node_modules $out/share/linkwarden/
+ rm -r $out/share/linkwarden/node_modules/@linkwarden/{mobile,react-native-render-html}
+
+ echo "#!${lib.getExe bash} -e
+ export DATABASE_URL=\''${DATABASE_URL-"postgresql://\$DATABASE_USER:\$POSTGRES_PASSWORD@\$DATABASE_HOST:\$DATABASE_PORT/\$DATABASE_NAME"}
+ export npm_config_cache="\$LINKWARDEN_CACHE_DIR/npm"
+
+ if [ \"\$1\" == \"worker\" ]; then
+ echo "Starting worker"
+ ${lib.getExe' nodejs "npm"} start --prefix $out/share/linkwarden/apps/worker
+ else
+ echo "Starting server"
+ ${lib.getExe prisma} migrate deploy --schema $out/share/linkwarden/packages/prisma/schema.prisma \
+ && ${lib.getExe' nodejs "npm"} start --prefix $out/share/linkwarden/apps/web -- -H \$LINKWARDEN_HOST -p \$LINKWARDEN_PORT
+ fi
+ " > $out/bin/start.sh
+ chmod +x $out/bin/start.sh
+
+ makeWrapper $out/bin/start.sh $out/bin/linkwarden \
+ --prefix PATH : "${
+ lib.makeBinPath [
+ bash
+ monolith
+ openssl
+ ]
+ }" \
+ --set-default PRISMA_CLIENT_ENGINE_TYPE 'binary' \
+ --set-default PRISMA_QUERY_ENGINE_LIBRARY "${prisma-engines}/lib/libquery_engine.node" \
+ --set-default PRISMA_QUERY_ENGINE_BINARY "${prisma-engines}/bin/query-engine" \
+ --set-default PRISMA_SCHEMA_ENGINE_BINARY "${prisma-engines}/bin/schema-engine" \
+ --set-default PLAYWRIGHT_LAUNCH_OPTIONS_EXECUTABLE_PATH ${playwright-driver.browsers-chromium}/chromium-*/chrome-linux/chrome \
+ --set-default LINKWARDEN_CACHE_DIR /var/cache/linkwarden \
+ --set-default LINKWARDEN_HOST localhost \
+ --set-default LINKWARDEN_PORT 3000 \
+ --set-default STORAGE_FOLDER /var/lib/linkwarden \
+ --set-default NEXT_TELEMETRY_DISABLED 1
+
+ runHook postInstall
+ '';
+
+ passthru.tests = {
+ inherit (nixosTests) linkwarden;
+ };
+
+ meta = {
+ description = "Self-hosted collaborative bookmark manager to collect, organize, and preserve webpages, articles, and more...";
+ homepage = "https://linkwarden.app/";
+ license = lib.licenses.agpl3Only;
+ maintainers = with lib.maintainers; [ jvanbruegge ];
+ platforms = [ "x86_64-linux" ];
+ mainProgram = "linkwarden";
+ };
+
+})
diff --git a/pkgs/by-name/li/linyaps-web-store-installer/package.nix b/pkgs/by-name/li/linyaps-web-store-installer/package.nix
new file mode 100644
index 000000000000..649e9002c5f2
--- /dev/null
+++ b/pkgs/by-name/li/linyaps-web-store-installer/package.nix
@@ -0,0 +1,43 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+ cmake,
+ qt6,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "linyaps-web-store-installer";
+ version = "1.6.8";
+
+ src = fetchFromGitHub {
+ owner = "OpenAtom-Linyaps";
+ repo = "linyaps-web-store-installer";
+ rev = finalAttrs.version;
+ hash = "sha256-KbtGoXzxZmo6x1bvzDZbwp/wl+dBojB6E+K87CAkI7g=";
+ };
+
+ postPatch = ''
+ substituteInPlace ll-installer/space.linglong.Installer.desktop \
+ --replace-fail "Exec=/usr/bin/ll-installer" "Exec=$out/bin/ll-installer"
+ '';
+
+ nativeBuildInputs = [
+ cmake
+ qt6.wrapQtAppsHook
+ ];
+
+ buildInputs = [
+ qt6.qtbase
+ ];
+
+ meta = {
+ description = "URI Handler for Linyaps Web Store";
+ homepage = "https://github.com/OpenAtom-Linyaps/linyaps-web-store-installer";
+ changelog = "https://github.com/OpenAtom-Linyaps/linyaps-web-store-installer/releases/tag/${finalAttrs.version}";
+ license = lib.licenses.lgpl3Plus;
+ maintainers = with lib.maintainers; [ hhr2020 ];
+ mainProgram = "ll-installer";
+ platforms = lib.platforms.linux;
+ };
+})
diff --git a/pkgs/by-name/li/listres/package.nix b/pkgs/by-name/li/listres/package.nix
new file mode 100644
index 000000000000..b473b29f671f
--- /dev/null
+++ b/pkgs/by-name/li/listres/package.nix
@@ -0,0 +1,51 @@
+{
+ lib,
+ stdenv,
+ fetchurl,
+ pkg-config,
+ libxaw,
+ libxmu,
+ xorgproto,
+ libxt,
+ writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+ pname = "listres";
+ version = "1.0.6";
+
+ src = fetchurl {
+ url = "mirror://xorg/individual/app/listres-${finalAttrs.version}.tar.xz";
+ hash = "sha256-TRxT79abplTyh34Vd+mUx4h0sFEvobBmbP/PRSruQ8o=";
+ };
+
+ strictDeps = true;
+
+ nativeBuildInputs = [ pkg-config ];
+
+ buildInputs = [
+ libxaw
+ libxmu
+ xorgproto
+ libxt
+ ];
+
+ passthru = {
+ updateScript = writeScript "update-${finalAttrs.pname}" ''
+ #!/usr/bin/env nix-shell
+ #!nix-shell -i bash -p common-updater-scripts
+ version="$(list-directory-versions --pname ${finalAttrs.pname} \
+ --url https://xorg.freedesktop.org/releases/individual/app/ \
+ | sort -V | tail -n1)"
+ update-source-version ${finalAttrs.pname} "$version"
+ '';
+ };
+
+ meta = {
+ description = "Utility to list X resources for a widget written using a toolkit based on libXt";
+ homepage = "https://gitlab.freedesktop.org/xorg/app/listres";
+ license = lib.licenses.x11;
+ mainProgram = "listres";
+ maintainers = [ ];
+ platforms = lib.platforms.unix;
+ };
+})
diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix
index 1c6a8c92341f..626336395493 100644
--- a/pkgs/by-name/ll/llama-cpp/package.nix
+++ b/pkgs/by-name/ll/llama-cpp/package.nix
@@ -12,7 +12,7 @@
rocmSupport ? config.rocmSupport,
rocmPackages ? { },
- rocmGpuTargets ? builtins.concatStringsSep ";" rocmPackages.clr.gpuTargets,
+ rocmGpuTargets ? rocmPackages.clr.localGpuTargets or rocmPackages.clr.gpuTargets,
openclSupport ? false,
clblast,
@@ -150,7 +150,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
]
++ optionals rocmSupport [
(cmakeFeature "CMAKE_HIP_COMPILER" "${rocmPackages.clr.hipClangPath}/clang++")
- (cmakeFeature "CMAKE_HIP_ARCHITECTURES" rocmGpuTargets)
+ (cmakeFeature "CMAKE_HIP_ARCHITECTURES" (builtins.concatStringsSep ";" rocmGpuTargets))
]
++ optionals metalSupport [
(cmakeFeature "CMAKE_C_FLAGS" "-D__ARM_FEATURE_DOTPROD=1")
diff --git a/pkgs/by-name/ll/lldpd/package.nix b/pkgs/by-name/ll/lldpd/package.nix
index e85b8cce0c92..5cfad1396ea9 100644
--- a/pkgs/by-name/ll/lldpd/package.nix
+++ b/pkgs/by-name/ll/lldpd/package.nix
@@ -43,6 +43,11 @@ stdenv.mkDerivation rec {
openssl
];
+ preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+ # Yes, this works and is required for cross :'/
+ export PATH=$PATH:${net-snmp.dev}/bin
+ '';
+
enableParallelBuilding = true;
outputs = [
diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix
index abd8342e999c..3f6eddb71be0 100644
--- a/pkgs/by-name/lm/lmstudio/package.nix
+++ b/pkgs/by-name/lm/lmstudio/package.nix
@@ -7,10 +7,10 @@
let
pname = "lmstudio";
- version_aarch64-darwin = "0.3.27-4";
- hash_aarch64-darwin = "sha256-KEgUgfYG6yHZzTaKpGiSkyhZcb3W2KTlIhnbQdKpYm0=";
- version_x86_64-linux = "0.3.27-4";
- hash_x86_64-linux = "sha256-CU7kfcyo054UvjSar5QB2aGrCPAdh1EMqEJyZkv7Mdk=";
+ version_aarch64-darwin = "0.3.28-2";
+ hash_aarch64-darwin = "sha256-7sxhKZwZKzA2VUPHsChgysxXMB7SKEd9zK4kIPbWYjo=";
+ version_x86_64-linux = "0.3.28-2";
+ hash_x86_64-linux = "sha256-ewVjJ0Sy5Zwf9tvlfngQKnAfAv3BvPIAO+p1tJ3mO8M=";
meta = {
description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";
diff --git a/pkgs/by-name/lo/localstack/package.nix b/pkgs/by-name/lo/localstack/package.nix
index 9310bff8be22..11be38a157de 100644
--- a/pkgs/by-name/lo/localstack/package.nix
+++ b/pkgs/by-name/lo/localstack/package.nix
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "localstack";
- version = "4.8.1";
+ version = "4.9.1";
pyproject = true;
src = fetchFromGitHub {
owner = "localstack";
repo = "localstack";
tag = "v${version}";
- hash = "sha256-IN6vMpHsGFTvY4yeMCdV9nwgh17ilC3j9SpOHWVOtew=";
+ hash = "sha256-vyk86iuYI6dGUCtijauwT7p4hSWNXluz5cHHRm8zdOE=";
};
build-system = with python3.pkgs; [
diff --git a/pkgs/by-name/lo/lockbook-desktop/package.nix b/pkgs/by-name/lo/lockbook-desktop/package.nix
index cc12dd32e0b3..d0e091b644b7 100644
--- a/pkgs/by-name/lo/lockbook-desktop/package.nix
+++ b/pkgs/by-name/lo/lockbook-desktop/package.nix
@@ -18,16 +18,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "lockbook-desktop";
- version = "25.9.17";
+ version = "25.10.7";
src = fetchFromGitHub {
owner = "lockbook";
repo = "lockbook";
tag = version;
- hash = "sha256-S2FApDKP2P4c9z6szM4irmu/ThmGnfgzzqJjI9qRc6w=";
+ hash = "sha256-EzVMTJaxPeIOJUdwmaShMLEe1XQcJx+0i1Rl0ILi5+c=";
};
- cargoHash = "sha256-94YNSY7s5mS3j/HhPx5HAMqiKXBXWbToysREmTHKgCk=";
+ cargoHash = "sha256-ze82Iu2lH0n3ucKibLu3/VWMaaDWhs0oFFe/na2GbmY=";
nativeBuildInputs = [
pkg-config
diff --git a/pkgs/by-name/lo/lockbook/package.nix b/pkgs/by-name/lo/lockbook/package.nix
index 12edcbc57a75..aa0bf6970c25 100644
--- a/pkgs/by-name/lo/lockbook/package.nix
+++ b/pkgs/by-name/lo/lockbook/package.nix
@@ -7,16 +7,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "lockbook";
- version = "25.9.17";
+ version = "25.10.7";
src = fetchFromGitHub {
owner = "lockbook";
repo = "lockbook";
tag = version;
- hash = "sha256-S2FApDKP2P4c9z6szM4irmu/ThmGnfgzzqJjI9qRc6w=";
+ hash = "sha256-EzVMTJaxPeIOJUdwmaShMLEe1XQcJx+0i1Rl0ILi5+c=";
};
- cargoHash = "sha256-94YNSY7s5mS3j/HhPx5HAMqiKXBXWbToysREmTHKgCk=";
+ cargoHash = "sha256-ze82Iu2lH0n3ucKibLu3/VWMaaDWhs0oFFe/na2GbmY=";
doCheck = false; # there are no cli tests
cargoBuildFlags = [
diff --git a/pkgs/by-name/lo/lokinet/package.nix b/pkgs/by-name/lo/lokinet/package.nix
index 71814f6431be..84b2008f4eef 100644
--- a/pkgs/by-name/lo/lokinet/package.nix
+++ b/pkgs/by-name/lo/lokinet/package.nix
@@ -10,20 +10,12 @@
nlohmann_json,
pkg-config,
spdlog,
- fmt_9,
sqlite,
systemd,
unbound,
zeromq,
}:
-let
- # Upstream has received reports of incompatibilities with fmt, and other
- # dependencies, see: https://github.com/oxen-io/lokinet/issues/2200.
- spdlog' = spdlog.override {
- fmt = fmt_9;
- };
-in
stdenv.mkDerivation rec {
pname = "lokinet";
version = "0.9.13";
@@ -55,7 +47,7 @@ stdenv.mkDerivation rec {
libuv
libsodium
nlohmann_json
- spdlog'
+ spdlog
sqlite
systemd
unbound
@@ -69,6 +61,10 @@ stdenv.mkDerivation rec {
];
meta = {
+ # Upstream has received reports of incompatibilities with fmt, and other
+ # dependencies, see: https://github.com/oxen-io/lokinet/issues/2200.
+ # But our version of spdlog doesn't support fmt_9
+ broken = true;
description = "Anonymous, decentralized and IP based overlay network for the internet";
homepage = "https://lokinet.org/";
changelog = "https://github.com/oxen-io/lokinet/releases/tag/v${version}";
diff --git a/pkgs/by-name/lu/luau/package.nix b/pkgs/by-name/lu/luau/package.nix
index f9b3c5caeaa7..ffadb233ea10 100644
--- a/pkgs/by-name/lu/luau/package.nix
+++ b/pkgs/by-name/lu/luau/package.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "luau";
- version = "0.693";
+ version = "0.694";
src = fetchFromGitHub {
owner = "luau-lang";
repo = "luau";
tag = finalAttrs.version;
- hash = "sha256-9D6nIuRP/MyzTYDp7Uo5RcK4QrF+YMV6tTVMX/mAKY8=";
+ hash = "sha256-PA7wcrbGRfrMYgT9vWcpPEgZot+HNkQrptPuEArVM3Q=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/misc/kjv/lukesmithxyz-kjv.nix b/pkgs/by-name/lu/lukesmithxyz-bible-kjv/package.nix
similarity index 100%
rename from pkgs/applications/misc/kjv/lukesmithxyz-kjv.nix
rename to pkgs/by-name/lu/lukesmithxyz-bible-kjv/package.nix
diff --git a/pkgs/by-name/lu/lune/package.nix b/pkgs/by-name/lu/lune/package.nix
index 7f0ec9b1faea..df7bf3ce6753 100644
--- a/pkgs/by-name/lu/lune/package.nix
+++ b/pkgs/by-name/lu/lune/package.nix
@@ -7,17 +7,17 @@
}:
rustPlatform.buildRustPackage rec {
pname = "lune";
- version = "0.10.2";
+ version = "0.10.3";
src = fetchFromGitHub {
owner = "filiptibell";
repo = "lune";
tag = "v${version}";
- hash = "sha256-td+rzfM4MtvuwnxDZbJOJAFMPzc/KzTWsHSiqJg2+a4=";
+ hash = "sha256-pWOGaVugfnwaA4alFP85ha+/iaN8x6KOVnx38vfFk78=";
fetchSubmodules = true;
};
- cargoHash = "sha256-vgnt76GyKYJhrnMqJNKj5YMXubDzSgsab07nd5Y8+qY=";
+ cargoHash = "sha256-cq7Sgq9f2XpVTgEOMfR/G7sTqcWLwuJBgG9U+h4IMWQ=";
# error: linker `aarch64-linux-gnu-gcc` not found
postPatch = ''
diff --git a/pkgs/by-name/lx/lxgw-neoxihei/package.nix b/pkgs/by-name/lx/lxgw-neoxihei/package.nix
index 7ef5b8b632a7..c428bb8f8757 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.223";
+ version = "1.224";
src = fetchurl {
url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf";
- hash = "sha256-mTfA4gHGtCKP7diimj9YzzEEQpXVdyYAXBezBEWiWHE=";
+ hash = "sha256-Wib8zZsdw9K5dmVYPymzv4hkAhrOWyEjflzEX8tv0zc=";
};
dontUnpack = true;
diff --git a/pkgs/by-name/lz/lzfse/package.nix b/pkgs/by-name/lz/lzfse/package.nix
index ce89b500accd..9facc49afec3 100644
--- a/pkgs/by-name/lz/lzfse/package.nix
+++ b/pkgs/by-name/lz/lzfse/package.nix
@@ -18,6 +18,14 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ cmake ];
+ # Fix the build with CMake 4.
+ postPatch = ''
+ substituteInPlace CMakeLists.txt \
+ --replace-fail \
+ 'cmake_minimum_required(VERSION 2.8.6)' \
+ 'cmake_minimum_required(VERSION 3.10)'
+ '';
+
meta = {
homepage = "https://github.com/lzfse/lzfse";
description = "Reference C implementation of the LZFSE compressor";
diff --git a/pkgs/by-name/ma/magic-vlsi/package.nix b/pkgs/by-name/ma/magic-vlsi/package.nix
index 2eef742ff097..ab6c05ec0095 100644
--- a/pkgs/by-name/ma/magic-vlsi/package.nix
+++ b/pkgs/by-name/ma/magic-vlsi/package.nix
@@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "magic-vlsi";
- version = "8.3.552";
+ version = "8.3.555";
src = fetchFromGitHub {
owner = "RTimothyEdwards";
repo = "magic";
tag = "${version}";
- sha256 = "sha256-rCT/w2Y6eV0oc/dOoQitzOpy7xFcUC7tUpkzWRf/QAc=";
+ sha256 = "sha256-O/W2gWdL4z7JSAv+ZvTkQ6ApKLhrg4UwGde68qSwq3c=";
leaveDotGit = true;
};
diff --git a/pkgs/by-name/ma/magma/package.nix b/pkgs/by-name/ma/magma/package.nix
index f3182f0b6eda..c4b854eaa964 100644
--- a/pkgs/by-name/ma/magma/package.nix
+++ b/pkgs/by-name/ma/magma/package.nix
@@ -4,6 +4,7 @@
cmake,
cudaPackages,
cudaSupport ? config.cudaSupport,
+ fetchpatch,
fetchurl,
gfortran,
gpuTargets ? [ ], # Non-CUDA targets, that is HIP
@@ -126,6 +127,15 @@ stdenv.mkDerivation (finalAttrs: {
"test"
];
+ patches = [
+ (fetchpatch {
+ # [PATCH] Drop CMP0037 to fix cmake 4.0 build error
+ name = "drop-cmp0037-old.patch";
+ url = "https://github.com/icl-utk-edu/magma/commit/2fecaf3f0c811344363f713669c1fe30f6879acd.patch";
+ hash = "sha256-Dfzq2gqoLSByCLWV5xvY/lXZeVa/yQ67lDSoIAa9jUU=";
+ })
+ ];
+
postPatch = ''
# For rocm version script invoked by cmake
patchShebangs tools/
@@ -170,6 +180,10 @@ stdenv.mkDerivation (finalAttrs: {
]
);
+ env.CFLAGS = "-DADD_" + lib.optionalString rocmSupport " -fopenmp";
+ env.CXXFLAGS = finalAttrs.env.CFLAGS;
+ env.FFLAGS = "-DADD_";
+
cmakeFlags = [
(strings.cmakeFeature "GPU_TARGET" gpuTargetString)
(strings.cmakeBool "MAGMA_ENABLE_CUDA" cudaSupport)
@@ -179,9 +193,6 @@ stdenv.mkDerivation (finalAttrs: {
# otherwise not be set in NVCC_FLAGS or DEVCCFLAGS (which we cannot modify).
# See https://github.com/NixOS/nixpkgs/issues/281656#issuecomment-1902931289
(strings.cmakeBool "USE_FORTRAN" true)
- (strings.cmakeFeature "CMAKE_C_FLAGS" "-DADD_")
- (strings.cmakeFeature "CMAKE_CXX_FLAGS" "-DADD_")
- (strings.cmakeFeature "FORTRAN_CONVENTION" "-DADD_")
]
++ lists.optionals cudaSupport [
(strings.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaArchitecturesString)
@@ -192,8 +203,8 @@ stdenv.mkDerivation (finalAttrs: {
# Can't easily apply the PR as a patch because we rely on the tarball with pregenerated
# hipified files ∴ fetchpatch of the PR will apply cleanly but fail to build
(strings.cmakeFeature "ROCM_CORE" "${rocmPackages.clr}")
- (strings.cmakeFeature "CMAKE_C_COMPILER" "${rocmPackages.clr}/bin/hipcc")
- (strings.cmakeFeature "CMAKE_CXX_COMPILER" "${rocmPackages.clr}/bin/hipcc")
+ (strings.cmakeFeature "CMAKE_C_COMPILER" "${rocmPackages.clr}/bin/clang")
+ (strings.cmakeFeature "CMAKE_CXX_COMPILER" "${rocmPackages.clr}/bin/clang++")
];
# Magma doesn't have a test suite we can easily run, just loose executables, all of which require a GPU.
diff --git a/pkgs/by-name/ma/maim/package.nix b/pkgs/by-name/ma/maim/package.nix
index eca2e188eba1..e2719e11d978 100644
--- a/pkgs/by-name/ma/maim/package.nix
+++ b/pkgs/by-name/ma/maim/package.nix
@@ -2,7 +2,6 @@
lib,
stdenv,
fetchFromGitHub,
- fetchpatch,
cmake,
pkg-config,
zlib,
@@ -23,13 +22,13 @@
stdenv.mkDerivation rec {
pname = "maim";
- version = "5.8.0";
+ version = "5.8.1";
src = fetchFromGitHub {
owner = "naelstrof";
repo = "maim";
rev = "v${version}";
- sha256 = "sha256-/tZqSJnKe8GiffSz9VIFKuxMktRld+hA4ZWP4TZQrlg=";
+ hash = "sha256-bbjV3+41cxAlKCEd1/nvnZ19GhctWOr5Lu4X+Vg3EAk=";
};
nativeBuildInputs = [
@@ -53,15 +52,6 @@ stdenv.mkDerivation rec {
icu
];
- patches = [
- # Use C++17 as required by icu
- (fetchpatch {
- name = "maim-c++-17.patch";
- url = "https://github.com/naelstrof/maim/commit/e7fe09b6734baeb59081b8805be542c92178cf0f.patch";
- sha256 = "0z9zvrr8msfli88jmhxm5knysi385s48j2w7zpacc7qhf4c5zh8c";
- })
- ];
-
doCheck = false;
meta = {
diff --git a/pkgs/by-name/ma/makemkv/package.nix b/pkgs/by-name/ma/makemkv/package.nix
index 83bfb1c94de4..5c18ed3bf0c9 100644
--- a/pkgs/by-name/ma/makemkv/package.nix
+++ b/pkgs/by-name/ma/makemkv/package.nix
@@ -18,21 +18,21 @@
}:
let
- version = "1.18.1";
+ version = "1.18.2";
# Using two URLs as the first one will break as soon as a new version is released
src_bin = fetchurl {
urls = [
"http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz"
"http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz"
];
- hash = "sha256-sWV2ZR6t7DWF6BeEOioaDryqcTuJ3R4CDYsdBW3bL9Y=";
+ hash = "sha256-v8THzrwPAEl2cf/Vbmo08HcKnmr37/LwEn76FD8oY24=";
};
src_oss = fetchurl {
urls = [
"http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz"
"http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz"
];
- hash = "sha256-3Efu+x5o99U55LB5u5POZBRBBK0jPeVoGJOYEOzQO3s=";
+ hash = "sha256-uUl/VVXCV/XTx/GLarA8dM/z6kQ36ANJ1hjRFb9fpEU=";
};
in
stdenv.mkDerivation {
diff --git a/pkgs/applications/graphics/mandelbulber/default.nix b/pkgs/by-name/ma/mandelbulber/package.nix
similarity index 100%
rename from pkgs/applications/graphics/mandelbulber/default.nix
rename to pkgs/by-name/ma/mandelbulber/package.nix
diff --git a/pkgs/by-name/ma/manifold/package.nix b/pkgs/by-name/ma/manifold/package.nix
index 10a3dd62ae49..78a0e727b881 100644
--- a/pkgs/by-name/ma/manifold/package.nix
+++ b/pkgs/by-name/ma/manifold/package.nix
@@ -6,7 +6,7 @@
clipper2,
gtest,
glm,
- tbb_2022,
+ onetbb,
python3Packages,
}:
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
gtest
glm
- tbb_2022
+ onetbb
];
propagatedBuildInputs = [ clipper2 ];
@@ -48,7 +48,6 @@ stdenv.mkDerivation (finalAttrs: {
'';
passthru = {
- tbb = tbb_2022;
tests = {
python = python3Packages.manifold3d;
};
diff --git a/pkgs/by-name/ma/mapproxy/package.nix b/pkgs/by-name/ma/mapproxy/package.nix
index 9b01f2851989..50f45c37b661 100644
--- a/pkgs/by-name/ma/mapproxy/package.nix
+++ b/pkgs/by-name/ma/mapproxy/package.nix
@@ -7,7 +7,7 @@
python3Packages.buildPythonApplication rec {
pname = "mapproxy";
- version = "5.0.0";
+ version = "5.1.1";
pyproject = true;
disabled = python3Packages.pythonOlder "3.8";
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
owner = "mapproxy";
repo = "mapproxy";
tag = version;
- hash = "sha256-+L9ZTgWh4E5cUGeP0rTclDbnqIzc/DlHvIXR+kDcjm8=";
+ hash = "sha256-4TRaY/NfOjmq5v+6Rv2UGwF1rqnw4UggVOX2HMa5mVI=";
};
prePatch = ''
diff --git a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix
index 7181b269bdde..5e76d0a1d5b0 100644
--- a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix
+++ b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix
@@ -8,16 +8,16 @@
buildGoModule (finalAttrs: {
pname = "matrix-alertmanager-receiver";
- version = "2025.9.17";
+ version = "2025.9.24";
src = fetchFromGitHub {
owner = "metio";
repo = "matrix-alertmanager-receiver";
tag = finalAttrs.version;
- hash = "sha256-cLAB3Pdt+bg8boaRvYclsIrQXIK50fPWi92eCg7g/LA=";
+ hash = "sha256-6k/pbAWkjvzxVpL7zX/B2ojZOTvSl9HKhLrI5OgsX5Y=";
};
- vendorHash = "sha256-zYcc2Gtdrh0xgHc/Bj+XQovlazlHpv7Rm+3lbw1ry1g=";
+ vendorHash = "sha256-8b9F4gVqHWznfPFbf7jRNENgBJg2SiMFle8cz5WVuw8=";
env.CGO_ENABLED = "0";
diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
index 164745df9347..65730a6ec682 100644
--- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
+++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
@@ -31,7 +31,8 @@ python3Packages.buildPythonApplication rec {
postPatch = ''
substituteInPlace pyproject.toml \
- --replace-fail "setuptools_rust>=1.3,<=1.11.1" "setuptools_rust<=1.12,>=1.3"
+ --replace-fail "setuptools_rust>=1.3,<=1.11.1" "setuptools_rust<=1.12,>=1.3" \
+ --replace-fail "poetry-core>=1.1.0,<=2.1.3" "poetry-core>=1.1.0,<=2.3.0"
'';
build-system = with python3Packages; [
diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix
index 1a5a7472b87a..7defb66efee7 100644
--- a/pkgs/by-name/ma/maturin/package.nix
+++ b/pkgs/by-name/ma/maturin/package.nix
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "maturin";
- version = "1.9.3";
+ version = "1.9.4";
src = fetchFromGitHub {
owner = "PyO3";
repo = "maturin";
rev = "v${version}";
- hash = "sha256-VhL4nKXyONXbxriEHta0vCnWY1j82oDOLoxVigaggSc=";
+ hash = "sha256-dZIcUaHPdXNgzUhSUld2TAKJVfktRahc7OtOwYRlKSQ=";
};
- cargoHash = "sha256-Iom4GoTBFJ9P5UQnYF5JbeQeO2Eh1MwKOwbo+PhgtQM=";
+ cargoHash = "sha256-tmImZOGERNvAI4I8H4nuJAdrMrMyOYza43+SVdyjFNc=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
libiconv
diff --git a/pkgs/by-name/ma/maxflow/0001-Raise-minimum-CMake-version.patch b/pkgs/by-name/ma/maxflow/0001-Raise-minimum-CMake-version.patch
new file mode 100644
index 000000000000..42523114b071
--- /dev/null
+++ b/pkgs/by-name/ma/maxflow/0001-Raise-minimum-CMake-version.patch
@@ -0,0 +1,42 @@
+From e4d8d49beebea53f5ed71d7134528a806e89d95f Mon Sep 17 00:00:00 2001
+From: Marcin Serwin